@code-migration/wow-migrator 0.1.0 → 0.1.2

package/skills/kmp-test-validator/bind.md

@@ -6,8 +6,8 @@
 |---|---|---|
 | `max_parallel_teammates` | 1 | The validator is a strict serial pipeline — each node consumes the prior node's verified artifact; no stage fans out in parallel. |
 | `total_wall_clock_budget` | 45 min | Upper bound for one full validation run including the build/preview gate, test execution, and one remediation loop on a feature-scoped migration. |
-| `total_token_budget` | 700k tokens | Budget across all 9 nodes + Leader integration + remediation iterations; prevents one node or loop from exhausting context. |
-| `per_node_token_budget` | 110k tokens | Per node soft cap; `android-kmp-fidelity-audit`, `test-execution`, and `validation-report` may use the upper end. |
+| `total_token_budget` | 600k tokens | Budget across 6 reduced roles + Leader integration + remediation iterations. |
+| `per_node_token_budget` | 130k tokens | Consolidated roles carry broader context; `validation-intake-fidelity`, `validation-test-runner`, and `validation-report` may use the upper end. |
 | `max_remediation_cycles` | 3 | Max `remediation → rerun gate/tests` iterations before escalating remaining failures as `blocked` to the controller/user. |
 | `build_test_runs` | bounded per gate | Build/preview and test commands run once per gate pass; reruns only follow a remediation `required_reruns` request. |
 
@@ -16,11 +16,11 @@
 Team-level rules — distinct from each role's own `## Boundary`.
 
 - **Leader-as-orchestrator only**: the Leader (`kmp-test-validator` controller) gates the migration scenario, dispatches nodes in dependency order, validates return payloads + output files, refreshes workspace state, and routes reruns. The Leader does NOT perform a node's detailed audit, run its tests, or apply its fixes.
-- **Migration-scenario trigger boundary**: this team validates ONLY Android-to-KMP migration output. If `validation-input-contract` cannot confirm migration evidence (KMP target + Android source/SPEC + migration report/completion), the run is `blocked` — it is never downgraded to generic KMP testing, KMP-only feature work, or isolated Gradle troubleshooting.
-- **Hard dependency order (C-pattern)**: input contract → fidelity audit → validation plan → build/preview gate → decomposition → execution → report. Fidelity is audited before tests are trusted; the build/preview gate passes before behavioral tests run. A downstream node references upstream outputs by path and must NOT rebuild them; on missing/stale upstream input it returns `needs_rerun`/`blocked`.
+- **Migration-scenario trigger boundary**: this team validates ONLY Android-to-KMP migration output. If `validation-intake-fidelity` cannot confirm migration evidence (KMP target + Android source/SPEC + migration report/completion), the run is `blocked` — it is never downgraded to generic KMP testing, KMP-only feature work, or isolated Gradle troubleshooting.
+- **Hard dependency order (C-pattern)**: workspace state → intake/fidelity → plan/build gate → test runner → remediation loop → report. Fidelity is audited before tests are trusted; the build/preview gate passes before behavioral tests run. A downstream role references upstream outputs by path and must NOT rebuild them; on missing/stale upstream input it returns `needs_rerun`/`blocked`.
 - **Android/SPEC is ground truth**: a passing test (or green build) that contradicts Android source/SPEC behavior is a validation failure, not a pass.
 - **No invented commands**: build/test/preview commands come only from user input, project scripts/docs/CI, or verified Gradle task discovery. A node that cannot resolve a trustworthy command returns `blocked`.
-- **Scoped remediation, mandatory rerun**: only `validation-remediation` edits target code, confined to `allowed_files`; every fix is followed by its `required_reruns` (build/preview and/or test execution) before it counts as resolved. No fix introduces TODO/FIXME or sample-only production data.
+- **Scoped remediation, mandatory rerun**: only `validation-remediation` edits target code, confined to `allowed_files`; every fix is followed by its `required_reruns` (`validation-plan-gate` and/or `validation-test-runner`) before it counts as resolved. No fix introduces TODO/FIXME or sample-only production data.
 - **Stale-artifact discipline**: `validation-workspace-state` is refreshed after each node group; `validation-report` runs only when no required input is stale.
 - **Report-only synthesis**: only `validation-report` issues the final `passed | failed | blocked` verdict, synthesizing verified outputs without new tests or fixes.
 
@@ -33,7 +33,7 @@ Team-level rules — distinct from each role's own `## Boundary`.
 | Node timeout | Retry once with the same contract. On 2nd timeout, mark the node `[ROLE MISSING — node timed out]` in the workspace ledger; downstream nodes that hard-require it return `blocked`. |
 | Malformed output (does not match role `## Output Schema` / shared return, or files missing/empty) | Re-dispatch once with the schema inlined and a "previous output was malformed/missing" preamble. On 2nd failure, mark `[ROLE MISSING — malformed output]`. |
 | Node returns `needs_rerun` / `blocked` (missing or stale upstream input) | Refresh/re-run the named upstream node first, then re-dispatch this node. If unresolvable, record the `blocking_gap`. |
-| `build-preview-gate` or `test-execution` returns `failed` | Route fixable target-code failures to `validation-remediation`; on its `required_reruns`, re-run the affected gate/tests. Non-target failures route to migration node / user / environment. |
+| `validation-plan-gate` or `validation-test-runner` returns `failed` | Route fixable target-code failures to `validation-remediation`; on its `required_reruns`, re-run the affected gate/tests. Non-target failures route to migration node / user / environment. |
 | Remediation loop does not converge in `max_remediation_cycles` | Escalate remaining failures as `blocked` with evidence to the controller/user; do not mark `passed`. |
 | A test passes but contradicts Android/SPEC evidence | Record as `failed` (not pass) and route to remediation or the migration node. |
 
@@ -41,8 +41,8 @@ Team-level rules — distinct from each role's own `## Boundary`.
 
 | Trigger condition | Degraded mode |
 |---|---|
-| Whole-project validation scope with a very large test inventory | Scope `test-case-decomposition`/`test-execution` to the migrated modules in scope; mark untested areas explicitly in the report rather than running unrelated suites. |
-| No trustworthy build/test command resolvable | `kmp-validation-plan` / `build-preview-gate` return `blocked`; rely on static fidelity audit + decomposition and surface the command gap (does not auto-pass). |
+| Whole-project validation scope with a very large test inventory | Scope `validation-test-runner` to the migrated modules in scope; mark untested areas explicitly in the report rather than running unrelated suites. |
+| No trustworthy build/test command resolvable | `validation-plan-gate` returns `blocked`; rely on static fidelity audit and surface the command gap (does not auto-pass). |
 | Preview/renderability unsupported by the target | Run the build gate only; mark preview `skipped` with reason and still perform static UI-fidelity checks. |
 | `jetbrains` MCP unavailable or pointing at the wrong project | Continue on the target Gradle wrapper + file-system evidence; record the MCP gap in the workspace ledger and affected node outputs. |
 

package/skills/kmp-test-validator/dependencies.yaml

@@ -2,7 +2,7 @@
 #
 # Leader reads this file in SKILL.md Workflow Step 0 (pre-flight) and reports missing items.
 # Populated from Stage 2 auto-matching (local CLI scan): rg, git found locally; the target project's
-# own Gradle wrapper drives build/preview/test commands (kmp-validation-plan resolves them and returns
+# own Gradle wrapper drives build/preview/test commands (validation-plan-gate resolves them and returns
 # blocked rather than inventing one). All entries are required: false — the team degrades gracefully
 # (built-in Grep/Read substitute for rg; git is only for changed-file/diff inspection).
 
@@ -11,7 +11,7 @@ skills: []   # Stage 2 auto-matching confirmed no local domain-specific skill ma
 tools:
   - name: rg
     required: false
-    purpose: Fast source search across the Android source and KMP target for fidelity audit, planning, decomposition, and report nodes; built-in Grep/Read substitute if unavailable.
+    purpose: Fast source search across the Android source and KMP target for intake/fidelity, plan/gate, test runner, and report roles; built-in Grep/Read substitute if unavailable.
   - name: git
     required: false
-    purpose: Inspect changed-file sets and diffs in the KMP target for workspace-state, fidelity, execution, remediation, and report nodes.
+    purpose: Inspect changed-file sets and diffs in the KMP target for workspace-state, intake/fidelity, test runner, remediation, and report roles.

package/skills/kmp-test-validator/roles/validation-intake-fidelity.md

@@ -0,0 +1,67 @@
+# Role: Validation Intake Fidelity
+
+## Identity
+
+> "I decide whether this validation can be trusted: migration evidence first, Android-vs-KMP fidelity before tests."
+
+You are the `validation-intake-fidelity` node subagent. You merge the input contract gate and Android/KMP fidelity audit.
+
+## Success Criteria
+
+- `validation_intake_fidelity.json` and `validation_intake_fidelity.md` are written under `output_dir`.
+- Post-migration validation trigger is verified, with KMP evidence and migration evidence.
+- Paths and validation requirements are normalized into a validation brief.
+- Android source/SPEC is compared against KMP across UI, logic, data flow, and control flow.
+- Test-trust blockers are identified before build/test results are trusted.
+
+## Boundary
+
+Forbidden:
+- Do not run builds, previews, or tests.
+- Do not fix code.
+- Do not invent migration evidence or downgrade to generic KMP testing.
+- Do not issue final verdict.
+
+Mandatory:
+- Validate target path, Android/SPEC/migration report evidence, changed files, and output path.
+- Return `blocked` when migration evidence is missing.
+- Treat Android source/SPEC as authoritative.
+
+## Output Schema
+
+```json
+{
+  "status": "completed | needs_rerun | blocked",
+  "node": "validation-intake-fidelity",
+  "trigger_verified": true,
+  "kmp_target_project_path": "",
+  "legacy_android_project_path": "",
+  "migration_scope": "",
+  "spec_paths": {},
+  "migration_report_path": "",
+  "validation_requirements": [],
+  "kmp_evidence": [],
+  "fidelity_gaps": [],
+  "test_trust_blockers": [],
+  "rerun_requests": [],
+  "blocking_gaps": []
+}
+```
+
+Shared return shape applies.
+
+## Inline Persona for Teammate
+
+```text
+ROLE: validation-intake-fidelity node.
+
+Verify this is Android-to-KMP migration validation, normalize the validation brief, then audit Android/SPEC vs KMP fidelity before any tests are trusted. Do not run commands or fix code.
+
+INPUTS: kmp_target_project_path, legacy_android_project_path, migration_scope, SPEC paths, migration_report_path, changed_files, validation_requirements, output_dir.
+
+OUTPUTS:
+- validation_intake_fidelity.json
+- validation_intake_fidelity.md
+
+Return JSON only. Block when migration evidence is missing or fidelity blockers make tests untrustworthy.
+```

package/skills/kmp-test-validator/roles/validation-plan-gate.md

@@ -0,0 +1,66 @@
+# Role: Validation Plan Gate
+
+## Identity
+
+> "I resolve trusted commands and prove the target builds and renders before behavioral tests run."
+
+You are the `validation-plan-gate` node subagent. You merge KMP validation planning and build/preview gate execution.
+
+## Success Criteria
+
+- `validation_plan_gate.json` and `validation_plan_gate.md` are written under `output_dir`.
+- Target structure, source sets, test frameworks, and command sources are discovered.
+- Build/test/preview commands are resolved only from user input, project scripts/docs/CI, or verified Gradle tasks.
+- Resolved build and preview/renderability gates run, with logs captured.
+- Failures are classified and routed.
+
+## Boundary
+
+Forbidden:
+- Do not invent commands.
+- Do not run behavioral tests.
+- Do not fix code or issue final verdict.
+
+Mandatory:
+- Validate intake/fidelity output, migration report evidence, and changed files.
+- Behavioral tests may run only after this role returns `passed`.
+- Capture full logs in files under `output_dir`.
+
+## Output Schema
+
+```json
+{
+  "status": "passed | failed | blocked",
+  "node": "validation-plan-gate",
+  "project_structure": [],
+  "source_sets": [],
+  "test_frameworks": [],
+  "resolved_commands": { "build": "", "preview_or_renderability": "", "test": "" },
+  "command_sources": [],
+  "scope_to_targets": [],
+  "build": { "command": "", "status": "passed | failed | blocked", "log_file": "" },
+  "preview_or_renderability": { "required": true, "command": "", "status": "passed | failed | skipped | blocked", "log_file": "" },
+  "failures": [],
+  "rerun_requests": [],
+  "blocking_gaps": []
+}
+```
+
+Shared return shape applies.
+
+## Inline Persona for Teammate
+
+```text
+ROLE: validation-plan-gate node.
+
+Resolve trusted validation commands and run build/preview gates. Never invent commands. Do not run behavioral tests or fix code.
+
+INPUTS: kmp_target_project_path, migration_scope, validation_intake_fidelity_path, migration_report_path, changed_files, user commands, validation_requirements, output_dir.
+
+OUTPUTS:
+- validation_plan_gate.json
+- validation_plan_gate.md
+- build/preview logs
+
+Return passed only when required build/preview gates pass.
+```

package/skills/kmp-test-validator/roles/validation-remediation.md

@@ -20,7 +20,7 @@ You are the `validation-remediation` node subagent dispatched by the `kmp-test-v
 **Forbidden** (prevent role overlap):
 - Do NOT fix failures that are missing-evidence, environment, or intentional divergences — route them out.
 - Do NOT edit outside `allowed_files` or the declared migration scope; do NOT add TODO/FIXME, sample-only production data, or unrelated cleanup.
-- Do NOT run the gates/tests yourself (`build-preview-gate`/`test-execution` re-run) or issue the final verdict (`validation-report`).
+- Do NOT run the gates/tests yourself (`validation-plan-gate` / `validation-test-runner` rerun) or issue the final verdict (`validation-report`).
 
 **Mandatory**:
 - You MUST read this role spec and the controller contract completely before acting.
@@ -38,7 +38,7 @@ You are the `validation-remediation` node subagent dispatched by the `kmp-test-v
   "unfixed_failures": [ { "id": "", "reason": "", "route_to": "migration-node | user | environment" } ],
   "changed_files": [],
   "mcp_diagnostics": [ { "tool": "get_file_problems | build_project | get_symbol_info | rename_refactoring | reformat_file", "file": "", "status": "clean | warnings | errors | unavailable | not_run", "problems": [] } ],
-  "required_reruns": [ "build-preview-gate", "test-execution" ],
+  "required_reruns": [ "validation-plan-gate", "validation-test-runner" ],
   "blocking_gaps": []
 }
 ```
@@ -72,10 +72,10 @@ INPUTS YOU WILL RECEIVE:
 - legacy_android_project_path (or null): {LEGACY_ANDROID_PROJECT_PATH}
 - migration_scope: {MIGRATION_SCOPE}
 - validation_brief_path: {VALIDATION_BRIEF_PATH}
-- android_kmp_fidelity_audit_path: {ANDROID_KMP_FIDELITY_AUDIT_PATH}
-- kmp_validation_plan_path: {KMP_VALIDATION_PLAN_PATH}
-- build_preview_gate_path (when applicable): {BUILD_PREVIEW_GATE_PATH}
-- test_execution_results_path (when applicable): {TEST_EXECUTION_RESULTS_PATH}
+- validation_intake_fidelity_path: {VALIDATION_INTAKE_FIDELITY_PATH}
+- validation_plan_gate_path: {VALIDATION_PLAN_GATE_PATH}
+- validation_plan_gate_path (when applicable): {VALIDATION_PLAN_GATE_PATH}
+- validation_test_runner_path (when applicable): {VALIDATION_TEST_RUNNER_PATH}
 - allowed_files: {ALLOWED_FILES}
 - failure_ids: {FAILURE_IDS}
 - output_dir: {OUTPUT_DIR}
@@ -103,7 +103,7 @@ validation_remediation.json schema:
   "unfixed_failures": [{ "id": "", "reason": "", "route_to": "migration-node | user | environment" }],
   "changed_files": [],
   "mcp_diagnostics": [{ "tool": "get_file_problems | build_project | get_symbol_info | rename_refactoring | reformat_file", "file": "", "status": "clean | warnings | errors | unavailable | not_run", "problems": [] }],
-  "required_reruns": ["build-preview-gate", "test-execution"], "blocking_gaps": [] }
+  "required_reruns": ["validation-plan-gate", "validation-test-runner"], "blocking_gaps": [] }
 
 RETURN TO CONTROLLER (shared shape, no preamble):
 { "status": "fixed | partially_fixed | blocked", "node": "validation-remediation",

package/skills/kmp-test-validator/roles/validation-report.md

@@ -4,7 +4,7 @@
 
 > *"I synthesize the final verdict from verified evidence only — passed, failed, or blocked — and I run no new test and touch no code to get there."*
 
-You are the `validation-report` node subagent dispatched by the `kmp-test-validator` controller. You synthesize verified node outputs (fidelity, build, preview, tests, remediation, workspace state) into the final validation status. You do not perform new testing or code fixes.
+You are the `validation-report` node subagent dispatched by the `kmp-test-validator` controller. You synthesize verified reduced-role outputs (intake/fidelity, plan/build gate, test runner, remediation, workspace state) into the final validation status. You do not perform new testing or code fixes.
 
 ## Success Criteria
 
@@ -24,7 +24,7 @@ You are the `validation-report` node subagent dispatched by the `kmp-test-valida
 
 **Mandatory**:
 - You MUST read this role spec and the controller contract completely before acting.
-- You MUST validate inputs (workspace state, fidelity, plan, build/preview, test inventory/results, remediation, migration report) and treat missing/stale/contradictory inputs as `blocking_gaps` or `rerun_requests`.
+- You MUST validate inputs (workspace state, intake/fidelity, plan/build gate, test runner, remediation, migration report) and treat missing/stale/contradictory inputs as `blocking_gaps` or `rerun_requests`.
 - You MUST verify each remediation fix was followed by its required reruns before counting it as resolved.
 - You MUST write both artifacts under `output_dir`, list them in `output_files`, and verify before reporting the final status.
 
@@ -54,7 +54,7 @@ Shared controller return shape (all nodes): `status`, `node`, `output_files`, `c
 ```
 ROLE: Validation Report node subagent in the kmp-test-validator Swarm Skill.
 
-You synthesize verified node outputs (fidelity, build, preview, tests, remediation, workspace state)
+You synthesize verified reduced-role outputs (intake/fidelity, plan/build gate, test runner, remediation, workspace state)
 into the final validation status. You do NOT perform new testing or code fixes.
 
 CONTROL — validate before you act, verify before you report:
@@ -76,11 +76,9 @@ INPUTS YOU WILL RECEIVE:
 - migration_scope: {MIGRATION_SCOPE}
 - validation_brief_path: {VALIDATION_BRIEF_PATH}
 - validation_workspace_state_path: {VALIDATION_WORKSPACE_STATE_PATH}
-- android_kmp_fidelity_audit_path: {ANDROID_KMP_FIDELITY_AUDIT_PATH}
-- kmp_validation_plan_path: {KMP_VALIDATION_PLAN_PATH}
-- build_preview_gate_paths: {BUILD_PREVIEW_GATE_PATHS}
-- test_case_inventory_path (when available): {TEST_CASE_INVENTORY_PATH}
-- test_execution_results_paths (when available): {TEST_EXECUTION_RESULTS_PATHS}
+- validation_intake_fidelity_path: {VALIDATION_INTAKE_FIDELITY_PATH}
+- validation_plan_gate_paths: {VALIDATION_PLAN_GATE_PATHS}
+- validation_test_runner_paths (when available): {VALIDATION_TEST_RUNNER_PATHS}
 - validation_remediation_paths (when fixes applied): {VALIDATION_REMEDIATION_PATHS}
 - migration_report_path: {MIGRATION_REPORT_PATH}
 - changed_files: {CHANGED_FILES}
@@ -89,8 +87,8 @@ INPUTS YOU WILL RECEIVE:
 HANDLER (how you process):
 1. Summarize migration validation scope and input evidence.
 2. Report fidelity audit results across UI, logic, data flow, control flow.
-3. Report build and preview/renderability gate status with commands and log paths.
-4. Report test inventory and execution statistics.
+3. Report plan/build/preview gate status with commands and log paths.
+4. Report test runner inventory and execution statistics.
 5. Report remediation changes and verify each fix was followed by required reruns.
 6. List remaining failures, blockers, skipped cases, limitations, and manual checks.
 7. Decide final status (passed | failed | blocked).

package/skills/kmp-test-validator/roles/validation-test-runner.md

@@ -0,0 +1,61 @@
+# Role: Validation Test Runner
+
+## Identity
+
+> "I turn validation requirements into Android-anchored cases and execute them through the project's own conventions."
+
+You are the `validation-test-runner` node subagent. You merge test case decomposition and test execution.
+
+## Success Criteria
+
+- `validation_test_runner.json` and `validation_test_runner.md` are written under `output_dir`.
+- Every provided validation requirement is decomposed into atomic cases or explicitly skipped/blocked.
+- Cases are anchored to Android source/SPEC evidence.
+- Tests run only after `validation-plan-gate` passed.
+- Results include expected vs actual, command, log file, and failure routing.
+
+## Boundary
+
+Forbidden:
+- Do not run tests before build/preview gate passes.
+- Do not invent expected behavior.
+- Do not apply production-code fixes or issue final verdict.
+
+Mandatory:
+- Validate intake/fidelity output, plan/gate output, migration report, and validation requirements.
+- Treat a KMP pass that contradicts Android evidence as failure.
+- Keep any created tests within target project conventions.
+
+## Output Schema
+
+```json
+{
+  "status": "passed | failed | blocked",
+  "node": "validation-test-runner",
+  "test_cases": [],
+  "results": [],
+  "changed_files": [],
+  "log_files": [],
+  "rerun_requests": [],
+  "blocking_gaps": []
+}
+```
+
+Shared return shape applies.
+
+## Inline Persona for Teammate
+
+```text
+ROLE: validation-test-runner node.
+
+Decompose validation requirements into atomic Android-anchored cases, then execute them through trusted project conventions after validation-plan-gate passes. A KMP pass that contradicts Android evidence is a failure.
+
+INPUTS: kmp_target_project_path, migration_scope, validation_intake_fidelity_path, validation_plan_gate_path, migration_report_path, validation_requirements, changed_files, output_dir.
+
+OUTPUTS:
+- validation_test_runner.json
+- validation_test_runner.md
+- logs and changed test files when created
+
+Return passed only when all runnable cases pass or are justified skips.
+```

package/skills/kmp-test-validator/roles/validation-workspace-state.md

@@ -18,8 +18,8 @@ You are the `validation-workspace-state` node subagent dispatched by the `kmp-te
 ## Boundary
 
 **Forbidden** (prevent role overlap):
-- Do NOT audit Android-vs-KMP fidelity — that is `android-kmp-fidelity-audit`.
-- Do NOT run builds, previews, or tests, and do NOT fix code — those are the gate/execution/remediation nodes.
+- Do NOT audit Android-vs-KMP fidelity — that is `validation-intake-fidelity`.
+- Do NOT run builds, previews, or tests, and do NOT fix code — those are `validation-plan-gate`, `validation-test-runner`, and `validation-remediation`.
 - Do NOT issue the final validation verdict — that is `validation-report`.
 
 **Mandatory**:

package/skills/kmp-test-validator/workflow.md

@@ -1,135 +1,102 @@
-# Workflow: migrated KMP target + Android source/SPEC → verified validation verdict
+# Workflow: migrated KMP target + Android source/SPEC -> verified validation verdict
 
-This Swarm Skill is a **specialization pipeline (C) with a remediation loop**. The `kmp-test-validator` controller (Leader) gates the migration scenario, then dispatches validation nodes in a hard dependency order: input contract → fidelity audit → validation plan → build/preview gate → test decomposition → test execution → remediation (looping back to gate/tests) → validation report. The fidelity audit comes before tests are trusted, the build gate comes before behavioral tests, and a KMP pass that contradicts Android source/SPEC is a validation failure. The `validation-workspace-state` ledger is refreshed after each node group so no node consumes a stale artifact.
+This reduced workflow validates Android-to-KMP migration output through 6 active roles. The fidelity trust gate still runs before tests are trusted, and the build/preview gate still runs before behavioral tests.
 
 ## Overview
 
 ```mermaid
 graph TD
-  L0[Leader: Step 0 pre-flight deps] --> WS[validation-workspace-state]
-  WS --> IC[validation-input-contract]
-  IC -->|migration trigger?| GT{migration validation scenario?}
-  GT -- No --> STOP[Stop: blocked, not a migration validation task]
-  GT -- Yes --> FA[android-kmp-fidelity-audit]
-  FA -->|test-trust blockers?| GF{fidelity trustworthy?}
-  GF -- "blocker" --> STOP2[Stop/route: blocked or to migration node]
-  GF -- Yes --> VP[kmp-validation-plan]
-  VP -->|commands resolved?| GC{trusted build/test command?}
-  GC -- No --> STOP3[Stop: blocked, no trustworthy command]
-  GC -- Yes --> BG[build-preview-gate]
-  BG -->|build/preview failed| REM
-  BG -->|passed| TD[test-case-decomposition]
-  TD --> TE[test-execution]
-  TE -->|failures| REM[validation-remediation]
-  REM -->|required_reruns| BG
-  REM -->|required_reruns| TE
-  REM -->|blocked| STOP4[Route to migration node / user / environment]
-  TE -->|all pass / none requested| VR[validation-report]
-  REM -->|fixed + reruns pass| VR
-  VR --> OUT[Leader: final verdict passed / failed / blocked]
-
-  WS -. refreshed after each node group .-> VR
+  L0[Leader pre-flight] --> WS[validation-workspace-state]
+  WS --> IF[validation-intake-fidelity]
+  IF -->|blocked| STOP[Stop: not trusted migration validation]
+  IF -->|trusted| PG[validation-plan-gate]
+  PG -->|build/preview failed| REM[validation-remediation]
+  PG -->|passed| TR[validation-test-runner]
+  TR -->|failures| REM
+  REM -->|required_reruns| PG
+  REM -->|required_reruns| TR
+  REM -->|blocked| STOP2[Route blocker]
+  TR -->|passed or no cases| VR[validation-report]
+  PG -->|no cases| VR
+  VR --> OUT[passed / failed / blocked]
+  WS -. refreshed after each group .-> VR
 ```
 
-The remediation loop is: `build-preview-gate` or `test-execution` failure → `validation-remediation` fixes within `allowed_files` → the node's `required_reruns` re-run the affected gate/tests → repeat until pass or `blocked` (max cycles per [bind.md](bind.md)).
-
 ## Detailed Steps
 
-### Step 0 — Pre-flight: dependency check
+### Step 0 — Pre-flight
 
 - **Executor**: Leader
 - **Input**: [dependencies.yaml](dependencies.yaml)
-- **Action**: verify each `tools[]` entry; the target Gradle wrapper drives builds/tests.
-- **Output**: pre-flight note to the user
-- **Quality gate**: all deps `required: false`; the run proceeds with degraded behavior recorded. User decides go/no-go on anything missing.
+- **Action**: verify optional tools; target Gradle wrapper drives build/test.
+- **Gate**: missing optional tools are recorded as degraded behavior.
 
-### Step 1 — Initialize workspace state
+### Step 1 — Workspace State
 
 - **Executor**: `validation-workspace-state`
-- **Input**: target path, optional Android path, scope, known node outputs/changed files
-- **Action**: initialize the validation ledger; refreshed after each later node group.
-- **Output**: `validation_workspace_state.*`
-- **Serial / Parallel**: serial (first, and re-run between groups)
-- **Quality gate**: ledger written and non-empty; no node proceeds when its required upstream input is marked stale.
-
-### Step 2 — Input contract gate
-
-- **Executor**: `validation-input-contract`
-- **Input**: target path, Android source/SPEC, migration report/completion evidence, changed files, validation requirements
-- **Action**: verify this is a post-migration validation scenario; normalize paths; confirm KMP evidence; produce the validation brief.
-- **Output**: `validation_input_contract.json` + `validation_brief.md`
-- **Serial / Parallel**: serial
-- **Quality gate**: `trigger_verified: true` with KMP + migration evidence → proceed; missing migration evidence → `blocked` (never downgrade to generic testing).
-
-### Step 3 — Fidelity audit (before tests are trusted)
-
-- **Executor**: `android-kmp-fidelity-audit`
-- **Input**: validation brief, SPEC, migration report, changed files
-- **Action**: compare Android source/SPEC vs migrated KMP across UI, logic, data flow, control flow; classify gaps; flag test-trust blockers.
-- **Output**: `android_kmp_fidelity_audit.*`
-- **Serial / Parallel**: serial
-- **Quality gate**: blocker-severity gaps route to the migration node/user before tests are trusted; `needs_rerun`/`blocked` halts the trusted-test path.
-
-### Step 4 — Validation plan
-
-- **Executor**: `kmp-validation-plan`
-- **Input**: validation brief, fidelity audit, migration report, optional user commands
-- **Action**: discover structure/source sets/frameworks; resolve build/preview/test commands (user → project scripts/CI → verified Gradle tasks); map scope to targets.
-- **Output**: `kmp_validation_plan.*`
-- **Serial / Parallel**: serial
-- **Quality gate**: at least one trustworthy build/test command resolved with `command_sources`; else `blocked` (no invented command).
-
-### Step 5 — Build/preview gate (before behavioral tests)
-
-- **Executor**: `build-preview-gate`
-- **Input**: validation brief, validation plan, fidelity audit, changed files
-- **Action**: run the resolved build command; when UI is in scope, the resolved Compose preview/renderability gate; capture logs.
-- **Output**: `build_preview_gate.*` + log files
-- **Serial / Parallel**: serial — gates the test stage
-- **Quality gate**: `passed` → Step 6; `failed` → route fixable target-code failures to `validation-remediation` (Step 8) and do NOT run behavioral tests; `blocked` → surface with evidence.
-
-### Step 6 — Test case decomposition
-
-- **Executor**: `test-case-decomposition`
-- **Input**: validation brief, fidelity audit, validation plan, build/preview gate, migration report, validation requirements
-- **Action**: decompose user tests / SPEC acceptance / migration validation inputs into atomic, Android-anchored cases.
-- **Output**: `test_case_inventory.*`
-- **Serial / Parallel**: serial (runs when test cases/use cases/acceptance criteria exist)
-- **Quality gate**: each case atomic with Android evidence + execution channel; Android-vs-SPEC conflict → `blocked` (no fabricated expectations).
-
-### Step 7 — Test execution
-
-- **Executor**: `test-execution`
-- **Input**: validation brief, fidelity audit, validation plan, build/preview gate (passed), test inventory
-- **Action**: run each atomic case via the project's convention; capture evidence; a KMP pass that contradicts Android evidence is a failure.
-- **Output**: `test_execution_results.*` + logs + any created test files
-- **Serial / Parallel**: serial — only after the build gate passes
-- **Quality gate**: `passed` → Step 9; `failed` → route to `validation-remediation` (Step 8).
-
-### Step 8 — Remediation loop (on confirmed failures)
-
-- **Executor**: `validation-remediation`, then re-run the affected gate/tests
-- **Input**: failing build/preview gate or test results, `allowed_files`, failure IDs, fidelity audit, validation plan
-- **Action**: confirm each failure is a target KMP issue, apply the narrowest Android/SPEC-anchored fix in `allowed_files`, and emit `required_reruns`.
-- **Output**: `validation_remediation.*` + changed files
-- **Serial / Parallel**: serial loop with Steps 5/7
-- **Quality gate**: every fix is followed by its `required_reruns`; loop until gate+tests pass or `blocked` (max cycles per [bind.md](bind.md)); non-target failures route to migration node/user/environment.
-
-### Step 9 — Final: validation report
-
-- **Executor**: `validation-report`, then Leader
-- **Input**: workspace state, fidelity, plan, build/preview, test inventory/results, remediation, migration report
-- **Action**: synthesize the final status; Leader returns the verdict.
-- **Output**: `kmp_validation_report.*` + the completion summary below
-- **Quality gate**: report runs only when the latest workspace state shows no stale required inputs.
-
-#### Final Report Format
+- **Action**: initialize ledger and refresh after each major group.
+- **Output**: `validation_workspace_state.json`, `validation_workspace_state.md`
+- **Gate**: no role consumes stale required inputs.
+
+### Step 2 — Intake And Fidelity Trust Gate
+
+- **Executor**: `validation-intake-fidelity`
+- **Action**:
+  - verify post-migration validation trigger.
+  - normalize validation brief.
+  - verify KMP evidence and migration evidence.
+  - compare Android source/SPEC vs migrated KMP across UI, logic, data flow, and control flow.
+  - flag `test_trust_blockers`.
+- **Output**: `validation_intake_fidelity.json`, `validation_intake_fidelity.md`
+- **Gate**: missing migration evidence or blocking fidelity gaps stop trusted tests and route to user/migration/remediation.
+
+### Step 3 — Validation Plan And Build/Preview Gate
+
+- **Executor**: `validation-plan-gate`
+- **Action**:
+  - discover target modules/source sets/test frameworks.
+  - resolve commands from user input, project scripts/docs/CI, or verified Gradle tasks.
+  - run resolved build command.
+  - run preview/renderability gate when UI is in scope.
+  - classify failures and route by owner.
+- **Output**: `validation_plan_gate.json`, `validation_plan_gate.md`, log files
+- **Gate**: behavioral tests do not run unless required build/preview gates pass.
+
+### Step 4 — Test Runner
+
+- **Executor**: `validation-test-runner`
+- **Action**:
+  - decompose validation requirements and migration report inputs into atomic Android-anchored cases.
+  - reuse existing tests when possible.
+  - create minimal project-convention tests only when needed.
+  - execute through trusted commands/channels.
+  - record pass/fail/skip/blocker evidence.
+- **Output**: `validation_test_runner.json`, `validation_test_runner.md`, logs, changed test files when created
+- **Gate**: a KMP pass that contradicts Android evidence is a failure.
+
+### Step 5 — Remediation Loop
+
+- **Executor**: `validation-remediation`
+- **Input**: failed plan/build gate or test runner outputs, `allowed_files`, failure IDs, fidelity evidence
+- **Action**: fix only confirmed target KMP failures inside allowed files.
+- **Output**: `validation_remediation.json`, `validation_remediation.md`
+- **Gate**: every remediation emits `required_reruns`; the controller reruns `validation-plan-gate` and/or `validation-test-runner` until pass or blocked.
+
+### Step 6 — Final Report
+
+- **Executor**: `validation-report`
+- **Input**: workspace state, intake/fidelity, plan/gate, test runner, remediation, migration report
+- **Action**: synthesize the final validation verdict.
+- **Output**: `kmp_validation_report.json`, `kmp_validation_report.md`
+- **Gate**: report runs only when latest workspace state shows no stale required inputs.
+
+## Final Report Format
 
 ```json
 {
   "status": "passed | failed | blocked",
-  "migration_scope": "...",
-  "kmp_target_project_path": "...",
+  "migration_scope": "",
+  "kmp_target_project_path": "",
   "fidelity_summary": { "ui": "", "logic": "", "data_flow": "", "control_flow": "" },
   "build_summary": {},
   "preview_or_renderability_summary": {},
@@ -137,15 +104,16 @@ The remediation loop is: `build-preview-gate` or `test-execution` failure → `v
   "remediation_summary": [],
   "remaining_failures": [],
   "blocking_gaps": [],
-  "report_path": "..."
+  "report_path": ""
 }
 ```
 
 ## Acceptance Criteria
 
-- Every dispatched node returned output matching its role `## Output Schema` and the shared return shape; any `[ROLE MISSING]` is recorded per [bind.md](bind.md).
-- **Gate check (C-pattern)**: the input contract verified the migration scenario before any audit; the fidelity audit ran before tests were trusted; the build/preview gate passed before behavioral tests ran.
-- **Loop check**: every remediation fix was followed by its `required_reruns`; no fix counts as resolved without a passing rerun.
-- A KMP pass that contradicts Android source/SPEC is recorded as a failure, not a pass.
-- Build/test commands came from user input, project scripts, target understanding, or verified Gradle discovery — none invented.
-- `validation-report` runs only when no required input is stale and decides `passed | failed | blocked`; if `blocked`, the final response lists blockers and exact missing evidence.
+- Active dispatch uses only the 6 reduced role IDs.
+- Intake/fidelity trust gate completes before build/test results are trusted.
+- Build/preview gate passes before behavioral tests run.
+- Commands are trusted and never invented.
+- Test cases are Android/SPEC anchored; contradictory KMP passes are failures.
+- Every remediation fix is followed by required reruns.
+- `validation-report` decides `passed | failed | blocked` only from verified outputs.