Skip to content
— Worktrees, diffs, conflicts, history

Git that works like the rest of the app.

Worktrees first. Side-by-side compare. A real conflict resolver. Stage and push from your phone — agent runs git locally, all communication encrypted.

acme-api · git main ↓ 0 ↑ 2
Diff History Conflict src/billing/proration.ts
4242 return invoice;
4343}
4444
45+ export function prorateOnDowngrade(sub: Subscription, at: Date) {
46+ const remaining = daysUntil(sub.currentPeriodEnd, at);
47+ const credit = sub.amount * (remaining / sub.periodDays);
48+ return issueCredit(sub.customerId, credit);
49+ }
4550
46- export const __legacy = true;
4751
Conflict · src/billing/index.ts
YOURS · main
export { prorateOnDowngrade }
  from "./proration";
RESULT
export { prorateOnDowngrade }
  from "./proration";
export { refundOnCancel }
  from "./refund";
THEIRS · fix/webhook
export { refundOnCancel }
  from "./refund";
commit: feat(billing): add proration helper for plan downgrades
Stage all Stash Commit (2) Commit & push

A git client that's not bolted on

The same git state powers the Git view, IDE decorations, sessions sidebar, dashboard urgency sort, and the mobile clients.

Worktrees, not just branches

List, switch, and compare worktrees side by side. Each worktree carries its own sync state — staged, unstaged, ahead/behind — surfaced before you click in.

VS Code-style 3-pane conflict resolver

YOURS, RESULT, THEIRS. Pick a hunk, edit the merged output, mark resolved. Same UI on desktop and the web portal.

Stage, commit, push from your phone

Mobile mirrors desktop git surfaces. Approve, stage, commit, push — every command flows through the encrypted relay; the agent host runs git locally.

Live commit graph + history

Lane-based commit graph (graph-lanes.ts) with checkout, cherry-pick, revert, reset, and tag from the row. Search across history.

External-change watcher

git_watcher.rs picks up changes made outside the app and refreshes the UI. Sessions sharing a working_directory dedupe — one subprocess per dir, not per session.

Decorations everywhere

Modified, added, deleted lines render in the Monaco gutter, the minimap, and the file tree. The IDE sees the same git state as the Git view.

— FREE FOREVER FOR SOLO DEVS

Bring Glueprint to your workflow.

Download once, run on your hardware, scale up to teams when you're ready. No credit card.