mirror of
https://github.com/stablyai/orca.git
synced 2026-09-22 16:02:32 +00:00
Jinjing
f2eb119c62
- Add PRConflictSummary type and derive conflict metadata (base ref, commits behind, conflicting files) via local git merge-tree - Fix parseUnmergedEntry to use space-separated parsing (porcelain v2 unmerged entries are not tab-separated) - Enhance rebase detection by checking rebase-merge/ and rebase-apply/ directories in addition to REBASE_HEAD - Show conflicting files list and commits-behind count in ChecksPanel - Disable merge button with tooltip when PR has conflicts - Add operation banners (merge/rebase/cherry-pick) in SourceControl and WorktreeCard - Reorder section list so unstaged changes appear above staged - Extract conflict-summary, issues, and gh-utils into separate modules - Add 10s timeout to git fetch in conflict summary derivation - Fix test fixtures to match real porcelain v2 format
Orca
A cross-platform AI Orchestrator for 100x engineers.
Seamlessly manage multiple worktrees and open multiple terminals running anything — Claude Code, Codex, OpenCode, and more.
Built-in status tracking, notifications, and unread markers. Makes coding multiple features across multiple repos a breeze.
Learn more at www.OrcaBuild.ai
Shipping daily
Missing something? It's probably landing tomorrow. Request a feature · Star to follow along.
Features
- Manage multiple worktrees
- Multiple terminals, tabs and panes
- Get worktree notifications (plus ability to manually mark threads as unread -- similar to Gmail ⭐)
- See which worktrees have working agents
- GitHub integrations for GH PRs (automatic), ability to link GH issues (via
ghcli), and a GH checks viewer - File editor, search, source control tab (see worktree changes, make edits, easily commit)
Install
Grab a release from https://www.orcabuild.ai/ or download from the GH release page
Developing
See CONTRIBUTING.md for branch naming, PR expectations, and required checks.
Install
$ pnpm install
Development
$ pnpm dev
Build
# For windows
$ pnpm build:win
# For macOS
$ pnpm build:mac
# For Linux
$ pnpm build:linux