m-dev-tools · rafael5 · May 11, 2026 · May 11, 2026
diff --git a/AGENTS.md b/AGENTS.md
@@ -132,7 +132,7 @@ make check         # lint + mypy + cov (run before push)
 ```
 
 ## Build / generate
-The committed payloads under `docs/integrated/` are produced by the
+The committed payloads under `integrated/` are produced by the
 pipeline. To regenerate them from `sources/`:
 
 ```bash
@@ -147,15 +147,15 @@ hasn't drifted from the committed integrated payloads.
 These are the `verification_commands` declared in `dist/repo.meta.json`:
 
 ```bash
-make integrated    # regenerates docs/integrated/ deterministically
+make integrated    # regenerates integrated/ deterministically
 make test          # full test suite
 ```
 
 A green `make check-manifest` proves the committed integrated payloads
 still match what the pipeline produces.
 
 ## Guardrails
-- **Do not hand-edit `docs/integrated/*` files.** They are pipeline
+- **Do not hand-edit `integrated/*` files.** They are pipeline
   outputs; edit `sources/` + the extract/reconcile/emit stages instead.
 - **Do not hand-edit `dist/repo.meta.json` `verified_on` to a future
   date.** The Phase 0 smoke test rejects manifests older than 90 days;

diff --git a/dist/repo.meta.json b/dist/repo.meta.json
@@ -8,15 +8,15 @@
   "agent_instructions": "AGENTS.md",
   "verified_on": "2026-05-10",
   "exposes": {
-    "grammar_surface":             "docs/integrated/grammar-surface.json",
-    "commands":                    "docs/integrated/commands.tsv",
-    "intrinsic_functions":         "docs/integrated/intrinsic-functions.tsv",
-    "intrinsic_special_variables": "docs/integrated/intrinsic-special-variables.tsv",
-    "operators":                   "docs/integrated/operators.tsv",
-    "errors":                      "docs/integrated/errors.tsv",
-    "pragmatic_standard":          "docs/integrated/pragmatic-m-standard.json",
-    "operational_standard":        "docs/integrated/operational-m-standard.json",
-    "va_sac_rules":                "docs/integrated/va-sac-rules.tsv"
+    "grammar_surface":             "integrated/grammar-surface.json",
+    "commands":                    "integrated/commands.tsv",
+    "intrinsic_functions":         "integrated/intrinsic-functions.tsv",
+    "intrinsic_special_variables": "integrated/intrinsic-special-variables.tsv",
+    "operators":                   "integrated/operators.tsv",
+    "errors":                      "integrated/errors.tsv",
+    "pragmatic_standard":          "integrated/pragmatic-m-standard.json",
+    "operational_standard":        "integrated/operational-m-standard.json",
+    "va_sac_rules":                "integrated/va-sac-rules.tsv"
   },
   "verification_commands": ["make integrated", "make test"]
 }
diff --git a/docs/integrated/commands.json → integrated/commands.json b/docs/integrated/commands.json → integrated/commands.json
diff --git a/docs/integrated/commands.tsv → integrated/commands.tsv b/docs/integrated/commands.tsv → integrated/commands.tsv
diff --git a/docs/integrated/conflicts.json → integrated/conflicts.json b/docs/integrated/conflicts.json → integrated/conflicts.json
diff --git a/docs/integrated/conflicts.tsv → integrated/conflicts.tsv b/docs/integrated/conflicts.tsv → integrated/conflicts.tsv
diff --git a/docs/integrated/environment.json → integrated/environment.json b/docs/integrated/environment.json → integrated/environment.json
diff --git a/docs/integrated/environment.tsv → integrated/environment.tsv b/docs/integrated/environment.tsv → integrated/environment.tsv
diff --git a/docs/integrated/errors.json → integrated/errors.json b/docs/integrated/errors.json → integrated/errors.json
diff --git a/docs/integrated/errors.tsv → integrated/errors.tsv b/docs/integrated/errors.tsv → integrated/errors.tsv
diff --git a/docs/integrated/grammar-surface.json → integrated/grammar-surface.json b/docs/integrated/grammar-surface.json → integrated/grammar-surface.json
diff --git a/docs/integrated/intrinsic-functions.json → integrated/intrinsic-functions.json b/docs/integrated/intrinsic-functions.json → integrated/intrinsic-functions.json
diff --git a/docs/integrated/intrinsic-functions.tsv → integrated/intrinsic-functions.tsv b/docs/integrated/intrinsic-functions.tsv → integrated/intrinsic-functions.tsv
diff --git a/...tegrated/intrinsic-special-variables.json → integrated/intrinsic-special-variables.json b/...tegrated/intrinsic-special-variables.json → integrated/intrinsic-special-variables.json
diff --git a/...ntegrated/intrinsic-special-variables.tsv → integrated/intrinsic-special-variables.tsv b/...ntegrated/intrinsic-special-variables.tsv → integrated/intrinsic-special-variables.tsv
diff --git a/docs/integrated/multi-vendor-extensions.tsv → integrated/multi-vendor-extensions.tsv b/docs/integrated/multi-vendor-extensions.tsv → integrated/multi-vendor-extensions.tsv
diff --git a/docs/integrated/operational-m-standard.json → integrated/operational-m-standard.json b/docs/integrated/operational-m-standard.json → integrated/operational-m-standard.json
diff --git a/docs/integrated/operational-m-standard.tsv → integrated/operational-m-standard.tsv b/docs/integrated/operational-m-standard.tsv → integrated/operational-m-standard.tsv
diff --git a/docs/integrated/operators.json → integrated/operators.json b/docs/integrated/operators.json → integrated/operators.json
diff --git a/docs/integrated/operators.tsv → integrated/operators.tsv b/docs/integrated/operators.tsv → integrated/operators.tsv
diff --git a/docs/integrated/pattern-codes.json → integrated/pattern-codes.json b/docs/integrated/pattern-codes.json → integrated/pattern-codes.json
diff --git a/docs/integrated/pattern-codes.tsv → integrated/pattern-codes.tsv b/docs/integrated/pattern-codes.tsv → integrated/pattern-codes.tsv
diff --git a/docs/integrated/pragmatic-m-standard.json → integrated/pragmatic-m-standard.json b/docs/integrated/pragmatic-m-standard.json → integrated/pragmatic-m-standard.json
diff --git a/docs/integrated/pragmatic-m-standard.tsv → integrated/pragmatic-m-standard.tsv b/docs/integrated/pragmatic-m-standard.tsv → integrated/pragmatic-m-standard.tsv
diff --git a/docs/integrated/va-sac-compliance.json → integrated/va-sac-compliance.json b/docs/integrated/va-sac-compliance.json → integrated/va-sac-compliance.json
diff --git a/docs/integrated/va-sac-compliance.tsv → integrated/va-sac-compliance.tsv b/docs/integrated/va-sac-compliance.tsv → integrated/va-sac-compliance.tsv
diff --git a/docs/integrated/va-sac-rules.tsv → integrated/va-sac-rules.tsv b/docs/integrated/va-sac-rules.tsv → integrated/va-sac-rules.tsv
diff --git a/src/m_standard/tools/validate.py b/src/m_standard/tools/validate.py
@@ -34,25 +34,19 @@
 def _integrated_dir(project_root: Path) -> Path:
     """Resolve the integrated/ directory location.
 
-    The repo layout was restructured in commit 3bfb947 (2026-04-30) to
-    move `integrated/` under `docs/integrated/`. Every gate in this
-    module reads from there. Accept either layout so a mid-migration
-    or older checkout still works:
-
-      1. `<project_root>/docs/integrated/` (current layout, preferred)
-      2. `<project_root>/integrated/`      (pre-3bfb947 fallback)
-
-    Returns the first that exists; falls back to the new path even if
-    neither exists, so callers that probe ``.exists()`` get a path
-    rooted in the current layout.
+    The canonical layout has `integrated/` at the repo root, alongside
+    `per-source/`, `schemas/`, `sources/`, and `src/`. The repo briefly
+    held it at `docs/integrated/` (3bfb947 .. its reversion); the
+    fallback is kept for one release cycle so a stale checkout still
+    validates.
     """
-    new = project_root / "docs" / "integrated"
-    if new.is_dir():
-        return new
-    legacy = project_root / "integrated"
+    canonical = project_root / "integrated"
+    if canonical.is_dir():
+        return canonical
+    legacy = project_root / "docs" / "integrated"
     if legacy.is_dir():
         return legacy
-    return new
+    return canonical
 
 
 # Names that are ALWAYS tracked under sources/<src>/ regardless of