Git client for the parallel-agent era

Everyone helps you launch the ships.
Astrolabe brings them home.

A native desktop Git client for macOS and Windows built for the half nobody tooled: merging the branches your agents left behind, resolving the conflicts, and knowing exactly who wrote which side.

Not shipped yet. macOS + Windows, 2026.

Commit graph with a Fleet task ready to land.

The problem

Parallel agents break a workflow built for one pair of hands.

Five agents, one working tree

Tasks finish while you are reading the last one. Checking out to look at a branch stops whatever else was running in that directory.

Conflicts with no authors

Conflict markers tell you two sides disagree. They never tell you which side came from which task, or which one you wrote yourself an hour ago.

Launching is one command. Landing is an afternoon.

Every tool in this category ends at dispatch. The reviewing, merging and attributing is still done by hand, in a terminal, one branch at a time.

Fleet

Every task gets its own berth.

Fleet runs your parallel agent tasks on real git worktrees. One task, one branch, one directory: a berth. Nothing is checked out over anything else, and one board tells you the state of the whole harbour.

Isolated by construction

A berth is a worktree, not a stash dance. Two agents editing the same file never touch the same index.

Live status, not a guess

Running, blocked, ready to land, landed. Read from git and the filesystem, refreshed as it happens.

Land from the board

Review the diff, merge, delete the berth. The queue drains in the order you choose, not the order they finished.

Fleet board · one row per berth, one berth per task.
Author Lens · attribution on both sides of one hunk.

Author Lens

A conflict should say who wrote it.

Every conflicting hunk carries its own attribution, per side: avatar, author, commit subject, short hash, relative time. You stop reading code in the dark and start deciding between two people's intentions.

Per hunk, not per file

Blame is resolved at the region that actually conflicts, so a file touched by three tasks reads as three separate decisions.

Task-aware

Astrolabe reads Co-Authored-By trailers, so it can tell you this side is Claude Code's AL-161 task and that side is you, from two hours ago.

Decide, don't archaeologise

Take one side, take both, or edit the result inline. The choice is recorded per hunk and stays undoable until you continue the merge.

Under the hood

A desktop app that behaves like your terminal.

Native, not Electron

Tauri and Rust. The system webview for the UI, a Rust core for the work: one small binary, real platform menus, no bundled browser sitting in memory.

Hybrid git engine

Anything that mutates the repository runs through your own git (2.40+), so merge semantics and hooks match your CLI exactly. The Rust core only reads and parses stable machine formats.

Your credentials, untouched

Astrolabe inherits the credential helper, SSH keys and config your CLI already uses. It never stores or asks for a password or token, and there is no account to make.

macOS and Windows

A universal macOS build and a Windows build from the same source, each with its own platform conventions: not one skinned to look like the other.

One-time purchase.

No subscription, no account, no telemetry.

Price announced at launch.