Update OrgX skills for MCP v2 tools

README.md

@@ -58,7 +58,7 @@ Run the repo-level drift check before opening a PR or shipping skill changes:
 python3 scripts/check_skill_tool_drift.py
 ```
 
-The check fails on deprecated OrgX tool names, unknown `mcp__orgx__*` references, and high-value workflow gaps such as spawning without `check_spawn_guard` or opening plan sessions without `complete_plan`.
+The check fails on deprecated OrgX tool names, unknown `mcp__orgx__*` references, and high-value workflow gaps such as spawning without `orgx_spawn` or opening plan sessions without `orgx_plan`.
 
 ## Skill Format
 

bulk-create/SKILL.md

@@ -22,14 +22,14 @@ Completed checkbox items are skipped by default.
 ## Workflow
 
 1. Bootstrap with `mcp__orgx__orgx_bootstrap`.
-2. Confirm or set workspace via `mcp__orgx__workspace`.
+2. Confirm or set workspace via `mcp__orgx__orgx_bootstrap`.
 3. Parse the list into ordered items with priority, nesting, and completion state.
-4. Check the parent initiative, milestone, or workstream with `mcp__orgx__list_entities`.
-5. Build a single `mcp__orgx__batch_create_entities` payload:
+4. Check the parent initiative, milestone, or workstream with `mcp__orgx__orgx_search`.
+5. Build a single `mcp__orgx__orgx_write` payload:
    - use `ref` keys for each created item
    - use `depends_on` for nested or sequential dependencies
    - prefer `type=task` unless the user explicitly wants milestones
-6. If a few standalone items are being added to an existing hierarchy, `mcp__orgx__create_task` or `mcp__orgx__create_milestone` is acceptable, but batch create is preferred.
+6. If a few standalone items are being added to an existing hierarchy, `mcp__orgx__orgx_write` or `mcp__orgx__orgx_write` is acceptable, but batch create is preferred.
 
 ## Priority Detection
 

bulk-create/instructions.md

@@ -3,13 +3,13 @@ You are bulk-creating OrgX tasks or milestones from a markdown list.
 ## Required Sequence
 
 1. Call `mcp__orgx__orgx_bootstrap`.
-2. Resolve the active workspace with `mcp__orgx__workspace`.
+2. Resolve the active workspace with `mcp__orgx__orgx_bootstrap`.
 3. Parse the list items, skipping checked-off items unless the user explicitly wants them imported.
-4. Resolve the parent initiative/workstream/milestone with `mcp__orgx__list_entities`.
-5. Build one `mcp__orgx__batch_create_entities` payload using:
+4. Resolve the parent initiative/workstream/milestone with `mcp__orgx__orgx_search`.
+5. Build one `mcp__orgx__orgx_write` payload using:
    - `ref` for each created item
    - `depends_on` for nested or sequential relationships
-6. Only fall back to repeated `create_task` / `create_milestone` calls if batching is impossible.
+6. Only fall back to repeated `orgx_write` / `orgx_write` calls if batching is impossible.
 
 ## Parsing Rules
 

bulk-create/skill.toml

@@ -2,6 +2,6 @@ name = "bulk-create"
 version = "2.0.0"
 description = "Create multiple tasks or milestones from a markdown checklist or bullet list using batch creation and ref-based dependency wiring"
 entry_instructions = "instructions.md"
-required_tools = ["mcp__orgx__orgx_bootstrap", "mcp__orgx__workspace", "mcp__orgx__list_entities", "mcp__orgx__batch_create_entities", "mcp__orgx__create_task", "mcp__orgx__create_milestone"]
+required_tools = ["mcp__orgx__orgx_bootstrap", "mcp__orgx__orgx_bootstrap", "mcp__orgx__orgx_search", "mcp__orgx__orgx_write", "mcp__orgx__orgx_write", "mcp__orgx__orgx_write"]
 required_scopes = []
 resources = []

design-agent/SKILL.md

@@ -10,17 +10,17 @@ description: |
 
 ## 1. Quick Start
 
-1. Run `mcp__orgx__orgx_bootstrap`, then resolve workspace scope with `mcp__orgx__workspace`.
-2. Confirm the artifact or decision type and the target audience. If the request is task-bound, hydrate it with `mcp__orgx__get_task_with_context`; otherwise map neighboring work with `mcp__orgx__list_entities`.
-3. Pull prior design precedent with `mcp__orgx__query_org_memory` and `mcp__orgx__get_relevant_learnings`.
-4. For interaction specs, breakpoint plans, or design-system migrations, use the planning loop: `mcp__orgx__start_plan_session`, `mcp__orgx__improve_plan`, `mcp__orgx__record_plan_edit`, then `mcp__orgx__complete_plan`.
+1. Run `mcp__orgx__orgx_bootstrap`, then resolve workspace scope with `mcp__orgx__orgx_bootstrap`.
+2. Confirm the artifact or decision type and the target audience. If the request is task-bound, hydrate it with `mcp__orgx__orgx_inspect`; otherwise map neighboring work with `mcp__orgx__orgx_search`.
+3. Pull prior design precedent with `mcp__orgx__orgx_search` and `mcp__orgx__orgx_search`.
+4. For interaction specs, breakpoint plans, or design-system migrations, use the planning loop: `mcp__orgx__orgx_plan`, `mcp__orgx__orgx_plan`, `mcp__orgx__orgx_plan`, then `mcp__orgx__orgx_plan`.
 5. Identify the **context signal** (see Context Adaptation Protocol) and adjust depth accordingly.
 6. Produce the artifact using the contract below and return:
    - A concise summary (3-6 bullets)
    - The artifact body (JSON or structured Markdown)
    - 3 actionable next steps with owners and effort estimates
 7. Run the precision loop before delivery. Every artifact ships validator-clean.
-8. Attach the result back to the active entity with `mcp__orgx__entity_action` (`action=attach`) or `mcp__orgx__comment_on_entity`, then record quality with `mcp__orgx__record_quality_score`.
+8. Attach the result back to the active entity with `mcp__orgx__orgx_act` (`action=attach`) or `mcp__orgx__orgx_act`, then record quality with `mcp__orgx__orgx_submit_receipt`.
 
 Deliver design artifacts that are implementation-ready, accessibility-compliant, and validator-clean.
 
@@ -119,15 +119,15 @@ If inputs are incomplete, declare assumptions explicitly at the top of the artif
 
 ## 6. Operating Workflow
 
-1. **Bootstrap**: Run `mcp__orgx__orgx_bootstrap` and resolve workspace with `mcp__orgx__workspace`.
-2. **Scope**: Confirm the artifact type and audience. If task-bound, load `mcp__orgx__get_task_with_context`. Identify the context signal from the table above.
+1. **Bootstrap**: Run `mcp__orgx__orgx_bootstrap` and resolve workspace with `mcp__orgx__orgx_bootstrap`.
+2. **Scope**: Confirm the artifact type and audience. If task-bound, load `mcp__orgx__orgx_inspect`. Identify the context signal from the table above.
 3. **Gather evidence**:
-   - Query existing OrgX artifacts with `mcp__orgx__list_entities`
-   - Pull prior standards and decisions with `mcp__orgx__query_org_memory`
-   - Pull prior learnings with `mcp__orgx__get_relevant_learnings`
+   - Query existing OrgX artifacts with `mcp__orgx__orgx_search`
+   - Pull prior standards and decisions with `mcp__orgx__orgx_search`
+   - Pull prior learnings with `mcp__orgx__orgx_search`
    - Pull Figma context with `mcp__figma__*` when available
    - Review related artifacts from Engineering and Product agents for constraints
-4. **Plan when needed**: For interaction flows, token migrations, or breakpoint programs, open a plan session with `mcp__orgx__start_plan_session`, refine with `mcp__orgx__improve_plan`, and record major revisions with `mcp__orgx__record_plan_edit`.
+4. **Plan when needed**: For interaction flows, token migrations, or breakpoint programs, open a plan session with `mcp__orgx__orgx_plan`, refine with `mcp__orgx__orgx_plan`, and record major revisions with `mcp__orgx__orgx_plan`.
 5. **Draft**: Produce the artifact directly in JSON (preferred) or Markdown with a fenced JSON block.
 6. **Self-review**: Run the Precision Loop (Section 12) against the draft.
 7. **Validate**:
@@ -137,13 +137,13 @@ python3 scripts/validate_design.py <artifact_file> --type <artifact_type>
 ```
 
 8. **Fix and re-validate**: Resolve every failed gate. Re-run validator until all gates pass.
-9. **Publish**: Save with `mcp__orgx__create_entity` and link related entities.
+9. **Publish**: Save with `mcp__orgx__orgx_write` and link related entities.
 10. **Attach proof**:
-    - `mcp__orgx__complete_plan` with `attach_to` for planning sessions
-    - `mcp__orgx__entity_action` with `action=attach` for audits, token packages, and component docs
-    - `mcp__orgx__comment_on_entity` for design review feedback
-11. **Record learnings and quality**: Submit learnings with `mcp__orgx__submit_learning` and record quality with `mcp__orgx__record_quality_score`.
-12. **Handoff**: Before delegating downstream work, run `mcp__orgx__check_spawn_guard`, then notify or spawn downstream agents per the Cross-Agent Handoff Contracts.
+    - `mcp__orgx__orgx_plan` with `attach_to` for planning sessions
+    - `mcp__orgx__orgx_act` with `action=attach` for audits, token packages, and component docs
+    - `mcp__orgx__orgx_act` for design review feedback
+11. **Record learnings and quality**: Submit learnings with `mcp__orgx__orgx_submit_receipt` and record quality with `mcp__orgx__orgx_submit_receipt`.
+12. **Handoff**: Before delegating downstream work, run `mcp__orgx__orgx_spawn`, then notify or spawn downstream agents per the Cross-Agent Handoff Contracts.
 
 ## 7. Artifact Contracts
 
@@ -752,7 +752,7 @@ The design agent improves over time by recording learnings and consuming them on
 
 ### Recording learnings:
 
-After every artifact delivery, submit a learning to `mcp__orgx__submit_learning` with:
+After every artifact delivery, submit a learning to `mcp__orgx__orgx_submit_receipt` with:
 
 - `category`: `design_pattern` | `accessibility_fix` | `token_decision` | `research_finding` | `motion_pattern`
 - `observation`: What was decided and why
@@ -762,7 +762,7 @@ After every artifact delivery, submit a learning to `mcp__orgx__submit_learning`
 
 ### Consuming learnings:
 
-At the start of every artifact, query `mcp__orgx__query_org_memory` with:
+At the start of every artifact, query `mcp__orgx__orgx_search` with:
 
 - The component or flow name
 - The artifact type
@@ -784,21 +784,21 @@ Apply relevant prior learnings. Reference them explicitly (e.g., "Per learning L
 ### Primary:
 
 - `mcp__orgx__orgx_bootstrap` — initialize OrgX session scope and recommended workflow
-- `mcp__orgx__workspace` — resolve workspace scope before review or publication
-- `mcp__orgx__get_task_with_context` — hydrate task-bound context, attachments, and plan sessions
-- `mcp__orgx__list_entities` — Query existing design artifacts and related work
-- `mcp__orgx__query_org_memory` — Pull prior design decisions and learnings
-- `mcp__orgx__get_relevant_learnings` — retrieve design-specific learnings before drafting
-- `mcp__orgx__start_plan_session` — open tracked design planning sessions
-- `mcp__orgx__improve_plan` — refine interaction or system plans
-- `mcp__orgx__record_plan_edit` — capture major planning revisions
-- `mcp__orgx__complete_plan` — persist and attach finalized design plans
-- `mcp__orgx__create_entity` — Publish completed artifacts
-- `mcp__orgx__entity_action` — attach evidence and update entity state
-- `mcp__orgx__submit_learning` — Record design learnings for the flywheel
-- `mcp__orgx__comment_on_entity` — Add design review comments to engineering work
-- `mcp__orgx__record_quality_score` — score artifact quality for calibration
-- `mcp__orgx__check_spawn_guard` — verify delegation is allowed before spawning follow-on work
+- `mcp__orgx__orgx_bootstrap` — resolve workspace scope before review or publication
+- `mcp__orgx__orgx_inspect` — hydrate task-bound context, attachments, and plan sessions
+- `mcp__orgx__orgx_search` — Query existing design artifacts and related work
+- `mcp__orgx__orgx_search` — Pull prior design decisions and learnings
+- `mcp__orgx__orgx_search` — retrieve design-specific learnings before drafting
+- `mcp__orgx__orgx_plan` — open tracked design planning sessions
+- `mcp__orgx__orgx_plan` — refine interaction or system plans
+- `mcp__orgx__orgx_plan` — capture major planning revisions
+- `mcp__orgx__orgx_plan` — persist and attach finalized design plans
+- `mcp__orgx__orgx_write` — Publish completed artifacts
+- `mcp__orgx__orgx_act` — attach evidence and update entity state
+- `mcp__orgx__orgx_submit_receipt` — Record design learnings for the flywheel
+- `mcp__orgx__orgx_act` — Add design review comments to engineering work
+- `mcp__orgx__orgx_submit_receipt` — score artifact quality for calibration
+- `mcp__orgx__orgx_spawn` — verify delegation is allowed before spawning follow-on work
 
 ### Optional (when configured):
 
@@ -819,7 +819,7 @@ python3 scripts/validate_design.py <artifact_file> --type <audit|tokens|componen
 | Missing design source (no Figma, no screenshots) | Request the source. If unavailable, proceed with stated assumptions and mark confidence as `low`. |
 | Figma tools unavailable | Continue with supplied evidence. Note confidence reduction in the artifact header. |
 | Validator fails | Do not publish. Fix every failed gate and re-run. Never override. |
-| Conflicting prior learnings | Present the conflict, state the resolution rationale, and update the learning with `mcp__orgx__submit_learning`. |
+| Conflicting prior learnings | Present the conflict, state the resolution rationale, and update the learning with `mcp__orgx__orgx_submit_receipt`. |
 | Ambiguous artifact type | Ask the requester to clarify. If no response within context, choose the most conservative type and note the assumption. |
 | Engineering says "not feasible" | Adapt the design to constraints. Document what was compromised and why. Record as a learning. |
 | Insufficient evidence for critique score | Mark the score as provisional, list what evidence is missing, and specify what would change the score. |
@@ -873,6 +873,6 @@ An artifact is done when all of the following are true:
 - Validator passes with zero errors
 - Findings and recommendations are specific, actionable, and evidence-backed
 - Downstream agent handoff requirements are met
-- Final artifact is saved via `mcp__orgx__create_entity` and linked to related entities
-- At least one learning has been recorded via `mcp__orgx__submit_learning`
+- Final artifact is saved via `mcp__orgx__orgx_write` and linked to related entities
+- At least one learning has been recorded via `mcp__orgx__orgx_submit_receipt`
 - Requester has received the summary with 3 next steps

design-agent/evaluations/design-evaluation.json

@@ -380,7 +380,7 @@
     },
     {
       "check": "learning_recorded",
-      "description": "At least one learning submitted via mcp__orgx__submit_learning per artifact",
+      "description": "At least one learning submitted via mcp__orgx__orgx_submit_receipt per artifact",
       "applies_to": "all"
     },
     {

design-agent/skill.toml

@@ -2,6 +2,6 @@ name = "design-agent"
 version = "2.0.0"
 description = "Produce high-confidence design artifacts for OrgX: WCAG accessibility audits, design token packages, and component documentation. Use when work requires design-system decisions, accessibility validation, or design-to-engineering handoff quality gates."
 entry_instructions = "SKILL.md"
-required_tools = ["mcp__orgx__orgx_bootstrap", "mcp__orgx__workspace", "mcp__orgx__get_task_with_context", "mcp__orgx__list_entities", "mcp__orgx__query_org_memory", "mcp__orgx__get_relevant_learnings", "mcp__orgx__start_plan_session", "mcp__orgx__improve_plan", "mcp__orgx__record_plan_edit", "mcp__orgx__complete_plan", "mcp__orgx__create_entity", "mcp__orgx__entity_action", "mcp__orgx__submit_learning", "mcp__orgx__comment_on_entity", "mcp__orgx__record_quality_score", "mcp__orgx__check_spawn_guard"]
+required_tools = ["mcp__orgx__orgx_bootstrap", "mcp__orgx__orgx_bootstrap", "mcp__orgx__orgx_inspect", "mcp__orgx__orgx_search", "mcp__orgx__orgx_search", "mcp__orgx__orgx_search", "mcp__orgx__orgx_plan", "mcp__orgx__orgx_plan", "mcp__orgx__orgx_plan", "mcp__orgx__orgx_plan", "mcp__orgx__orgx_write", "mcp__orgx__orgx_act", "mcp__orgx__orgx_submit_receipt", "mcp__orgx__orgx_act", "mcp__orgx__orgx_submit_receipt", "mcp__orgx__orgx_spawn"]
 required_scopes = []
 resources = []