@mmerterden/multi-agent-pipeline 11.2.0 → 11.3.1

package/pipeline/scripts/smoke-channels-flow.sh

@@ -18,13 +18,13 @@
 set -uo pipefail
 
 ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
-CLAUDE_CMD="$ROOT/pipeline/commands/multi-agent/channels.md"
+CLAUDE_CMD="$ROOT/pipeline/commands/multi-agent/channels/SKILL.md"
 COPILOT_SKILL="$ROOT/pipeline/skills/shared/core/multi-agent-channels/SKILL.md"
-ENRICH_CMD="$ROOT/pipeline/commands/multi-agent/enrich.md"
+ENRICH_CMD="$ROOT/pipeline/commands/multi-agent/enrich/SKILL.md"
 ENRICH_SKILL_DIR="$ROOT/pipeline/skills/shared/core/multi-agent-enrich"
-PHASE7="$ROOT/pipeline/commands/multi-agent/refs/phases/phase-7-report.md"
-MODES="$ROOT/pipeline/commands/multi-agent/refs/phases/modes.md"
-WIKI_CAPTURE="$ROOT/pipeline/commands/multi-agent/refs/wiki-capture.md"
+PHASE7="$ROOT/pipeline/multi-agent-refs/phases/phase-7-report.md"
+MODES="$ROOT/pipeline/multi-agent-refs/phases/modes.md"
+WIKI_CAPTURE="$ROOT/pipeline/multi-agent-refs/wiki-capture.md"
 SCHEMA="$ROOT/pipeline/schemas/prefs.schema.json"
 MIGRATE="$ROOT/pipeline/scripts/migrate-prefs.mjs"
 TEMPLATE="$ROOT/pipeline/preferences-template.json"

package/pipeline/scripts/smoke-clarify.sh

@@ -24,7 +24,7 @@ ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
 AGENT="$ROOT/pipeline/agents/task-clarifier.md"
 SCHEMA="$ROOT/pipeline/schemas/clarify-output.schema.json"
 PREFS_SCHEMA="$ROOT/pipeline/schemas/prefs.schema.json"
-PHASE_DOC="$ROOT/pipeline/commands/multi-agent/refs/phases/phase-0-init.md"
+PHASE_DOC="$ROOT/pipeline/multi-agent-refs/phases/phase-0-init.md"
 
 pass=0
 fail=0

package/pipeline/scripts/smoke-commands-skills-parity.sh

@@ -36,7 +36,7 @@ fail() { FAIL=$((FAIL+1)); echo "  ✗ $1"; }
 # Underscore-prefixed files (e.g. _account-picker.md) are internal fragments
 # loaded by other commands via Read; they're not invocable slash commands and
 # intentionally have no matching skill.
-CMDS=$(find "$CMDS_DIR" -maxdepth 1 -name "*.md" ! -name "_*" -exec basename {} .md \; | sort)
+CMDS=$(find "$CMDS_DIR" -mindepth 2 -maxdepth 2 -name "SKILL.md" -exec dirname {} \; | xargs -n1 basename | sort)
 
 # help.md in commands maps to multi-agent-help skill; the main "multi-agent"
 # skill covers the behavior documented across multiple command files, so we
@@ -67,7 +67,7 @@ echo "→ Checking that every multi-agent-* skill has a corresponding command"
 SKILLS=$(find "$SKILLS_DIR" -maxdepth 1 -type d -name "multi-agent-*" -exec basename {} \; | sed 's/^multi-agent-//' | sort)
 
 for skill in $SKILLS; do
-  cmd_file="$CMDS_DIR/$skill.md"
+  cmd_file="$CMDS_DIR/$skill/SKILL.md"
   # A few skills are Copilot-CLI-style conveniences without a Claude slash equivalent:
   case "$skill" in
     autopilot | dev-autopilot) # dash-style shortcut skills, the flags are documented in help.md
@@ -76,7 +76,7 @@ for skill in $SKILLS; do
       ;;
   esac
   if [ -f "$cmd_file" ]; then
-    pass "skills/shared/multi-agent-$skill/ ↔ commands/multi-agent/$skill.md"
+    pass "skills/shared/multi-agent-$skill/ ↔ commands/multi-agent/$skill/SKILL.md"
   else
     fail "skills/shared/multi-agent-$skill/ has no matching command"
   fi

package/pipeline/scripts/smoke-community-gates.sh

@@ -18,7 +18,7 @@
 set -euo pipefail
 
 REPO_ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
-PHASES_DIR="$REPO_ROOT/pipeline/commands/multi-agent/refs/phases"
+PHASES_DIR="$REPO_ROOT/pipeline/multi-agent-refs/phases"
 
 PASS=0
 FAIL=0

package/pipeline/scripts/smoke-compliance-skills.sh

@@ -24,9 +24,9 @@ APPLE_SKILL="$ROOT/pipeline/skills/shared/core/apple-archive-compliance/SKILL.md
 GOOGLE_SKILL="$ROOT/pipeline/skills/shared/core/google-play-compliance/SKILL.md"
 SIM_TEST="$ROOT/pipeline/commands/sim-test.md"
 SEC_AUDITOR="$ROOT/pipeline/agents/security-auditor.md"
-REVIEW_CMD="$ROOT/pipeline/commands/multi-agent/review.md"
+REVIEW_CMD="$ROOT/pipeline/commands/multi-agent/review/SKILL.md"
 REVIEW_SKILL="$ROOT/pipeline/skills/shared/core/multi-agent-review/SKILL.md"
-CHANNELS_CMD="$ROOT/pipeline/commands/multi-agent/channels.md"
+CHANNELS_CMD="$ROOT/pipeline/commands/multi-agent/channels/SKILL.md"
 CHANNELS_SKILL="$ROOT/pipeline/skills/shared/core/multi-agent-channels/SKILL.md"
 
 PASS=0

package/pipeline/scripts/smoke-cost-summary.sh

@@ -18,7 +18,7 @@ ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
 RENDERER="$ROOT/pipeline/scripts/render-cost-summary.sh"
 TABLE="$ROOT/pipeline/scripts/cost-table.json"
 SCHEMA="$ROOT/pipeline/schemas/prefs.schema.json"
-CHANNELS_DOC="$ROOT/pipeline/commands/multi-agent/channels.md"
+CHANNELS_DOC="$ROOT/pipeline/commands/multi-agent/channels/SKILL.md"
 
 pass=0
 fail=0

package/pipeline/scripts/smoke-cross-cli-behavior.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # smoke-cross-cli-behavior.sh  -  enforces the cross-CLI parity invariant
-# defined in ~/.claude/commands/multi-agent/refs/cross-cli-contract.md.
+# defined in ~/.claude/multi-agent-refs/cross-cli-contract.md.
 #
 # This is a behavioral complement to smoke-sync-parity.sh (which tests the
 # parity checker itself). This script asserts the actual Claude Code and
@@ -41,7 +41,10 @@ fi
 # Underscore-prefixed Claude files (e.g. _account-picker.md) are internal
 # fragments lazy-loaded by other commands; they're not invocable on either CLI
 # and intentionally have no Copilot skill counterpart.
-CLAUDE_LIST=$(find "$CLAUDE_CMDS" -maxdepth 1 -name "*.md" ! -name "_*" -type f -exec basename {} \; 2>/dev/null | sed 's/\.md$//' | sort)
+# Also exclude local-only alias wrappers (frontmatter `local-only: true`)  -  personal
+# aliases to private marketplace-plugin skills, intentionally Claude-only, no Copilot peer.
+CLAUDE_LIST=$(find "$CLAUDE_CMDS" -mindepth 2 -maxdepth 2 -name "SKILL.md" 2>/dev/null \
+  | while IFS= read -r f; do grep -q "^local-only: true" "$f" || basename "$(dirname "$f")"; done | sort)
 COPILOT_LIST=$(find "$COPILOT_SKILLS" -maxdepth 1 -type d -name "multi-agent-*" -exec basename {} \; 2>/dev/null | sed 's/^multi-agent-//' | sort)
 
 if [ "$CLAUDE_LIST" = "$COPILOT_LIST" ]; then
@@ -69,7 +72,7 @@ DEPRECATED=(
 )
 for p in "${DEPRECATED[@]}"; do
   # grep -l returns filenames; empty = no matches
-  FOUND=$(grep -l -F -- "$p" "$CLAUDE_CMDS"/*.md 2>/dev/null || true)
+  FOUND=$(grep -l -F -- "$p" $(find "$CLAUDE_CMDS" -name SKILL.md 2>/dev/null) 2>/dev/null || true)
   if [ -z "$FOUND" ]; then
     pass "no '$p' in Claude commands"
   else
@@ -85,7 +88,7 @@ PERSONAL_HARDCODES=(
   "${USER}_tkgithub"
 )
 for p in "${PERSONAL_HARDCODES[@]}"; do
-  FOUND=$(grep -l -F -- "$p" "$CLAUDE_CMDS"/*.md 2>/dev/null || true)
+  FOUND=$(grep -l -F -- "$p" $(find "$CLAUDE_CMDS" -name SKILL.md 2>/dev/null) 2>/dev/null || true)
   if [ -z "$FOUND" ]; then
     pass "no '$p' leaked into Claude commands"
   else
@@ -97,13 +100,13 @@ done
 echo ""
 echo "→ 4. Canonical placeholders present (sanity)"
 # These MUST exist (regressions would mean someone undid a drift fix)
-if grep -q -F "{owner}" "$CLAUDE_CMDS/sync.md" 2>/dev/null; then
+if grep -q -F "{owner}" "$CLAUDE_CMDS/sync/SKILL.md" 2>/dev/null; then
   pass "sync.md uses canonical '{owner}'"
 else
   fail "sync.md missing '{owner}'  -  drift fix may have regressed"
 fi
 
-if grep -q -F "{website-host}" "$CLAUDE_CMDS/sync.md" 2>/dev/null; then
+if grep -q -F "{website-host}" "$CLAUDE_CMDS/sync/SKILL.md" 2>/dev/null; then
   pass "sync.md uses canonical '{website-host}'"
 else
   fail "sync.md missing '{website-host}'  -  drift fix may have regressed"
@@ -114,7 +117,7 @@ echo ""
 echo "→ 5. Canonical project-name vocabulary in log.md"
 CANONICAL_PROJECTS=("my-ui-components" "my-figma-app" "my-ios-app")
 for c in "${CANONICAL_PROJECTS[@]}"; do
-  if grep -q -F -- "$c" "$CLAUDE_CMDS/log.md" 2>/dev/null; then
+  if grep -q -F -- "$c" "$CLAUDE_CMDS/log/SKILL.md" 2>/dev/null; then
     pass "log.md references '$c'"
   else
     fail "log.md missing canonical '$c'"
@@ -124,7 +127,7 @@ done
 # ──────────────────────────────────────────────────────────────────────────
 echo ""
 echo "→ 6. Contract doc exists (required source of truth)"
-CONTRACT="$CLAUDE_CMDS/refs/cross-cli-contract.md"
+CONTRACT="$HOME/.claude/multi-agent-refs/cross-cli-contract.md"
 if [ -f "$CONTRACT" ]; then
   SIZE=$(wc -l < "$CONTRACT" | tr -d ' ')
   if [ "$SIZE" -ge 100 ]; then
@@ -138,40 +141,11 @@ fi
 
 # ──────────────────────────────────────────────────────────────────────────
 echo ""
-echo "→ 7. Figma skill trees deployed to both CLIs (WS-8b, v5.0.1+)"
-
-CLAUDE_SKILLS="$HOME/.claude/skills"
-FIGMA_TREES=(figma-ios figma-android figma-common)
-
-for tree in "${FIGMA_TREES[@]}"; do
-  claude_tree="$CLAUDE_SKILLS/$tree"
-  claude_note=""
-  # /multi-agent:stack parks inactive-platform trees under skills-inactive/.
-  # A parked tree is still deployed - count it from its parked location so
-  # iOS-stack machines don't fail on the android tree (and vice versa).
-  if [ ! -d "$claude_tree" ] && [ -d "$HOME/.claude/skills-inactive/$tree" ]; then
-    claude_tree="$HOME/.claude/skills-inactive/$tree"
-    claude_note=" (claude: parked by /multi-agent:stack)"
-  fi
-  copilot_tree="$COPILOT_SKILLS/$tree"
-  if [ -d "$claude_tree" ] && [ -d "$copilot_tree" ]; then
-    claude_count=$(find "$claude_tree" -maxdepth 1 -mindepth 1 -type d | wc -l | tr -d ' ')
-    copilot_count=$(find "$copilot_tree" -maxdepth 1 -mindepth 1 -type d | wc -l | tr -d ' ')
-    if [ "$claude_count" -eq "$copilot_count" ]; then
-      pass "$tree deployed to both CLIs ($claude_count skills each)$claude_note"
-    else
-      fail "$tree count mismatch (claude=$claude_count copilot=$copilot_count)$claude_note"
-    fi
-  elif [ -d "$claude_tree" ] || [ -d "$copilot_tree" ]; then
-    fail "$tree deployed to only ONE CLI"
-  else
-    echo "    (tree not installed on either CLI  -  run \`node install.js --all\` to deploy)"
-  fi
-done
-
-# ──────────────────────────────────────────────────────────────────────────
-echo ""
-echo "→ 8. Agent personas deployed to both CLIs"
+# Figma/component skill trees no longer ship in the pipeline (v11.2.0+): they
+# live in the marketplace component plugins (ai-ios-engineering-toolkit /
+# multi-agent-plugins), which each CLI loads through its own plugin channel.
+# The pipeline therefore has no figma tree to deploy or parity-check here.
+echo "→ 7. Agent personas deployed to both CLIs"
 
 CLAUDE_AGENTS="$HOME/.claude/agents"
 COPILOT_AGENTS="$HOME/.copilot/agents"
@@ -207,7 +181,7 @@ fi
 # drift across the phase doc, the schema, and the consensus block.
 echo "→ reviewer-count contract (Claude=2, Copilot=3)"
 REPO_ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
-P4="$REPO_ROOT/pipeline/commands/multi-agent/refs/phases/phase-4-review.md"
+P4="$REPO_ROOT/pipeline/multi-agent-refs/phases/phase-4-review.md"
 REVSCHEMA="$REPO_ROOT/pipeline/schemas/reviewer-output.schema.json"
 TRSCHEMA="$REPO_ROOT/pipeline/schemas/triage-output.schema.json"
 if grep -qiE "Claude Code (dispatches|=|:) ?2|2-model" "$P4" && grep -qiE "Copilot CLI (dispatches|=|:) ?3|3-model" "$P4"; then

package/pipeline/scripts/smoke-cross-phase-cohesion.sh

@@ -24,7 +24,7 @@
 set -euo pipefail
 
 REPO_ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
-PHASE_DIR="$REPO_ROOT/pipeline/commands/multi-agent/refs/phases"
+PHASE_DIR="$REPO_ROOT/pipeline/multi-agent-refs/phases"
 SCHEMA_DIR="$REPO_ROOT/pipeline/schemas"
 
 PASS=0

package/pipeline/scripts/smoke-dev-critic.sh

@@ -16,7 +16,7 @@ set -euo pipefail
 
 ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
 AGENT="$ROOT/pipeline/agents/dev-critic.md"
-PHASE_DOC="$ROOT/pipeline/commands/multi-agent/refs/phases/phase-3-dev.md"
+PHASE_DOC="$ROOT/pipeline/multi-agent-refs/phases/phase-3-dev.md"
 PREFS_SCHEMA="$ROOT/pipeline/schemas/prefs.schema.json"
 CRITIC_SCHEMA="$ROOT/pipeline/schemas/dev-critic-output.schema.json"
 

package/pipeline/scripts/smoke-diff-explain.sh

@@ -28,7 +28,7 @@ TMP=$(mktemp -d)
 
 # ──────────────────────────────────────────────────────────────────────────
 echo "→ 1. Command + skill files exist"
-[ -f "$REPO_ROOT/pipeline/commands/multi-agent/diff-explain.md" ] && pass "diff-explain.md present" || fail "diff-explain.md missing"
+[ -f "$REPO_ROOT/pipeline/commands/multi-agent/diff-explain/SKILL.md" ] && pass "diff-explain.md present" || fail "diff-explain.md missing"
 [ -f "$REPO_ROOT/pipeline/skills/shared/core/multi-agent-diff-explain/SKILL.md" ] && pass "multi-agent-diff-explain SKILL.md present" || fail "Copilot peer missing"
 [ -x "$SCRIPT" ] && pass "diff-explain.mjs is executable" || fail "diff-explain.mjs not executable"
 

package/pipeline/scripts/smoke-diff-risk.sh

@@ -22,7 +22,7 @@ ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
 SCORE="$ROOT/pipeline/scripts/diff-risk-score.mjs"
 VALIDATE="$ROOT/pipeline/scripts/validate-diff-risk.mjs"
 SCHEMA="$ROOT/pipeline/schemas/diff-risk.schema.json"
-PHASE4="$ROOT/pipeline/commands/multi-agent/refs/phases/phase-4-review.md"
+PHASE4="$ROOT/pipeline/multi-agent-refs/phases/phase-4-review.md"
 REVIEWER="$ROOT/pipeline/agents/code-reviewer.md"
 PREFS="$ROOT/pipeline/schemas/prefs.schema.json"
 FIX_IOS="$ROOT/pipeline/scripts/fixtures/diff-risk-ios.diff"

package/pipeline/scripts/smoke-evidence-gate.sh

@@ -80,7 +80,7 @@ echo ""
 echo "→ 5. Wiring: phase docs reference the gate"
 GREP_HITS=0
 for doc in phase-3-dev phase-4-review phase-6-commit; do
-  grep -q "evidence-gate" "$ROOT/pipeline/commands/multi-agent/refs/phases/$doc.md" && GREP_HITS=$((GREP_HITS+1))
+  grep -q "evidence-gate" "$ROOT/pipeline/multi-agent-refs/phases/$doc.md" && GREP_HITS=$((GREP_HITS+1))
 done
 if [ "$GREP_HITS" -ge 2 ]; then
   pass "evidence-gate referenced in $GREP_HITS phase docs"

package/pipeline/scripts/smoke-figma-dispatch.sh

@@ -1,19 +1,19 @@
 #!/usr/bin/env bash
-# smoke-figma-dispatch.sh  -  Phase 3 component dispatch contract.
+# smoke-figma-dispatch.sh  -  Phase 3 component dispatch contract (plugin-based).
 #
-# Verifies that multi-agent Phase 3 delegates to the figma-to-component
-# orchestrator (WS-4) instead of embedding figma logic inline.
+# Verifies that multi-agent Phase 3 dispatches component tasks to the
+# ai-<platform>-engineering-toolkit MARKETPLACE PLUGIN (create-component,
+# fallback create-ui-component) instead of a bundled figma-to-component skill.
 #
-# Runs offline  -  scans docs only, no orchestrator invocation.
+# Runs offline  -  scans docs only, no skill invocation.
 
 set -euo pipefail
 
 HERE="$(cd "$(dirname "$0")" && pwd)"
 ROOT="$(cd "$HERE/../.." && pwd)"
-PHASE0="$ROOT/pipeline/commands/multi-agent/refs/phases/phase-0-init.md"
-PHASE3="$ROOT/pipeline/commands/multi-agent/refs/phases/phase-3-dev.md"
-DISPATCH="$ROOT/pipeline/commands/multi-agent/refs/component-dispatch.md"
-ORCH_IOS="$ROOT/pipeline/skills/figma-ios/figma-to-component/SKILL.md"
+PHASE0="$ROOT/pipeline/multi-agent-refs/phases/phase-0-init.md"
+PHASE3="$ROOT/pipeline/multi-agent-refs/phases/phase-3-dev.md"
+DISPATCH="$ROOT/pipeline/multi-agent-refs/component-dispatch.md"
 
 PASS=0
 FAIL=0
@@ -22,62 +22,47 @@ fail() { FAIL=$((FAIL+1)); echo "  ✗ $1"; }
 
 [ -f "$PHASE0" ] || { echo "error: $PHASE0 missing" >&2; exit 1; }
 [ -f "$PHASE3" ] || { echo "error: $PHASE3 missing" >&2; exit 1; }
-[ -f "$DISPATCH" ] || { echo "error: $DISPATCH missing (WS-4 extracted contract)" >&2; exit 1; }
-[ -f "$ORCH_IOS" ] || { echo "error: orchestrator skill missing at $ORCH_IOS (run WS-2 import first)" >&2; exit 1; }
+[ -f "$DISPATCH" ] || { echo "error: $DISPATCH missing" >&2; exit 1; }
 
-# Combined scan  -  both Phase 3 itself and the extracted contract may carry the
-# canonical strings. Use a function so each check reads both.
-has_in_phase3_or_dispatch() {
-  grep -Fq "$1" "$PHASE3" || grep -Fq "$1" "$DISPATCH"
-}
-
-echo "→ 1. Phase 0 classification routes component → figma-to-component"
-if grep -Fq "pipeline/skills/figma-ios/figma-to-component" "$PHASE0"; then
-  pass "Phase 0 references the new orchestrator path"
-else
-  fail "Phase 0 does NOT reference pipeline/skills/figma-ios/figma-to-component"
-fi
-
-if grep -Fq "figma-to-swiftui" "$PHASE0"; then
-  fail "Phase 0 still references legacy 'figma-to-swiftui' (expected 'figma-to-component')"
+echo "→ 1. no bundled figma orchestrator remains in the tree"
+if [ -e "$ROOT/pipeline/skills/figma-ios" ] || [ -e "$ROOT/pipeline/skills/figma-android" ] || [ -e "$ROOT/pipeline/skills/figma-common" ]; then
+  fail "bundled pipeline/skills/figma-* tree still present (should be plugin-only)"
 else
-  pass "Phase 0 has no legacy figma-to-swiftui reference"
+  pass "no pipeline/skills/figma-* tree (component skills live in the plugin)"
 fi
 
 echo ""
-echo "→ 2. Phase 3 has a component dispatch section"
-if grep -Fq "Component tasks  -  delegated dispatch" "$PHASE3"; then
-  pass "Phase 3 has 'Component tasks  -  delegated dispatch' section"
+echo "→ 2. Phase 0 routes component tasks to the plugin component skill"
+if grep -Fq "create-component" "$PHASE0"; then
+  pass "Phase 0 references the plugin create-component skill"
 else
-  fail "Phase 3 missing component dispatch section"
+  fail "Phase 0 does NOT reference create-component"
 fi
-
-if grep -Fq 'taskType === "component"' "$DISPATCH"; then
-  pass "dispatch contract mentions taskType guard"
+if grep -Fq "figma-to-swiftui" "$PHASE0" || grep -Fq "skills/figma-ios/figma-to-component" "$PHASE0"; then
+  fail "Phase 0 still references a legacy/bundled figma orchestrator path"
 else
-  fail "dispatch contract missing taskType guard"
+  pass "Phase 0 has no legacy/bundled figma orchestrator reference"
 fi
 
 echo ""
-echo "→ 3. dispatch documents platform routing (iOS + Android orchestrator selection)"
-if grep -Fq "figma-ios/figma-to-component" "$DISPATCH" && grep -Fq "figma-android" "$DISPATCH"; then
-  pass "dispatch documents iOS + Android orchestrator routing"
+echo "→ 3. dispatch guards taskType and resolves the plugin (dual-name)"
+if grep -Fq 'taskType === "component"' "$DISPATCH"; then
+  pass "dispatch mentions taskType guard"
 else
-  fail "dispatch missing platform-aware orchestrator routing"
+  fail "dispatch missing taskType guard"
 fi
-
-echo ""
-echo "→ 4. dispatch delegates subphase tracking to orchestrator"
-if grep -Fq "subphases[]" "$DISPATCH" || grep -Fq 'subphases\[\]' "$DISPATCH"; then
-  pass "dispatch documents state.phases[3].subphases[] report"
+if grep -Fq "create-component" "$DISPATCH" && grep -Fq "create-ui-component" "$DISPATCH"; then
+  pass "dispatch documents dual-name resolution (create-component / create-ui-component)"
 else
-  fail "dispatch missing subphases[] documentation"
+  fail "dispatch missing dual-name plugin resolution"
 fi
 
-if grep -Fq "phase-tracker" "$DISPATCH"; then
-  pass "dispatch refers to phase-tracker for subphase rendering"
+echo ""
+echo "→ 4. dispatch layer owns subphase state + phase-tracker"
+if grep -Fq 'subphases[]' "$DISPATCH" && grep -Fq "phase-tracker" "$DISPATCH"; then
+  pass "dispatch documents state.phases[3].subphases[] + phase-tracker"
 else
-  fail "dispatch missing phase-tracker reference"
+  fail "dispatch missing subphases[]/phase-tracker documentation"
 fi
 
 echo ""
@@ -87,7 +72,6 @@ if grep -Fq "<!-- progress-contract: applied -->" "$PHASE3"; then
 else
   fail "Phase 3 missing the adoption marker"
 fi
-
 if grep -Fq "<!-- progress-contract: applied -->" "$PHASE0"; then
   pass "Phase 0 carries the adoption marker"
 else
@@ -95,28 +79,33 @@ else
 fi
 
 echo ""
-echo "→ 6. Phase 3 emits dispatch progress lines"
-if grep -qE '→ dispatching figma-to-component' "$PHASE3"; then
-  pass "Phase 3 documents '→ dispatching figma-to-component <name>' emission"
+echo "→ 6. Phase 3 emits the plugin dispatch progress line"
+if grep -qE '→ dispatching create-component' "$PHASE3"; then
+  pass "Phase 3 documents '→ dispatching create-component <name>' emission"
 else
   fail "Phase 3 missing dispatch progress line"
 fi
 
 echo ""
-echo "→ 7. dispatch has failure + retry semantics for orchestrator"
-if grep -Fq "retryCount" "$DISPATCH" && grep -qE '(resume via|resumes instead of restarting)' "$DISPATCH"; then
-  pass "dispatch documents retryCount + orchestrator resume path"
+echo "→ 7. dispatch has failure + retry semantics"
+if grep -Fq "retryCount" "$DISPATCH"; then
+  pass "dispatch documents retryCount"
 else
-  fail "dispatch missing retry / resume documentation"
+  fail "dispatch missing retryCount documentation"
 fi
 
 echo ""
-echo "→ 8. dispatch covers multi-repo report"
-if grep -Fq "state.projects[]" "$DISPATCH" || grep -Fq 'state\.projects\[\]' "$DISPATCH"; then
+echo "→ 8. dispatch covers multi-repo + intentional cross-CLI divergence"
+if grep -Fq 'state.projects[]' "$DISPATCH"; then
   pass "dispatch documents multi-repo report"
 else
   fail "dispatch missing multi-repo report paragraph"
 fi
+if grep -Fiq "Copilot" "$DISPATCH"; then
+  pass "dispatch documents the Copilot cross-CLI divergence"
+else
+  fail "dispatch missing cross-CLI divergence note"
+fi
 
 echo ""
 echo "══ figma-dispatch smoke: $PASS passed, $FAIL failed ══"

package/pipeline/scripts/smoke-gate-hooks.sh

@@ -62,7 +62,7 @@ else
 fi
 
 # 4. picker-contract documents the hook template + the phase-enforced caveat
-PC="$ROOT/pipeline/commands/multi-agent/refs/picker-contract.md"
+PC="$ROOT/pipeline/multi-agent-refs/picker-contract.md"
 if grep -q "claude-hooks.json" "$PC" && grep -q "phase-enforced" "$PC"; then
   pass "picker-contract references the template + the phase-enforced gates caveat"
 else

package/pipeline/scripts/smoke-generate-issue.sh

@@ -16,13 +16,13 @@ set -euo pipefail
 
 HERE="$(cd "$(dirname "$0")" && pwd)"
 ROOT="$(cd "$HERE/../.." && pwd)"
-CMD="$ROOT/pipeline/commands/multi-agent/generate.md"
-REF="$ROOT/pipeline/commands/multi-agent/refs/generate-issue.md"
+CMD="$ROOT/pipeline/commands/multi-agent/generate/SKILL.md"
+REF="$ROOT/pipeline/multi-agent-refs/generate-issue.md"
 SKILL="$ROOT/pipeline/skills/shared/core/multi-agent-generate/SKILL.md"
-DISPATCHER="$ROOT/pipeline/commands/multi-agent.md"
-CONTRACT="$ROOT/pipeline/commands/multi-agent/refs/cross-cli-contract.md"
-SYNC="$ROOT/pipeline/commands/multi-agent/sync.md"
-HELP="$ROOT/pipeline/commands/multi-agent/help.md"
+DISPATCHER="$ROOT/pipeline/commands/multi-agent/SKILL.md"
+CONTRACT="$ROOT/pipeline/multi-agent-refs/cross-cli-contract.md"
+SYNC="$ROOT/pipeline/commands/multi-agent/sync/SKILL.md"
+HELP="$ROOT/pipeline/commands/multi-agent/help/SKILL.md"
 
 PASS=0
 FAIL=0
@@ -34,7 +34,7 @@ for f in "$CMD" "$REF" "$SKILL"; do
   if [ -f "$f" ]; then pass "exists: ${f#$ROOT/}"; else fail "missing: ${f#$ROOT/}"; fi
 done
 # old split commands must be gone
-for f in "$ROOT/pipeline/commands/multi-agent/generate-task.md" "$ROOT/pipeline/commands/multi-agent/generate-bug.md"; do
+for f in "$ROOT/pipeline/commands/multi-agent/generate-task/SKILL.md" "$ROOT/pipeline/commands/multi-agent/generate-bug/SKILL.md"; do
   if [ -f "$f" ]; then fail "stale file present: ${f#$ROOT/}"; else pass "removed: ${f##*/}"; fi
 done
 [ "$FAIL" -eq 0 ] || { echo "══ generate-issue smoke: $PASS passed, $FAIL failed ══"; exit 1; }
@@ -90,7 +90,7 @@ grep -Fqi "swagger" "$REF" && pass "swagger context present" || fail "swagger co
 echo ""
 echo "→ 8. registration + count consistency (36)"
 grep -Fq '| `generate ' "$DISPATCHER" && pass "dispatcher routing: generate" || fail "dispatcher routing missing: generate"
-grep -Fq "generate.md" "$DISPATCHER" && pass "dispatcher loading row" || fail "dispatcher loading row missing"
+grep -Fq "generate/SKILL.md" "$DISPATCHER" && pass "dispatcher loading row" || fail "dispatcher loading row missing"
 grep -Fq "## 1. Command Inventory (36 commands)" "$CONTRACT" && pass "contract count = 36" || fail "contract count wrong"
 grep -Eq '(^|[ ,])generate, help([ ,]|$)' "$CONTRACT" && pass "contract list has generate" || fail "contract list missing generate"
 grep -Fq "**36 commands are synced**" "$SYNC" && pass "sync count = 36" || fail "sync count wrong"

package/pipeline/scripts/smoke-handoff-contract.sh

@@ -12,9 +12,9 @@
 set -euo pipefail
 
 ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
-OPS="$ROOT/pipeline/commands/multi-agent/refs/phases/operations.md"
-LOGFMT="$ROOT/pipeline/commands/multi-agent/refs/phases/log-format.md"
-RESUME="$ROOT/pipeline/commands/multi-agent/resume.md"
+OPS="$ROOT/pipeline/multi-agent-refs/phases/operations.md"
+LOGFMT="$ROOT/pipeline/multi-agent-refs/phases/log-format.md"
+RESUME="$ROOT/pipeline/commands/multi-agent/resume/SKILL.md"
 
 pass=0
 fail=0

package/pipeline/scripts/smoke-identity-isolation.sh

@@ -16,8 +16,8 @@ set -uo pipefail
 # machines that haven't re-run install.js after a pipeline update.
 HERE="$(cd "$(dirname "$0")" && pwd)"
 ROOT="$(cd "$HERE/../.." && pwd)"
-PHASE0="$ROOT/pipeline/commands/multi-agent/refs/phases/phase-0-init.md"
-SETUP="$ROOT/pipeline/commands/multi-agent/setup.md"
+PHASE0="$ROOT/pipeline/multi-agent-refs/phases/phase-0-init.md"
+SETUP="$ROOT/pipeline/commands/multi-agent/setup/SKILL.md"
 PREFS_SCHEMA="$ROOT/pipeline/schemas/prefs.schema.json"
 
 PASS=0; FAIL=0

package/pipeline/scripts/smoke-intent-guard.sh

@@ -14,7 +14,7 @@ set -uo pipefail
 
 ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
 CLASSIFY="$ROOT/pipeline/lib/classify-intent.sh"
-PHASE0="$ROOT/pipeline/commands/multi-agent/refs/phases/phase-0-init.md"
+PHASE0="$ROOT/pipeline/multi-agent-refs/phases/phase-0-init.md"
 PREFS="$ROOT/pipeline/schemas/prefs.schema.json"
 
 PASS=0

package/pipeline/scripts/smoke-issue-comment-template.sh

@@ -19,8 +19,8 @@ cd "$PIPELINE_ROOT"
 
 FAIL=0
 
-TEMPLATE="commands/multi-agent/refs/channels/issue-comment.md"
-PHASE7="commands/multi-agent/refs/phases/phase-7-report.md"
+TEMPLATE="multi-agent-refs/channels/issue-comment.md"
+PHASE7="multi-agent-refs/phases/phase-7-report.md"
 
 # 1. Template file exists.
 if [ ! -f "$TEMPLATE" ]; then

package/pipeline/scripts/smoke-issue-jira-triad.sh

@@ -14,9 +14,9 @@ set -euo pipefail
 HERE="$(cd "$(dirname "$0")" && pwd)"
 ROOT="$(cd "$HERE/../.." && pwd)"
 PREFS="$ROOT/pipeline/schemas/prefs.schema.json"
-PHASE0="$ROOT/pipeline/commands/multi-agent/refs/phases/phase-0-init.md"
-PHASE7="$ROOT/pipeline/commands/multi-agent/refs/phases/phase-7-report.md"
-TRIAD="$ROOT/pipeline/commands/multi-agent/refs/issue-jira-triad.md"
+PHASE0="$ROOT/pipeline/multi-agent-refs/phases/phase-0-init.md"
+PHASE7="$ROOT/pipeline/multi-agent-refs/phases/phase-7-report.md"
+TRIAD="$ROOT/pipeline/multi-agent-refs/issue-jira-triad.md"
 
 PASS=0
 FAIL=0
@@ -59,7 +59,7 @@ fi
 
 echo ""
 echo "→ 4. Channels Wiki adapter documents wiki → Jira auto-link"
-CHANNELS="$(cd "$HERE/../.." && pwd)/pipeline/commands/multi-agent/channels.md"
+CHANNELS="$(cd "$HERE/../.." && pwd)/pipeline/commands/multi-agent/channels/SKILL.md"
 if grep -Fq "Wiki → Jira" "$CHANNELS" || grep -Fq "wiki summary to Jira" "$CHANNELS" \
    || grep -Fq "Wiki → Jira comment" "$CHANNELS" || grep -Fq "wiki pages" "$CHANNELS"; then
   pass "channels.md documents the wiki → Jira report"

package/pipeline/scripts/smoke-language-axis.sh

@@ -42,7 +42,7 @@ declare -a FORBIDDEN_PHRASES=(
 # (it's the rule source), CHANGELOG (history), STABILITY-FIX-PLAN (history),
 # and feedback memory (notes the rule, can quote it).
 TARGETS=(
-  "commands/multi-agent/refs/phases/*.md"
+  "multi-agent-refs/phases/*.md"
   "commands/multi-agent/*.md"
   "skills/shared/core/multi-agent/SKILL.md"
 )
@@ -51,10 +51,10 @@ TARGETS=(
 # setup.md (Step 0 sets the language and explains why label stays English),
 # refs/picker-contract.md (UI contract spec).
 declare -a ALLOWLIST=(
-  "commands/multi-agent/refs/rules.md"
-  "commands/multi-agent/language.md"
-  "commands/multi-agent/setup.md"
-  "commands/multi-agent/refs/picker-contract.md"
+  "multi-agent-refs/rules.md"
+  "commands/multi-agent/language/SKILL.md"
+  "commands/multi-agent/setup/SKILL.md"
+  "multi-agent-refs/picker-contract.md"
 )
 
 is_allowlisted() {
@@ -83,7 +83,7 @@ for pattern in "${FORBIDDEN_PHRASES[@]}"; do
 done
 
 # Positive assertion: rules.md must contain the per-field language matrix.
-RULES="commands/multi-agent/refs/rules.md"
+RULES="multi-agent-refs/rules.md"
 if [ -f "pipeline/$RULES" ]; then
   if ! grep -q "Per-field language matrix" "pipeline/$RULES"; then
     echo "FAIL [smoke-language-axis]: $RULES must contain the 'Per-field language matrix' section"

package/pipeline/scripts/smoke-learnings-ledger.sh

@@ -75,9 +75,9 @@ echo "$briefA" | grep -q 'repoB only fact' && fail "repoA brief leaked repoB con
 
 echo ""
 echo "→ 5. wiring + docs"
-grep -q 'learnings-ledger.mjs' "$ROOT/pipeline/commands/multi-agent/refs/phases/phase-1-analysis.md" && pass "phase-1 injects the brief" || fail "phase-1 wiring missing"
-grep -q 'learnings-ledger.mjs' "$ROOT/pipeline/commands/multi-agent/refs/phases/phase-4-review.md" && pass "phase-4 triage injects rejected prefs" || fail "phase-4 wiring missing"
-grep -q 'learnings-ledger.mjs' "$ROOT/pipeline/commands/multi-agent/refs/phases/phase-7-report.md" && pass "phase-7 distills the ledger" || fail "phase-7 wiring missing"
+grep -q 'learnings-ledger.mjs' "$ROOT/pipeline/multi-agent-refs/phases/phase-1-analysis.md" && pass "phase-1 injects the brief" || fail "phase-1 wiring missing"
+grep -q 'learnings-ledger.mjs' "$ROOT/pipeline/multi-agent-refs/phases/phase-4-review.md" && pass "phase-4 triage injects rejected prefs" || fail "phase-4 wiring missing"
+grep -q 'learnings-ledger.mjs' "$ROOT/pipeline/multi-agent-refs/phases/phase-7-report.md" && pass "phase-7 distills the ledger" || fail "phase-7 wiring missing"
 grep -q '"learningsLedger"' "$ROOT/pipeline/schemas/prefs.schema.json" && pass "prefs exposes learningsLedger" || fail "prefs toggle missing"
 [ -f "$ROOT/pipeline/schemas/learnings-ledger.schema.json" ] && pass "ledger schema present" || fail "ledger schema missing"