|
|
@@ -6,9 +6,7 @@ description: Manage Git worktrees as OMO safe isolated coding lanes for complex,
|
|
|
# Worktrees Orchestration Protocol
|
|
|
|
|
|
The `worktrees` skill provides an opinionated, safe orchestration protocol for
|
|
|
-managing Git worktrees as isolated coding lanes. Its goal is not to teach Git
|
|
|
-commands. Its value is giving the Orchestrator a consistent OMO workflow for
|
|
|
-parallel agents, risky experiments, integration review, and cleanup.
|
|
|
+managing Git worktrees as isolated coding lanes. Its value is giving the Orchestrator a consistent OMO workflow for parallel agents, risky experiments, integration review, and cleanup.
|
|
|
|
|
|
## Core Contract
|
|
|
|
|
|
@@ -37,7 +35,7 @@ structural tracking:
|
|
|
"lanes": [
|
|
|
{
|
|
|
"slug": "feature-auth-v2",
|
|
|
- "branch": "omo/feature-auth-v2",
|
|
|
+ "branch": "omos/feature-auth-v2",
|
|
|
"path": ".slim/worktrees/feature-auth-v2",
|
|
|
"base": "main",
|
|
|
"purpose": "refactor authentication flow to use OAuth2",
|
|
|
@@ -66,7 +64,7 @@ following guards:
|
|
|
- Confirm the current directory is inside a Git repository.
|
|
|
- Check the current branch, base branch, and dirty/uncommitted state.
|
|
|
- Inspect the output of `git worktree list` to avoid path or branch conflicts.
|
|
|
-- Ensure the branch name (e.g. `omo/<slug>` or custom project convention) does not already exist locally or on remote.
|
|
|
+- Ensure the branch name (e.g. `omos/<slug>` or custom project convention) does not already exist locally or on remote.
|
|
|
- Ensure `.slim/worktrees/` is ignored by Git before creating nested worktrees.
|
|
|
|
|
|
### 2. Mandatory User Confirmation
|
|
|
@@ -111,7 +109,7 @@ Before creating lanes, add or update managed marker blocks only.
|
|
|
|
|
|
### Phase 1: Planning & Setup
|
|
|
1. Identify the task scope and determine a short `<slug>` for the worktree.
|
|
|
-2. Formulate a branch name. Default to `omo/<slug>` unless project/user conventions dictate otherwise.
|
|
|
+2. Formulate a branch name. Default to `omos/<slug>` unless project/user conventions dictate otherwise.
|
|
|
3. Validate repository safety. Ask the user for confirmation to initialize the lane.
|
|
|
4. Ensure the managed ignore blocks are present.
|
|
|
5. Run:
|
|
|
@@ -159,8 +157,8 @@ Before merging or integrating the worktree branch:
|
|
|
- Running independent background agents on separate branches.
|
|
|
- Conducting exploratory spikes or prototyping that may be discarded.
|
|
|
- Isolating third-party packages or complex upgrades.
|
|
|
+- Explicitly asked to use worktrees for a specific task.
|
|
|
|
|
|
### Do NOT Use When:
|
|
|
- Making simple single-file changes, documentation updates, or minor bug fixes.
|
|
|
- Working in a git repository that is not fully initialized or has complex multi-submodule states not supported easily by worktrees.
|
|
|
-- The user wants the work done directly in the current checkout.
|