ae77156ab2
* feat(worktree): reuse an existing branch when creating a worktree (#5181) Adds an explicit "Reuse this branch" checkbox to the new-worktree composer. When an existing local branch is selected in the smart name field, the checkbox (default on) checks that branch out instead of creating a new branch from it — and the choice now survives renaming the worktree folder. Previously, reusing an existing branch only worked implicitly: it required keeping the auto-filled worktree name equal to the branch, and editing the name silently reverted to "create a new branch". There was no discoverable, durable control — the gap the issue reports. The fix is renderer-only: picking an existing local branch already sets baseBranch === branchNameOverride, so the existing backend reuse path (`git worktree add <path> <branch>`, preserveBranchOnDelete) checks the branch out correctly across local/SSH/runtime. The checkbox pins that override via the existing branchNameOverridePreservesNameEdits flag so the worktree folder can be named independently while the branch is reused; unchecking creates a fresh branch from the selected ref as base. - New pure helper resolveComposerBranchReuse (local-vs-remote + default). - Checkbox hidden for remote-only refs and non-branch sources. - Tests: pure helper, card render/toggle, and a backend integration test proving a renamed folder still reuses the exact branch. * fix(worktree): refine reuse-branch checkbox (placement, label, eligibility) Address review feedback on the "Reuse branch" control: - Move the checkbox directly under the branch (smart) selection instead of the Advanced "Name" field — the worktree folder name can legitimately differ from the branch, so the choice belongs next to the branch pick and is now visible without expanding Advanced. - Rename the label "Reuse this branch" -> "Reuse branch". - Make eligibility dynamic: reuse is impossible when the branch is already checked out in another worktree (git allows a branch in only one worktree), so the checkbox is now hidden in that case (it was already hidden for remote-only refs). When a busy branch is picked, the override is no longer pinned to it, so creation cleanly falls back to a new branch from that ref as base instead of a silently-suffixed branch. Adds isBranchCheckedOutInWorktrees (pure, unit-tested) and threads the repo's worktree branch list from the store into the selection logic. * feat(worktree): animate the reuse-branch row's show/hide Keep the "Reuse branch" row mounted and collapse it with a grid-rows transition (same pattern as the Advanced drawer) instead of conditionally rendering it, so the create-worktree dialog grows and shrinks smoothly when the option appears/disappears as the selected branch changes. The checkbox is taken out of the tab order while collapsed. * refactor(worktree): address review nits on reuse-branch control From a multi-dimensional review of the branch (all findings low severity): - Reset reuse state (reuseEligibleBranch, reuseSelectedBranch, branchNameOverridePreservesNameEdits) on repo and project switches, matching the other reset paths — avoids carrying stale branch-scoped state. - Disable the reuse checkbox while collapsed so no focusable control lives inside the aria-hidden row. - Extract the busy-branch override decision into a pure resolveComposerReuseOverride helper and unit-test it (busy local branch drops the override; remote-only ref keeps it) — pins the "no suffixed-branch collision" guarantee. - Note the worktreesByRepo visibility limitation near the busy-branch check (a branch busy only in a hidden external worktree is caught by the backend). - Strengthen tests: reuse-checkbox toggle in both directions, empty worktree list case. |
||
|---|---|---|
| .github | ||
| .husky | ||
| .visual-evidence/sidebar-nav | ||
| Casks | ||
| config | ||
| docs | ||
| mobile | ||
| native | ||
| notes | ||
| previews | ||
| resources | ||
| skills | ||
| src | ||
| tests | ||
| tools | ||
| .gitattributes | ||
| .gitignore | ||
| .npmrc | ||
| .oxfmtrc.json | ||
| .oxlintrc.json | ||
| AGENTS.md | ||
| CLAUDE.md | ||
| LICENSE | ||
| README.md | ||
| components.json | ||
| electron.vite.config.ts | ||
| orca.yaml | ||
| package.json | ||
| pnpm-lock.yaml | ||
| tsconfig.json | ||
| vite.web.config.ts | ||
README.md
Orca
The AI Orchestrator for 100x builders.
Run Codex, ClaudeCode, OpenCode or Pi side-by-side — each in its own worktree, tracked in one place.
Download Orca
Features
Mobile CompanionMonitor and steer your agents from your phone — get notified when an agent finishes and send follow-ups from anywhere. |
|
Parallel WorktreesFan one prompt across five agents, each in its own isolated git worktree — compare the results and merge the winner. |
|
Terminal SplitsGhostty-class terminals with WebGL rendering, infinite splits, and scrollback that survives restarts. |
|
Design ModeClick any UI element in a real Chromium window to send its HTML, CSS, and a cropped screenshot straight into your agent's prompt. |
|
GitHub & Linear, NativeBrowse PRs, issues, and project boards in-app — open a worktree from any task and review without a context switch. |
|
SSH WorktreesRun agents on a beefy remote box with full file editing, git, and terminals — auto-reconnect and port forwarding included. |
|
Annotate AI DiffsDrop comments on any diff line and ship them back to the agent — review, edit, and commit without leaving Orca. |
|
Drag Files to AgentsVS Code's editor with autosave everywhere — drag files or images straight into an agent prompt. |
|
Orca CLIAgents drive Orca too — script every workflow with |
|
Also in the box:
- Quick open — Search across worktrees, files, agents, commands, and repo context without leaving your flow.
- Account switcher & usage tracking — See Claude and Codex usage and rate-limit resets, and hot-swap accounts without re-logging in.
- Rich repo previews — Preview Markdown, images, PDFs, and repo docs in the workspace.
- Computer Use — Let agents operate desktop apps and visible UI when a workflow needs real interaction.
- Notifications and unread state — Know when an agent finishes or needs attention, then mark threads unread to come back later.
- And many, many more — we ship daily, so this list is perpetually behind. The changelog is the real feature list.
Supported Agents
Works with any CLI agent — if it runs in a terminal, it runs in Orca.
Claude Code
Codex
Grok
Gemini
Cursor
GitHub Copilot
OpenCode
Amp
OpenClaude
Antigravity
Pi
oh-my-pi
Hermes Agent
Devin
Goose
Auggie
Autohand Code
Charm
Cline
Codebuff
Command Code
Continue
Droid
Kilocode
Kimi
Kiro
Mistral Vibe
Qwen Code
Rovo Dev
+ any CLI agent
Install
Desktop — macOS, Windows, Linux
- Download from onOrca.dev
- Or grab a build directly: macOS Apple Silicon · macOS Intel · Windows (.exe) · Linux AppImage · All builds
Or via a package manager:
# macOS (Homebrew)
brew install --cask stablyai/orca/orca
# Arch Linux (AUR) — or stably-orca-git to build from source
yay -S stably-orca-bin
Mobile Companion — iOS, Android
Pair with your desktop app to monitor and steer your agents from your phone.
- iOS: Download on the App Store
- Android: Download the APK
Community & Support
- Discord: Join the community on Discord.
- Twitter / X: Follow @orca_build for updates and announcements.
- Feedback & Ideas: We ship fast. Missing something? Request a new feature.
- Privacy: See the privacy & telemetry docs for what anonymous usage data Orca collects and how to opt out.
- Show Support: Star this repo to follow along with our daily ships.
Developing
Want to contribute or run locally? See our CONTRIBUTING.md guide.
License
Orca is free and open source under the MIT License.