Repository navigation
orca-fleet 0.5.0: several fleets in one project, with an Admiral - #15
Merged
Merged
Conversation
A project can now run several fleets at once, each with its own orchestrator (/orca-fleet:conduct --fleet <id>), and an Admiral (/orca-fleet:admiral) above them. - fleets.py: fleet directory, shared merge lock, numbered claims, close - conduct: fleet mode, starting and closing lanes, merge lock, talking to other fleets - join-lane: records its fleet, follows only its own fleet's orchestrator, may coordinate with other fleets - join-checker: shared checker pool under the Admiral - hand-over: carries the fleet; Admiral handoff template - reporting.py and successor.py: --fleet, and the admiral line - orca-peers 0.4.0: rows show fleet: <id> - orca-strator 0.3.2: /orca offers the Admiral role A config without a fleets map behaves exactly as before. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changes
A project can run several fleets at once, each with its own orchestrator, lanes and orders file, and one Admiral above them. A config without a
fleetsmap behaves exactly as before.File by file
orca-fleet/scripts/fleets.py(new): the fleet directory (each fleet's orchestrator and the Admiral), a shared merge lock keyed on the session that took it, numbered claims (claim,next; numbers compared by value), andclose.closechecks the caller: only the Admiral, or a registered orchestrator closing a session of its own fleet in the same project. It never closes this session, the Admiral or a registered orchestrator. Every worktree of a repo shares one directory (the main checkout).orca-fleet/scripts/test_fleets.py(new): 9 tests (lock, handover release, claims, retire rights, separate projects).orca-fleet/skills/admiral/(new): starts and closes fleets, hourly roll-up, the shared checker pool (no upper limit), lock break, clashes, budgets, the person's loops. It never builds and routes through orchestrators. A yes counts only as the project's rules file says, and is never relayed.conduct:--fleet <id>, registration (--takeoverat a handover), only its own fleet's sessions, starting and closing lanes, merging under the lock, talking to other fleets.join-lane: records its fleet, follows "report to me" only from its own fleet, may coordinate with lanes of other fleets (copying its orchestrator), handles "Close now".join-checker: the shared pool reports to the Admiral.hand-over: carries## Fleet, admiral role and template.reporting.py:--fleet, newadmiralline.successor.py:--fleet.orca-peers0.4.0: rows end withfleet: <id>.orca-strator0.3.2:/orcaoffers the Admiral.What does not change
One fleet projects: same commands, names, crons and messages. No hooks change.
Review
An independent review found five issues in
fleets.py(worktrees got separate locks, 198 vs 0198, close too permissive, register takeover, lock stuck at handover). All five are fixed and covered by tests.Follow up
The Admiral README reuses the orca-fleet flow image; a dedicated Admiral visual is still to make.
🤖 Generated with Claude Code