feat(cfold): canonicalize custom test layout

runner/harness/discovery.py

@@ -11,8 +11,8 @@ hook; the orchestrator decides additive-vs-skip. Sources, in precedence order
       > cc-ci       tests/<recipe>/test_<op>.py
     (the generic tests/_generic/test_<op>.py is the always-present floor, run separately by default)
 
-    custom test_*.py (functional/ + playwright/ ONLY, rcust P4 placement rule) — ALL run,
-        additively, from BOTH locations (opt-in).
+    custom test_*.py (`custom/` canonical; `functional/` + `playwright/` deprecated aliases) —
+        ALL run, additively, from BOTH locations (opt-in).
 
     install-steps hook — install_steps.sh: repo-local > cc-ci, or none.
 
@@ -27,6 +27,7 @@ from __future__ import annotations
 
 import glob
 import os
+import sys
 
 LIFECYCLE_OPS = ("install", "upgrade", "backup", "restore")
 
@@ -102,15 +103,16 @@ def resolve_op(recipe: str, op: str, repo_local_dir: str | None) -> tuple[str, s
 
 def custom_tests(recipe: str, repo_local_dir: str | None) -> list[tuple[str, str]]:
     """All custom-tier test_*.py from cc-ci's tests/<recipe>/ and (if approved) the recipe's
-    repo-local tests/. PLACEMENT RULE (rcust P4): custom tests live ONLY under
-      - functional/   tests/<recipe>/functional/test_*.py  (parity ports + recipe-specific)
-      - playwright/   tests/<recipe>/playwright/test_*.py  (UI flows)
+    repo-local tests/. PLACEMENT RULE (rcust P4): custom tests live under canonical
+      - custom/       tests/<recipe>/custom/test_*.py      (canonical home)
+      - functional/   tests/<recipe>/functional/test_*.py  (deprecated alias)
+      - playwright/   tests/<recipe>/playwright/test_*.py  (deprecated alias)
     A top-level test_*.py is a LIFECYCLE OVERLAY (test_<op>.py) and nothing else — top-level
     non-lifecycle files are NOT discovered (zero users at the time of the change; the lifecycle-
     name exclusion below stays as a safety net so a misfiled test_<op>.py can never double-run).
     Repo-local is consulted only for allowlist-approved recipes (HC2)."""
     lifecycle_names = {f"test_{op}.py" for op in LIFECYCLE_OPS}
-    subdirs = ("functional", "playwright")
+    subdirs = ("custom", "functional", "playwright")
     found: list[tuple[str, str]] = []
     for source, d in (("cc-ci", cc_ci_dir(recipe)), ("repo-local", _gated(recipe, repo_local_dir))):
         if not d or not os.path.isdir(d):
@@ -118,6 +120,12 @@ def custom_tests(recipe: str, repo_local_dir: str | None) -> list[tuple[str, str
         for sub in subdirs:
             for p in sorted(glob.glob(os.path.join(d, sub, "test_*.py"))):
                 if os.path.basename(p) not in lifecycle_names:
+                    if sub != "custom":
+                        print(
+                            f"WARNING [cfold]: test found in deprecated folder '{sub}/' — move to custom/: {p}",
+                            file=sys.stderr,
+                            flush=True,
+                        )
                     found.append((source, p))
     return found
 

runner/harness/manifest.py

@@ -52,7 +52,7 @@ def _pre_ops(path: str) -> list[str]:
 def _custom_counts(recipe: str, repo_local: str | None) -> dict[str, dict[str, int]]:
     out: dict[str, dict[str, int]] = {}
     for source, path in discovery.custom_tests(recipe, repo_local):
-        sub = os.path.basename(os.path.dirname(path))  # functional | playwright
+        sub = "custom"
         out.setdefault(source, {}).setdefault(sub, 0)
         out[source][sub] += 1
     return out