@monoes/monomindcli 2.16.2 → 2.16.4

package/.claude/skills/mastermind-invite-landing/SKILL.md

@@ -3,11 +3,12 @@ name: mastermind-invite-landing
 description: Mastermind invite-landing — accept an org invite as a human member or as an agent. Validates the invite token, presents org/role info, and processes join as human (name/email) or as an agent (adapter type, model, agent name, config). Mirrors InviteLanding.tsx.
 type: domain-skill
 default_mode: confirm
+pick: low
 ---
 
 # Mastermind Invite Landing
 
-This skill is invoked by `mastermind:invite-landing` or directly via `/mastermind:invite-landing`.
+This skill is invoked by `mastermind:invite-landing` or directly via `/mastermind-invite-landing`.
 
 ---
 
@@ -196,7 +197,7 @@ echo "  Adapter:     $adapterType / $modelId"
 echo "  Org:         $org_name"
 echo "  Joined at:   $ts"
 echo ""
-echo "  View agent: /mastermind:agent-detail --org $org_name --agent-id $agentId"
+echo "  View agent: /mastermind-agent-detail --org $org_name --agent-id $agentId"
 ```
 
 ### status

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

@@ -3,11 +3,12 @@ name: mastermind-invites
 description: Mastermind invites — manage org invitations and join request queue. Create/revoke invites with role assignment, view invite history, review pending join requests (human and agent), and approve or reject them. Merges CompanyInvites and JoinRequestQueue pages.
 type: domain-skill
 default_mode: confirm
+pick: low
 ---
 
 # Mastermind Invites
 
-This skill is invoked by `mastermind:invites` or directly via `/mastermind:invites`.
+This skill is invoked by `mastermind:invites` or directly via `/mastermind-invites`.
 
 ---
 
@@ -214,7 +215,7 @@ jq --arg id "$request_id" --arg role "$reqRole" --arg ts "$ts" \
 
 echo "Join request '$request_id' approved."
 echo "  Role: $reqRole  |  Joined: $ts"
-echo "  Member added. View members: /mastermind:access --org $org_name --action list"
+echo "  Member added. View members: /mastermind-access --org $org_name --action list"
 ```
 
 ### reject-join

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

@@ -3,11 +3,12 @@ name: mastermind-issue-detail
 description: Mastermind issue-detail — deep per-issue/task inspection and management. Show thread summary, run history, comments, sub-issues, file attachments, assign, close, and recovery actions for a single task within an org.
 type: domain-skill
 default_mode: auto
+pick: low
 ---
 
 # Mastermind Issue Detail
 
-This skill is invoked by `mastermind:issue-detail` or directly via `/mastermind:issue-detail`.
+This skill is invoked by `mastermind:issue-detail` or directly via `/mastermind-issue-detail`.
 
 ---
 
@@ -52,7 +53,7 @@ orgFile=".monomind/orgs/${org_name}.json"
 [ ! -f "$orgFile" ] && { echo "ERROR: Org '${org_name}' not found."; exit 1; }
 
 issuesFile=".monomind/orgs/${org_name}-issues.json"
-[ ! -f "$issuesFile" ] && { echo "ERROR: No issues file for org '$org_name'. Create issues via /mastermind:issues --action create."; exit 1; }
+[ ! -f "$issuesFile" ] && { echo "ERROR: No issues file for org '$org_name'. Create issues via /mastermind-issues --action create."; exit 1; }
 
 issueDef=$(jq -r --arg id "$issue_id" '(.issues // [])[] | select(.id == $id or .slug == $id)' "$issuesFile")
 [ -z "$issueDef" ] && { echo "ERROR: Issue '$issue_id' not found in org '$org_name'."; exit 1; }
@@ -210,7 +211,7 @@ jq -r --arg pid "$resolvedId" '(.issues // [])[] | select(.parentId == $pid) |
 done
 
 echo ""
-echo "To create a sub-issue: /mastermind:issues --org $org_name --action create --title '<title>' --parent-id $issue_id"
+echo "To create a sub-issue: /mastermind-issues --org $org_name --action create --title '<title>' --parent-id $issue_id"
 ```
 
 ### attachments

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

@@ -3,11 +3,12 @@ name: mastermind-issues
 description: Mastermind issues — list, create, update, and close org-level issues (tasks/tickets) with search, assignee, status, and workspace filters. Mirrors Issues.tsx. For personal assigned issues use mastermind:my-issues; for issue detail use mastermind:issue-detail.
 type: domain-skill
 default_mode: auto
+pick: low
 ---
 
 # Mastermind Issues
 
-This skill is invoked by `mastermind:issues` or directly via `/mastermind:issues`.
+This skill is invoked by `mastermind:issues` or directly via `/mastermind-issues`.
 
 ---
 
@@ -132,8 +133,8 @@ print(f"\n  Showing {len(issues)} issue(s).")
 PYEOF
 
 echo ""
-echo "  Create: /mastermind:issues --org $org_name --action create --title 'My Issue'"
-echo "  Detail: /mastermind:issue-detail --org $org_name --issue-id <id>"
+echo "  Create: /mastermind-issues --org $org_name --action create --title 'My Issue'"
+echo "  Detail: /mastermind-issue-detail --org $org_name --issue-id <id>"
 ```
 
 ### search

package/.claude/skills/mastermind-join-queue/SKILL.md

@@ -3,11 +3,12 @@ name: mastermind-join-queue
 description: Mastermind join-queue — lists pending join requests for an org, approves or rejects them, and filters by request type (human/agent/all) and status. Mirrors JoinRequestQueue.tsx.
 type: domain-skill
 default_mode: auto
+pick: low
 ---
 
 # Mastermind Join Queue
 
-This skill is invoked by `mastermind:join-queue` or directly via `/mastermind:join-queue`.
+This skill is invoked by `mastermind:join-queue` or directly via `/mastermind-join-queue`.
 
 ---
 
@@ -54,7 +55,7 @@ echo "────────────────────────
 if [ ! -f "$joinFile" ]; then
   echo "  No join requests found."
   echo ""
-  echo "  Approve: /mastermind:join-queue --org $org_name --action approve --request-id <id>"
+  echo "  Approve: /mastermind-join-queue --org $org_name --action approve --request-id <id>"
   exit 0
 fi
 
@@ -86,8 +87,8 @@ print(f"\n  Total: {len(filtered)} request(s) (status={status_f}, type={type_f})
 PYEOF
 
 echo ""
-echo "  Approve: /mastermind:join-queue --org $org_name --action approve --request-id <id>"
-echo "  Reject:  /mastermind:join-queue --org $org_name --action reject  --request-id <id>"
+echo "  Approve: /mastermind-join-queue --org $org_name --action approve --request-id <id>"
+echo "  Reject:  /mastermind-join-queue --org $org_name --action reject  --request-id <id>"
 ```
 
 ### approve

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

@@ -3,11 +3,12 @@ name: mastermind-liveness
 description: Mastermind liveness — enforce the non-terminal issue liveness contract for agent-owned work. Checks if every in_progress/blocked/in_review issue has a valid action path (active run, queued wake, explicit blocker, or recovery action). Can checkout an issue to an agent run, release checkout, trigger wakeup decisions, and file explicit recovery actions for stalled issues. Based on Paperclip's execution-semantics.md liveness contract.
 type: domain-skill
 default_mode: auto
+pick: low
 ---
 
 # Mastermind Liveness
 
-This skill is invoked by `mastermind:liveness` or directly via `/mastermind:liveness`.
+This skill is invoked by `mastermind:liveness` or directly via `/mastermind-liveness`.
 
 ---
 
@@ -230,7 +231,7 @@ if stalled:
         print(f"    {iid}: [{s}] {t}")
         print(f"      → {p}")
     print()
-    print("  Fix: /mastermind:liveness --org <org> --action recover --issue-id <id> --reason 'execution path lost'")
+    print("  Fix: /mastermind-liveness --org <org> --action recover --issue-id <id> --reason 'execution path lost'")
 else:
     print("  ✓ No stalled issues.")
 
@@ -265,7 +266,7 @@ for iss in issues:
         existing = iss.get("checkoutRunId")
         if existing and existing != runId:
             print(f"  CONFLICT: Issue already checked out by run {existing}")
-            print(f"  Release first: /mastermind:liveness --org <org> --action release --issue-id {iid}")
+            print(f"  Release first: /mastermind-liveness --org <org> --action release --issue-id {iid}")
             sys.exit(1)
         iss["checkoutRunId"]  = runId
         iss["executionRunId"] = runId
@@ -430,7 +431,7 @@ for iss in issues:
         print(f"  Issue {iid} → status: blocked (pending recovery)")
         print(f"  Owner: {owner}")
         print(f"  Cause: {cause}")
-        print(f"  Resolve with: /mastermind:liveness --org <org> --action checkout --issue-id {iid} --agent-id <id> --run-id <id>")
+        print(f"  Resolve with: /mastermind-liveness --org <org> --action checkout --issue-id {iid} --agent-id <id> --run-id <id>")
         sys.exit(0)
 
 print(f"  ERROR: Issue '{iid}' not found.")

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

@@ -7,7 +7,7 @@ default_mode: confirm
 
 # Mastermind Monitor
 
-Invoked via `mastermind:monitor` or `/mastermind:monitor`.
+Invoked via `mastermind:monitor` or `/mastermind-monitor`.
 
 A monitor is a named, forever-running task executor. It polls one or more task sources on a configurable interval, claims matching tasks, hands them off to a Claude agent for execution, posts back results as comments/status updates, and self-reschedules via `ScheduleWakeup`.
 
@@ -99,7 +99,7 @@ cat > "$cfg" <<EOF
 EOF
 
 echo "Monitor '$name' created."
-echo "Add sources with: /mastermind:monitor --action add-source --name $name --source linear ..."
+echo "Add sources with: /mastermind-monitor --action add-source --name $name --source linear ..."
 echo "Then start the tick loop."
 ```
 
@@ -107,7 +107,7 @@ After creating the config, if at least one source was provided (via `--source` +
 
 Then **immediately call `ScheduleWakeup`** with:
 - `delaySeconds`: 10 (first tick almost immediately)
-- `prompt`: `/mastermind:monitor --action tick --name <name>`
+- `prompt`: `/mastermind-monitor --action tick --name <name>`
 - `reason`: `First tick for monitor: <name>`
 
 ---
@@ -138,7 +138,7 @@ echo "Monitor '$name' is now: $new_status"
 
 If `action=resume`, call `ScheduleWakeup`:
 - `delaySeconds`: 10
-- `prompt`: `/mastermind:monitor --action tick --name <name>`
+- `prompt`: `/mastermind-monitor --action tick --name <name>`
 - `reason`: `Resuming monitor: <name>`
 
 ---
@@ -339,7 +339,7 @@ in_flight_count=${in_flight_count:-0}
 if [ "$in_flight_count" -ge "$max_concurrent" ]; then
   echo "[$name] In-flight ($in_flight_count) >= max_concurrent ($max_concurrent) — skipping claim this tick."
   # Reschedule next tick — do this BEFORE exit so the loop survives
-  # ScheduleWakeup: delaySeconds=poll_interval, prompt="/mastermind:monitor --action tick --name <name>",
+  # ScheduleWakeup: delaySeconds=poll_interval, prompt="/mastermind-monitor --action tick --name <name>",
   #   reason="Monitor <name> in-flight throttle — will retry next tick"
   exit 0
 fi
@@ -1068,7 +1068,7 @@ Always the last step, regardless of whether a task was found/executed.
 
 Call `ScheduleWakeup` with:
 - `delaySeconds`: value of `poll_interval` from config (default 120)
-- `prompt`: `/mastermind:monitor --action tick --name <name>`
+- `prompt`: `/mastermind-monitor --action tick --name <name>`
 - `reason`: `Monitor <name> polling every <poll_interval>s (<N sources>)`
 
 This is what makes the monitor run forever. The only way to stop it is to set `status=stopped` or `status=paused` — the tick checks this at the top of Step 2.
@@ -1198,38 +1198,38 @@ If `caller` is not "command", follow `mastermind-protocol/SKILL.md` Brain Write
 
 ```bash
 # Create a monitor watching GitHub issues assigned to you
-/mastermind:monitor --action start --name dev-watcher \
+/mastermind-monitor --action start --name dev-watcher \
   --source github --project monoes/monomind --user nokhodian \
   --label ai-agent --agent coder --interval 120
 
 # Add a Linear source to an existing monitor
-/mastermind:monitor --action add-source --name dev-watcher \
+/mastermind-monitor --action add-source --name dev-watcher \
   --source linear --team ENG --user your@email.com \
   --state Todo --label ai-agent
 
 # Add a monotask board source
-/mastermind:monitor --action add-source --name dev-watcher \
+/mastermind-monitor --action add-source --name dev-watcher \
   --source monotask --project monomind-tasks-dev \
   --state Todo --label role:ai-agent
 
 # Add a filesystem folder source
-/mastermind:monitor --action add-source --name dev-watcher \
+/mastermind-monitor --action add-source --name dev-watcher \
   --source filesystem --folder ./tasks
 
 # Check status
-/mastermind:monitor --action status --name dev-watcher
+/mastermind-monitor --action status --name dev-watcher
 
 # List all monitors
-/mastermind:monitor
+/mastermind-monitor
 
 # Pause (stops auto-rescheduling after current tick)
-/mastermind:monitor --action pause --name dev-watcher
+/mastermind-monitor --action pause --name dev-watcher
 
 # Resume (re-enters the tick loop)
-/mastermind:monitor --action resume --name dev-watcher
+/mastermind-monitor --action resume --name dev-watcher
 
 # Stop permanently
-/mastermind:monitor --action stop --name dev-watcher
+/mastermind-monitor --action stop --name dev-watcher
 ```
 
 ---

package/.claude/skills/mastermind-my-issues/SKILL.md

@@ -3,11 +3,12 @@ name: mastermind-my-issues
 description: Mastermind my-issues — filtered issue queue scoped to the current operator or a specific assignee. Lists open and in-progress issues, supports self-assign and unassign. Mirrors MyIssues.tsx.
 type: domain-skill
 default_mode: auto
+pick: low
 ---
 
 # Mastermind My Issues
 
-This skill is invoked by `mastermind:my-issues` or directly via `/mastermind:my-issues`.
+This skill is invoked by `mastermind:my-issues` or directly via `/mastermind-my-issues`.
 
 ---
 

package/.claude/skills/mastermind-new-agent/SKILL.md

@@ -1,13 +1,16 @@
 ---
 name: mastermind-new-agent
-description: Mastermind new-agent — wizard to hire/create a new agent within an org. Configures adapter type, model, role name, reports_to hierarchy, governance policy, skill assignments, and budget. Writes the new role to the org config file.
+description: Mastermind new-agent — wizard to hire/create a new agent within an org. Configures runtime, model, role name, reports_to hierarchy, responsibilities, skill assignments (found with `monomind org skills search`), and budget. Writes a valid Org Runtime role to the org config file and validates it.
 type: domain-skill
 default_mode: confirm
+pick: low
 ---
 
 # Mastermind New Agent
 
-This skill is invoked by `mastermind:new-agent` or directly via `/mastermind:new-agent`.
+This skill is invoked by `mastermind:new-agent` or directly via `/mastermind-new-agent`.
+
+It writes one role in the Org Runtime shape (`RoleSchema` in `packages/@monomind/cli/src/orgrt/types.ts`) — the same shape `mastermind-createorg` produces — and runs `monomind org validate` on the result. There is no `adapter` object, heartbeat or per-role system prompt in the org config: the runtime reads `runtime`, `adapter_config.model`, `responsibilities`, `skills` and `skill_pool`.
 
 ---
 
@@ -15,35 +18,33 @@ This skill is invoked by `mastermind:new-agent` or directly via `/mastermind:new
 
 - `brain_context`: BRAIN CONTEXT block (injected by command, or loaded below if standalone)
 - `org_name`: org to add the agent to (required)
-- `action`: create | preview | list-roles | list-adapters
+- `action`: create | preview | list-roles | list-runtimes
 - `agent_id`: unique slug for the new agent (required for create; auto-generated if omitted)
 - `title`: display title for the agent (required for create)
-- `adapter_type`: claude-local | gemini-local | codex-local | cursor | opencode | hermes | http | acpx (default: claude-local)
-- `model`: model identifier (e.g. claude-sonnet-5, claude-opus-5, gemini-2.0-flash)
-- `max_tokens`: max tokens per run (default: 8192)
-- `reports_to`: parent agent id in the hierarchy (null = top-level)
-- `governance`: auto | board | strict (default: inherit from org)
-- `skills`: comma-separated skill names to assign (e.g. mastermind:tasks,mastermind:goals)
-- `budget_tokens`: per-run token budget cap (optional)
-- `heartbeat_enabled`: true | false (default: false)
-- `heartbeat_interval`: heartbeat interval in seconds (default: 900)
-- `system_prompt`: brief system prompt override (optional)
+- `responsibilities`: what the role does, `;`-separated (3–6 specific duties — this is the role's briefing and what `assignee: "auto"` matches tasks against)
+- `runtime`: claude | codex | antigravity | kimicode | opencode | vercel (default: claude — leave unset for the default Claude runtime)
+- `model`: model identifier (default: the latest model for the runtime, see below)
+- `max_tokens`: optional max output tokens per model call (omit to inherit)
+- `reports_to`: parent role id in the hierarchy (required — an org has exactly one root role, and that is the boss)
+- `skills`: comma-separated org-library skill names pinned into the prompt (1–3; found in Step 1.5)
+- `skill_pool`: comma-separated skill names or `tag:<tag>` the role may load mid-run with `org_skill_load`
+- `budget_tokens`: optional per-role token budget (positive integer; omitted when unset — the role then gets its even share of the org budget)
 - `caller`: command | master
 
 ---
 
-## Adapter Types
+## Runtimes and their latest models
+
+Every role gets an explicit `adapter_config.model` — never leave it to a runtime default, which moves when a release changes it. Unless the user asked for a specific model, use the latest one for the role's runtime (`resolveModel()` in `orgrt/session.ts` is the source of truth; if it disagrees with this table, it wins):
 
-| Type | Description | Default Model |
-|------|-------------|---------------|
-| `claude-local` | Claude via Anthropic API | claude-sonnet-5 |
-| `gemini-local` | Gemini via Google API | gemini-2.0-flash |
-| `codex-local` | OpenAI Codex | gpt-4o |
-| `cursor` | Cursor IDE agent | cursor-default |
-| `opencode` | OpenCode agent | opencode-default |
-| `hermes` | Hermes local model | hermes-3 |
-| `http` | Custom HTTP adapter | (custom) |
-| `acpx` | ACPX protocol | (custom) |
+| `runtime` | Latest model |
+|-----------|--------------|
+| `claude` (default — omit the field) | `claude-sonnet-5` |
+| `codex` | `gpt-5.6-terra` |
+| `antigravity` | `gemini-3.6-flash-high` |
+| `kimicode` | `kimi-code/k3` |
+| `opencode` | `glm-5.2` |
+| `vercel` | `gpt-5.5` |
 
 ---
 
@@ -62,26 +63,35 @@ orgFile=".monomind/orgs/${org_name}.json"
 
 ---
 
+## Step 1.5 — Find Skills (create / preview)
+
+Skills are org-library skills, not slash commands: names like `mastermind:tasks` are not valid here and fail `org validate`. When `skills` / `skill_pool` were not given, search the library with the role's title and responsibilities and choose from the hits:
+
+```bash
+npx monomind org skills search "${title} ${responsibilities}" --limit 8 --format json \
+  | jq -r '.skills[] | "\(.name)\t\(.description)"'
+npx monomind org skills show <name>   # read one before choosing it
+```
+
+Pin 1–3 that define the role in `skills`; put the ones it needs only for some tasks in `skill_pool`. Leave both empty when nothing fits cleanly — `responsibilities` alone is a complete role.
+
+---
+
 ## Step 2 — Execute Action
 
-### list-adapters
+### list-runtimes
 
 ```bash
-echo "AVAILABLE ADAPTERS"
+echo "ORG RUNTIME RUNTIMES (latest model)"
 echo "────────────────────────────────────────────────────────"
-cat <<'ADAPTERS'
-  claude-local    Claude via Anthropic API   (recommended)
-    Models: claude-sonnet-5, claude-opus-5, claude-fable-5-1, claude-haiku-4-5-20251001
-  gemini-local    Gemini via Google AI
-    Models: gemini-2.0-flash, gemini-1.5-pro
-  codex-local     OpenAI Codex
-    Models: gpt-4o, gpt-4o-mini, o3-mini
-  cursor          Cursor IDE agent
-  opencode        OpenCode agent
-  hermes          Hermes local LLM (Ollama)
-  http            Custom HTTP adapter endpoint
-  acpx            ACPX protocol adapter
-ADAPTERS
+cat <<'RUNTIMES'
+  claude        claude-sonnet-5          (default; also claude-opus-5, claude-fable-5-1, claude-haiku-4-5-20251001)
+  codex         gpt-5.6-terra
+  antigravity   gemini-3.6-flash-high
+  kimicode      kimi-code/k3
+  opencode      glm-5.2
+  vercel        gpt-5.5                  (pair with provider.vendor)
+RUNTIMES
 ```
 
 ### list-roles
@@ -89,135 +99,108 @@ ADAPTERS
 ```bash
 echo "CURRENT ROLES IN ORG: $org_name"
 echo "────────────────────────────────────────────────────────"
-printf "%-22s %-20s %-14s %s\n" "ID" "TITLE" "ADAPTER" "REPORTS TO"
+printf "%-22s %-24s %-12s %-24s %s\n" "ID" "TITLE" "RUNTIME" "MODEL" "REPORTS TO"
 echo "────────────────────────────────────────────────────────"
 jq -r '(.roles // [])[] |
-  [.id, (.title // "-"), (.adapter.type // "claude-local"), (.reports_to // "(root)")] | @tsv' \
-  "$orgFile" | while IFS=$'\t' read -r id title adapter rt; do
-  printf "%-22s %-20s %-14s %s\n" "$id" "$title" "$adapter" "$rt"
+  [.id, (.title // "-"), (.runtime // "claude"), (.adapter_config.model // "(unset)"), (.reports_to // "(root)")] | @tsv' \
+  "$orgFile" | while IFS=$'\t' read -r id title rt model parent; do
+  printf "%-22s %-24s %-12s %-24s %s\n" "$id" "$title" "$rt" "$model" "$parent"
 done
 ```
 
-### preview
+### preview / create — shared setup
 
 ```bash
-[ -z "$title" ] && { echo "ERROR: --title required for preview."; exit 1; }
+[ -z "$title" ] && { echo "ERROR: --title required."; exit 1; }
+[ -z "$reports_to" ] && { echo "ERROR: --reports-to required (the org already has its root role)."; exit 1; }
 
-adapterType="${adapter_type:-claude-local}"
+runtimeVal="${runtime:-claude}"
 modelId="${model}"
-# Default model per adapter
 if [ -z "$modelId" ]; then
-  case "$adapterType" in
-    claude-local)  modelId="claude-sonnet-5" ;;
-    gemini-local)  modelId="gemini-2.0-flash" ;;
-    codex-local)   modelId="gpt-4o" ;;
-    cursor)        modelId="cursor-default" ;;
-    opencode)      modelId="opencode-default" ;;
-    hermes)        modelId="hermes-3" ;;
-    *)             modelId="(custom)" ;;
+  case "$runtimeVal" in
+    claude)       modelId="claude-sonnet-5" ;;
+    codex)        modelId="gpt-5.6-terra" ;;
+    antigravity)  modelId="gemini-3.6-flash-high" ;;
+    kimicode)     modelId="kimi-code/k3" ;;
+    opencode)     modelId="glm-5.2" ;;
+    vercel)       modelId="gpt-5.5" ;;
+    *) echo "ERROR: unknown runtime '$runtimeVal' (see --action list-runtimes)."; exit 1 ;;
   esac
 fi
 
-# Generate slug if not set
-agentIdPreview="${agent_id}"
-if [ -z "$agentIdPreview" ]; then
-  agentIdPreview=$(echo "$title" | tr '[:upper:]' '[:lower:]' | tr -cs 'a-z0-9' '-' | sed 's/^-//;s/-$//')
+[ -z "$agent_id" ] && agent_id=$(echo "$title" | tr '[:upper:]' '[:lower:]' | tr -cs 'a-z0-9' '-' | sed 's/^-//;s/-$//')
+
+if [ -n "$budget_tokens" ] && ! [[ "$budget_tokens" =~ ^[1-9][0-9]*$ ]]; then
+  echo "ERROR: --budget-tokens must be a positive integer (omit it for the even share)."; exit 1
 fi
+```
+
+### preview
 
-echo "PREVIEW — new agent to be added to org '$org_name'"
+```bash
+echo "PREVIEW — new role to be added to org '$org_name'"
 echo "────────────────────────────────────────────────────────"
-echo "  ID:          $agentIdPreview"
-echo "  Title:       $title"
-echo "  Adapter:     $adapterType / $modelId"
-echo "  Max tokens:  ${max_tokens:-8192}"
-echo "  Reports to:  ${reports_to:-(root/top-level)}"
-echo "  Governance:  ${governance:-inherit}"
-echo "  Skills:      ${skills:-(none)}"
-echo "  Budget:      ${budget_tokens:-(unlimited)}"
-echo "  Heartbeat:   ${heartbeat_enabled:-false} (${heartbeat_interval:-900}s)"
-[ -n "$system_prompt" ] && echo "  Prompt:      $system_prompt"
+echo "  ID:               $agent_id"
+echo "  Title:            $title"
+echo "  Runtime / model:  $runtimeVal / $modelId"
+echo "  Reports to:       $reports_to"
+echo "  Responsibilities: ${responsibilities:-(none — add some: they are the role's briefing)}"
+echo "  Skills:           ${skills:-(none)}"
+echo "  Skill pool:       ${skill_pool:-(none)}"
+echo "  Budget:           ${budget_tokens:-(even share of the org budget)}"
 echo ""
-echo "Run with --action create to add this agent to the org."
+echo "Run with --action create to add this role to the org."
 ```
 
 ### create
 
 ```bash
-[ -z "$title" ] && { echo "ERROR: --title required."; exit 1; }
-
-adapterType="${adapter_type:-claude-local}"
-modelId="${model}"
-if [ -z "$modelId" ]; then
-  case "$adapterType" in
-    claude-local)  modelId="claude-sonnet-5" ;;
-    gemini-local)  modelId="gemini-2.0-flash" ;;
-    codex-local)   modelId="gpt-4o" ;;
-    cursor)        modelId="cursor-default" ;;
-    opencode)      modelId="opencode-default" ;;
-    hermes)        modelId="hermes-3" ;;
-    *)             modelId="(custom)" ;;
-  esac
-fi
-
-# Generate id from title if not provided
-if [ -z "$agent_id" ]; then
-  agent_id=$(echo "$title" | tr '[:upper:]' '[:lower:]' | tr -cs 'a-z0-9' '-' | sed 's/^-//;s/-$//')
-fi
-
-# Check for duplicate id
 duplicate=$(jq -r --arg id "$agent_id" '[(.roles // [])[] | select(.id == $id)] | length' "$orgFile")
-[ "$duplicate" -gt 0 ] && { echo "ERROR: Agent id '$agent_id' already exists in org '$org_name'. Use --agent-id to specify a unique id."; exit 1; }
+[ "$duplicate" -gt 0 ] && { echo "ERROR: Role id '$agent_id' already exists in org '$org_name'. Use --agent-id to specify a unique id."; exit 1; }
 
-# Validate reports_to if set
-if [ -n "$reports_to" ]; then
-  parentExists=$(jq -r --arg pid "$reports_to" '[(.roles // [])[] | select(.id == $pid)] | length' "$orgFile")
-  [ "$parentExists" -eq 0 ] && { echo "ERROR: Parent agent '$reports_to' not found in org '${org_name}'. Check the agent ID with /mastermind:org-chart --org ${org_name}."; exit 1; }
-fi
+parentExists=$(jq -r --arg pid "$reports_to" '[(.roles // [])[] | select(.id == $pid)] | length' "$orgFile")
+[ "$parentExists" -eq 0 ] && { echo "ERROR: Parent role '$reports_to' not found in org '${org_name}'. Check ids with --action list-roles."; exit 1; }
 
-# Build skills array
-skillsArray="[]"
-if [ -n "$skills" ]; then
-  skillsArray=$(echo "$skills" | tr ',' '\n' | jq -Rsc 'split("\n") | map(select(. != ""))')
-fi
-
-ts=$(date -u +%Y-%m-%dT%H:%M:%SZ)
+list() { [ -n "$1" ] && echo "$1" | tr "$2" '\n' | sed 's/^ *//;s/ *$//' | jq -Rsc 'split("\n") | map(select(. != ""))' || echo '[]'; }
 
 tmp="${orgFile}.tmp"
 jq --arg id "$agent_id" \
    --arg title "$title" \
-   --arg adapter "$adapterType" \
+   --arg rt "$reports_to" \
+   --arg runtime "$runtimeVal" \
    --arg model "$modelId" \
-   --argjson maxTok "${max_tokens:-8192}" \
-   --arg rt "${reports_to:-}" \
-   --arg gov "${governance:-}" \
-   --argjson skills "$skillsArray" \
-   --argjson budget "${budget_tokens:-null}" \
-   --argjson hbEnabled "${heartbeat_enabled:-false}" \
-   --argjson hbInterval "${heartbeat_interval:-900}" \
-   --arg prompt "${system_prompt:-}" \
-   --arg ts "$ts" \
-  '.roles += [{
-    "id": $id,
-    "title": $title,
-    "adapter": {"type": $adapter, "model": $model, "max_tokens": $maxTok},
-    "reports_to": (if $rt != "" then $rt else null end),
-    "governance": (if $gov != "" then $gov else null end),
-    "skills": $skills,
-    "budget_tokens": $budget,
-    "heartbeat": {"enabled": $hbEnabled, "interval": $hbInterval},
-    "system_prompt": (if $prompt != "" then $prompt else null end),
-    "created_at": $ts
-  }]' \
-  "$orgFile" > "$tmp" && mv "$tmp" "$orgFile"
-
-echo "Agent created: $agent_id"
+   --arg maxTok "${max_tokens:-}" \
+   --arg budget "${budget_tokens:-}" \
+   --argjson resp "$(list "$responsibilities" ';')" \
+   --argjson skills "$(list "$skills" ',')" \
+   --argjson pool "$(list "$skill_pool" ',')" \
+  '.roles += [
+    {id: $id, title: $title, type: "specialist", reports_to: $rt, responsibilities: $resp,
+     adapter_config: ({model: $model} + (if $maxTok != "" then {max_tokens: ($maxTok | tonumber)} else {} end))}
+    + (if $runtime != "claude" then {runtime: $runtime} else {} end)
+    + (if ($skills | length) > 0 then {skills: $skills} else {} end)
+    + (if ($pool | length) > 0 then {skill_pool: $pool} else {} end)
+    + (if $budget != "" then {budget_tokens: ($budget | tonumber)} else {} end)
+  ]' \
+  "$orgFile" > "$tmp" || { rm -f "$tmp"; echo "ERROR: could not build the role."; exit 1; }
+
+# Validate BEFORE replacing the config: the same parse org run/serve use,
+# plus unknown-skill checks. A refused role leaves the org file untouched.
+cp "$orgFile" "${orgFile}.bak" && mv "$tmp" "$orgFile"
+if ! npx -y monomind@latest org validate "$org_name"; then
+  mv "${orgFile}.bak" "$orgFile"
+  echo "ERROR: the new role did not validate (see above) — org config restored."; exit 1
+fi
+rm -f "${orgFile}.bak"
+
+echo "Role created: $agent_id"
 echo "  Title:    $title"
-echo "  Adapter:  $adapterType / $modelId"
-echo "  Reports:  ${reports_to:-(root)}"
-echo "  Skills:   ${skills:-(none)}"
+echo "  Runtime:  $runtimeVal / $modelId"
+echo "  Reports:  $reports_to"
+echo "  Skills:   ${skills:-(none)}  pool: ${skill_pool:-(none)}"
 echo ""
-echo "Org '${org_name}' now has $(jq '.roles | length' "$orgFile") agent(s)."
-echo "View: /mastermind:agent-detail --org $org_name --agent-id $agent_id"
+echo "Org '${org_name}' now has $(jq '.roles | length' "$orgFile") role(s)."
+echo "View: /mastermind-agent-detail --org $org_name --agent-id $agent_id"
 ```
 
 ---
@@ -230,7 +213,7 @@ status: complete
 action: <action>
 org: <org_name>
 agent_id: <agent_id>
-adapter_type: <type>
+runtime: <runtime>
 model: <model>
 ```