monomind 2.5.1 → 2.5.3

package/packages/@monomind/cli/.claude/skills/{mastermind-skills/project-detail.md → mastermind-project-detail/SKILL.md}

@@ -40,7 +40,7 @@ This skill is invoked by `mastermind:project-detail` or directly via `/mastermin
 
 ## Step 0 — Brain Load (standalone only)
 
-If `caller` is not "command", load brain context following _protocol.md Brain Load Procedure with namespace: `ops`.
+If `caller` is not "command", load brain context following mastermind-protocol/SKILL.md Brain Load Procedure with namespace: `ops`.
 
 ---
 
@@ -246,4 +246,4 @@ project_status: <status>
 
 ## Step 4 — Brain Write (standalone only)
 
-If `caller` is not "command", follow _protocol.md Brain Write Procedure for domain `ops`.
+If `caller` is not "command", follow mastermind-protocol/SKILL.md Brain Write Procedure for domain `ops`.

package/packages/@monomind/cli/.claude/skills/{mastermind-skills/project-workspace.md → mastermind-project-workspace/SKILL.md}

@@ -55,7 +55,7 @@ This skill is invoked by `mastermind:project-workspace` or directly via `/master
 
 ## Step 0 — Brain Load (standalone only)
 
-If `caller` is not "command", load brain context following _protocol.md Brain Load Procedure with namespace: `ops`.
+If `caller` is not "command", load brain context following mastermind-protocol/SKILL.md Brain Load Procedure with namespace: `ops`.
 
 ---
 
@@ -241,4 +241,4 @@ workspace_id: <workspace_id>
 
 ## Step 4 — Brain Write (standalone only)
 
-If `caller` is not "command", follow _protocol.md Brain Write Procedure for domain `ops`.
+If `caller` is not "command", follow mastermind-protocol/SKILL.md Brain Write Procedure for domain `ops`.

package/packages/@monomind/cli/.claude/skills/{mastermind-skills/projects.md → mastermind-projects/SKILL.md}

@@ -26,7 +26,7 @@ This skill is invoked by `mastermind:projects` or directly via `/mastermind:proj
 
 ## Step 0 — Brain Load (standalone only)
 
-If `caller` is not "command", load brain context following _protocol.md Brain Load Procedure with namespace: `ops`.
+If `caller` is not "command", load brain context following mastermind-protocol/SKILL.md Brain Load Procedure with namespace: `ops`.
 
 ---
 
@@ -164,4 +164,4 @@ projects_file: .monomind/orgs/<org_name>-projects.json
 
 ## Step 4 — Brain Write (standalone only)
 
-If `caller` is not "command", follow _protocol.md Brain Write Procedure for domain `ops`.
+If `caller` is not "command", follow mastermind-protocol/SKILL.md Brain Write Procedure for domain `ops`.

package/packages/@monomind/cli/.claude/skills/{mastermind-skills/_protocol.md → mastermind-protocol/SKILL.md}

@@ -12,7 +12,7 @@ This file is a reference loaded by mastermind domain skills and master. It is NE
 
 ## Agent Delegation Protocol
 
-**Every Task/Agent spawn in mastermind and monomind MUST include the AGENT DELEGATION CAPABILITY block from `_delegation.md`.**
+**Every Task/Agent spawn in mastermind and monomind MUST include the AGENT DELEGATION CAPABILITY block from `mastermind-delegation/SKILL.md`.**
 
 This makes delegation recursive: every spawned agent can itself spawn sub-agents, which can spawn their own sub-agents. The capability block tells each agent which agent categories exist and how to delegate.
 
@@ -20,7 +20,7 @@ This makes delegation recursive: every spawned agent can itself spawn sub-agents
 
 **Why this matters:** Agents read their prompts cold. Without the delegation block, a spawned Security Engineer won't know it can delegate codebase exploration to a Code Reviewer, or that it can spawn a backend-dev to fix the issues it finds. With the block, every agent in the chain can self-organize and pull in the right specialist.
 
-**Reference:** Full block text is in `_delegation.md`. Copy it verbatim — do not paraphrase.
+**Reference:** Full block text is in `mastermind-delegation/SKILL.md`. Copy it verbatim — do not paraphrase.
 
 ---
 
@@ -400,5 +400,5 @@ AGENT: [agent slug, e.g. backend-dev | frontend-dev]
 SWARM: [topology agent-count consensus, e.g. \"hierarchical 4 raft\"]
 
 DEPENDENCIES: [task IDs, or \"none\"]
-OUTPUT FORMAT: Unified output schema (see mastermind _protocol.md)"
+OUTPUT FORMAT: Unified output schema (see mastermind mastermind-protocol/SKILL.md)"
 ```

package/packages/@monomind/cli/.claude/skills/{mastermind-skills/release.md → mastermind-release/SKILL.md}

@@ -13,7 +13,7 @@ This skill is invoked by `mastermind:master` or directly via `/mastermind:releas
 
 ## Inputs
 
-- `brain_context`: BRAIN CONTEXT block (injected by master, or loaded standalone via _protocol.md brain load)
+- `brain_context`: BRAIN CONTEXT block (injected by master, or loaded standalone via mastermind-protocol/SKILL.md brain load)
 - `prompt`: the release goal (version target, scope, environment)
 - `project_name`: monotask space name
 - `board_id`: monotask board ID (set by master, or created standalone)
@@ -43,9 +43,9 @@ Assess the prompt to determine execution mode:
 
 If this skill is invoked directly (not by master):
 
-1. Load brain context following _protocol.md Brain Load Procedure (namespace: `release`)
-2. Run intake from _intake.md if prompt is vague
-3. Follow _protocol.md Monotask Space+Board Setup Procedure:
+1. Load brain context following mastermind-protocol/SKILL.md Brain Load Procedure (namespace: `release`)
+2. Run intake from mastermind-intake/SKILL.md if prompt is vague
+3. Follow mastermind-protocol/SKILL.md Monotask Space+Board Setup Procedure:
    ```bash
    project_name="${project_name:-$(basename "$PWD")}"
    space_id=$(monotask space list 2>/dev/null | awk -F' \| ' -v n="$project_name" '$2==n{print $1}' | head -1)
@@ -59,7 +59,7 @@ If this skill is invoked directly (not by master):
    done_col=$(monotask column create "$board_id" "Done"  --json | jq -r '.id')
    ```
 4. Proceed with complexity assessment below
-5. At end: follow _protocol.md Brain Write Procedure (namespace: `release`)
+5. At end: follow mastermind-protocol/SKILL.md Brain Write Procedure (namespace: `release`)
 
 ---
 

package/packages/@monomind/cli/.claude/skills/{mastermind-skills/_repeat.md → mastermind-repeat/SKILL.md}

@@ -1,5 +1,5 @@
 ---
-name: mastermind-repeat-postamble
+name: mastermind-repeat
 description: REPEAT POSTAMBLE — executes inter-session repeat/tillend loop continuation after any mastermind or monomind command completes. Calls ScheduleWakeup when work remains.
 type: protocol-skill
 ---
@@ -142,7 +142,7 @@ cat > ".monomind/loops/${LOOP_ID}.json" << EOF
   "lastRunAt": ${NOW_MS},
   "nextRunAt": ${NEXT_AT},
   "status": "running",
-  "source": "_repeat.md"
+  "source": "mastermind-repeat/SKILL.md"
 }
 EOF
 ```

package/packages/@monomind/cli/.claude/skills/{mastermind-skills/research.md → mastermind-research/SKILL.md}

@@ -13,7 +13,7 @@ This skill is invoked by `mastermind:master` or directly via `/mastermind:resear
 
 ## Inputs
 
-- `brain_context`: BRAIN CONTEXT block (injected by master, or loaded standalone via _protocol.md brain load)
+- `brain_context`: BRAIN CONTEXT block (injected by master, or loaded standalone via mastermind-protocol/SKILL.md brain load)
 - `prompt`: the research question or intelligence goal
 - `project_name`: monotask space name
 - `board_id`: monotask board ID (set by master, or created standalone)
@@ -43,9 +43,9 @@ Assess the prompt to determine execution mode:
 
 If this skill is invoked directly (not by master):
 
-1. Load brain context following _protocol.md Brain Load Procedure (namespace: `research`)
-2. Run intake from _intake.md if prompt is vague
-3. Follow _protocol.md Monotask Space+Board Setup Procedure:
+1. Load brain context following mastermind-protocol/SKILL.md Brain Load Procedure (namespace: `research`)
+2. Run intake from mastermind-intake/SKILL.md if prompt is vague
+3. Follow mastermind-protocol/SKILL.md Monotask Space+Board Setup Procedure:
    ```bash
    project_name="${project_name:-$(basename "$PWD")}"
    space_id=$(monotask space list 2>/dev/null | awk -F' \| ' -v n="$project_name" '$2==n{print $1}' | head -1)
@@ -59,7 +59,7 @@ If this skill is invoked directly (not by master):
    done_col=$(monotask column create "$board_id" "Done"  --json | jq -r '.id')
    ```
 4. Proceed with complexity assessment below
-5. At end: follow _protocol.md Brain Write Procedure (namespace: `research`)
+5. At end: follow mastermind-protocol/SKILL.md Brain Write Procedure (namespace: `research`)
 
 ---
 

package/packages/@monomind/cli/.claude/skills/{mastermind-skills/review.md → mastermind-review/SKILL.md}

@@ -13,7 +13,7 @@ This skill is invoked by `mastermind:master` or directly via `/mastermind:review
 
 ## Inputs
 
-- `brain_context`: BRAIN CONTEXT block (injected by master, or loaded standalone via _protocol.md brain load)
+- `brain_context`: BRAIN CONTEXT block (injected by master, or loaded standalone via mastermind-protocol/SKILL.md brain load)
 - `prompt`: what to review and what to assess
 - `project_name`: monotask space name
 - `board_id`: monotask board ID (set by master, or created standalone)
@@ -54,9 +54,9 @@ Assess the prompt to determine execution mode:
 
 If this skill is invoked directly (not by master):
 
-1. Load brain context following _protocol.md Brain Load Procedure (namespace: `review`)
-2. Run intake from _intake.md if prompt is vague
-3. Follow _protocol.md Monotask Space+Board Setup Procedure:
+1. Load brain context following mastermind-protocol/SKILL.md Brain Load Procedure (namespace: `review`)
+2. Run intake from mastermind-intake/SKILL.md if prompt is vague
+3. Follow mastermind-protocol/SKILL.md Monotask Space+Board Setup Procedure:
    ```bash
    project_name="${project_name:-$(basename "$PWD")}"
    space_id=$(monotask space list 2>/dev/null | awk -F' \| ' -v n="$project_name" '$2==n{print $1}' | head -1)
@@ -70,7 +70,7 @@ If this skill is invoked directly (not by master):
    done_col=$(monotask column create "$board_id" "Done"  --json | jq -r '.id')
    ```
 4. Proceed with complexity assessment below
-5. At end: follow _protocol.md Brain Write Procedure (namespace: `review`)
+5. At end: follow mastermind-protocol/SKILL.md Brain Write Procedure (namespace: `review`)
 
 ---
 

package/packages/@monomind/cli/.claude/skills/{mastermind-skills/routine-detail.md → mastermind-routine-detail/SKILL.md}

@@ -59,7 +59,7 @@ This skill is invoked by `mastermind:routine-detail` or directly via `/mastermin
 
 ## Step 0 — Brain Load (standalone only)
 
-If `caller` is not "command", load brain context following _protocol.md Brain Load Procedure with namespace: `ops`.
+If `caller` is not "command", load brain context following mastermind-protocol/SKILL.md Brain Load Procedure with namespace: `ops`.
 
 ---
 
@@ -250,4 +250,4 @@ trigger_kind: <schedule|webhook>
 
 ## Step 4 — Brain Write (standalone only)
 
-If `caller` is not "command", follow _protocol.md Brain Write Procedure for domain `ops`.
+If `caller` is not "command", follow mastermind-protocol/SKILL.md Brain Write Procedure for domain `ops`.

package/packages/@monomind/cli/.claude/skills/{mastermind-skills/routines.md → mastermind-routines/SKILL.md}

@@ -30,7 +30,7 @@ This skill is invoked by `mastermind:routines` or directly via `/mastermind:rout
 
 ## Step 0 — Brain Load (standalone only)
 
-If `caller` is not "command", load brain context following _protocol.md Brain Load Procedure with namespace: `ops`.
+If `caller` is not "command", load brain context following mastermind-protocol/SKILL.md Brain Load Procedure with namespace: `ops`.
 
 ---
 
@@ -200,4 +200,4 @@ routines_file: .monomind/orgs/<org_name>-routines.json
 
 ## Step 4 — Brain Write (standalone only)
 
-If `caller` is not "command", follow _protocol.md Brain Write Procedure for domain `ops`.
+If `caller` is not "command", follow mastermind-protocol/SKILL.md Brain Write Procedure for domain `ops`.

package/packages/@monomind/cli/.claude/skills/{mastermind-skills/runorgv1.md → mastermind-runorgv1/SKILL.md}

@@ -26,7 +26,7 @@ This skill is invoked by `mastermind:runorgv1` or directly via `/mastermind:runo
 
 ## Step 0 — Brain Load (standalone only)
 
-If `caller` is not "command", load brain context following _protocol.md Brain Load Procedure with namespace: `ops`.
+If `caller` is not "command", load brain context following mastermind-protocol/SKILL.md Brain Load Procedure with namespace: `ops`.
 
 ---
 
@@ -702,7 +702,7 @@ run_id: "<runId>"
 
 ## Step 8 — Brain Write (standalone only)
 
-If `caller` is not "command", follow _protocol.md Brain Write Procedure for domain `ops`.
+If `caller` is not "command", follow mastermind-protocol/SKILL.md Brain Write Procedure for domain `ops`.
 
 ---
 

package/packages/@monomind/cli/.claude/skills/{mastermind-skills/sales.md → mastermind-sales/SKILL.md}

@@ -13,7 +13,7 @@ This skill is invoked by `mastermind:master` or directly via `/mastermind:sales`
 
 ## Inputs
 
-- `brain_context`: BRAIN CONTEXT block (injected by master, or loaded standalone via _protocol.md brain load)
+- `brain_context`: BRAIN CONTEXT block (injected by master, or loaded standalone via mastermind-protocol/SKILL.md brain load)
 - `prompt`: the sales goal for this run
 - `project_name`: monotask space name
 - `board_id`: monotask board ID (set by master, or created standalone)
@@ -43,9 +43,9 @@ Assess the prompt to determine execution mode:
 
 If this skill is invoked directly (not by master):
 
-1. Load brain context following _protocol.md Brain Load Procedure (namespace: `sales`)
-2. Run intake from _intake.md if prompt is vague
-3. Follow _protocol.md Monotask Space+Board Setup Procedure:
+1. Load brain context following mastermind-protocol/SKILL.md Brain Load Procedure (namespace: `sales`)
+2. Run intake from mastermind-intake/SKILL.md if prompt is vague
+3. Follow mastermind-protocol/SKILL.md Monotask Space+Board Setup Procedure:
    ```bash
    project_name="${project_name:-$(basename "$PWD")}"
    space_id=$(monotask space list 2>/dev/null | awk -F' \| ' -v n="$project_name" '$2==n{print $1}' | head -1)
@@ -59,7 +59,7 @@ If this skill is invoked directly (not by master):
    done_col=$(monotask column create "$board_id" "Done"  --json | jq -r '.id')
    ```
 4. Proceed with complexity assessment below
-5. At end: follow _protocol.md Brain Write Procedure (namespace: `sales`)
+5. At end: follow mastermind-protocol/SKILL.md Brain Write Procedure (namespace: `sales`)
 
 ---
 

package/packages/@monomind/cli/.claude/skills/{mastermind-skills/search.md → mastermind-search/SKILL.md}

@@ -24,7 +24,7 @@ This skill is invoked by `mastermind:search` or directly via `/mastermind:search
 
 ## Step 0 — Brain Load (standalone only)
 
-If `caller` is not "command", load brain context following _protocol.md Brain Load Procedure with namespace: `ops`.
+If `caller` is not "command", load brain context following mastermind-protocol/SKILL.md Brain Load Procedure with namespace: `ops`.
 
 ---
 
@@ -183,4 +183,4 @@ total_hits: <N>
 
 ## Step 4 — Brain Write (standalone only)
 
-If `caller` is not "command", follow _protocol.md Brain Write Procedure for domain `ops`.
+If `caller` is not "command", follow mastermind-protocol/SKILL.md Brain Write Procedure for domain `ops`.

package/packages/@monomind/cli/.claude/skills/{mastermind-skills/secrets.md → mastermind-secrets/SKILL.md}

@@ -25,7 +25,7 @@ This skill is invoked by `mastermind:secrets` or directly via `/mastermind:secre
 
 ## Step 0 — Brain Load (standalone only)
 
-If `caller` is not "command", load brain context following _protocol.md Brain Load Procedure with namespace: `ops`.
+If `caller` is not "command", load brain context following mastermind-protocol/SKILL.md Brain Load Procedure with namespace: `ops`.
 
 ---
 
@@ -196,4 +196,4 @@ secrets_count: <N>
 
 ## Step 4 — Brain Write (standalone only)
 
-If `caller` is not "command", follow _protocol.md Brain Write Procedure for domain `ops`.
+If `caller` is not "command", follow mastermind-protocol/SKILL.md Brain Write Procedure for domain `ops`.

package/packages/@monomind/cli/.claude/skills/{mastermind-skills/skill-builder.md → mastermind-skill-builder/SKILL.md}

@@ -66,14 +66,16 @@ API docs, syntax guides, tool documentation
 ## Directory Structure
 
 ```
-.claude/skills/mastermind/
-  skill-name.md              # Main skill (required)
+.claude/skills/
+  mastermind-<name>/
+    SKILL.md               # Main skill (required — a bare <name>.md does NOT register)
+    *-prompt.md            # Optional supporting files (prompt templates, references)
 
 .claude/commands/mastermind/
-  skill-name.md              # Command entry point (required)
+  <name>.md                # Command entry point (required)
 ```
 
-**Flat namespace** — all mastermind skills in one searchable namespace.
+**One top-level directory per skill** — Claude Code only registers `.claude/skills/<dir>/SKILL.md`, under the directory's own name. Grouping folders inside `.claude/skills/` do NOT register their children, so never nest. The `mastermind-` prefix on every skill directory is what prevents collisions with other skills, so never omit it — `monomind init` ships every `mastermind-*` directory automatically. Command wrappers invoke `Skill("mastermind-<name>")`.
 
 ## Skill File Structure
 
@@ -120,21 +122,21 @@ name: mastermind-[name]
 description: [one-line description of when to use]
 ---
 
-**First — extract repeat flags:** Follow REPEAT PREAMBLE from `_repeat.md`.
+**First — extract repeat flags:** Follow REPEAT PREAMBLE from `mastermind-repeat/SKILL.md`.
 
 Parse `$ARGUMENTS` for `--auto`, `--confirm`, `--project <name>`, and remaining text.
 
-Load brain context (follow `_protocol.md` Brain Load Procedure).
+Load brain context (follow `mastermind-protocol/SKILL.md` Brain Load Procedure).
 
 Default mode: **confirm** (or **auto** for low-risk/fast skills).
 
 ---
 
-Invoke `Skill("mastermind-skills:[name]")` passing: brain_context, params, mode.
+Invoke `Skill("mastermind-[name]")` passing: brain_context, params, mode.
 
-After skill returns: follow `_protocol.md` Brain Write Procedure.
+After skill returns: follow `mastermind-protocol/SKILL.md` Brain Write Procedure.
 
-Invoke `Skill("mastermind-skills:_repeat")` now. Required — do not skip.
+Invoke `Skill("mastermind-repeat")` now. Required — do not skip.
 ```
 
 ## Claude Search Optimization (CSO)
@@ -182,15 +184,15 @@ Use words Claude would search for:
 
 **Techniques:**
 - Reference other skills instead of repeating content
-- Use cross-references: `**REQUIRED BACKGROUND:** Use Skill("mastermind-skills:X")`
+- Use cross-references: `**REQUIRED BACKGROUND:** Use Skill("mastermind-X")`
 - One excellent example beats many mediocre ones
 
 ### Cross-Referencing Other Skills
 
 ```markdown
 # GOOD: Explicit requirement marker
-**REQUIRED SUB-SKILL:** Use Skill("mastermind-skills:worktree")
-**REQUIRED BACKGROUND:** You MUST understand Skill("mastermind-skills:finish")
+**REQUIRED SUB-SKILL:** Use Skill("mastermind-worktree")
+**REQUIRED BACKGROUND:** You MUST understand Skill("mastermind-finish")
 
 # BAD: Unclear if required
 See mastermind/worktree.md
@@ -221,7 +223,7 @@ See mastermind/worktree.md
 
 ## File Organization
 
-Mastermind skills are single files in a flat namespace. Keep everything inline. If a skill genuinely needs heavy reference material (500+ lines of API docs), condense it to what agents actually retrieve — a skill nobody can afford to load teaches nothing. Reusable prompt templates (like taskdev's implementer/reviewer prompts) live as sibling `*-prompt.md` files in the skills directory.
+Each mastermind skill is one directory holding a single `SKILL.md`. Keep everything inline in that file. If a skill genuinely needs heavy reference material (500+ lines of API docs), condense it to what agents actually retrieve — a skill nobody can afford to load teaches nothing. Reusable prompt templates (like taskdev's implementer/reviewer prompts) live as supporting `*-prompt.md` files inside the owning skill's directory, referenced as `./<name>-prompt.md`.
 
 ## The Iron Law (Same as TDD)
 
@@ -418,7 +420,7 @@ helper1, helper2, step3, pattern4
 - [ ] Re-test until bulletproof
 
 **Deployment:**
-- [ ] Skill file at `.claude/skills/mastermind/<name>.md`
+- [ ] Skill file at `.claude/skills/mastermind-<name>/SKILL.md`
 - [ ] Command file at `.claude/commands/mastermind/<name>.md`
 - [ ] Commit both files to git
 - [ ] Mirror both files into `packages/@monomind/cli/.claude/` (the npm-shipped copy)

package/packages/@monomind/cli/.claude/skills/mastermind-skills/{skills.md → SKILL.md}

@@ -24,7 +24,7 @@ This skill is invoked by `mastermind:skills` or directly via `/mastermind:skills
 
 ## Step 0 — Brain Load (standalone only)
 
-If `caller` is not "command", load brain context following _protocol.md Brain Load Procedure with namespace: `ops`.
+If `caller` is not "command", load brain context following mastermind-protocol/SKILL.md Brain Load Procedure with namespace: `ops`.
 
 ---
 
@@ -153,4 +153,4 @@ skills_found: <N>
 
 ## Step 4 — Brain Write (standalone only)
 
-If `caller` is not "command", follow _protocol.md Brain Write Procedure for domain `ops`.
+If `caller` is not "command", follow mastermind-protocol/SKILL.md Brain Write Procedure for domain `ops`.

package/packages/@monomind/cli/.claude/skills/{mastermind-skills/stoporg.md → mastermind-stoporg/SKILL.md}

@@ -21,7 +21,7 @@ This skill is invoked by `mastermind:stoporg` or directly via `/mastermind:stopo
 
 ## Step 0 — Brain Load (standalone only)
 
-If `caller` is not "command", load brain context following _protocol.md Brain Load Procedure with namespace: `ops`.
+If `caller` is not "command", load brain context following mastermind-protocol/SKILL.md Brain Load Procedure with namespace: `ops`.
 
 ---
 
@@ -144,4 +144,4 @@ next_actions:
 
 ## Step 7 — Brain Write (standalone only)
 
-If `caller` is not "command", follow _protocol.md Brain Write Procedure for domain `ops`.
+If `caller` is not "command", follow mastermind-protocol/SKILL.md Brain Write Procedure for domain `ops`.

package/packages/@monomind/cli/.claude/skills/{mastermind-skills/taskdev.md → mastermind-taskdev/SKILL.md}

@@ -49,7 +49,7 @@ digraph when_to_use {
 
 ## Inputs
 
-- `brain_context`: BRAIN CONTEXT block (loaded via _protocol.md brain load)
+- `brain_context`: BRAIN CONTEXT block (loaded via mastermind-protocol/SKILL.md brain load)
 - `plan_file`: absolute path to the plan `.md` file to execute
 - `params`: any additional flags or context
 - `mode`: auto | confirm
@@ -366,12 +366,12 @@ Done!
 ## Integration
 
 **Required workflow skills:**
-- `Skill("mastermind-skills:plan")` - Creates the plan this skill executes
-- `Skill("mastermind-skills:review")` - Code review template for reviewer subagents
-- `Skill("mastermind-skills:finish")` - Complete development after all tasks done
+- `Skill("mastermind-plan")` - Creates the plan this skill executes
+- `Skill("mastermind-review")` - Code review template for reviewer subagents
+- `Skill("mastermind-finish")` - Complete development after all tasks done
 
 **Subagents should use:**
-- `Skill("mastermind-skills:tdd")` - Subagents follow TDD for each task
+- `Skill("mastermind-tdd")` - Subagents follow TDD for each task
 
 **Alternative workflow:**
-- `Skill("mastermind-skills:execute")` - Use for parallel session instead of same-session execution
+- `Skill("mastermind-execute")` - Use for parallel session instead of same-session execution

package/packages/@monomind/cli/.claude/skills/{mastermind-skills → mastermind-taskdev}/implementer-prompt.md

@@ -30,7 +30,7 @@ Task tool (general-purpose):
 
     Once you're clear on requirements:
     1. Implement exactly what the task specifies
-    2. Write tests following TDD (use Skill("mastermind-skills:tdd") if available)
+    2. Write tests following TDD (use Skill("mastermind-tdd") if available)
     3. Verify implementation works
     4. Commit your work
     5. Self-review (see below)

package/packages/@monomind/cli/.claude/skills/{mastermind-skills/tasks.md → mastermind-tasks/SKILL.md}

@@ -28,7 +28,7 @@ This skill is invoked by `mastermind:tasks` or directly via `/mastermind:tasks`.
 
 ## Step 0 — Brain Load (standalone only)
 
-If `caller` is not "command", load brain context following _protocol.md Brain Load Procedure with namespace: `ops`.
+If `caller` is not "command", load brain context following mastermind-protocol/SKILL.md Brain Load Procedure with namespace: `ops`.
 
 ---
 
@@ -149,4 +149,4 @@ task_id: <task_id if applicable>
 
 ## Step 4 — Brain Write (standalone only)
 
-If `caller` is not "command", follow _protocol.md Brain Write Procedure for domain `ops`.
+If `caller` is not "command", follow mastermind-protocol/SKILL.md Brain Write Procedure for domain `ops`.

package/packages/@monomind/cli/.claude/skills/{mastermind-skills/tdd.md → mastermind-tdd/SKILL.md}

@@ -19,7 +19,7 @@ Write the test first. Watch it fail. Write minimal code to pass.
 
 ## Inputs
 
-- `brain_context`: BRAIN CONTEXT block (injected by master, or loaded standalone via _protocol.md brain load)
+- `brain_context`: BRAIN CONTEXT block (injected by master, or loaded standalone via mastermind-protocol/SKILL.md brain load)
 - `prompt`: what feature or bug to implement with TDD
 - `project_name`: monotask space name
 - `board_id`: monotask board ID (set by master, or created standalone)
@@ -137,7 +137,7 @@ Confirm:
 
 **Test errors?** Fix error, re-run until it fails correctly.
 
-Invoke `Skill("mastermind-skills:verify")` to gate this step: the RED verification must confirm the test fails for the expected reason.
+Invoke `Skill("mastermind-verify")` to gate this step: the RED verification must confirm the test fails for the expected reason.
 
 ### GREEN — Minimal Code
 
@@ -192,7 +192,7 @@ Confirm:
 
 **Other tests fail?** Fix now.
 
-Invoke `Skill("mastermind-skills:verify")` to gate this step.
+Invoke `Skill("mastermind-verify")` to gate this step.
 
 ### REFACTOR — Clean Up
 
@@ -350,7 +350,7 @@ Extract validation for multiple fields if needed.
 
 ## Verification Checklist
 
-Before marking work complete — invoke `Skill("mastermind-skills:verify")` to run this gate:
+Before marking work complete — invoke `Skill("mastermind-verify")` to run this gate:
 
 - [ ] Every new function/method has a test
 - [ ] Watched each test fail before implementing

package/packages/@monomind/cli/.claude/skills/{mastermind-skills/techport.md → mastermind-techport/SKILL.md}

@@ -1,5 +1,5 @@
 ---
-name: mastermind:techport
+name: mastermind-techport
 description: Tech Port — deep-analyzes a foreign project, reviews the current monomind target to avoid conflicts and duplication, produces a scored port plan with mono-branded naming, and executes approved ports with full brand normalization.
 type: domain-skill
 default_mode: confirm
@@ -14,10 +14,10 @@ Five-phase porting skill. Phases 0–1 run in parallel. Phase 2 builds the gap m
 ## Standalone Execution
 
 If invoked directly (not by `mastermind:master`):
-1. Load brain context following `_protocol.md` Brain Load Procedure (namespace: `techport`)
+1. Load brain context following `mastermind-protocol/SKILL.md` Brain Load Procedure (namespace: `techport`)
 2. Parse `source_path`, `focus_hint`, `mode` from user input
 3. Proceed with Phase 0 below
-4. At the end of every run — regardless of which phase concluded — execute `_protocol.md` Brain Write Procedure, writing output to namespace `mastermind:techport:raw`. This includes Phase 1A license-gate STOPs and secrets STOPs. Never skip Brain Write.
+4. At the end of every run — regardless of which phase concluded — execute `mastermind-protocol/SKILL.md` Brain Write Procedure, writing output to namespace `mastermind:techport:raw`. This includes Phase 1A license-gate STOPs and secrets STOPs. Never skip Brain Write.
 
 ---
 
@@ -590,7 +590,7 @@ For each approved item, in recommended order.
 | Exported functions | camelCase, no prefix | `buildGraph()`, `resolveAgent()` |
 | Config keys | camelCase | `projectRoot`, `maxAgents` |
 | Env vars | `MONOMIND_*` uppercase | `MONOMIND_PORT`, `MONOMIND_LOG_LEVEL` |
-| npm packages | `@monomind/<name>` | `@monomind/hooks` |
+| npm packages | `@monomind/<name>` | `@monoes/hooks` |
 | CLI commands | `monomind <command>` | `monomind agent spawn` |
 | Error classes | extend monomind hierarchy | `class PortedError extends CLIError {}` |
 | Event names | `domain:action` kebab | `'hook:fired'`, `'agent:spawned'` |
@@ -726,10 +726,10 @@ NEXT STEPS
 
 ## Output Schema (Brain Write — mastermind:master compatible)
 
-After Phase 3 (analysis) or Phase 5 (execution), write brain output using `_protocol.md` Unified Output Schema — the required fields must be present exactly, with techport-specific data embedded in `artifacts` and `decisions`:
+After Phase 3 (analysis) or Phase 5 (execution), write brain output using `mastermind-protocol/SKILL.md` Unified Output Schema — the required fields must be present exactly, with techport-specific data embedded in `artifacts` and `decisions`:
 
 ```yaml
-# _protocol.md Unified Output Schema — namespace: mastermind:techport:raw
+# mastermind-protocol/SKILL.md Unified Output Schema — namespace: mastermind:techport:raw
 domain: techport
 status: analysis_complete | port_complete | blocked
 artifacts:

package/packages/@monomind/cli/.claude/skills/{mastermind-skills/threads.md → mastermind-threads/SKILL.md}

@@ -27,7 +27,7 @@ This skill is invoked by `mastermind:threads` or directly via `/mastermind:threa
 
 ## Step 0 — Brain Load (standalone only)
 
-If `caller` is not "command", load brain context following _protocol.md Brain Load Procedure with namespace: `ops`.
+If `caller` is not "command", load brain context following mastermind-protocol/SKILL.md Brain Load Procedure with namespace: `ops`.
 
 ---
 
@@ -256,4 +256,4 @@ thread_id: <thread_id or new_id>
 
 ## Step 4 — Brain Write (standalone only)
 
-If `caller` is not "command", follow _protocol.md Brain Write Procedure for domain `ops`.
+If `caller` is not "command", follow mastermind-protocol/SKILL.md Brain Write Procedure for domain `ops`.

package/packages/@monomind/cli/.claude/skills/{mastermind-skills/tree-control.md → mastermind-tree-control/SKILL.md}

@@ -34,7 +34,7 @@ All tree-control actions must respect these invariants:
 
 ## Step 0 — Brain Load (standalone only)
 
-If `caller` is not "command", load brain context following _protocol.md Brain Load Procedure with namespace: `ops`.
+If `caller` is not "command", load brain context following mastermind-protocol/SKILL.md Brain Load Procedure with namespace: `ops`.
 
 ---
 
@@ -247,4 +247,4 @@ issue_id: <issue_id>
 
 ## Step 4 — Brain Write (standalone only)
 
-If `caller` is not "command", follow _protocol.md Brain Write Procedure for domain `ops`.
+If `caller` is not "command", follow mastermind-protocol/SKILL.md Brain Write Procedure for domain `ops`.

package/packages/@monomind/cli/.claude/skills/{mastermind-skills/verify.md → mastermind-verify/SKILL.md}

@@ -19,7 +19,7 @@ Claiming work is complete without verification is dishonesty, not efficiency.
 
 ## Inputs
 
-- `brain_context`: BRAIN CONTEXT block (injected by master, or loaded standalone via _protocol.md brain load)
+- `brain_context`: BRAIN CONTEXT block (injected by master, or loaded standalone via mastermind-protocol/SKILL.md brain load)
 - `prompt`: what to verify and what claim is being made
 - `project_name`: monotask space name
 - `board_id`: monotask board ID (set by master, or created standalone)

package/packages/@monomind/cli/.claude/skills/{mastermind-skills/wiki.md → mastermind-wiki/SKILL.md}

@@ -46,7 +46,7 @@ This skill is invoked by `mastermind:wiki` or directly via `/mastermind:wiki`.
 
 ## Step 0 — Brain Load (standalone only)
 
-If `caller` is not "command", load brain context following _protocol.md Brain Load Procedure with namespace: `ops`.
+If `caller` is not "command", load brain context following mastermind-protocol/SKILL.md Brain Load Procedure with namespace: `ops`.
 
 ---
 
@@ -311,4 +311,4 @@ wiki_root: .monomind/orgs/<org_name>/wiki/
 
 ## Step 4 — Brain Write (standalone only)
 
-If `caller` is not "command", follow _protocol.md Brain Write Procedure for domain `ops`.
+If `caller` is not "command", follow mastermind-protocol/SKILL.md Brain Write Procedure for domain `ops`.

package/packages/@monomind/cli/.claude/skills/{mastermind-skills/workspace-detail.md → mastermind-workspace-detail/SKILL.md}

@@ -43,7 +43,7 @@ This skill is invoked by `mastermind:workspace-detail` or directly via `/masterm
 
 ## Step 0 — Brain Load (standalone only)
 
-If `caller` is not "command", load brain context following _protocol.md Brain Load Procedure with namespace: `ops`.
+If `caller` is not "command", load brain context following mastermind-protocol/SKILL.md Brain Load Procedure with namespace: `ops`.
 
 ---
 
@@ -314,4 +314,4 @@ workspace_status: <status>
 
 ## Step 4 — Brain Write (standalone only)
 
-If `caller` is not "command", follow _protocol.md Brain Write Procedure for domain `ops`.
+If `caller` is not "command", follow mastermind-protocol/SKILL.md Brain Write Procedure for domain `ops`.

package/packages/@monomind/cli/.claude/skills/{mastermind-skills/workspaces.md → mastermind-workspaces/SKILL.md}

@@ -46,7 +46,7 @@ A workspace is a git worktree assigned to a project, optionally running services
 
 ## Step 0 — Brain Load (standalone only)
 
-If `caller` is not "command", load brain context following _protocol.md Brain Load Procedure with namespace: `ops`.
+If `caller` is not "command", load brain context following mastermind-protocol/SKILL.md Brain Load Procedure with namespace: `ops`.
 
 ---
 
@@ -258,4 +258,4 @@ workspaces_total: <N>
 
 ## Step 4 — Brain Write (standalone only)
 
-If `caller` is not "command", follow _protocol.md Brain Write Procedure for domain `ops`.
+If `caller` is not "command", follow mastermind-protocol/SKILL.md Brain Write Procedure for domain `ops`.