@monoes/monomindcli 2.16.2 → 2.16.4

package/.claude/skills/mastermind-diagnose/SKILL.md

@@ -7,7 +7,7 @@ default_mode: confirm
 
 # Mastermind Diagnose
 
-This skill is invoked by `mastermind:diagnose` or directly via `/mastermind:diagnose`.
+This skill is invoked by `mastermind:diagnose` or directly via `/mastermind-diagnose`.
 
 ---
 
@@ -148,7 +148,7 @@ else
 fi
 
 echo ""
-echo "  For deep diagnosis: /mastermind:diagnose --org $org_name --action diagnose --issue-id <id>"
+echo "  For deep diagnosis: /mastermind-diagnose --org $org_name --action diagnose --issue-id <id>"
 ```
 
 ### diagnose
@@ -224,7 +224,7 @@ echo "  1. Productive work continues:  [check heartbeats + open issues]"
 echo "  2. Only real blockers stop:    [check stall candidates above]"
 echo "  3. No infinite loops:          [check activity log for repeat patterns]"
 echo ""
-echo "  Run scan first: /mastermind:diagnose --org $org_name --action scan"
+echo "  Run scan first: /mastermind-diagnose --org $org_name --action scan"
 ```
 
 ---

package/.claude/skills/mastermind-env/SKILL.md

@@ -3,11 +3,12 @@ name: mastermind-env
 description: Mastermind env — audit and configure the runtime environment for an org. Shows LLM provider config, memory backend, agent JWT settings, logging, and storage — highlighting missing or misconfigured values.
 type: domain-skill
 default_mode: auto
+pick: low
 ---
 
 # Mastermind Env
 
-This skill is invoked by `mastermind:env` or directly via `/mastermind:env`.
+This skill is invoked by `mastermind:env` or directly via `/mastermind-env`.
 
 ---
 
@@ -81,18 +82,6 @@ echo "  namespace: org:${org_name}"
 npx monomind@latest memory list --namespace "org:${org_name}" 2>/dev/null | wc -l | xargs echo "  stored entries:"
 echo ""
 
-# LEGACY-ORG-V1: board_id/*_col_id only exist on the pre-v2 board-backed org shape
-# Board config
-echo "TASK BOARD"
-echo "──────────"
-board_id=$(jq -r '.board_id // "NOT CONFIGURED"' "$orgFile")
-echo "  board_id:    $board_id"
-echo "  todo_col:    $(jq -r '.todo_col_id // "NOT CONFIGURED"' "$orgFile")"
-echo "  doing_col:   $(jq -r '.doing_col_id // "NOT CONFIGURED"' "$orgFile")"
-echo "  done_col:    $(jq -r '.done_col_id // "NOT CONFIGURED"' "$orgFile")"
-echo ""
-# end LEGACY-ORG-V1 board block
-
 # Run config
 echo "RUN CONFIG"
 echo "──────────"
@@ -131,12 +120,10 @@ for key in ANTHROPIC_API_KEY; do
   fi
 done
 
-# LEGACY-ORG-V1: board_id belongs to the legacy v1 runner — see runorgv1. Org
-# Runtime v2 configs have no board_id at all, so this check only applies to
-# orgs still running the v1 board-backed shape.
-board_id=$(jq -r '.board_id // empty' "$orgFile")
-[ -z "$board_id" ] && { echo "  ✗ MISSING: board_id — boards belong to the legacy v1 runner, see runorgv1"; errors=$((errors + 1)); } || echo "  ✓ board_id"
-# end LEGACY-ORG-V1
+# Check the config against the runtime schema and structural invariants
+npx -y monomind@latest org validate "$org_name" >/dev/null 2>&1 \
+  && echo "  ✓ config valid (monomind org validate)" \
+  || { echo "  ✗ INVALID config — run: monomind org validate $org_name"; errors=$((errors + 1)); }
 
 # Check roles
 role_count=$(jq '.roles | length' "$orgFile")

package/.claude/skills/mastermind-environments/SKILL.md

@@ -3,11 +3,12 @@ name: mastermind-environments
 description: Mastermind environments — manage execution environments (local, SSH, sandbox) for an org. Controls where agent workloads run, SSH connection details, and which environment is the default.
 type: domain-skill
 default_mode: confirm
+pick: low
 ---
 
 # Mastermind Environments
 
-This skill is invoked by `mastermind:environments` or directly via `/mastermind:environments`.
+This skill is invoked by `mastermind:environments` or directly via `/mastermind-environments`.
 
 ---
 

package/.claude/skills/mastermind-execute/SKILL.md

@@ -53,7 +53,7 @@ For each task in the plan:
 
 ```javascript
 Task({
-  subagent_type: "coder", // pick per task, per the plan's agent recommendation
+  subagent_type: "coder", // the plan's agent recommendation if installed, else the [PICK] line, else mcp__monomind__pick({task: "<task title>", kind: "agents", top: 1}).agents.ranked[0].name (no MCP: mmpick from mastermind-agent-select), else "coder"
   description: "<task title from plan>",
   run_in_background: false, // true only when running independently alongside other parallel tasks
   prompt: `You are executing one task from an implementation plan for project "${project_name}".

package/.claude/skills/mastermind-export/SKILL.md

@@ -3,11 +3,12 @@ name: mastermind-export
 description: Mastermind export — full org portability. Export an org to a compressed archive (tar.gz or zip) with file tree selection, and import from an archive with collision strategy and adapter override. Mirrors Paperclip's CompanyExport/CompanyImport pages.
 type: domain-skill
 default_mode: confirm
+pick: low
 ---
 
 # Mastermind Export
 
-This skill is invoked by `mastermind:export` or directly via `/mastermind:export`.
+This skill is invoked by `mastermind:export` or directly via `/mastermind-export`.
 
 ---
 

package/.claude/skills/mastermind-goal-detail/SKILL.md

@@ -3,11 +3,12 @@ name: mastermind-goal-detail
 description: Mastermind goal-detail — deep per-goal inspection and management. Show sub-goal tree, linked projects, edit title/status/description/priority, add child goals, and close or reopen a single goal within an org.
 type: domain-skill
 default_mode: auto
+pick: low
 ---
 
 # Mastermind Goal Detail
 
-This skill is invoked by `mastermind:goal-detail` or directly via `/mastermind:goal-detail`.
+This skill is invoked by `mastermind:goal-detail` or directly via `/mastermind-goal-detail`.
 
 ---
 
@@ -51,7 +52,7 @@ orgFile=".monomind/orgs/${org_name}.json"
 [ ! -f "$orgFile" ] && { echo "ERROR: Org '${org_name}' not found."; exit 1; }
 
 goalsFile=".monomind/orgs/${org_name}-goals.json"
-[ ! -f "$goalsFile" ] && { echo "ERROR: No goals file for org '$org_name'. Create goals via /mastermind:goals."; exit 1; }
+[ ! -f "$goalsFile" ] && { echo "ERROR: No goals file for org '$org_name'. Create goals via /mastermind-goals."; exit 1; }
 
 goalDef=$(jq -r --arg id "$goal_id" '(.goals // [])[] | select(.id == $id or .slug == $id)' "$goalsFile")
 [ -z "$goalDef" ] && { echo "ERROR: Goal '$goal_id' not found in org '$org_name'."; exit 1; }

package/.claude/skills/mastermind-goals/SKILL.md

@@ -3,11 +3,12 @@ name: mastermind-goals
 description: Mastermind goals — define, track, and visualize hierarchical goals for an org. Goals link to tasks, have progress metrics, and form a goal tree.
 type: domain-skill
 default_mode: confirm
+pick: low
 ---
 
 # Mastermind Goals
 
-This skill is invoked by `mastermind:goals` or directly via `/mastermind:goals`.
+This skill is invoked by `mastermind:goals` or directly via `/mastermind-goals`.
 
 ---
 
@@ -140,7 +141,7 @@ goal_id: <goal_id if applicable>
 goals_file: .monomind/orgs/<org_name>-goals.json
 ```
 
-Suggest next: "Link tasks to this goal with /mastermind:tasks link or /mastermind:goals link --goal-id <id> --task-id <card_id>"
+Suggest next: "Link tasks to this goal with /mastermind-tasks link or /mastermind-goals link --goal-id <id> --task-id <card_id>"
 
 ---
 

package/.claude/skills/mastermind-idea/SKILL.md

@@ -13,7 +13,7 @@ This skill is invoked by `mastermind:master` or directly via `/mastermind:idea`.
 
 **File mode (default, `USE_MONOTASK=false`):**
 
-Invoke `Skill("mastermind-ideate", $ARGUMENTS)` immediately — it provides the same research, evaluation, elaboration, and task-decomposition pipeline with file-first storage (`docs/ideas/` and `docs/tasks/`). The rest of this skill is skipped in file mode.
+Invoke `Skill("mastermind:ideate", $ARGUMENTS)` immediately — it provides the same research, evaluation, elaboration, and task-decomposition pipeline with file-first storage (`docs/ideas/` and `docs/tasks/`). The rest of this skill is skipped in file mode.
 
 **Board mode (`USE_MONOTASK=true`):**
 
@@ -154,59 +154,38 @@ echo "==================================="
 
 ### Step 4 — Idea Manager Agent (Divergent Thinking)
 
-**Before spawning the Idea Manager**, run the registry-aware specialist selection to determine which agents to use. This replaces hardcoded agent types with the best available specialists for the prompt.
+**Before spawning the Idea Manager**, pick specialists from the shared agent index instead of hardcoded agent types (pick order in `mastermind-agent-select/SKILL.md`).
+
+**If `mcp__monomind__pick` is available**, call it twice — `{ task: prompt, kind: "agents", categories: ["marketing","specialized","design","testing"], top: 6 }` and `{ task: prompt, kind: "agents", categories: ["engineering","architecture","core","specialized"], top: 2 }` — merge the `agents.ranked[].name` values (unique, max 8) into `specialist_list`, and skip the Bash block below unless fewer than 2 came back.
 
 ```bash
-REGISTRY=".monomind/registry.json"
 PROMPT="$prompt"
-TOP_N=6
-
-# Select user/market/ops angle specialists
-CATEGORIES="marketing strategy product academic specialized"
-user_market_agents=$(jq \
-  --arg cats "$CATEGORIES" \
-  --arg kw "$(echo "$PROMPT" | tr '[:upper:]' '[:lower:]' | grep -oE '[a-z]{5,}' | sort -u | tr '\n' ' ')" \
-  --argjson n "$TOP_N" \
-  '[ (.agents // [])[] | select(.deprecated != true)
-     | select(.category as $c | ($cats | split(" ") | any(. == $c)))
-     | {name: .name, slug: .slug, category: .category,
-        score: (
-          (.name | ascii_downcase) as $n |
-          (.description // "" | ascii_downcase) as $desc |
-          # Score keyword matches against both name (weight 2) and description (weight 1) —
-          # name match is a stronger signal (mirrors master.md pick_domain_manager scoring).
-          # Bind each word to $w before contains(): piping into contains(.) rebinds "." to the
-          # piped value, which would silently match everything.
-          (if ($kw | length) > 0
-           then ([$kw | split(" ")[] | select(length > 0) | . as $w |
-                  (if ($n | contains($w)) then 2 else 0 end) +
-                  (if ($desc | contains($w)) then 1 else 0 end)
-                 ] | add // 0)
-           else 0 end)
-        )}
-   ] | sort_by(-.score) | unique_by(.slug) | .[0:$n] | [.[].name]' \
-  "$REGISTRY" 2>/dev/null)
-
-# Select technical angle specialists
-CATEGORIES="engineering development architecture"
-tech_agents=$(jq \
-  --arg cats "$CATEGORIES" \
-  --argjson n 3 \
-  '[ (.agents // [])[] | select(.deprecated != true)
-     | select(.category as $c | ($cats | split(" ") | any(. == $c)))
-     | {name: .name, slug: .slug}
-   ] | unique_by(.slug) | .[0:$n] | [.[].name]' \
-  "$REGISTRY" 2>/dev/null)
-
-# Merge: take top 6 from market/ops + top 2 from tech (cap at 8 total)
-# Both variables hold JSON arrays (no -r flag) — use jq -s add to merge properly
+
+# The shared agent index: Jev when configured, keyword ranking otherwise. It
+# only returns agents that exist.
+# Local only — never npx. Accept a binary only when its pick output is the
+# unified index (skill entries carry `source`); see mastermind-agent-select.
+mmpick() { for c in monomind ./node_modules/.bin/monomind; do
+    command -v "$c" >/dev/null 2>&1 || continue
+    out=$("$c" pick "$@" --json 2>/dev/null) || continue
+    printf '%s' "$out" | jq -e '[.skills.ranked[]? | has("source")] | (length > 0 and all)' \
+      >/dev/null 2>&1 && { printf '%s\n' "$out"; return 0; }
+  done; return 127; }
+pick_names() { mmpick -t "$1" --categories "$2" --top "$3" \
+    | jq -c '[.agents.ranked[].name]' 2>/dev/null; }
+
+# User/market/ops angle specialists, then technical angle specialists
+user_market_agents=$(pick_names "$PROMPT" "marketing specialized design testing" 6)
+tech_agents=$(pick_names "$PROMPT" "engineering architecture core specialized" 2)
+
+# Merge: top 6 market/ops + top 2 tech (cap at 8 total)
 specialist_list=$(jq -s 'add // [] | unique | .[0:8]' \
-  <(printf '%s' "$user_market_agents") \
-  <(printf '%s' "$tech_agents") 2>/dev/null)
+  <(printf '%s' "${user_market_agents:-[]}") \
+  <(printf '%s' "${tech_agents:-[]}") 2>/dev/null)
 
-# Fallback if registry missing or returned an empty array — need at least 2 specialists
+# Fallback if picking is unavailable or returned too few — need at least 2 specialists
 specialist_count=$(echo "$specialist_list" | jq 'length // 0' 2>/dev/null || echo 0)
-[ "$specialist_count" -lt 2 ] && specialist_list='["researcher","Trend Researcher","Growth Hacker","UX Researcher","Content Creator","Account Strategist"]'
+[ "${specialist_count:-0}" -lt 2 ] && specialist_list='["researcher","Launch Strategist","CRO Specialist","Competitive Content Strategist","Software Architect","Pricing Strategist"]'
 
 echo "Selected specialists: $specialist_list"
 ```
@@ -244,7 +223,7 @@ STEP 2 — SPAWN SPECIALISTS
 Spawn one Task agent per angle (all in parallel, mesh topology). Each agent receives the
 angle description, brain context, and project context, and must return a JSON array of ideas.
 
-The following specialist agents have been pre-selected from the registry as best-fit for this prompt.
+The following specialist agents have been pre-selected from the shared agent index as best-fit for this prompt.
 Spawn ALL of them in one message, assigning each a distinct angle:
 
 SPECIALISTS: ${specialist_list}
@@ -326,7 +305,7 @@ ideas_list=$(echo "$ideas_output_json" | jq -r \
 **CRITICAL — Variable substitution required for Step 5 Task call:**
 Before constructing the Task prompt below, read the literal UUID values from the `=== IDEA BOARD LITERAL VALUES ===` echo block (Step 3) and embed them as hard-coded strings. Also embed the full `brain_context`, `prompt`, and `ideas_list` (built above) as literal text. Replace every `${BOARD_ID}`, `${COL_EVALUATED}`, `${COL_ICED}`, `${COL_REJECTED}`, `${brain_context}`, `${prompt}`, `${project_name}`, `${date}`, and `${ideas_list}` with its actual value before calling Task — the agent receives unsubstituted `${...}` strings verbatim and silently skips every board update.
 
-Spawn a single `general-purpose` agent via the Task tool. Do NOT use `Product Manager` — that agent type lacks Bash tool access and cannot execute `monotask` CLI commands. The evaluator agent produces verdicts and executes all board updates directly via Bash.
+Spawn a single `general-purpose` agent via the Task tool. Do NOT substitute a specialist whose definition restricts `tools:` without Bash — it cannot execute `monotask` CLI commands. The evaluator agent produces verdicts and executes all board updates directly via Bash.
 
 ```javascript
 Task({
@@ -463,7 +442,7 @@ Spawn two agents in parallel via Task tool:
 ```javascript
 // Agent 1 — code explorer
 Task({
-  subagent_type: "feature-dev:code-explorer",
+  subagent_type: "Explore",
   description: "Elaboration: codebase constraints for dev ideas",
   run_in_background: true,
   prompt: `SAFETY CHECK: You are an elaboration agent. Do NOT call monotask board create, space create, or column create. Your only job is producing an ELABORATION_OUTPUT block — the outer skill writes to the board.
@@ -547,9 +526,10 @@ ELABORATION_OUTPUT
 END_ELABORATION_OUTPUT`
 })
 
-// Agent 2 — Product Manager
+// Agent 2 — feasibility assessor: mcp__monomind__pick({task: "feasibility assessment: <ops ideas>", kind: "agents", top: 1}) -> agents.ranked[0].name
+//   (no MCP: mmpick -t "feasibility assessment: <ops ideas>" --top 1 | jq -r '.agents.ranked[0].name'; fallback "general-purpose")
 Task({
-  subagent_type: "Product Manager",
+  subagent_type: "<picked agent>",
   description: "Elaboration: feasibility assessment for ops ideas",
   run_in_background: true,
   prompt: `SAFETY CHECK: You are an elaboration agent. Do NOT call monotask board create, space create, or column create. Your only job is producing an ELABORATION_OUTPUT block — the outer skill writes to the board.
@@ -725,52 +705,32 @@ After applying all user instructions, proceed to Step 6c with the remaining idea
 
 #### 6c. Task Decomposition
 
-**Select decomposition agents from the registry** before spawning. Run this selection once per track:
+**Select decomposition agents from the shared agent index** before spawning. With `mcp__monomind__pick`, call it once per track (`kind: "agents"`, `top: 1`, the categories below as an array) and use `agents.ranked[0].name`; otherwise run this selection once per track:
 
 ```bash
-REGISTRY=".monomind/registry.json"
-
-# Dev decomposition agent — pick the most relevant engineering/architecture specialist
-dev_decomp_agent=$(jq -r \
-  '[ (.agents // [])[] | select(.deprecated != true)
-     | select(.category == "engineering" or .category == "architecture")
-     | {name: .name,
-        score: (.name | ascii_downcase |
-                if contains("architect") then 3
-                elif contains("backend") then 2
-                elif contains("mobile") then 2
-                elif contains("frontend") then 2
-                elif contains("security") then 2
-                elif contains("data") then 2
-                else 1 end
-               )}
-   ] | sort_by(-.score) | .[0].name // "Software Architect"' \
-  "$REGISTRY" 2>/dev/null)
+# The shared agent index picks the best decomposer for each track.
+# Local only — never npx. Accept a binary only when its pick output is the
+# unified index (skill entries carry `source`); see mastermind-agent-select.
+mmpick() { for c in monomind ./node_modules/.bin/monomind; do
+    command -v "$c" >/dev/null 2>&1 || continue
+    out=$("$c" pick "$@" --json 2>/dev/null) || continue
+    printf '%s' "$out" | jq -e '[.skills.ranked[]? | has("source")] | (length > 0 and all)' \
+      >/dev/null 2>&1 && { printf '%s\n' "$out"; return 0; }
+  done; return 127; }
+pick_one() { mmpick -t "$1" --categories "$2" --top 1 \
+    | jq -r '.agents.ranked[0].name // empty' 2>/dev/null; }
+
+dev_decomp_agent=$(pick_one "decompose into engineering tasks: $dev_ideas_list" "engineering architecture")
 dev_decomp_agent="${dev_decomp_agent:-Software Architect}"
 
-# Ops decomposition agent — pick the most relevant strategy/sales/product specialist
-ops_decomp_agent=$(jq -r \
-  '[ (.agents // [])[] | select(.deprecated != true)
-     | select(.category == "strategy" or .category == "sales" or .category == "product" or .category == "marketing")
-     | {name: .name,
-        score: (.name | ascii_downcase |
-                if contains("product manager") then 4
-                elif contains("launch") then 3
-                elif contains("outbound") then 3
-                elif contains("deal") then 3
-                elif contains("pricing") then 3
-                elif contains("growth") then 2
-                else 1 end
-               )}
-   ] | sort_by(-.score) | .[0].name // "Product Manager"' \
-  "$REGISTRY" 2>/dev/null)
-ops_decomp_agent="${ops_decomp_agent:-Product Manager}"
+ops_decomp_agent=$(pick_one "decompose into go-to-market and operations tasks: $ops_ideas_list" "marketing specialized")
+ops_decomp_agent="${ops_decomp_agent:-Launch Strategist}"
 
 echo "Dev decomp: $dev_decomp_agent | Ops decomp: $ops_decomp_agent"
 ```
 
 **CRITICAL — Variable substitution required for Step 6c Task calls:**
-Before constructing each Task prompt, replace `${brain_context}`, `${prompt}`, `${project_name}`, `${dev_ideas_elaborated}`, and `${ops_ideas_elaborated}` with actual literal text. Also substitute the `subagent_type` values: replace `dev_decomp_agent` and `ops_decomp_agent` with the string values echoed by the registry selection above (e.g. `"Software Architect"`). Build those lists from the VERDICTS_OUTPUT and ELABORATION_OUTPUT results:
+Before constructing each Task prompt, replace `${brain_context}`, `${prompt}`, `${project_name}`, `${dev_ideas_elaborated}`, and `${ops_ideas_elaborated}` with actual literal text. Also substitute the `subagent_type` values: replace `dev_decomp_agent` and `ops_decomp_agent` with the string values echoed by the selection above (e.g. `"Software Architect"`). Build those lists from the VERDICTS_OUTPUT and ELABORATION_OUTPUT results:
 
 ```bash
 # Collect IDs of cards iced during elaboration (blocking_issue was set) — exclude from decomposition.
@@ -804,7 +764,7 @@ ops_ideas_elaborated=$(echo "$verdicts_output_json" | jq -r \
 ```javascript
 // Dev decomposition agent (only if dev_ideas_elaborated is non-empty)
 Task({
-  subagent_type: dev_decomp_agent,  // value from registry selection above
+  subagent_type: dev_decomp_agent,  // value from the selection above
   description: "Task decomposition: dev ideas for " + project_name,
   run_in_background: true,
   prompt: `SAFETY CHECK: You are a decomposition agent. You must NOT call monotask board create, space create, or column create. Your only job is producing a TASKS_OUTPUT block — the outer skill creates the cards. If you are unsure of any card ID, list it as "UNKNOWN" rather than inventing a value.
@@ -843,7 +803,7 @@ END_TASKS_OUTPUT`
 
 // Ops decomposition agent (only if ops_ideas_elaborated is non-empty)
 Task({
-  subagent_type: ops_decomp_agent,  // value from registry selection above
+  subagent_type: ops_decomp_agent,  // value from the selection above
   description: "Task decomposition: ops ideas for " + project_name,
   run_in_background: true,
   prompt: `SAFETY CHECK: You are a decomposition agent. You must NOT call monotask board create, space create, or column create. Your only job is producing a TASKS_OUTPUT block — the outer skill creates the cards. If you are unsure of any card ID, list it as "UNKNOWN" rather than inventing a value.

package/.claude/skills/mastermind-import/SKILL.md

@@ -3,11 +3,12 @@ name: mastermind-import
 description: Mastermind import — import an org from a portable ZIP archive exported by mastermind:export. Previews the archive contents, shows agent plans (create/update/skip), lets you choose a collision strategy, and applies the import to the local .monomind/orgs/ directory. Mirrors CompanyImport.tsx.
 type: domain-skill
 default_mode: confirm
+pick: low
 ---
 
 # Mastermind Import
 
-This skill is invoked by `mastermind:import` or directly via `/mastermind:import`.
+This skill is invoked by `mastermind:import` or directly via `/mastermind-import`.
 
 ---
 

package/.claude/skills/mastermind-inbox/SKILL.md

@@ -1,13 +1,14 @@
 ---
 name: mastermind-inbox
-description: Mastermind inbox — unified view of everything that needs human attention across all orgs: pending approvals, running heartbeats, active task assignments, and budget alerts. The single place to check before starting work.
+description: Mastermind inbox — unified view of everything that needs human attention across all orgs: pending tool approvals, running orgs, active task assignments, and budget alerts. The single place to check before starting work.
 type: domain-skill
 default_mode: auto
+pick: low
 ---
 
 # Mastermind Inbox
 
-This skill is invoked by `mastermind:inbox` or directly via `/mastermind:inbox`.
+This skill is invoked by `mastermind:inbox` or directly via `/mastermind-inbox`.
 
 ---
 
@@ -52,25 +53,20 @@ total_alerts=0
 for org in $orgs; do
   orgFile=".monomind/orgs/${org}.json"
   stateFile=".monomind/orgs/${org}-state.json"
-  approvalsFile=".monomind/orgs/${org}-approvals.json"
+  approvalsFile=".monomind/orgs/${org}/approvals.json"
+  rtFile=".monomind/orgs/${org}/runtime.json"
 
-  # LEGACY-ORG-V1: approvals files only exist for the v1 prompt-orchestrated
-  # runner — see runorgv1 / approvev1.
-  # 1. Pending approvals
+  # 1. Pending tool approvals (the runtime's queue — `monomind org approvals <org>`)
   if [ -f "$approvalsFile" ]; then
-    pending=$(jq '[(.approvals // [])[] | select(.status == "pending")] | length' "$approvalsFile" 2>/dev/null || echo 0)
+    pending=$(jq '[(.approvals // [])[] | select(.approved == null)] | length' "$approvalsFile" 2>/dev/null || echo 0)
     total_approvals=$((total_approvals + pending))
   fi
-  # end LEGACY-ORG-V1
-
-  # LEGACY-ORG-V1: state-file "heartbeats" are the v1 scheduler's running-agent
-  # tracking — v2 runs live under .monomind/orgs/<name>/run-*/bus.jsonl instead.
-  # 2. Running agents (active heartbeats)
-  if [ -f "$stateFile" ]; then
-    running=$(jq '[.agents // {} | to_entries[] | select(.value.status == "running")] | length' "$stateFile" 2>/dev/null || echo 0)
-    total_heartbeats=$((total_heartbeats + running))
+
+  # 2. Running orgs (runtime.json status "running" with a live pid)
+  rt_pid=$(jq -r 'if .status == "running" then (.pid // 0) else 0 end' "$rtFile" 2>/dev/null || echo 0)
+  if [ "$rt_pid" -gt 0 ] && kill -0 "$rt_pid" 2>/dev/null; then
+    total_heartbeats=$((total_heartbeats + 1))
   fi
-  # end LEGACY-ORG-V1
 
   # 3. Budget alerts
   budget=$(jq -r '.run_config.budget_tokens // 0' "$orgFile" 2>/dev/null || echo 0)
@@ -96,36 +92,32 @@ echo "║  MASTERMIND INBOX                                    ║"
 echo "╚══════════════════════════════════════════════════════╝"
 echo ""
 echo "  🔴 APPROVALS NEEDED:   $total_approvals"
-echo "  🟡 AGENTS RUNNING:     $total_heartbeats"
+echo "  🟡 ORGS RUNNING:       $total_heartbeats"
 echo "  🟠 BUDGET ALERTS:      $total_alerts"
 echo ""
 
 for org in $orgs; do
   orgFile=".monomind/orgs/${org}.json"
   stateFile=".monomind/orgs/${org}-state.json"
-  approvalsFile=".monomind/orgs/${org}-approvals.json"
+  approvalsFile=".monomind/orgs/${org}/approvals.json"
+  rtFile=".monomind/orgs/${org}/runtime.json"
 
   has_items=0
 
-  # LEGACY-ORG-V1: approvals belong to the v1 prompt-orchestrated runner
-  # Pending approvals
+  # Pending tool approvals
   if [ -f "$approvalsFile" ]; then
-    pending_approvals=$(jq -r '(.approvals // [])[] | select(.status == "pending") | "  [APPROVAL] [\(.id)] \(.agent_id): \(.title)  risk=\(.risk_level // "low")"' \
+    pending_approvals=$(jq -r '(.approvals // [])[] | select(.approved == null) | "  [APPROVAL] \(.roleId): \(.action)\(if .requestId then "  [\(.requestId)]" else "" end)"' \
       "$approvalsFile" 2>/dev/null)
     [ -n "$pending_approvals" ] && { has_items=1; echo "ORG: $org"; echo "$pending_approvals"; }
   fi
-  # end LEGACY-ORG-V1
-
-  # LEGACY-ORG-V1: state-file heartbeats are the v1 scheduler's tracking
-  # Running agents
-  if [ -f "$stateFile" ]; then
-    running_agents=$(jq -r '
-      .agents // {} | to_entries[] | select(.value.status == "running") |
-      "  [RUNNING]  [\(.key)]  since=\(.value.last_heartbeat // "unknown")"
-    ' "$stateFile" 2>/dev/null)
-    [ -n "$running_agents" ] && { has_items=1; [ $has_items -eq 1 ] || echo "ORG: $org"; echo "$running_agents"; }
+
+  # Running org
+  rt_pid=$(jq -r 'if .status == "running" then (.pid // 0) else 0 end' "$rtFile" 2>/dev/null || echo 0)
+  if [ "$rt_pid" -gt 0 ] && kill -0 "$rt_pid" 2>/dev/null; then
+    [ $has_items -eq 1 ] || echo "ORG: $org"
+    has_items=1
+    echo "  [RUNNING]  run=$(jq -r '.run // "?"' "$rtFile")  since=$(jq -r '.updated // "unknown"' "$rtFile")"
   fi
-  # end LEGACY-ORG-V1
 
   [ $has_items -eq 1 ] && echo ""
 done
@@ -137,34 +129,21 @@ fi
 
 ### filter: approvals only
 
-<!-- LEGACY-ORG-V1: approvals belong to the v1 prompt-orchestrated runner — see runorgv1 / approvev1. -->
 ```bash
 for org in $orgs; do
-  approvalsFile=".monomind/orgs/${org}-approvals.json"
-  [ -f "$approvalsFile" ] || continue
+  [ -f ".monomind/orgs/${org}/approvals.json" ] || continue
   echo "=== $org ==="
-  jq -r '(.approvals // [])[] | select(.status == "pending") |
-    "[\(.id)] \(.agent_id): \(.title)\n  Action: \(.action)\n  Risk: \(.risk_level // "low")\n  → /mastermind:approvev1 --org '"$org"' --action approve --approval-id \(.id)"
-  ' "$approvalsFile" 2>/dev/null || echo "  No pending approvals."
+  npx -y monomind@latest org approvals "$org"
   echo ""
 done
 ```
 
 ### filter: heartbeats only
 
-<!-- LEGACY-ORG-V1: state-file heartbeats are the v1 scheduler's running-agent tracking. -->
-Show currently running agent heartbeats across all orgs:
+Show the orgs that are running now:
 
 ```bash
-for org in $orgs; do
-  stateFile=".monomind/orgs/${org}-state.json"
-  [ -f "$stateFile" ] || continue
-  running=$(jq -r '
-    .agents // {} | to_entries[] | select(.value.status == "running") |
-    "  [\(.key)] since=\(.value.last_heartbeat // "?")"
-  ' "$stateFile" 2>/dev/null)
-  [ -n "$running" ] && { echo "=== $org ==="; echo "$running"; echo ""; }
-done
+npx -y monomind@latest org status
 ```
 
 ### filter: alerts only
@@ -192,11 +171,12 @@ done
 From the inbox, the user can directly:
 
 ```bash
-# Approve a pending request:
-/mastermind:approvev1 --org <org> --action approve --approval-id <id>
+# Approve or deny a pending tool request:
+monomind org approve <org> <role> "<action>"
+monomind org deny <org> <role> "<action>"
 
-# Stop a running agent:
-/mastermind:agents --org <org> --action pause --agent-id <id>
+# Stop a running org:
+monomind org stop <org>
 
 # Check costs:
 /mastermind:costs --org <org> --action report

package/.claude/skills/mastermind-instance/SKILL.md

@@ -3,11 +3,12 @@ name: mastermind-instance
 description: Mastermind instance — global instance-level settings including scheduler heartbeat management across all orgs, system-wide configuration, and cross-org health overview.
 type: domain-skill
 default_mode: auto
+pick: low
 ---
 
 # Mastermind Instance
 
-This skill is invoked by `mastermind:instance` or directly via `/mastermind:instance`.
+This skill is invoked by `mastermind:instance` or directly via `/mastermind-instance`.
 
 ---
 
@@ -84,8 +85,9 @@ echo "  Active orgs: $orgs"
 
 ### heartbeats
 
-<!-- LEGACY-ORG-V1: role-level heartbeat scheduling is a v1 org concept — v2 orgs run on `schedule` via the daemon instead. -->
-List all agents across all orgs that have scheduled heartbeats:
+The Org Runtime does not read role-level `heartbeat` fields — orgs run on their
+top-level `schedule` under `monomind org serve`. This lists any role `heartbeat`
+fields still present in org config files:
 
 ```bash
 echo "SCHEDULER HEARTBEATS"
@@ -117,13 +119,14 @@ for orgF in .monomind/orgs/*.json; do
   done
 done
 
-[ "$found" -eq 0 ] && echo "  No scheduled heartbeat agents found. Configure via /mastermind:heartbeatv1."
+[ "$found" -eq 0 ] && echo "  No role heartbeat fields found. Orgs run on their top-level schedule via: monomind org serve"
 ```
 
 ### toggle-heartbeat
 
-<!-- LEGACY-ORG-V1: role-level heartbeat scheduling is a v1 org concept. -->
-Enable or disable the scheduler heartbeat for a specific agent:
+Flip the role-level `heartbeat.enabled` field for a specific agent. The Org
+Runtime ignores this field — to change when an org runs, edit its `schedule`
+with `/mastermind-org-settings`:
 
 ```bash
 [ -z "$agent_id" ] && { echo "ERROR: --agent-id required."; exit 1; }
@@ -213,7 +216,7 @@ echo "  Running agents:   $total_running"
 echo "  Pending approvals:$total_pending"
 echo ""
 [ "$total_running" -gt 0 ] && echo "  ✓ System is active." || echo "  ◌ No agents running."
-[ "$total_pending" -gt 0 ] && echo "  ⚠ $total_pending approval(s) need attention. Run /mastermind:inbox."
+[ "$total_pending" -gt 0 ] && echo "  ⚠ $total_pending approval(s) need attention. Run /mastermind-inbox."
 ```
 
 ---