Merge pull request #836 from vangel76/gap-parity-effects

#831: cargo xtask parity measures effects and transitions (--area)

crates/project/examples/effect_catalog.rs

@@ -0,0 +1,34 @@
+//! Print FilmCraft's effect and transition catalog as the Effects panel lists it, as JSON: one
+//! object per item with its `id`, display `name`, `kind` (`Video`, `Audio`, `VideoTransition`,
+//! `AudioTransition`) and Effects-panel folder `path` (e.g. `["Video Effects", "Blur & Sharpen"]`).
+//! Items with no Effects-panel folder (intrinsic Motion / Opacity / Volume…, graphic layers) and
+//! the hidden obsolete transitions are left out, as in the panel (the same top-level folder filter
+//! as `panels/effects.rs`). `cargo xtask parity --area effects|transitions` reads this to measure
+//! coverage against a reference list.
+//!
+//! ```sh
+//! cargo run -p filmcraft-project --example effect_catalog
+//! ```
+
+use std::process::ExitCode;
+
+use filmcraft_project::vtransition::EFFECT_TOP_FOLDERS;
+use serde_json::json;
+
+fn main() -> ExitCode {
+    let items: Vec<serde_json::Value> = filmcraft_project::effect_defs()
+        .iter()
+        .filter(|d| d.category.first().is_some_and(|top| EFFECT_TOP_FOLDERS.contains(top)))
+        .map(|d| json!({"id": d.id, "name": d.name, "kind": format!("{:?}", d.kind), "path": d.category}))
+        .collect();
+    match serde_json::to_string_pretty(&items) {
+        Ok(text) => {
+            println!("{text}");
+            ExitCode::SUCCESS
+        }
+        Err(e) => {
+            eprintln!("effect_catalog: {e}");
+            ExitCode::FAILURE
+        }
+    }
+}

docs/gaps.md

@@ -134,8 +134,13 @@ platforms** G4, G9, G17; **performance** G16; **ecosystem** G11; **measurement**
   `plan/premiere/menus.json`; presence and placement reported separately (same path, elsewhere,
   missing), app / Help / recent / account / macOS items out of scope, a markdown checklist, and
   `--min` to fail below a presence threshold. Without a reference it prints our inventory only.
-- **Missing:** the other areas (commands, effects, transitions, panels, preferences, formats),
-  fidelity tiers (exact, approximate, stub), a CI job, and a committed `docs/parity-checklist.md`.
+  `--area effects` and `--area transitions` (#831) measure the Effects panel the same way: the
+  effects and transitions the engine's effect definitions list (`examples/effect_catalog.rs` in
+  `filmcraft-project`) against a reference of folder paths or bare names (default the local
+  `plan/premiere/effects.json` / `transitions.json`), placement by folder, Presets and the other
+  area out of scope.
+- **Missing:** the other areas (commands, panels, preferences, formats), fidelity tiers (exact,
+  approximate, stub), a CI job, and a committed `docs/parity-checklist.md`.
 - **Evidence:** the 92% menu figure in this pass came from an ad hoc label-matching script; it has
   not yet been re-measured with the tool.
 - **Estimate:** 8–17 h left (the menu snapshot is local-only, so CI needs a committed, Adobe-free

docs/target-app-parity.md

@@ -51,7 +51,9 @@ issues now document. That is new evidence, not drift: see [Calibration](#calibra
 - **Effects (measured by tests).** `premiere_26_video_effects_catalogue`,
   `premiere_audio_set_is_complete_and_foldered` and `premiere_26_transition_tree` check the
   catalogue against Premiere's Effects panel: video effects 93/93 (+Legacy, Obsolete), audio
-  effects 53/53, video transitions 84/84 (+21 Legacy), audio transitions 3/3.
+  effects 53/53, video transitions 84/84 (+21 Legacy), audio transitions 3/3. `cargo xtask
+  parity --area effects|transitions` measures the shipped catalogue against a reference list too
+  (presence and folder placement, [G7](gaps.md#g7-no-measured-parity-tool-in-ci)).
 - **The installed app (file names and listings only, per [AGENTS.md](../AGENTS.md) §2; nothing
   inside the bundle was opened or read).** `Contents/Resources/*.lproj`: de, en, es, fr, it, ja,
   ko, pt, ru, zh_CN (10 UI languages). `Contents/MediaIO/systempresets/` folder names are

xtask/src/main.rs

@@ -11,9 +11,10 @@
 //! - `fixtures [crate…]`: pre-generate the ffmpeg fixture matrix of the oracle tests (runs each
 //!   crate's ignored `generate_fixtures` test, i.e. the same generators the tests use) and print
 //!   what was made, reused or skipped.
-//! - `parity [--reference FILE] [--out FILE] [--min PERCENT]`: measured menu parity of our shipped
-//!   menu bar against a reference list of menu paths (default: the local `plan/premiere/menus.json`),
-//!   presence and placement reported separately (`parity.rs`, docs/gaps.md G7).
+//! - `parity [--area menus|effects|transitions] [--reference FILE] [--out FILE] [--min PERCENT]`:
+//!   measured parity of our shipped menu bar, or of the effects / transitions the Effects panel
+//!   lists, against a reference list (default: the local `plan/premiere/<area>.json`), presence and
+//!   placement reported separately (`parity.rs`, docs/gaps.md G7).
 //! - `ico <out.ico> <in.png>…`: pack PNGs into a Windows `.ico` (used by `packaging/icons.sh`).
 //! - `ci`: fmt check, clippy -D warnings, tests, layers, assets, wasm.
 
@@ -500,7 +501,7 @@ fn main() -> ExitCode {
             ico::run(&rest.iter().map(String::as_str).collect::<Vec<_>>())
         }
         _ => Err(
-            "usage: cargo xtask <layers|assets|wasm|web [--dev] [--serve PORT]|fixtures [crate…]|parity [--reference FILE] [--out FILE] [--min PERCENT]|ico OUT IN…|version [set X.Y.Z]|ci|bench [args]|bench-playback [args]>"
+            "usage: cargo xtask <layers|assets|wasm|web [--dev] [--serve PORT]|fixtures [crate…]|parity [--area menus|effects|transitions] [--reference FILE] [--out FILE] [--min PERCENT]|ico OUT IN…|version [set X.Y.Z]|ci|bench [args]|bench-playback [args]>"
                 .into(),
         ),
     };

xtask/src/parity.rs

@@ -1,20 +1,31 @@
-//! `cargo xtask parity [--reference FILE] [--ours FILE] [--out FILE] [--min PERCENT]`: measured
-//! menu parity (docs/gaps.md G7).
+//! `cargo xtask parity [--area menus|effects|transitions] [--reference FILE] [--ours FILE]
+//! [--out FILE] [--min PERCENT]`: measured parity (docs/gaps.md G7).
 //!
-//! Compares FilmCraft's shipped menu bar (`crates/ui-egui/examples/menu_tree.rs`, or a saved dump
-//! of it given with `--ours`) with a reference list of menu paths, and reports presence and
-//! placement separately: a reference item is *same place* when we have its label at the same menu
-//! path, *elsewhere* when we have the label under another path, and *missing* otherwise. A label
-//! match is presence only, not behaviour.
+//! Compares one area of what FilmCraft ships with a reference list, and reports presence and
+//! placement separately: a reference item is *same place* when we have its label at the same path,
+//! *elsewhere* when we have the label under another path, and *missing* otherwise. A label match is
+//! presence only, not behaviour. The areas:
 //!
-//! The reference defaults to the maintainers' local menu snapshot `plan/premiere/menus.json`
-//! (gitignored, never committed). Without one the tool prints our own menu inventory and measures
-//! nothing. The reference may be any JSON of menu paths: an array of paths (`["File", "New",
-//! "Sequence…"]`) or of `"File > New > Sequence…"` strings, a tree of nodes (`{"name": …,
-//! "children" | "items" | "submenu": […]}`), or nested objects keyed by label. App, Apple and Help
-//! menus, recent-file lists, account / cloud items and macOS system items are counted out of scope.
+//! - `menus` (default): the shipped menu bar (`crates/ui-egui/examples/menu_tree.rs`); paths are
+//!   menu paths. App, Apple and Help menus, recent-file lists, account / cloud items and macOS
+//!   system items are counted out of scope.
+//! - `effects` / `transitions`: the effects (video and audio) or transitions (video and audio) the
+//!   Effects panel lists, from the engine's effect definitions
+//!   (`crates/project/examples/effect_catalog.rs`); paths are Effects-panel folders
+//!   (`Video Effects > Blur & Sharpen > Gaussian Blur`). A reference entry may also be a bare name,
+//!   which has no folder and so is matched by name alone. Presets and Lumetri Presets are out of
+//!   scope, and so are the other area's items (a folder named `… Transitions`), so one reference
+//!   of the whole Effects panel serves both areas.
 //!
-//! The report goes to `target/parity/parity-checklist.md` (or `--out`); `--min` fails when presence
+//! `--ours` reads a saved dump of our side instead of running the example. The reference defaults
+//! to the maintainers' local snapshot `plan/premiere/<area>.json` (gitignored, never committed).
+//! Without one the tool prints our own inventory and measures nothing. The reference may be any
+//! JSON of paths: an array of paths (`["File", "New", "Sequence…"]`) or of
+//! `"File > New > Sequence…"` strings, a tree of nodes (`{"name": …, "children" | "items" |
+//! "submenu": […]}`), or nested objects keyed by label.
+//!
+//! The report goes to `target/parity/parity-checklist.md` for menus and
+//! `target/parity/parity-<area>.md` for the other areas (or `--out`); `--min` fails when presence
 //! is below the given percentage.
 
 use std::collections::{BTreeMap, HashMap, HashSet};
@@ -30,10 +41,99 @@ const MAX_ITEMS: usize = 20_000;
 /// Keys holding a node's label, and its children.
 const LABEL_KEYS: [&str; 3] = ["name", "title", "label"];
 const CHILD_KEYS: [&str; 6] = ["children", "items", "submenu", "menu", "menuItems", "menu_items"];
-/// Keys of a wrapper object around the whole menu bar.
-const WRAPPER_KEYS: [&str; 5] = ["menus", "menuBar", "menu_bar", "menubar", "items"];
+/// Keys of a wrapper object around the whole menu bar, or the whole effect list.
+const MENU_WRAPPER_KEYS: [&str; 5] = ["menus", "menuBar", "menu_bar", "menubar", "items"];
+const EFFECT_WRAPPER_KEYS: [&str; 4] = ["effects", "transitions", "folders", "items"];
+
+/// What a parity run measures.
+#[derive(Clone, Copy, Debug, PartialEq)]
+enum Area {
+    Menus,
+    Effects,
+    Transitions,
+}
+
+impl Area {
+    fn parse(s: &str) -> Result<Self, String> {
+        match s {
+            "menus" => Ok(Area::Menus),
+            "effects" => Ok(Area::Effects),
+            "transitions" => Ok(Area::Transitions),
+            other => Err(format!("--area {other}: expected menus, effects or transitions")),
+        }
+    }
+
+    fn name(self) -> &'static str {
+        match self {
+            Area::Menus => "menus",
+            Area::Effects => "effects",
+            Area::Transitions => "transitions",
+        }
+    }
+
+    /// Our side, as the report names it.
+    fn ours(self) -> &'static str {
+        match self {
+            Area::Menus => "shipped menu bar",
+            Area::Effects => "Effects panel effects",
+            Area::Transitions => "Effects panel transitions",
+        }
+    }
+
+    /// What a path is made of: "menu path" or "folder".
+    fn place(self) -> &'static str {
+        match self {
+            Area::Menus => "menu path",
+            Area::Effects | Area::Transitions => "folder",
+        }
+    }
+
+    fn out_file(self) -> String {
+        match self {
+            Area::Menus => "parity-checklist.md".into(),
+            other => format!("parity-{}.md", other.name()),
+        }
+    }
+
+    /// Fewest path parts a reference item has: a menu item needs its menu, an effect may be a
+    /// bare name.
+    fn min_len(self) -> usize {
+        match self {
+            Area::Menus => 2,
+            Area::Effects | Area::Transitions => 1,
+        }
+    }
+
+    fn wrapper_keys(self) -> &'static [&'static str] {
+        match self {
+            Area::Menus => &MENU_WRAPPER_KEYS,
+            Area::Effects | Area::Transitions => &EFFECT_WRAPPER_KEYS,
+        }
+    }
+
+    /// The effect kinds (`EffectKind` names in the catalog dump) this area counts.
+    fn kinds(self) -> &'static [&'static str] {
+        match self {
+            Area::Menus => &[],
+            Area::Effects => &["Video", "Audio"],
+            Area::Transitions => &["VideoTransition", "AudioTransition"],
+        }
+    }
+
+    /// The group a path is tallied under in the report: the top-level menu, or the folder path.
+    fn group(self, path: &[String]) -> String {
+        match self {
+            Area::Menus => path.first().cloned().unwrap_or_default(),
+            Area::Effects | Area::Transitions => match path.split_last() {
+                Some((_, folders)) if !folders.is_empty() => show(folders),
+                _ => "(no folder)".into(),
+            },
+        }
+    }
+}
 
 struct Args {
+    area: Area,
     reference: Option<PathBuf>,
     ours: Option<PathBuf>,
     out: Option<PathBuf>,
@@ -41,11 +141,12 @@ struct Args {
 }
 
 fn parse_args(args: &[&str]) -> Result<Args, String> {
-    let mut a = Args { reference: None, ours: None, out: None, min: None };
+    let mut a = Args { area: Area::Menus, reference: None, ours: None, out: None, min: None };
     let mut it = args.iter();
     while let Some(flag) = it.next() {
         let mut value = || it.next().map(|v| v.to_string()).ok_or_else(|| format!("{flag} needs a value"));
         match *flag {
+            "--area" => a.area = Area::parse(&value()?)?,
             "--reference" => a.reference = Some(value()?.into()),
             "--ours" => a.ours = Some(value()?.into()),
             "--out" => a.out = Some(value()?.into()),
@@ -59,7 +160,7 @@ fn parse_args(args: &[&str]) -> Result<Args, String> {
             }
             other => {
                 return Err(format!(
-                    "parity: unknown argument {other} (usage: cargo xtask parity [--reference FILE] [--ours FILE] [--out FILE] [--min PERCENT])"
+                    "parity: unknown argument {other} (usage: cargo xtask parity [--area menus|effects|transitions] [--reference FILE] [--ours FILE] [--out FILE] [--min PERCENT])"
                 ));
             }
         }
@@ -69,30 +170,36 @@ fn parse_args(args: &[&str]) -> Result<Args, String> {
 
 pub fn run(root: &Path, args: &[&str]) -> Result<(), String> {
     let args = parse_args(args)?;
+    let area = args.area;
     let ours_json = match &args.ours {
         Some(p) => std::fs::read_to_string(p).map_err(|e| format!("{}: {e}", p.display()))?,
-        None => dump_ours()?,
+        None => dump_ours(area)?,
     };
-    let ours = our_items(&serde_json::from_str(&ours_json).map_err(|e| format!("our menu dump: {e}"))?)?;
-    let default_ref = root.join("plan/premiere/menus.json");
+    let ours_value: Value = serde_json::from_str(&ours_json).map_err(|e| format!("our {} dump: {e}", area.name()))?;
+    let ours = match area {
+        Area::Menus => our_items(&ours_value)?,
+        Area::Effects | Area::Transitions => our_catalog(&ours_value, area)?,
+    };
+    let default_ref = root.join(format!("plan/premiere/{}.json", area.name()));
     let reference = match &args.reference {
         Some(p) => Some(p.clone()),
         None => default_ref.exists().then_some(default_ref),
     };
     let Some(reference) = reference else {
-        print!("{}", inventory(&ours));
-        println!("\nno reference menu list (plan/premiere/menus.json, or --reference FILE): menu parity not measured");
+        print!("{}", inventory(area, &ours));
+        let a = area.name();
+        println!("\nno reference list (plan/premiere/{a}.json, or --reference FILE): {a} parity not measured");
         return match args.min {
-            Some(_) => Err("--min needs a reference menu list".into()),
+            Some(_) => Err("--min needs a reference list".into()),
             None => Ok(()),
         };
     };
     let text = std::fs::read_to_string(&reference).map_err(|e| format!("{}: {e}", reference.display()))?;
     let value: Value = serde_json::from_str(&text).map_err(|e| format!("{}: {e}", reference.display()))?;
-    let paths = reference_paths(&value)?;
+    let paths = reference_paths(&value, area)?;
     let name = reference.file_name().map(|n| n.to_string_lossy().into_owned()).unwrap_or_default();
-    let report = compare(&paths, &ours);
-    let out = args.out.unwrap_or_else(|| crate::target_dir().join("parity/parity-checklist.md"));
+    let report = compare(area, &paths, &ours);
+    let out = args.out.unwrap_or_else(|| crate::target_dir().join("parity").join(area.out_file()));
     if let Some(dir) = out.parent() {
         std::fs::create_dir_all(dir).map_err(|e| format!("{}: {e}", dir.display()))?;
     }
@@ -100,20 +207,25 @@ pub fn run(root: &Path, args: &[&str]) -> Result<(), String> {
     println!("{}", report.summary());
     println!("report: {}", out.display());
     match args.min {
-        Some(min) if report.presence() < min => Err(format!("menu presence {:.1}% is below --min {min}%", report.presence())),
+        Some(min) if report.presence() < min => Err(format!("{} presence {:.1}% is below --min {min}%", area.name(), report.presence())),
         _ => Ok(()),
     }
 }
 
-/// Our menu bar as JSON, from the `menu_tree` example.
-fn dump_ours() -> Result<String, String> {
+/// Our side as JSON: the menu bar from the `menu_tree` example, or the Effects panel catalog from
+/// the `effect_catalog` example.
+fn dump_ours(area: Area) -> Result<String, String> {
+    let (package, example) = match area {
+        Area::Menus => ("filmcraft-ui-egui", "menu_tree"),
+        Area::Effects | Area::Transitions => ("filmcraft-project", "effect_catalog"),
+    };
     let mut cmd = Command::new(env!("CARGO"));
-    cmd.args(["run", "-q", "-p", "filmcraft-ui-egui", "--example", "menu_tree"]).stderr(Stdio::inherit());
-    let out = cmd.output().map_err(|e| format!("menu_tree: {e}"))?;
+    cmd.args(["run", "-q", "-p", package, "--example", example]).stderr(Stdio::inherit());
+    let out = cmd.output().map_err(|e| format!("{example}: {e}"))?;
     if !out.status.success() {
-        return Err(format!("menu_tree failed: {}", out.status));
+        return Err(format!("{example} failed: {}", out.status));
     }
-    String::from_utf8(out.stdout).map_err(|e| format!("menu_tree: {e}"))
+    String::from_utf8(out.stdout).map_err(|e| format!("{example}: {e}"))
 }
 
 /// Full paths (menu path + label) of our menu items, from the `menu_tree` dump.
@@ -130,32 +242,47 @@ fn our_items(v: &Value) -> Result<Vec<Vec<String>>, String> {
         .collect())
 }
 
-/// Item counts per top-level menu, for runs without a reference.
-fn inventory(ours: &[Vec<String>]) -> String {
-    let mut per: BTreeMap<&str, usize> = BTreeMap::new();
+/// Full paths (Effects-panel folders + name) of the catalog items of `area`, from the
+/// `effect_catalog` dump.
+fn our_catalog(v: &Value, area: Area) -> Result<Vec<Vec<String>>, String> {
+    let items = v.as_array().ok_or("our effect catalog dump is not an array")?;
+    Ok(items
+        .iter()
+        .filter(|it| it.get("kind").and_then(Value::as_str).is_some_and(|k| area.kinds().contains(&k)))
+        .filter_map(|it| {
+            let name = it.get("name")?.as_str()?;
+            let mut path: Vec<String> = it.get("path")?.as_array()?.iter().filter_map(|p| p.as_str().map(str::to_string)).collect();
+            path.push(name.to_string());
+            Some(path)
+        })
+        .collect())
+}
+
+/// Item counts per group (top-level menu, or folder), for runs without a reference.
+fn inventory(area: Area, ours: &[Vec<String>]) -> String {
+    let mut per: BTreeMap<String, usize> = BTreeMap::new();
     for p in ours {
-        if let Some(top) = p.first() {
-            *per.entry(top.as_str()).or_default() += 1;
-        }
+        *per.entry(area.group(p)).or_default() += 1;
     }
-    let mut s = format!("FilmCraft menu bar: {} items\n", ours.len());
-    for (top, n) in per {
-        s.push_str(&format!("  {top:<22} {n}\n"));
+    let mut s = format!("FilmCraft {}: {} items\n", area.ours(), ours.len());
+    let width = per.keys().map(|g| g.chars().count()).max().unwrap_or(0).max(22);
+    for (group, n) in per {
+        s.push_str(&format!("  {group:<width$} {n}\n"));
     }
     s
 }
 
-/// Leaf menu paths (top-level menu first, item label last) of a reference file.
-fn reference_paths(v: &Value) -> Result<Vec<Vec<String>>, String> {
+/// Leaf paths (top-level menu or folder first, item label last) of a reference file.
+fn reference_paths(v: &Value, area: Area) -> Result<Vec<Vec<String>>, String> {
     let mut root = v;
     if let Value::Object(o) = v
         && label_of(o).is_none()
-        && let Some(inner) = WRAPPER_KEYS.iter().find_map(|k| o.get(*k).filter(|c| c.is_array() || c.is_object()))
+        && let Some(inner) = area.wrapper_keys().iter().find_map(|k| o.get(*k).filter(|c| c.is_array() || c.is_object()))
     {
         root = inner;
     }
     let mut out = Vec::new();
-    walk(root, &[], 0, &mut out)?;
+    walk(root, &[], 0, area.min_len(), &mut out)?;
     Ok(out)
 }
 
@@ -169,16 +296,16 @@ fn is_separator(label: &str) -> bool {
     l.is_empty() || l.chars().all(|c| matches!(c, '-' | '—' | '–' | '_')) || l.eq_ignore_ascii_case("missing value") || l.eq_ignore_ascii_case("separator")
 }
 
-fn push_leaf(prefix: &[String], label: &str, out: &mut Vec<Vec<String>>) -> Result<(), String> {
+fn push_leaf(prefix: &[String], label: &str, min: usize, out: &mut Vec<Vec<String>>) -> Result<(), String> {
     if is_separator(label) || prefix.iter().any(|p| is_separator(p)) {
         return Ok(());
     }
     if out.len() >= MAX_ITEMS {
-        return Err(format!("reference has more than {MAX_ITEMS} menu items"));
+        return Err(format!("reference has more than {MAX_ITEMS} items"));
     }
     let mut path = prefix.to_vec();
     path.push(label.trim().to_string());
-    if path.len() >= 2 {
+    if path.len() >= min.max(1) {
         out.push(path);
     }
     Ok(())
@@ -189,9 +316,9 @@ fn split_path(s: &str) -> Option<Vec<String>> {
     (parts.len() >= 2 && parts.iter().all(|p| !p.is_empty())).then_some(parts)
 }
 
-fn walk(v: &Value, prefix: &[String], depth: usize, out: &mut Vec<Vec<String>>) -> Result<(), String> {
+fn walk(v: &Value, prefix: &[String], depth: usize, min: usize, out: &mut Vec<Vec<String>>) -> Result<(), String> {
     if depth > MAX_DEPTH {
-        return Err(format!("reference menus are nested deeper than {MAX_DEPTH} levels"));
+        return Err(format!("reference is nested deeper than {MAX_DEPTH} levels"));
     }
     let with = |label: &str| {
         let mut p = prefix.to_vec();
@@ -201,10 +328,10 @@ fn walk(v: &Value, prefix: &[String], depth: usize, out: &mut Vec<Vec<String>>)
     match v {
         Value::String(s) => match split_path(s).filter(|_| prefix.is_empty()) {
             Some(parts) => match parts.split_last() {
-                Some((label, menus)) => push_leaf(menus, label, out),
+                Some((label, menus)) => push_leaf(menus, label, min, out),
                 None => Ok(()),
             },
-            None => push_leaf(prefix, s, out),
+            None => push_leaf(prefix, s, min, out),
         },
         Value::Array(a) => {
             for el in a {
@@ -212,10 +339,10 @@ fn walk(v: &Value, prefix: &[String], depth: usize, out: &mut Vec<Vec<String>>)
                     Value::Array(path) if !path.is_empty() && path.iter().all(Value::is_string) => {
                         let parts: Vec<String> = prefix.iter().cloned().chain(path.iter().filter_map(|p| p.as_str().map(str::to_string))).collect();
                         if let Some((label, menus)) = parts.split_last() {
-                            push_leaf(menus, label, out)?;
+                            push_leaf(menus, label, min, out)?;
                         }
                     }
-                    _ => walk(el, prefix, depth + 1, out)?,
+                    _ => walk(el, prefix, depth + 1, min, out)?,
                 }
             }
             Ok(())
@@ -224,17 +351,17 @@ fn walk(v: &Value, prefix: &[String], depth: usize, out: &mut Vec<Vec<String>>)
             Some(label) => {
                 let children = CHILD_KEYS.iter().find_map(|k| o.get(*k).filter(|c| has_entries(c)));
                 match children {
-                    Some(c) if !is_separator(label) => walk(c, &with(label), depth + 1, out),
+                    Some(c) if !is_separator(label) => walk(c, &with(label), depth + 1, min, out),
                     Some(_) => Ok(()),
-                    None => push_leaf(prefix, label, out),
+                    None => push_leaf(prefix, label, min, out),
                 }
             }
             None => {
                 for (k, val) in o {
                     if has_entries(val) {
-                        walk(val, &with(k), depth + 1, out)?;
+                        walk(val, &with(k), depth + 1, min, out)?;
                     } else {
-                        push_leaf(prefix, k, out)?;
+                        push_leaf(prefix, k, min, out)?;
                     }
                 }
                 Ok(())
@@ -259,7 +386,26 @@ fn norm(label: &str) -> String {
 }
 
 /// Why a reference item is not counted, if it isn't.
-fn out_of_scope(path: &[String]) -> Option<&'static str> {
+fn out_of_scope(area: Area, path: &[String]) -> Option<&'static str> {
+    match area {
+        Area::Menus => menu_out_of_scope(path),
+        Area::Effects | Area::Transitions => {
+            let top = norm(path.first()?);
+            if path.len() >= 2 && (top == "presets" || top == "lumetri presets") {
+                return Some("presets");
+            }
+            let folders = path.get(..path.len().saturating_sub(1)).unwrap_or_default();
+            let transition = folders.iter().any(|f| norm(f).ends_with("transitions"));
+            match area {
+                Area::Effects if transition => Some("transitions (--area transitions)"),
+                Area::Transitions if !folders.is_empty() && !transition => Some("effects (--area effects)"),
+                _ => None,
+            }
+        }
+    }
+}
+
+fn menu_out_of_scope(path: &[String]) -> Option<&'static str> {
     let (top, label) = (norm(path.first()?), norm(path.last()?));
     if top == "apple" || top == "help" || top.contains("premiere") {
         return Some("app, Apple and Help menus");
@@ -284,13 +430,14 @@ enum Placement {
 }
 
 struct Report {
+    area: Area,
     /// (reference path, where it is in FilmCraft).
     items: Vec<(Vec<String>, Placement)>,
     out_of_scope: BTreeMap<&'static str, usize>,
     ours_only: Vec<Vec<String>>,
 }
 
-fn compare(reference: &[Vec<String>], ours: &[Vec<String>]) -> Report {
+fn compare(area: Area, reference: &[Vec<String>], ours: &[Vec<String>]) -> Report {
     let key = |p: &[String]| p.iter().map(|s| norm(s)).collect::<Vec<_>>();
     let our_paths: HashSet<Vec<String>> = ours.iter().map(|p| key(p)).collect();
     let mut by_label: HashMap<String, &Vec<String>> = HashMap::new();
@@ -299,18 +446,19 @@ fn compare(reference: &[Vec<String>], ours: &[Vec<String>]) -> Report {
             by_label.entry(norm(l)).or_insert(p);
         }
     }
-    let mut report = Report { items: Vec::new(), out_of_scope: BTreeMap::new(), ours_only: Vec::new() };
+    let mut report = Report { area, items: Vec::new(), out_of_scope: BTreeMap::new(), ours_only: Vec::new() };
     let mut seen = HashSet::new();
     for p in reference {
         if !seen.insert(key(p)) {
             continue;
         }
-        if let Some(why) = out_of_scope(p) {
+        if let Some(why) = out_of_scope(area, p) {
             *report.out_of_scope.entry(why).or_default() += 1;
             continue;
         }
         let label = p.last().map(|l| norm(l)).unwrap_or_default();
-        let placement = if our_paths.contains(&key(p)) {
+        // a bare name (no folder) has no place to compare: found is all it can be
+        let placement = if our_paths.contains(&key(p)) || (p.len() == 1 && by_label.contains_key(&label)) {
             Placement::Same
         } else if let Some(at) = by_label.get(&label) {
             Placement::Elsewhere((*at).clone())
@@ -349,7 +497,8 @@ impl Report {
         let (same, elsewhere, missing) = self.counts();
         let n = self.items.len();
         format!(
-            "menus: presence {}/{n} ({:.1}%), same place {same}/{n} ({:.1}%), elsewhere {elsewhere}, missing {missing}, out of scope {}",
+            "{}: presence {}/{n} ({:.1}%), same place {same}/{n} ({:.1}%), elsewhere {elsewhere}, missing {missing}, out of scope {}",
+            self.area.name(),
             same + elsewhere,
             self.presence(),
             pct(same, n),
@@ -360,17 +509,30 @@ impl Report {
     fn markdown(&self, reference: &str, ours: usize) -> String {
         let (same, elsewhere, missing) = self.counts();
         let n = self.items.len();
-        let mut s = String::from("# Menu parity checklist\n\n");
+        let area = self.area;
+        let (title, column) = match area {
+            Area::Menus => ("Menu", "Menu"),
+            Area::Effects => ("Effect", "Folder"),
+            Area::Transitions => ("Transition", "Folder"),
+        };
+        let mut s = format!("# {title} parity checklist\n\n");
         s.push_str(&format!(
-            "Generated by `cargo xtask parity` from `{reference}` ({n} items in scope, {} out of scope) against FilmCraft's \
-             shipped menu bar ({ours} items). *Same place*: we have the label at the same menu path; *elsewhere*: under \
-             another path; *missing*: nowhere. A label match is presence only, not behaviour.\n\n",
-            self.out_of_scope.values().sum::<usize>()
+            "Generated by `cargo xtask parity --area {}` from `{reference}` ({n} items in scope, {} out of scope) against \
+             FilmCraft's {} ({ours} items). *Same place*: we have the label at the same {place}; *elsewhere*: under \
+             another {place}; *missing*: nowhere. A label match is presence only, not behaviour.{}\n\n",
+            area.name(),
+            self.out_of_scope.values().sum::<usize>(),
+            area.ours(),
+            match area {
+                Area::Menus => "",
+                Area::Effects | Area::Transitions => " A bare name with no folder in the reference is matched by name alone.",
+            },
+            place = area.place(),
         ));
-        s.push_str("| Menu | Items | Same place | Elsewhere | Missing | Presence |\n|---|---|---|---|---|---|\n");
-        let mut per: Vec<(&str, [usize; 3])> = Vec::new();
+        s.push_str(&format!("| {column} | Items | Same place | Elsewhere | Missing | Presence |\n|---|---|---|---|---|---|\n"));
+        let mut per: Vec<(String, [usize; 3])> = Vec::new();
         for (p, pl) in &self.items {
-            let top = p.first().map(String::as_str).unwrap_or_default();
+            let top = area.group(p);
             let i = match per.iter().position(|(t, _)| *t == top) {
                 Some(i) => i,
                 None => {
@@ -440,7 +602,7 @@ mod tests {
             json!({"Edit": {"Undo": "Cmd+Z"}, "File": {"New": ["Sequence…"], "-": null, "Save": null}}),
         ];
         for f in forms {
-            let mut got = reference_paths(&f).unwrap();
+            let mut got = reference_paths(&f, Area::Menus).unwrap();
             got.sort();
             let mut w = want.clone();
             w.sort();
@@ -454,11 +616,15 @@ mod tests {
         for _ in 0..200 {
             v = json!({ "name": "m", "children": [v] });
         }
-        assert!(reference_paths(&v).unwrap_err().contains("nested deeper"));
-        let many: Vec<String> = (0..MAX_ITEMS + 1).map(|i| format!("File > Item {i}")).collect();
-        assert!(reference_paths(&json!(many)).unwrap_err().contains("more than"));
+        for area in [Area::Menus, Area::Effects] {
+            assert!(reference_paths(&v, area).unwrap_err().contains("nested deeper"));
+            let many: Vec<String> = (0..MAX_ITEMS + 1).map(|i| format!("File > Item {i}")).collect();
+            assert!(reference_paths(&json!(many), area).unwrap_err().contains("more than"));
+            let bare: Vec<String> = (0..MAX_ITEMS + 1).map(|i| format!("Effect {i}")).collect();
+            assert!(area == Area::Menus || reference_paths(&json!(bare), area).unwrap_err().contains("more than"));
+        }
         // odd values are skipped, not trusted
-        assert_eq!(reference_paths(&json!([1, null, true, {"name": 5}, ["File"]])).unwrap(), Vec::<Vec<String>>::new());
+        assert_eq!(reference_paths(&json!([1, null, true, {"name": 5}, ["File"]]), Area::Menus).unwrap(), Vec::<Vec<String>>::new());
     }
 
     #[test]
@@ -474,7 +640,7 @@ mod tests {
             &["Edit", "Spelling"],
         ]);
         let ours = paths(&[&["File", "New", "Sequence…"], &["File", "Export", "Export Frame"], &["Edit", "Find and Replace…"], &["Clip", "Nest…"]]);
-        let r = compare(&reference, &ours);
+        let r = compare(Area::Menus, &reference, &ours);
         assert_eq!(r.counts(), (2, 1, 1), "duplicates count once; out-of-scope items are not counted");
         assert!((r.presence() - 75.0).abs() < 1e-9);
         assert_eq!(r.out_of_scope.values().sum::<usize>(), 3);
@@ -488,7 +654,7 @@ mod tests {
 
     #[test]
     fn empty_reference_measures_zero_without_dividing_by_zero() {
-        let r = compare(&[], &paths(&[&["File", "Save"]]));
+        let r = compare(Area::Menus, &[], &paths(&[&["File", "Save"]]));
         assert_eq!(r.presence(), 0.0);
         assert!(r.summary().contains("presence 0/0 (0.0%)"));
     }
@@ -502,6 +668,79 @@ mod tests {
         assert!(parse_args(&["--min", "x"]).is_err());
         assert!(parse_args(&["--out"]).is_err());
         assert!(parse_args(&["--bogus"]).is_err());
-        assert!(parse_args(&["--min", "90", "--reference", "r.json"]).is_ok_and(|a| a.min == Some(90.0) && a.reference.is_some()));
+        assert!(parse_args(&["--min", "90", "--reference", "r.json"]).is_ok_and(|a| a.min == Some(90.0) && a.reference.is_some() && a.area == Area::Menus));
+        assert!(parse_args(&["--area", "transitions"]).is_ok_and(|a| a.area == Area::Transitions));
+        assert!(parse_args(&["--area", "panels"]).is_err());
+        assert!(parse_args(&["--area"]).is_err());
+    }
+
+    fn catalog() -> Value {
+        json!([
+            {"id": "gaussian_blur", "name": "Gaussian Blur", "kind": "Video", "path": ["Video Effects", "Blur & Sharpen"]},
+            {"id": "mosaic", "name": "Mosaic", "kind": "Video", "path": ["Video Effects", "Stylize"]},
+            {"id": "volume_x", "name": "Hard Limiter", "kind": "Audio", "path": ["Audio Effects", "Amplitude and Compression"]},
+            {"id": "cross_dissolve", "name": "Cross Dissolve", "kind": "VideoTransition", "path": ["Video Transitions", "Dissolve"]},
+            {"id": "push_legacy", "name": "Push (Legacy)", "kind": "VideoTransition", "path": ["Legacy", "Video Transitions"]},
+            {"id": "constant_power", "name": "Constant Power", "kind": "AudioTransition", "path": ["Audio Transitions", "Crossfade"]},
+            {"bad": true},
+            {"name": "No kind", "path": []}
+        ])
+    }
+
+    #[test]
+    fn effect_catalog_splits_into_effects_and_transitions() {
+        let fx = our_catalog(&catalog(), Area::Effects).unwrap();
+        assert_eq!(
+            fx,
+            paths(&[
+                &["Video Effects", "Blur & Sharpen", "Gaussian Blur"],
+                &["Video Effects", "Stylize", "Mosaic"],
+                &["Audio Effects", "Amplitude and Compression", "Hard Limiter"]
+            ])
+        );
+        let tr = our_catalog(&catalog(), Area::Transitions).unwrap();
+        assert_eq!(tr.len(), 3);
+        assert!(tr.contains(&paths(&[&["Legacy", "Video Transitions", "Push (Legacy)"]])[0]));
+        assert!(our_catalog(&json!({"effects": []}), Area::Effects).is_err());
+        let inv = inventory(Area::Effects, &fx);
+        assert!(inv.starts_with("FilmCraft Effects panel effects: 3 items"), "{inv}");
+        assert!(inv.contains("Video Effects ▸ Stylize"), "{inv}");
+    }
+
+    #[test]
+    fn effects_reference_of_bare_names_and_folders_is_measured() {
+        // one reference of the whole Effects panel: folders, bare names, presets, both areas
+        let reference = json!({"effects": {
+            "Presets": {"Bevel Edges": ["Bevel Edges Thick"]},
+            "Video Effects": {"Blur & Sharpen": ["Gaussian Blur", "Camera Blur"], "Distort": ["Mosaic"]},
+            "Video Transitions": {"Dissolve": ["Cross Dissolve", "Film Dissolve"]},
+            "Audio Transitions": {"Crossfade": ["Constant Power"]}
+        }});
+        let bare = json!(["Hard Limiter", "Echo"]);
+        let mut fx_ref = reference_paths(&reference, Area::Effects).unwrap();
+        assert_eq!(fx_ref.len(), 7);
+        fx_ref.extend(reference_paths(&bare, Area::Effects).unwrap());
+        // menus need a menu: bare names are not menu items
+        assert!(reference_paths(&bare, Area::Menus).unwrap().is_empty());
+        let ours = our_catalog(&catalog(), Area::Effects).unwrap();
+        let r = compare(Area::Effects, &fx_ref, &ours);
+        // Gaussian Blur same; Mosaic elsewhere (Stylize); Hard Limiter by bare name; Camera Blur, Echo missing
+        assert_eq!(r.counts(), (2, 1, 2), "{:?}", r.summary());
+        assert_eq!(r.out_of_scope.get("presets"), Some(&1));
+        assert_eq!(r.out_of_scope.get("transitions (--area transitions)"), Some(&3));
+        let md = r.markdown("effects.json", ours.len());
+        assert!(md.starts_with("# Effect parity checklist"), "{md}");
+        assert!(md.contains("| Folder | Items |"), "{md}");
+        assert!(md.contains("| Video Effects ▸ Blur & Sharpen | 2 | 1 | 0 | 1 | 50.0% |"), "{md}");
+        assert!(md.contains("| (no folder) | 2 | 1 | 0 | 1 | 50.0% |"), "{md}");
+        assert!(md.contains("- Video Effects ▸ Distort ▸ Mosaic → Video Effects ▸ Stylize ▸ Mosaic"), "{md}");
+        assert!(md.contains("- [ ] Echo"), "{md}");
+        assert!(r.summary().starts_with("effects: presence 3/5 (60.0%)"), "{}", r.summary());
+
+        let tr_ref = reference_paths(&reference, Area::Transitions).unwrap();
+        let tr = compare(Area::Transitions, &tr_ref, &our_catalog(&catalog(), Area::Transitions).unwrap());
+        assert_eq!(tr.counts(), (2, 0, 1), "{}", tr.summary());
+        assert_eq!(tr.out_of_scope.get("effects (--area effects)"), Some(&3));
+        assert!(tr.markdown("effects.json", 3).contains("- [ ] Video Transitions ▸ Dissolve ▸ Film Dissolve"));
     }
 }