Alvin Unreal 1 month ago
parent
commit
2e9ba223ee
3 changed files with 7 additions and 28 deletions
  1. 2 4
      src/skills/reflect/SKILL.md
  2. 0 17
      src/skills/worktrees/README.md
  3. 5 7
      src/skills/worktrees/SKILL.md

+ 2 - 4
src/skills/reflect/SKILL.md

@@ -10,8 +10,7 @@ looks back over recent sessions, project notes, and existing agent assets, then
 recommends the smallest useful improvement: a skill, custom agent, command,
 recommends the smallest useful improvement: a skill, custom agent, command,
 configuration change, prompt rule, documentation playbook, or no change.
 configuration change, prompt rule, documentation playbook, or no change.
 
 
-The goal is not to generate more assets. The goal is to identify real repeated
-friction and suggest practical improvements with evidence.
+The goal is to identify real repeated friction and suggest practical improvements with evidence.
 
 
 ## When to Use
 ## When to Use
 
 
@@ -20,8 +19,7 @@ Use Reflect when the user asks to:
 - run `/reflect` or `/reflect <focus>`;
 - run `/reflect` or `/reflect <focus>`;
 - learn from recent sessions or repeated workflows;
 - learn from recent sessions or repeated workflows;
 - find work they keep doing manually;
 - find work they keep doing manually;
-- suggest new skills, custom agents, commands, prompt rules, or config changes;
-- improve their oh-my-opencode-slim setup based on actual usage;
+- improve their oh-my-opencode-slim setup based on actual usage using oh-my-opencode-slim skill;
 - review whether a recurring process should become a reusable playbook;
 - review whether a recurring process should become a reusable playbook;
 - turn repeated workflow friction into a safer future default.
 - turn repeated workflow friction into a safer future default.
 
 

+ 0 - 17
src/skills/worktrees/README.md

@@ -1,17 +0,0 @@
-# Worktrees Skill
-
-Manage Git worktrees as OMO safe isolated coding lanes for complex, risky, or parallel work.
-
-## Overview
-
-This bundled skill gives the `orchestrator` an opinionated safe orchestration
-protocol for Git worktrees. It keeps isolated coding lanes under
-`.slim/worktrees/<slug>/` and can track lane metadata in `.slim/worktrees.json`.
-
-The point is not teaching Git commands. The skill standardizes how OMO plans
-parallel work, assigns agents to isolated branches, asks before mutating Git
-state, validates diffs, and cleans up safely.
-
-## Installation
-
-Bundled with `oh-my-opencode-slim` and installed automatically when bundled skills are enabled via the installer.

+ 5 - 7
src/skills/worktrees/SKILL.md

@@ -6,9 +6,7 @@ description: Manage Git worktrees as OMO safe isolated coding lanes for complex,
 # Worktrees Orchestration Protocol
 # Worktrees Orchestration Protocol
 
 
 The `worktrees` skill provides an opinionated, safe orchestration protocol for
 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
 ## Core Contract
 
 
@@ -37,7 +35,7 @@ structural tracking:
   "lanes": [
   "lanes": [
     {
     {
       "slug": "feature-auth-v2",
       "slug": "feature-auth-v2",
-      "branch": "omo/feature-auth-v2",
+      "branch": "omos/feature-auth-v2",
       "path": ".slim/worktrees/feature-auth-v2",
       "path": ".slim/worktrees/feature-auth-v2",
       "base": "main",
       "base": "main",
       "purpose": "refactor authentication flow to use OAuth2",
       "purpose": "refactor authentication flow to use OAuth2",
@@ -66,7 +64,7 @@ following guards:
 - Confirm the current directory is inside a Git repository.
 - Confirm the current directory is inside a Git repository.
 - Check the current branch, base branch, and dirty/uncommitted state.
 - Check the current branch, base branch, and dirty/uncommitted state.
 - Inspect the output of `git worktree list` to avoid path or branch conflicts.
 - 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.
 - Ensure `.slim/worktrees/` is ignored by Git before creating nested worktrees.
 
 
 ### 2. Mandatory User Confirmation
 ### 2. Mandatory User Confirmation
@@ -111,7 +109,7 @@ Before creating lanes, add or update managed marker blocks only.
 
 
 ### Phase 1: Planning & Setup
 ### Phase 1: Planning & Setup
 1. Identify the task scope and determine a short `<slug>` for the worktree.
 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.
 3. Validate repository safety. Ask the user for confirmation to initialize the lane.
 4. Ensure the managed ignore blocks are present.
 4. Ensure the managed ignore blocks are present.
 5. Run:
 5. Run:
@@ -159,8 +157,8 @@ Before merging or integrating the worktree branch:
 - Running independent background agents on separate branches.
 - Running independent background agents on separate branches.
 - Conducting exploratory spikes or prototyping that may be discarded.
 - Conducting exploratory spikes or prototyping that may be discarded.
 - Isolating third-party packages or complex upgrades.
 - Isolating third-party packages or complex upgrades.
+- Explicitly asked to use worktrees for a specific task.
 
 
 ### Do NOT Use When:
 ### Do NOT Use When:
 - Making simple single-file changes, documentation updates, or minor bug fixes.
 - 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.
 - 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.