ryo-executor 0.2.0

//! V2 ASTRegApply implementations for trait operations
//!
//! - ExtractTrait: Extract methods from impl block into a new trait
//! - InlineTrait: Inline trait methods back into inherent impl
//!
//! # Implementation Strategy
//!
//! **ExtractTrait:**
//! 1. Find the inherent impl for the struct (impl Foo { ... } where trait_ is None)
//! 2. Extract specified methods (or all if methods is None)
//! 3. Create a new trait definition with method signatures
//! 4. Create a new trait impl (impl TraitName for Foo { ... }) with method bodies
//! 5. Remove the extracted methods from the inherent impl
//!
//! **InlineTrait:**
//! 1. Find the trait impl (impl TraitName for Foo { ... })
//! 2. Find or create the inherent impl (impl Foo { ... })
//! 3. Move methods from trait impl to inherent impl
//! 4. Optionally remove the trait definition and trait impl

use std::collections::HashSet;

use ryo_analysis::{SymbolKind, SymbolRegistry};
use ryo_mutations::basic::{
    EnumToTraitMutation, EnumToTraitStrategy, ExtractTraitMutation, InlineTraitMutation,
    MatchHandling, RemoveTraitMutation,
};
use ryo_mutations::{Mutation, MutationResult};
use ryo_source::pure::{
    MacroDelimiter, PureBlock, PureExpr, PureField, PureFields, PureFn, PureGenericParam,
    PureGenerics, PureImpl, PureImplItem, PureItem, PureParam, PureStmt, PureStruct, PureTrait,
    PureTraitItem, PureType, PureUse, PureUseTree, PureVis,
};
use ryo_symbol::SymbolId;

use crate::engine::{ASTMutationContext, ASTRegApply, ModificationType};

/// Build a `use <path>;` PureItem from a `::`-separated path string.
///
/// `path` is expected to be the fully-qualified path of an importable
/// item (e.g. `"ryo_app::api::Api"`). The trailing segment becomes the
/// name binding; preceding segments become a chain of `Path` nodes.
fn build_use_item_for_path(path: &str) -> PureItem {
    let segments: Vec<&str> = path.split("::").collect();
    let tree = build_use_tree(&segments);
    PureItem::Use(PureUse {
        vis: PureVis::Private,
        tree,
    })
}

/// Rewrite a fully-qualified `<crate>::<module>::<Item>` path to its
/// same-crate `crate::<module>::<Item>` form (used by the R4 caller-side
/// `use` injection so the import resolves regardless of which file in
/// the crate hosts the caller).
fn rewrite_to_local_use_path(full_path: &str) -> String {
    let mut segments = full_path.split("::");
    let _crate_seg = segments.next();
    let mut out = String::from("crate");
    for seg in segments {
        out.push_str("::");
        out.push_str(seg);
    }
    out
}

fn build_use_tree(segments: &[&str]) -> PureUseTree {
    match segments.len() {
        0 => PureUseTree::Name(String::new()),
        1 => PureUseTree::Name(segments[0].to_string()),
        _ => PureUseTree::Path {
            path: segments[0].to_string(),
            tree: Box::new(build_use_tree(&segments[1..])),
        },
    }
}

/// Conservative check: does this `PureType::Path` string mention `Self`
/// **by value** (rather than as `&Self` / `&mut Self`)? Used by the
/// R7 supertrait inference to decide whether `Sized` needs to be added
/// to the extracted trait. We only have the type as an opaque string
/// here, so the heuristic looks for a bare `Self` segment that isn't
/// preceded by `&` (any number of spaces) — covering `Self`, `Self<T>`,
/// `Result<Self, _>`, etc., while still rejecting `&Self` and `&mut Self`.
fn pure_type_mentions_self_by_value(ty_str: &str) -> bool {
    let trimmed = ty_str.trim();
    let mut i = 0;
    let bytes = trimmed.as_bytes();
    while i + 4 <= bytes.len() {
        if &bytes[i..i + 4] == b"Self" {
            // Boundary check: previous byte (if any) must not be alnum/_.
            let prev_ok =
                i == 0 || !matches!(bytes[i - 1], b'A'..=b'Z' | b'a'..=b'z' | b'0'..=b'9' | b'_');
            // Boundary check: next byte (if any) must not be alnum/_.
            let next_ok = i + 4 == bytes.len()
                || !matches!(
                    bytes[i + 4],
                    b'A'..=b'Z' | b'a'..=b'z' | b'0'..=b'9' | b'_'
                );
            if prev_ok && next_ok {
                // Is this a by-reference Self (e.g. `&Self`, `&mut Self`,
                // `&'a Self`)? Look back for an unmatched `&` token that
                // is not closed by another type segment.
                let mut j = i;
                while j > 0 {
                    j -= 1;
                    match bytes[j] {
                        b' ' | b'\t' | b'\'' => continue,
                        b'a'..=b'z' | b'A'..=b'Z' | b'_' | b'0'..=b'9' => {
                            // Consume identifier (likely `mut`); keep walking.
                            while j > 0
                                && matches!(
                                    bytes[j - 1],
                                    b'a'..=b'z' | b'A'..=b'Z' | b'_' | b'0'..=b'9'
                                )
                            {
                                j -= 1;
                            }
                            continue;
                        }
                        b'&' => return false, // `&Self` / `&mut Self`
                        _ => break,
                    }
                }
                return true;
            }
        }
        i += 1;
    }
    false
}

/// Walk up the symbol's path until we land on a `Mod` symbol; returns
/// that module's `SymbolId`. Used to identify the containing file of a
/// caller (we inject the `use` statement at module scope).
fn walk_to_module(symbol_id: SymbolId, registry: &SymbolRegistry) -> Option<SymbolId> {
    let path = registry.path(symbol_id)?;
    let mut current = path.clone();
    while let Some(parent) = current.parent() {
        if let Some(parent_id) = registry.lookup(&parent) {
            if matches!(registry.kind(parent_id), Some(SymbolKind::Mod)) {
                return Some(parent_id);
            }
        }
        current = parent;
    }
    None
}

/// Returns `true` when `tree` already imports `target_path` (either as a
/// direct path, as part of a group, or via a glob over an enclosing
/// module). Used to suppress duplicate `use` injection.
fn use_tree_imports_path(tree: &PureUseTree, target_path: &str) -> bool {
    let target_segments: Vec<&str> = target_path.split("::").collect();
    tree_matches_segments(tree, &target_segments)
}

fn tree_matches_segments(tree: &PureUseTree, target: &[&str]) -> bool {
    match tree {
        PureUseTree::Name(name) => target.last().is_some_and(|t| t == name),
        PureUseTree::Rename { name, .. } => target.last().is_some_and(|t| t == name),
        PureUseTree::Glob => target.len() <= 1,
        PureUseTree::Path { path, tree } => {
            if target.first().is_none_or(|head| head != path) {
                false
            } else {
                tree_matches_segments(tree, &target[1..])
            }
        }
        PureUseTree::Group(children) => children.iter().any(|c| tree_matches_segments(c, target)),
    }
}

impl ASTRegApply for ExtractTraitMutation {
    fn apply_to_registry(&self, ctx: &mut ASTMutationContext) -> MutationResult {
        // Step 1: O(1) lookup for the inherent impl using symbol_id
        let impl_id = self.symbol_id;
        let impl_path = match ctx.symbol_registry.path(impl_id) {
            Some(path) => path.clone(),
            None => {
                return MutationResult {
                    mutation_type: self.mutation_type().to_string(),
                    changes: 0,
                    description: format!("SymbolId {:?} not found in registry", impl_id),
                };
            }
        };

        // Verify it's an impl and get the AST
        let inherent_impl = match ctx.ast_registry.get(impl_id) {
            Some(PureItem::Impl(imp)) => {
                // Verify it's an inherent impl (not a trait impl)
                if imp.trait_.is_some() {
                    return MutationResult {
                        mutation_type: self.mutation_type().to_string(),
                        changes: 0,
                        description: format!(
                            "SymbolId {:?} is a trait impl, not an inherent impl",
                            impl_id
                        ),
                    };
                }
                imp.clone()
            }
            Some(_) => {
                return MutationResult {
                    mutation_type: self.mutation_type().to_string(),
                    changes: 0,
                    description: format!("SymbolId {:?} is not an impl block", impl_id),
                };
            }
            None => {
                return MutationResult {
                    mutation_type: self.mutation_type().to_string(),
                    changes: 0,
                    description: format!("No AST found for SymbolId {:?}", impl_id),
                };
            }
        };

        // Get struct name from the impl's self_ty
        let struct_name = inherent_impl.self_ty.clone();

        // Step 2: Partition methods into extracted vs remaining
        let (extracted_items, remaining_items): (Vec<_>, Vec<_>) =
            inherent_impl.items.into_iter().partition(|item| {
                if let PureImplItem::Fn(f) = item {
                    match &self.methods {
                        Some(methods) => methods.contains(&f.name),
                        None => true, // Extract all methods
                    }
                } else {
                    false // Don't extract non-method items
                }
            });

        if extracted_items.is_empty() {
            return MutationResult {
                mutation_type: self.mutation_type().to_string(),
                changes: 0,
                description: "No methods to extract".to_string(),
            };
        }

        let mut changes = 0;

        // Step 3: Create trait definition with method signatures
        let trait_items: Vec<PureTraitItem> = extracted_items
            .iter()
            .filter_map(|item| {
                if let PureImplItem::Fn(f) = item {
                    // R5(b) edge-case fix: strip the `mut` qualifier off
                    // `mut self` receivers and off `mut <name>` named
                    // parameters when emitting the trait signature.
                    // Rust's grammar rejects either form inside a
                    // body-less fn declaration (it parses the `mut`
                    // binding as a pattern, hence cargo's
                    // `patterns aren't allowed in functions without
                    // bodies`). The body-bearing impl method below
                    // keeps its `mut` exactly as before.
                    let signature_params: Vec<PureParam> = f
                        .params
                        .iter()
                        .map(|p| match p {
                            PureParam::SelfValue { is_ref, .. } => PureParam::SelfValue {
                                is_ref: *is_ref,
                                is_mut: false,
                            },
                            PureParam::Typed { name, ty, pat, .. } => PureParam::Typed {
                                name: name.clone(),
                                ty: ty.clone(),
                                is_mut: false,
                                pat: pat.clone(),
                            },
                        })
                        .collect();
                    // Create trait method signature (empty body for trait definition).
                    //
                    // R14: drop the `const` qualifier when lifting the
                    // signature into the trait. Rust's grammar rejects
                    // `const fn` inside `trait` declarations
                    // ("functions in traits cannot be declared const"),
                    // and the concrete impl below keeps its `const fn`
                    // exactly as before, so the constness still applies
                    // to the call site that goes through the impl. Same
                    // shape as the R5(b) `mut` strip on signature params
                    // — only the trait-side signature gets the
                    // qualifier removed; impl-side behaviour is unchanged.
                    let trait_fn = PureFn {
                        attrs: f.attrs.clone(),
                        vis: PureVis::Private, // Trait methods use default visibility
                        is_async: f.is_async,
                        is_async_inferred: f.is_async_inferred,
                        is_const: false,
                        is_unsafe: f.is_unsafe,
                        abi: None,
                        name: f.name.clone(),
                        generics: f.generics.clone(),
                        params: signature_params,
                        ret: f.ret.clone(),
                        body: PureBlock::default(), // Empty body for trait signature
                    };
                    Some(PureTraitItem::Fn(trait_fn))
                } else {
                    None
                }
            })
            .collect();

        // R7 (Sized bound): when any extracted method's signature mentions
        // `Self` by-value — either as an owned `self` receiver (not `&self`
        // / `&mut self`) or as a `-> Self` return type — the trait
        // implicitly requires `Self: Sized`. Without it cargo rejects the
        // signature with `the size for values of type Self cannot be known
        // at compilation time` because trait `Self` is `?Sized` by default
        // and owned access needs a known size.
        //
        // Add `Sized` as a supertrait whenever the heuristic fires. This
        // is a no-op for any concrete `impl Trait for ConcreteType` whose
        // self type is already `Sized` (i.e. every non-`dyn` newtype the
        // ExtractTrait suggester ever targets).
        let needs_sized = trait_items.iter().any(|item| {
            let PureTraitItem::Fn(f) = item else {
                return false;
            };
            if matches!(&f.ret, Some(PureType::Path(p)) if pure_type_mentions_self_by_value(p)) {
                return true;
            }
            f.params
                .iter()
                .any(|p| matches!(p, PureParam::SelfValue { is_ref: false, .. }))
        });
        let supertraits = if needs_sized {
            vec!["Sized".to_string()]
        } else {
            Vec::new()
        };

        let new_trait = PureTrait {
            attrs: Vec::new(),
            vis: PureVis::Public, // Default to public trait
            is_unsafe: false,
            is_auto: false,
            name: self.trait_name.clone(),
            generics: PureGenerics::default(),
            supertraits,
            items: trait_items,
        };

        // Register the new trait
        let trait_path = match impl_path
            .parent()
            .and_then(|p| p.child(&self.trait_name).ok())
        {
            Some(path) => path,
            None => {
                return MutationResult {
                    mutation_type: self.mutation_type().to_string(),
                    changes: 0,
                    description: format!("Failed to create path for trait '{}'", self.trait_name),
                };
            }
        };

        let trait_item = PureItem::Trait(new_trait);
        if ctx
            .register_with_ast(trait_path.clone(), SymbolKind::Trait, trait_item.clone())
            .is_some()
        {
            // R6: When the parent of `trait_path` is an inline `mod foo { ... }`
            // (as opposed to a file-level module / crate root), the registry
            // generator skips this trait from the top-level symbol iter pass
            // because every "child of an inline module" path is expected to
            // live inside the parent's `PureMod.items` list. `register_with_ast`
            // only updates the `id → PureItem` map without touching the
            // parent's items list, so without this push the new trait
            // declaration never surfaces in the regenerated source —
            // downstream Step 6 then injects `use crate::<inline_mod>::<TraitName>;`
            // into every caller and cargo check fails with
            // `unresolved import 'crate::<inline_mod>::<TraitName>'` (R6
            // fixture Case32 verify diag).
            //
            // For top-level traits (parent = crate root, NOT inline) the
            // symbol iter pass already emits the trait, so we must NOT push
            // it to crate root's PureMod.items — that would create a
            // duplicate `trait <Name>` declaration. Guarded by
            // `is_inline_module(parent_id)` to scope this strictly to the
            // inline-mod case.
            //
            // The trait IMPL (Step 4 below) does an unconditional
            // `get_module_items_mut().push(...)` because impls are always
            // routed through `iter_module_items + file_level_items` filter
            // (line 463-467 of registry_generator.rs takes only Use/Impl),
            // never via the symbol iter pass — so no duplication risk for
            // that side. Traits are handled by the symbol iter pass
            // exclusively, hence the inline-mod guard here.
            if let Some(parent_path) = trait_path.parent() {
                if let Some(parent_id) = ctx.symbol_registry.lookup(&parent_path) {
                    if ctx.ast_registry.is_inline_module(parent_id) {
                        if let Some(parent_items) = ctx.ast_registry.get_module_items_mut(parent_id)
                        {
                            parent_items.push(trait_item);
                        }
                    }
                }
            }
            changes += 1;
        }

        // Step 4: Create trait impl with method bodies
        // Trait impl methods must NOT have visibility qualifiers (pub is inherited from trait)
        // R8: strip `mut` qualifier from impl-side signature params to match
        // the trait-side signature built in Step 3 (R5(b)). Without this the
        // two sides desynchronize and cargo reports `method ... has an
        // incompatible type for trait`. The body is left untouched — only the
        // signature `mut` markers are removed (mirrors Step 3 exactly).
        let trait_impl_items: Vec<PureImplItem> = extracted_items
            .into_iter()
            .map(|item| {
                if let PureImplItem::Fn(mut f) = item {
                    f.vis = PureVis::Private; // Remove pub for trait impl methods
                    f.params = f
                        .params
                        .into_iter()
                        .map(|p| match p {
                            PureParam::SelfValue { is_ref, .. } => PureParam::SelfValue {
                                is_ref,
                                is_mut: false,
                            },
                            PureParam::Typed { name, ty, pat, .. } => PureParam::Typed {
                                name,
                                ty,
                                is_mut: false,
                                pat,
                            },
                        })
                        .collect();
                    PureImplItem::Fn(f)
                } else {
                    item
                }
            })
            .collect();

        // Snapshot the extracted method names before `trait_impl_items` is
        // moved into the trait impl below. Step 6 below uses these names
        // to look up the methods' SymbolIds via `<struct>::<method>` and
        // walk the call graph for caller-side `use` injection.
        let trait_method_names: Vec<String> = trait_impl_items
            .iter()
            .filter_map(|item| {
                if let PureImplItem::Fn(f) = item {
                    Some(f.name.clone())
                } else {
                    None
                }
            })
            .collect();

        let trait_impl = PureImpl {
            attrs: Vec::new(),
            generics: inherent_impl.generics.clone(),
            is_unsafe: false,
            trait_: Some(self.trait_name.clone()),
            self_ty: struct_name.clone(),
            items: trait_impl_items,
        };

        // Register the trait impl
        let trait_impl_name = format!(
            "<impl {} for {}>",
            self.trait_name,
            struct_name
                .replace("::", "_")
                .replace('<', "_")
                .replace('>', "")
        );
        let trait_impl_path = match impl_path
            .parent()
            .and_then(|p| p.child(&trait_impl_name).ok())
        {
            Some(path) => path,
            None => {
                return MutationResult {
                    mutation_type: self.mutation_type().to_string(),
                    changes,
                    description: "Failed to create path for trait impl".to_string(),
                };
            }
        };

        if let Some(_trait_impl_id) = ctx.register_with_ast(
            trait_impl_path,
            SymbolKind::Impl,
            PureItem::Impl(trait_impl.clone()),
        ) {
            // Also add to module_items
            if let Some(parent_path) = impl_path.parent() {
                if let Some(parent_id) = ctx.symbol_registry.lookup(&parent_path) {
                    if let Some(module_items) = ctx.ast_registry.get_module_items_mut(parent_id) {
                        module_items.push(PureItem::Impl(trait_impl));
                    }
                }
            }
            changes += 1;
        }

        // Step 5: Update the inherent impl to remove extracted methods
        if remaining_items.is_empty() {
            // If no methods remain, remove the inherent impl
            ctx.remove_symbol(impl_id);
            changes += 1;
        } else {
            let updated_impl = PureImpl {
                attrs: inherent_impl.attrs,
                generics: inherent_impl.generics,
                is_unsafe: inherent_impl.is_unsafe,
                trait_: None,
                self_ty: struct_name.clone(),
                items: remaining_items,
            };
            ctx.set_ast(impl_id, PureItem::Impl(updated_impl));
            changes += 1;
        }

        // Step 7 (R6 visibility): when the impl's own module is declared
        // private to its parent (e.g. `mod multi;` in
        // `generator/mod.rs`), the trait's fully-qualified path
        // `crate::<parent>::<impl_module>::<TraitName>` is not reachable
        // from other modules — cargo reports
        // `module <impl_module> is private` on every caller's `use`.
        //
        // Re-export the trait through the parent module so the
        // public-facing path
        // `crate::<parent>::<TraitName>` resolves, mirroring the
        // pattern that production code uses when a private
        // implementation module exposes types via the parent
        // (`pub use multi::GeneratedFiles;` etc.). Skip when the impl
        // module is already public, when the lookup chain bottoms out
        // (impl at crate root, parent missing), or when a matching
        // re-export already lives in the parent's items (idempotent
        // ingestion).
        let trait_reexport_parent_id: Option<SymbolId> = (|| {
            let impl_module_path = impl_path.parent()?;
            let impl_module_id = ctx.symbol_registry.lookup(&impl_module_path)?;
            let impl_module_vis = ctx.symbol_registry.visibility(impl_module_id);
            if !matches!(impl_module_vis, Some(ryo_symbol::Visibility::Private)) {
                return None;
            }
            let impl_module_name = impl_module_path.segments().last()?.to_string();
            let parent_path = impl_module_path.parent()?;
            let parent_id = ctx.symbol_registry.lookup(&parent_path)?;
            let reexport_path = format!("{}::{}", impl_module_name, self.trait_name);
            let existing_items = ctx
                .ast_registry
                .get_module_items(parent_id)
                .cloned()
                .unwrap_or_default();
            let already_present = existing_items.iter().any(|item| {
                if let PureItem::Use(u) = item {
                    matches!(u.vis, PureVis::Public)
                        && use_tree_imports_path(&u.tree, &reexport_path)
                } else {
                    false
                }
            });
            if already_present {
                return Some(parent_id);
            }
            let mut reexport_item = build_use_item_for_path(&reexport_path);
            if let PureItem::Use(ref mut u) = reexport_item {
                u.vis = PureVis::Public;
            }
            let mut updated = existing_items;
            updated.insert(0, reexport_item);
            ctx.ast_registry.set_module_items(parent_id, updated);
            ctx.emit_modified(parent_id, ModificationType::BodyModified);
            changes += 1;
            Some(parent_id)
        })();

        // Step 6 (R4 + P3): Inject a trait import into every module that
        // calls one of the extracted methods, so existing `Type::method()`
        // / `instance.method()` sites continue to resolve through the new
        // trait rather than the (now replaced or removed) inherent impl.
        // Same-crate caller modules get `use crate::<module>::<Trait>;`,
        // cross-crate caller modules get the full
        // `use <crate_module>::<module>::<Trait>;` form (P3,
        // CrossCrateExtractTrait).
        //
        // The cross-crate form is sound without any Cargo.toml edit
        // because a caller found via `callers_of` invokes the impl's
        // methods — its crate already depends on the trait's crate. The
        // residual unsound case (a facade re-export consumer without the
        // direct dependency edge) is wholesale-skipped upstream by the
        // suggester's direct-dep guard (pattern_suggest RL061 arm,
        // WorkspaceResolver::depends_on).
        //
        // Requires the optional `code_graph` handle on ASTMutationContext;
        // when it's absent (legacy callers that construct the context
        // without a graph) the step is silently skipped.
        if let Some(code_graph) = ctx.code_graph {
            if let Some(trait_parent_path) = impl_path.parent() {
                if let Ok(struct_path) = trait_parent_path.child(&struct_name) {
                    let trait_crate_name = trait_path.crate_name().to_string();
                    let trait_module_id = ctx.symbol_registry.lookup(&trait_parent_path);

                    // Build the same-crate `use` form: `crate::<module..>::<Trait>`.
                    // `trait_path` is `<crate>::<module>::<Trait>`; we replace
                    // the leading crate segment with `crate` so the import
                    // resolves regardless of which file inside the crate
                    // sees it.
                    //
                    // R6 commit 2: when Step 7 above injected a parent
                    // `pub use <impl_module>::<TraitName>;` re-export
                    // (i.e. the impl module is private and trait
                    // visibility had to be lifted to the parent), use
                    // the parent's `crate::<parent>::<TraitName>` path
                    // instead of `crate::<parent>::<impl_module>::<TraitName>` —
                    // the latter is unreachable through the private
                    // `mod <impl_module>;` and would surface as
                    // `module <impl_module> is private` at cargo check.
                    let trait_local_path = if let Some(parent_id) = trait_reexport_parent_id {
                        if let Some(parent_path) = ctx.symbol_registry.path(parent_id) {
                            rewrite_to_local_use_path(&format!(
                                "{}::{}",
                                parent_path, self.trait_name
                            ))
                        } else {
                            rewrite_to_local_use_path(&trait_path.to_string())
                        }
                    } else {
                        rewrite_to_local_use_path(&trait_path.to_string())
                    };
                    let use_stmt = build_use_item_for_path(&trait_local_path);
                    let trait_full_path_str = trait_path.to_string();

                    // Cross-crate `use` form (P3, CrossCrateExtractTrait):
                    // the full `<crate_module>::<module..>::<Trait>` path,
                    // R6-adjusted the same way as the local form when the
                    // trait was re-exported through a parent module. The
                    // suggester's direct-dep guard has already vetted that
                    // every cross-crate caller's crate declares a
                    // `[dependencies]` edge on the trait's crate, so this
                    // path resolves there.
                    let trait_extern_path = if let Some(parent_id) = trait_reexport_parent_id {
                        if let Some(parent_path) = ctx.symbol_registry.path(parent_id) {
                            format!("{}::{}", parent_path, self.trait_name)
                        } else {
                            trait_full_path_str.clone()
                        }
                    } else {
                        trait_full_path_str.clone()
                    };
                    let extern_use_stmt = build_use_item_for_path(&trait_extern_path);

                    let mut caller_modules: HashSet<SymbolId> = HashSet::new();
                    let mut cross_caller_modules: HashSet<SymbolId> = HashSet::new();
                    for method_name in trait_method_names {
                        let Ok(method_path) = struct_path.child(&method_name) else {
                            continue;
                        };
                        let Some(method_id) = ctx.symbol_registry.lookup(&method_path) else {
                            continue;
                        };
                        for caller_id in code_graph.callers_of(method_id) {
                            let Some(caller_path) = ctx.symbol_registry.path(caller_id) else {
                                continue;
                            };
                            let is_same_crate = caller_path.crate_name() == trait_crate_name;
                            if let Some(parent_mod_id) =
                                walk_to_module(caller_id, ctx.symbol_registry)
                            {
                                if is_same_crate {
                                    caller_modules.insert(parent_mod_id);
                                } else {
                                    cross_caller_modules.insert(parent_mod_id);
                                }
                            }
                        }
                    }

                    // (module set, use path, use item) per injection form:
                    // same-crate modules get the `crate::…` form, cross-
                    // crate modules the full `<crate_module>::…` form.
                    let injections = [
                        (caller_modules, &trait_local_path, &use_stmt),
                        (cross_caller_modules, &trait_extern_path, &extern_use_stmt),
                    ];
                    for (modules, use_path, stmt) in injections {
                        for caller_mod_id in modules {
                            if Some(caller_mod_id) == trait_module_id {
                                // Trait is declared in the same module — already in scope.
                                continue;
                            }
                            let existing_items = ctx
                                .ast_registry
                                .get_module_items(caller_mod_id)
                                .cloned()
                                .unwrap_or_default();
                            // Treat both the injection form and the original
                            // `<crate>::`-prefixed form as "already imported"
                            // so an existing direct path import doesn't get a
                            // duplicate sibling.
                            let already_imported = existing_items.iter().any(|i| {
                                if let PureItem::Use(u) = i {
                                    use_tree_imports_path(&u.tree, use_path)
                                        || use_tree_imports_path(&u.tree, &trait_full_path_str)
                                } else {
                                    false
                                }
                            });
                            if already_imported {
                                continue;
                            }
                            let mut updated = existing_items;
                            updated.insert(0, stmt.clone());
                            ctx.ast_registry.set_module_items(caller_mod_id, updated);
                            ctx.emit_modified(caller_mod_id, ModificationType::BodyModified);
                            changes += 1;
                        }
                    }
                }
            }
        }

        MutationResult {
            mutation_type: self.mutation_type().to_string(),
            changes,
            description: format!(
                "Extracted trait '{}' from '{}'",
                self.trait_name, struct_name
            ),
        }
    }
}

impl ASTRegApply for InlineTraitMutation {
    fn apply_to_registry(&self, ctx: &mut ASTMutationContext) -> MutationResult {
        // Get trait name from symbol_id (O(1) lookup)
        let trait_name = match ctx.symbol_registry.path(self.symbol_id) {
            Some(path) => path.name().to_string(),
            None => {
                return MutationResult {
                    mutation_type: self.mutation_type().to_string(),
                    changes: 0,
                    description: format!("Trait symbol {:?} not found in registry", self.symbol_id),
                };
            }
        };

        // Phase 2d: Cross-crate caller scan (informational only — Phase
        // 2e will turn the result into actual caller-side rewrites).
        // Surfaces the per-caller pattern set so downstream tooling
        // (suggester gate, executor migration engine, human review) can
        // see exactly what shape the cross-crate references take before
        // any rewrite path is wired up. Scanner is read-only on both
        // registries; the subsequent mutation steps proceed unchanged.
        let cross_crate_callers = super::inline_trait_caller_scanner::scan_cross_crate_callers_raw(
            ctx.ast_registry,
            ctx.symbol_registry,
            self.symbol_id,
        );

        // Step 1: Find the trait impl (impl TraitName for Foo)
        let trait_impl_entry = ctx.symbol_registry.iter().find(|(id, _path)| {
            if !matches!(ctx.symbol_registry.kind(*id), Some(SymbolKind::Impl)) {
                return false;
            }
            if let Some(PureItem::Impl(imp)) = ctx.ast_registry.get(*id) {
                imp.trait_.as_ref() == Some(&trait_name) && imp.self_ty == self.struct_name
            } else {
                false
            }
        });

        let (trait_impl_id, trait_impl_path) = match trait_impl_entry {
            Some((id, path)) => (id, path.clone()),
            None => {
                return MutationResult {
                    mutation_type: self.mutation_type().to_string(),
                    changes: 0,
                    description: format!(
                        "No impl of '{}' for '{}' found",
                        trait_name, self.struct_name
                    ),
                };
            }
        };

        let trait_impl = match ctx.ast_registry.get(trait_impl_id) {
            Some(PureItem::Impl(imp)) => imp.clone(),
            _ => {
                return MutationResult {
                    mutation_type: self.mutation_type().to_string(),
                    changes: 0,
                    description: "No AST found for trait impl".to_string(),
                };
            }
        };

        let mut changes = 0;

        // Step 2: Find or identify the inherent impl
        let inherent_impl_entry = ctx.symbol_registry.iter().find(|(id, _path)| {
            if !matches!(ctx.symbol_registry.kind(*id), Some(SymbolKind::Impl)) {
                return false;
            }
            if let Some(PureItem::Impl(imp)) = ctx.ast_registry.get(*id) {
                imp.trait_.is_none() && imp.self_ty == self.struct_name
            } else {
                false
            }
        });

        // Step 3: Move methods to inherent impl
        if let Some((inherent_impl_id, _)) = inherent_impl_entry {
            // Existing inherent impl - add methods to it (both ASTRegistry and module_items)
            if let Some(PureItem::Impl(mut inherent_impl)) =
                ctx.ast_registry.get(inherent_impl_id).cloned()
            {
                inherent_impl.items.extend(trait_impl.items.clone());
                ctx.set_ast(inherent_impl_id, PureItem::Impl(inherent_impl.clone()));

                // Also update in module_items
                if let Some(parent_path) = trait_impl_path.parent() {
                    if let Some(parent_id) = ctx.symbol_registry.lookup(&parent_path) {
                        if let Some(module_items) = ctx.ast_registry.get_module_items_mut(parent_id)
                        {
                            for item in module_items.iter_mut() {
                                if let PureItem::Impl(impl_block) = item {
                                    if impl_block.trait_.is_none()
                                        && impl_block.self_ty == self.struct_name
                                    {
                                        impl_block.items.extend(trait_impl.items.clone());
                                        break;
                                    }
                                }
                            }
                        }
                    }
                }

                changes += 1;
            }
        } else {
            // No inherent impl exists - create one with the trait methods
            let new_inherent_impl = PureImpl {
                attrs: Vec::new(),
                generics: trait_impl.generics.clone(),
                is_unsafe: false,
                trait_: None,
                self_ty: self.struct_name.clone(),
                items: trait_impl.items.clone(),
            };

            let impl_name = format!(
                "<impl {}>",
                self.struct_name
                    .replace("::", "_")
                    .replace('<', "_")
                    .replace('>', "")
            );
            let impl_path = match trait_impl_path
                .parent()
                .and_then(|p| p.child(&impl_name).ok())
            {
                Some(path) => path,
                None => {
                    return MutationResult {
                        mutation_type: self.mutation_type().to_string(),
                        changes: 0,
                        description: "Failed to create path for inherent impl".to_string(),
                    };
                }
            };

            if let Some(_new_impl_id) = ctx.register_with_ast(
                impl_path,
                SymbolKind::Impl,
                PureItem::Impl(new_inherent_impl.clone()),
            ) {
                // Also add to module_items
                if let Some(parent_path) = trait_impl_path.parent() {
                    if let Some(parent_id) = ctx.symbol_registry.lookup(&parent_path) {
                        if let Some(module_items) = ctx.ast_registry.get_module_items_mut(parent_id)
                        {
                            module_items.push(PureItem::Impl(new_inherent_impl));
                        }
                    }
                }
                changes += 1;
            }
        }

        // Step 4: Remove the trait impl
        ctx.remove_symbol(trait_impl_id);
        changes += 1;

        // Step 5: Optionally remove the trait definition (O(1) using symbol_id)
        if self.remove_trait {
            ctx.remove_symbol(self.symbol_id);
            changes += 1;
        }

        let mut description = format!(
            "Inlined trait '{}' into '{}'{}",
            trait_name,
            self.struct_name,
            if self.remove_trait {
                " (trait removed)"
            } else {
                ""
            }
        );

        // Phase 2d/2e caller-side migration footnote: when cross-crate
        // callers reference the inlined trait, count the distribution
        // and (for the Ufcs pattern, which Phase 2e implements) rewrite
        // the caller body in-place from `Trait::method` → `Struct::m`.
        // Other patterns (GenericBound / DynDispatch) still require
        // caller-side rewrites that ship in later sub-phases; their
        // count is reported but not yet rewritten.
        if !cross_crate_callers.is_empty() {
            use ryo_mutations::basic::trait_ops::cross_crate_caller_pattern::{
                rewrite_body_ufcs, rewrite_fn_dyn_dispatch, rewrite_fn_generic_bound, CallerPattern,
            };
            let mut dot = 0usize;
            let mut ufcs = 0usize;
            let mut generic = 0usize;
            let mut dyn_dispatch = 0usize;
            let mut other = 0usize;
            let mut ufcs_paths_rewritten = 0usize;
            let mut dyn_types_rewritten = 0usize;
            let mut generic_edits = 0usize;
            let mut pub_generic_audit_callers: Vec<String> = Vec::new();
            let mut escapes_aborted_callers: Vec<String> = Vec::new();

            for r in &cross_crate_callers {
                for p in &r.patterns {
                    match p {
                        CallerPattern::Dot => dot += 1,
                        CallerPattern::Ufcs => ufcs += 1,
                        CallerPattern::GenericBound => generic += 1,
                        CallerPattern::DynDispatch => dyn_dispatch += 1,
                        CallerPattern::Other => other += 1,
                    }
                }
                // Phase 2e/2f/2g: rewrite in-place for every pattern the
                // executor can mechanically migrate. Dot is no-op
                // (post-inline dispatch unchanged). GenericBound is the
                // most invasive — it strips `T: Trait` generic params
                // and substitutes `T` with the concrete struct type
                // throughout the signature, which changes the caller's
                // external type contract. The transitive caller scanner
                // (Phase 4) must audit downstream call sites before
                // GenericBound rewrites should be considered safe in
                // production workflows.
                // Phase 4-A + 4-B: decide whether each pub
                // GenericBound caller's transitive cascade can leave
                // the current workspace. When `code_graph` is
                // attached (the normal `execute_ast_reg` path), run
                // `walk_transitive_callers` to compute the verdict;
                // an `Escapes` verdict skips the GenericBound rewrite
                // for that caller and records its name. Phase 4-A's
                // audit footnote (caller name list) is kept; Phase
                // 4-B adds the `aborted` list when any verdict came
                // back `Escapes`.
                let mut skip_generic_bound = false;
                if r.patterns.contains(&CallerPattern::GenericBound) && r.is_public {
                    if let Some(p) = ctx.symbol_registry.path(r.caller_id) {
                        pub_generic_audit_callers.push(p.name().to_string());
                    }
                    if let Some(code_graph) = ctx.code_graph {
                        use super::inline_trait_caller_scanner::{
                            walk_transitive_callers, CascadeVerdict,
                        };
                        let verdict =
                            walk_transitive_callers(code_graph, ctx.ast_registry, r.caller_id);
                        if verdict == CascadeVerdict::Escapes {
                            skip_generic_bound = true;
                            if let Some(p) = ctx.symbol_registry.path(r.caller_id) {
                                escapes_aborted_callers.push(p.name().to_string());
                            }
                        }
                    }
                }
                if r.patterns.contains(&CallerPattern::Ufcs)
                    || r.patterns.contains(&CallerPattern::DynDispatch)
                    || r.patterns.contains(&CallerPattern::GenericBound)
                {
                    if let Some(PureItem::Fn(f)) = ctx.ast_registry.get_mut(r.caller_id) {
                        if r.patterns.contains(&CallerPattern::Ufcs) {
                            ufcs_paths_rewritten +=
                                rewrite_body_ufcs(&mut f.body, &trait_name, &self.struct_name);
                        }
                        if r.patterns.contains(&CallerPattern::DynDispatch) {
                            dyn_types_rewritten +=
                                rewrite_fn_dyn_dispatch(f, &trait_name, &self.struct_name);
                        }
                        if r.patterns.contains(&CallerPattern::GenericBound) && !skip_generic_bound
                        {
                            generic_edits +=
                                rewrite_fn_generic_bound(f, &trait_name, &self.struct_name);
                        }
                    }
                }
            }
            changes += ufcs_paths_rewritten + dyn_types_rewritten + generic_edits;
            description.push_str(&format!(
                " [cross-crate callers: {} (dot={} ufcs={} generic={} dyn={} other={}); Phase 2e rewrote {} Ufcs path(s); Phase 2f rewrote {} Dyn type(s); Phase 2g performed {} GenericBound edit(s)]",
                cross_crate_callers.len(),
                dot,
                ufcs,
                generic,
                dyn_dispatch,
                other,
                ufcs_paths_rewritten,
                dyn_types_rewritten,
                generic_edits
            ));
            if !pub_generic_audit_callers.is_empty() {
                description.push_str(&format!(
                    " [Phase 4-A audit: pub GenericBound caller(s) ({}) — transitive cascade verdict pending Phase 4-B walk]",
                    pub_generic_audit_callers.join(", ")
                ));
            }
            if !escapes_aborted_callers.is_empty() {
                description.push_str(&format!(
                    " [Phase 4-B verdict: GenericBound rewrite ABORTED for caller(s) ({}) — transitive cascade Escapes workspace boundary]",
                    escapes_aborted_callers.join(", ")
                ));
            }
        }

        MutationResult {
            mutation_type: self.mutation_type().to_string(),
            changes,
            description,
        }
    }
}

impl ASTRegApply for RemoveTraitMutation {
    fn apply_to_registry(&self, ctx: &mut ASTMutationContext) -> MutationResult {
        // Use the provided SymbolId for O(1) access
        let trait_id = self.trait_id;

        // Verify the trait exists and is a trait
        if ctx.symbol_registry.kind(trait_id) != Some(SymbolKind::Trait) {
            return MutationResult {
                mutation_type: "RemoveTrait".to_string(),
                changes: 0,
                description: format!("Symbol {} is not a trait", trait_id),
            };
        }

        ctx.ast_registry.remove(trait_id);

        MutationResult {
            mutation_type: "RemoveTrait".to_string(),
            changes: 1,
            description: format!("Removed trait {}", trait_id),
        }
    }
}

impl ASTRegApply for EnumToTraitMutation {
    fn apply_to_registry(&self, ctx: &mut ASTMutationContext) -> MutationResult {
        let enum_id = self.symbol_id;

        // Verify the symbol exists and is an enum
        if !matches!(ctx.symbol_registry.kind(enum_id), Some(SymbolKind::Enum)) {
            return MutationResult {
                mutation_type: self.mutation_type().to_string(),
                changes: 0,
                description: format!("Symbol {:?} is not an enum or not found", enum_id),
            };
        }

        let enum_path = match ctx.symbol_registry.path(enum_id) {
            Some(p) => p.clone(),
            None => {
                return MutationResult {
                    mutation_type: self.mutation_type().to_string(),
                    changes: 0,
                    description: format!("Path not found for symbol {:?}", enum_id),
                };
            }
        };

        // Get enum name from path for trait name and usage replacement
        let enum_name = enum_path.name().to_string();

        // Determine trait name:
        // - If user specified trait_name, use it
        // - For MarkerOnly without specified name, use {EnumName}Trait to avoid collision
        // - Otherwise, use enum_name
        let default_trait_name;
        let trait_name = match &self.trait_name {
            Some(name) => name.as_str(),
            None => {
                match self.strategy {
                    EnumToTraitStrategy::MarkerOnly => {
                        // MarkerOnly keeps enum, so trait needs different name
                        default_trait_name = format!("{}Trait", enum_name);
                        &default_trait_name
                    }
                    _ => &enum_name,
                }
            }
        };

        // Get the enum AST
        let enum_def = match ctx.ast_registry.get(enum_id) {
            Some(PureItem::Enum(e)) => e.clone(),
            _ => {
                return MutationResult {
                    mutation_type: self.mutation_type().to_string(),
                    changes: 0,
                    description: format!("No AST found for enum '{}'", enum_name),
                };
            }
        };

        let mut changes = 0;
        let parent_path = match enum_path.parent() {
            Some(p) => p,
            None => {
                return MutationResult {
                    mutation_type: self.mutation_type().to_string(),
                    changes: 0,
                    description: "Cannot determine parent module".to_string(),
                };
            }
        };

        // Collect variant names for usage site replacement
        let variant_names: Vec<String> = enum_def.variants.iter().map(|v| v.name.clone()).collect();

        // Step 1.5: Find enum's inherent impl block and extract methods
        let enum_impl_id: Option<_> = ctx
            .symbol_registry
            .iter()
            .find(|(id, _)| {
                if !matches!(ctx.symbol_registry.kind(*id), Some(SymbolKind::Impl)) {
                    return false;
                }
                if let Some(PureItem::Impl(imp)) = ctx.ast_registry.get(*id) {
                    // Inherent impl: no trait, matches enum name
                    imp.trait_.is_none() && imp.self_ty == enum_name
                } else {
                    false
                }
            })
            .map(|(id, _)| id); // Extract just the SymbolId to end the borrow

        // Extract methods from enum's impl block
        let enum_methods: Vec<PureFn> = if let Some(impl_id) = enum_impl_id {
            if let Some(PureItem::Impl(imp)) = ctx.ast_registry.get(impl_id) {
                imp.items
                    .iter()
                    .filter_map(|item| {
                        if let PureImplItem::Fn(f) = item {
                            // Only extract instance methods (with &self or &mut self)
                            let has_self = f
                                .params
                                .iter()
                                .any(|p| matches!(p, PureParam::SelfValue { .. }));
                            if has_self {
                                Some(f.clone())
                            } else {
                                None
                            }
                        } else {
                            None
                        }
                    })
                    .collect()
            } else {
                Vec::new()
            }
        } else {
            Vec::new()
        };

        // Step 1.6: Remove enum FIRST if trait name equals enum name (to free the path)
        // This must happen before trait registration to avoid path collision
        // MarkerOnly: NEVER remove enum early (types still reference it)
        let enum_removed_early = match self.strategy {
            EnumToTraitStrategy::MarkerOnly => false, // Never remove for MarkerOnly
            _ if self.remove_enum && trait_name == enum_name => {
                ctx.remove_symbol(enum_id);
                changes += 1;
                // Also remove the enum's inherent impl block early
                if let Some(impl_id) = enum_impl_id {
                    ctx.remove_symbol(impl_id);
                    changes += 1;
                }
                true
            }
            _ => false,
        };

        // Step 2: Create trait definition with method signatures
        let trait_items: Vec<PureTraitItem> = enum_methods
            .iter()
            .map(|f| {
                // Create trait method signature (no body for trait definition)
                let trait_fn = PureFn {
                    attrs: Vec::new(),
                    vis: PureVis::Private, // Trait methods use default visibility
                    is_async: f.is_async,
                    is_async_inferred: f.is_async_inferred,
                    is_const: f.is_const,
                    is_unsafe: f.is_unsafe,
                    abi: None,
                    name: f.name.clone(),
                    generics: f.generics.clone(),
                    params: f.params.clone(),
                    ret: f.ret.clone(),
                    body: PureBlock::default(), // Empty body = abstract method in trait
                };
                PureTraitItem::Fn(trait_fn)
            })
            .collect();

        let new_trait = PureTrait {
            attrs: Vec::new(),
            vis: PureVis::Public,
            is_unsafe: false,
            is_auto: false,
            name: trait_name.to_string(),
            generics: PureGenerics::default(),
            supertraits: Vec::new(),
            items: trait_items,
        };

        let trait_path = match parent_path.child(trait_name) {
            Ok(path) => path,
            Err(_) => {
                return MutationResult {
                    mutation_type: self.mutation_type().to_string(),
                    changes: 0,
                    description: format!("Failed to create path for trait '{}'", trait_name),
                };
            }
        };

        if ctx
            .register_with_ast(
                trait_path.clone(),
                SymbolKind::Trait,
                PureItem::Trait(new_trait),
            )
            .is_some()
        {
            changes += 1;
        }

        // Step 3: Create struct + impl for each variant
        for variant in &enum_def.variants {
            // Convert variant fields to struct fields
            let struct_fields = match &variant.fields {
                PureFields::Named(fields) => PureFields::Named(
                    fields
                        .iter()
                        .map(|f| PureField {
                            attrs: Vec::new(),
                            vis: PureVis::Public,
                            name: f.name.clone(),
                            ty: f.ty.clone(),
                        })
                        .collect(),
                ),
                PureFields::Tuple(types) => PureFields::Tuple(types.clone()),
                PureFields::Unit => PureFields::Unit,
            };

            let new_struct = PureStruct {
                attrs: Vec::new(),
                vis: PureVis::Public,
                name: variant.name.clone(),
                generics: PureGenerics::default(),
                fields: struct_fields,
            };

            let struct_path = match parent_path.child(&variant.name) {
                Ok(path) => path,
                Err(_) => continue,
            };

            if ctx
                .register_with_ast(
                    struct_path.clone(),
                    SymbolKind::Struct,
                    PureItem::Struct(new_struct),
                )
                .is_some()
            {
                changes += 1;
            }

            // Create impl Trait for struct with method implementations
            let impl_items: Vec<PureImplItem> = enum_methods
                .iter()
                .map(|f| {
                    // Create method implementation with todo!() body
                    let impl_fn = PureFn {
                        attrs: Vec::new(),
                        vis: PureVis::Private, // Trait impl methods don't have visibility
                        is_async: f.is_async,
                        is_async_inferred: f.is_async_inferred,
                        is_const: f.is_const,
                        is_unsafe: f.is_unsafe,
                        abi: None,
                        name: f.name.clone(),
                        generics: f.generics.clone(),
                        params: f.params.clone(),
                        ret: f.ret.clone(),
                        body: PureBlock {
                            stmts: vec![PureStmt::Expr(PureExpr::Macro {
                                name: "todo".to_string(),
                                delimiter: MacroDelimiter::Paren,
                                tokens: format!("\"{}::{}::{}\"", trait_name, variant.name, f.name),
                            })],
                        },
                    };
                    PureImplItem::Fn(impl_fn)
                })
                .collect();

            let trait_impl = PureImpl {
                attrs: Vec::new(),
                generics: PureGenerics::default(),
                is_unsafe: false,
                trait_: Some(trait_name.to_string()),
                self_ty: variant.name.clone(),
                items: impl_items,
            };

            // NOTE: must use the dedicated trait-impl segment constructor.
            // `parent_path.child("<impl X for Y>")` goes through
            // `Segment::new`, whose identifier validation rejects the
            // space / angle-bracket segment and returned `Err` — silently
            // skipping registration of every variant trait impl (the
            // converted code then fails with "the trait bound `Variant:
            // Trait` is not satisfied" at any coercion site).
            let impl_path = parent_path.child_trait_impl(trait_name, &variant.name);

            if ctx
                .register_with_ast(
                    impl_path,
                    SymbolKind::Impl,
                    PureItem::Impl(trait_impl.clone()),
                )
                .is_some()
            {
                // Also add to module_items. File generation deliberately
                // skips Impl symbols on the ast_registry.iter() path
                // (registry_generator.rs generate_internal) and renders
                // impls ONLY from the parent module's module_items, so a
                // registered-but-not-pushed impl never reaches the output
                // file (same wiring as the ExtractTrait registration above).
                if let Some(parent_id) = ctx.symbol_registry.lookup(&parent_path) {
                    if let Some(module_items) = ctx.ast_registry.get_module_items_mut(parent_id) {
                        module_items.push(PureItem::Impl(trait_impl));
                    }
                }
                changes += 1;
            }
        }

        // Step 4: Replace usage sites (EnumName::VariantName -> VariantName)
        // MarkerOnly: Do NOT replace usage sites - enum remains as the concrete type
        let usage_changes = match self.strategy {
            EnumToTraitStrategy::MarkerOnly => 0, // Keep enum usages as-is
            _ => replace_enum_usages(ctx, &enum_name, &variant_names),
        };
        changes += usage_changes;

        // Step 5: Replace type annotations based on strategy
        // Note: MarkerOnly does NOT replace types - the enum remains as the concrete type
        let type_changes = match self.strategy {
            EnumToTraitStrategy::Dynamic => {
                // Replace `EnumName` with `Box<dyn TraitName>`
                replace_type_annotations(
                    ctx,
                    &enum_name,
                    trait_name,
                    TypeReplacement::BoxDyn,
                    &variant_names,
                )
            }
            EnumToTraitStrategy::Static => {
                // Replace `EnumName` with `impl TraitName` (falls back to Box<dyn> for fields)
                replace_type_annotations(
                    ctx,
                    &enum_name,
                    trait_name,
                    TypeReplacement::ImplTrait,
                    &variant_names,
                )
            }
            EnumToTraitStrategy::Generic => {
                // Replace `EnumName` with generic type parameter, add generics to containers
                replace_type_annotations(
                    ctx,
                    &enum_name,
                    trait_name,
                    TypeReplacement::Generic,
                    &variant_names,
                )
            }
            EnumToTraitStrategy::MarkerOnly => {
                // No type replacement - enum remains as the concrete type
                0
            }
        };
        changes += type_changes;

        // Step 6: Handle match expressions based on match_handling
        let match_changes = match self.match_handling {
            MatchHandling::WarnOnly => {
                // TODO: Emit warnings for match expressions that need manual migration
                // For now, just count them for reporting
                count_match_expressions(ctx, &enum_name)
            }
            MatchHandling::Downcast => {
                // TODO: Convert match to downcast-based dispatch
                // This requires adding Any bound to trait
                0
            }
            MatchHandling::BlockOnMatch => {
                // This should have been checked before execution
                // If we're here, there were no match expressions
                0
            }
        };
        // Note: match_changes is informational, not counted as changes

        // Step 7: Optionally remove the original enum and its inherent impl
        // MarkerOnly strategy: NEVER remove enum (types still reference it)
        // Other strategies: remove if remove_enum is true (skip if already removed in step 1.5)
        let should_remove = match self.strategy {
            EnumToTraitStrategy::MarkerOnly => false, // Never remove for MarkerOnly
            _ => self.remove_enum && !enum_removed_early,
        };
        if should_remove {
            ctx.remove_symbol(enum_id);
            changes += 1;

            // Also remove the enum's inherent impl block
            if let Some(impl_id) = enum_impl_id {
                ctx.remove_symbol(impl_id);
                changes += 1;
            }
        }

        let strategy_desc = match self.strategy {
            EnumToTraitStrategy::Dynamic => " with Box<dyn>",
            EnumToTraitStrategy::Static => " with impl Trait",
            EnumToTraitStrategy::Generic => " with generics",
            EnumToTraitStrategy::MarkerOnly => " (marker only)",
        };

        let match_warning = if match_changes > 0 {
            format!(
                " ({} match expression(s) need manual migration)",
                match_changes
            )
        } else {
            String::new()
        };

        // Track if enum was actually removed (either early or in step 7)
        let enum_actually_removed = enum_removed_early || should_remove;

        MutationResult {
            mutation_type: self.mutation_type().to_string(),
            changes,
            description: format!(
                "Converted enum '{}' to trait '{}' with {} variants{}{}{}",
                enum_name,
                trait_name,
                variant_names.len(),
                strategy_desc,
                if enum_actually_removed {
                    " (enum removed)"
                } else {
                    ""
                },
                match_warning
            ),
        }
    }
}

/// Type replacement strategy
enum TypeReplacement {
    /// Replace with `Box<dyn TraitName>`
    BoxDyn,
    /// Replace with `impl TraitName`
    ImplTrait,
    /// Replace with generic type parameter `T` (requires adding generics to container)
    Generic,
}

/// Replace type annotations in functions, structs, and impl blocks
fn replace_type_annotations(
    ctx: &mut ASTMutationContext,
    enum_name: &str,
    trait_name: &str,
    replacement: TypeReplacement,
    variant_names: &[String],
) -> usize {
    let mut changes = 0;

    // Collect all symbols to iterate
    let symbol_ids: Vec<_> = ctx.symbol_registry.iter().map(|(id, _)| id).collect();

    for symbol_id in symbol_ids {
        let item = match ctx.ast_registry.get(symbol_id) {
            Some(item) => item.clone(),
            None => continue,
        };

        let updated_item = match item {
            PureItem::Fn(mut f) => {
                let fn_changes =
                    replace_types_in_fn(&mut f, enum_name, trait_name, &replacement, variant_names);
                if fn_changes > 0 {
                    changes += fn_changes;
                    Some(PureItem::Fn(f))
                } else {
                    None
                }
            }
            PureItem::Struct(mut s) => {
                // For struct fields, impl Trait is not allowed in Rust
                // Fall back to Box<dyn Trait> for Static strategy (but keep Generic as-is)
                let field_replacement = match replacement {
                    TypeReplacement::ImplTrait => &TypeReplacement::BoxDyn,
                    _ => &replacement,
                };
                let struct_changes = replace_types_in_fields(
                    &mut s.fields,
                    enum_name,
                    trait_name,
                    field_replacement,
                );
                if struct_changes > 0 {
                    // For Generic strategy, add type parameter to struct
                    if matches!(replacement, TypeReplacement::Generic) {
                        add_generic_param(&mut s.generics, trait_name);
                    }
                    changes += struct_changes;
                    Some(PureItem::Struct(s))
                } else {
                    None
                }
            }
            PureItem::Impl(mut imp) => {
                let mut impl_changed = false;
                for item in &mut imp.items {
                    if let PureImplItem::Fn(ref mut f) = item {
                        if replace_types_in_fn(
                            f,
                            enum_name,
                            trait_name,
                            &replacement,
                            variant_names,
                        ) > 0
                        {
                            impl_changed = true;
                        }
                    }
                }
                if impl_changed {
                    changes += 1;
                    Some(PureItem::Impl(imp))
                } else {
                    None
                }
            }
            PureItem::Trait(mut t) => {
                let mut trait_changed = false;
                for item in &mut t.items {
                    if let PureTraitItem::Fn(ref mut f) = item {
                        if replace_types_in_fn(
                            f,
                            enum_name,
                            trait_name,
                            &replacement,
                            variant_names,
                        ) > 0
                        {
                            trait_changed = true;
                        }
                    }
                }
                if trait_changed {
                    changes += 1;
                    Some(PureItem::Trait(t))
                } else {
                    None
                }
            }
            _ => None,
        };

        if let Some(new_item) = updated_item {
            ctx.set_ast(symbol_id, new_item);
        }
    }

    changes
}

/// Replace types in a function signature
fn replace_types_in_fn(
    f: &mut PureFn,
    enum_name: &str,
    trait_name: &str,
    replacement: &TypeReplacement,
    variant_names: &[String],
) -> usize {
    let mut changes = 0;

    // Replace in parameters
    for param in &mut f.params {
        if let PureParam::Typed { ty, .. } = param {
            if replace_type(ty, enum_name, trait_name, replacement) {
                changes += 1;
            }
        }
    }

    // Replace in return type
    let mut ret_replaced = false;
    if let Some(ref mut ret) = f.ret {
        if replace_type(ret, enum_name, trait_name, replacement) {
            ret_replaced = true;
            changes += 1;
        }
    }

    // BoxDyn return-type rewrite changes the fn contract from `-> Enum` to
    // `-> Box<dyn Trait>`, but `replace_enum_usages` (which runs before this
    // pass) has already rewritten body constructions `Enum::Variant` →
    // `Variant` — a bare unit-struct value that no longer typechecks against
    // the boxed return type. Wrap variant constructions in return position
    // with `Box::new(...)` so the coercion to `Box<dyn Trait>` applies.
    if ret_replaced && matches!(replacement, TypeReplacement::BoxDyn) {
        changes += box_variant_returns(&mut f.body, variant_names);
    }

    // For Generic strategy, add type parameter if changes were made
    if changes > 0 && matches!(replacement, TypeReplacement::Generic) {
        add_generic_param(&mut f.generics, trait_name);
    }

    changes
}

/// Wrap variant-construction expressions in return position with `Box::new(...)`.
///
/// Covers two return positions:
/// 1. every `return <expr>` whose inner expr is a direct variant construction
/// 2. the body tail expression (implicit return)
///
/// A "direct variant construction" is a bare path (`Cold`), a tuple-variant
/// call (`Cold(x)`), or a struct-variant literal (`Cold { .. }`) whose name
/// matches one of the converted enum's variants (post-`replace_enum_usages`
/// spelling, i.e. without the `Enum::` prefix).
fn box_variant_returns(body: &mut PureBlock, variant_names: &[String]) -> usize {
    use ryo_mutations::basic::trait_ops::cross_crate_caller_pattern::walk_block_mut;

    let mut changes = 0;

    // `return <variant>` statements anywhere in the body
    walk_block_mut(body, &mut |expr| {
        if let PureExpr::Return(Some(inner)) = expr {
            if is_variant_construction(inner, variant_names) {
                wrap_in_box_new(inner);
                changes += 1;
            }
        }
    });

    // Tail expression (implicit return). A tail `return ...` was already
    // handled above and no longer matches `is_variant_construction`.
    if let Some(PureStmt::Expr(tail)) = body.stmts.last_mut() {
        if is_variant_construction(tail, variant_names) {
            wrap_in_box_new(tail);
            changes += 1;
        }
    }

    changes
}

/// Check if `expr` is a direct construction of one of `variant_names`.
fn is_variant_construction(expr: &PureExpr, variant_names: &[String]) -> bool {
    match expr {
        PureExpr::Path(p) => variant_names.iter().any(|v| v == p),
        PureExpr::Call { func, .. } => {
            matches!(&**func, PureExpr::Path(p) if variant_names.iter().any(|v| v == p))
        }
        PureExpr::Struct { path, .. } => variant_names.iter().any(|v| v == path),
        _ => false,
    }
}

/// Replace `expr` in place with `Box::new(<expr>)`.
fn wrap_in_box_new(expr: &mut PureExpr) {
    let inner = std::mem::replace(expr, PureExpr::Path(String::new()));
    *expr = PureExpr::Call {
        func: Box::new(PureExpr::Path("Box::new".to_string())),
        args: vec![inner],
    };
}

/// Replace types in struct fields
fn replace_types_in_fields(
    fields: &mut PureFields,
    enum_name: &str,
    trait_name: &str,
    replacement: &TypeReplacement,
) -> usize {
    let mut changes = 0;

    match fields {
        PureFields::Named(named_fields) => {
            for field in named_fields {
                if replace_type(&mut field.ty, enum_name, trait_name, replacement) {
                    changes += 1;
                }
            }
        }
        PureFields::Tuple(tuple_fields) => {
            for f in tuple_fields {
                if replace_type(&mut f.ty, enum_name, trait_name, replacement) {
                    changes += 1;
                }
            }
        }
        PureFields::Unit => {}
    }

    changes
}

/// Add generic type parameter `T: TraitName` to generics
fn add_generic_param(generics: &mut PureGenerics, trait_name: &str) {
    // Check if T already exists
    let has_t = generics
        .params
        .iter()
        .any(|p| matches!(p, PureGenericParam::Type { name, .. } if name == "T"));

    if !has_t {
        generics.params.push(PureGenericParam::Type {
            name: "T".to_string(),
            bounds: vec![trait_name.to_string()],
        });
    }
}

/// Replace a type if it matches the enum name
fn replace_type(
    ty: &mut PureType,
    enum_name: &str,
    trait_name: &str,
    replacement: &TypeReplacement,
) -> bool {
    match ty {
        PureType::Path(path) => {
            let type_name = path.split("::").last().unwrap_or(path);

            // Check for exact match (e.g., "Filter")
            if type_name == enum_name || path == enum_name {
                *ty = match replacement {
                    TypeReplacement::BoxDyn => PureType::Path(format!("Box<dyn {}>", trait_name)),
                    TypeReplacement::ImplTrait => PureType::ImplTrait(vec![trait_name.to_string()]),
                    TypeReplacement::Generic => {
                        // Use generic type parameter (caller adds generics to container)
                        PureType::Path("T".to_string())
                    }
                };
                return true;
            }

            // Check for generic types containing the enum (e.g., "Option<Filter>", "Vec<Filter>")
            // Replace enum name within generic arguments
            if path.contains('<') && path.contains(enum_name) {
                let replacement_str = match replacement {
                    TypeReplacement::BoxDyn => format!("Box<dyn {}>", trait_name),
                    TypeReplacement::ImplTrait => format!("impl {}", trait_name),
                    TypeReplacement::Generic => "T".to_string(),
                };

                // Simple replacement: replace "EnumName" with the replacement type
                // This handles cases like Option<Filter> -> Option<Box<dyn Filter>>
                let new_path = replace_type_in_generic_path(path, enum_name, &replacement_str);
                if new_path != *path {
                    *path = new_path;
                    return true;
                }
            }

            false
        }
        PureType::Ref { ty: inner, .. } => replace_type(inner, enum_name, trait_name, replacement),
        PureType::Tuple(types) => {
            let mut changed = false;
            for t in types {
                if replace_type(t, enum_name, trait_name, replacement) {
                    changed = true;
                }
            }
            changed
        }
        PureType::Array { ty: inner, .. } => {
            replace_type(inner, enum_name, trait_name, replacement)
        }
        PureType::Slice(inner) => replace_type(inner, enum_name, trait_name, replacement),
        PureType::Fn { params, ret } => {
            let mut changed = false;
            for p in params {
                if replace_type(p, enum_name, trait_name, replacement) {
                    changed = true;
                }
            }
            if let Some(ref mut r) = ret {
                if replace_type(r, enum_name, trait_name, replacement) {
                    changed = true;
                }
            }
            changed
        }
        _ => false,
    }
}

/// Replace enum type within a generic path string
/// e.g., "Option<Filter>" -> "Option<Box<dyn Filter>>"
fn replace_type_in_generic_path(path: &str, enum_name: &str, replacement: &str) -> String {
    // Find positions where enum_name appears as a type argument
    // We need to be careful to only replace complete type names, not substrings
    let mut result = String::new();
    let chars = path.chars().peekable();
    let mut current_word = String::new();

    for c in chars {
        if c.is_alphanumeric() || c == '_' {
            current_word.push(c);
        } else {
            // Check if current_word matches enum_name
            if current_word == enum_name {
                result.push_str(replacement);
            } else {
                result.push_str(&current_word);
            }
            current_word.clear();
            result.push(c);
        }
    }

    // Handle trailing word
    if current_word == enum_name {
        result.push_str(replacement);
    } else {
        result.push_str(&current_word);
    }

    result
}

/// Count match expressions on the enum (for warning purposes)
fn count_match_expressions(ctx: &ASTMutationContext, enum_name: &str) -> usize {
    let mut count = 0;

    let fn_ids: Vec<_> = ctx
        .symbol_registry
        .iter()
        .filter(|(id, _)| matches!(ctx.symbol_registry.kind(*id), Some(SymbolKind::Function)))
        .map(|(id, _)| id)
        .collect();

    for fn_id in fn_ids {
        if let Some(PureItem::Fn(func)) = ctx.ast_registry.get(fn_id) {
            count += count_matches_in_block(&func.body, enum_name);
        }
    }

    count
}

fn count_matches_in_block(block: &PureBlock, enum_name: &str) -> usize {
    let mut count = 0;
    for stmt in &block.stmts {
        count += count_matches_in_stmt(stmt, enum_name);
    }
    count
}

fn count_matches_in_stmt(stmt: &PureStmt, enum_name: &str) -> usize {
    match stmt {
        PureStmt::Local { init, .. } => {
            if let Some(expr) = init {
                count_matches_in_expr(expr, enum_name)
            } else {
                0
            }
        }
        PureStmt::Semi(expr) | PureStmt::Expr(expr) => count_matches_in_expr(expr, enum_name),
        PureStmt::Item(_) => 0,
        // Verbatim is opaque raw bytes — leaf for trait_ops (B-3-cont).
        PureStmt::Verbatim(_) => 0,
    }
}

fn count_matches_in_expr(expr: &PureExpr, enum_name: &str) -> usize {
    match expr {
        PureExpr::Match {
            expr: scrutinee,
            arms,
        } => {
            let mut count = count_matches_in_expr(scrutinee, enum_name);

            // Check if any arm pattern matches our enum
            for arm in arms {
                if pattern_references_enum(&arm.pattern, enum_name) {
                    count += 1;
                    break; // Count this match once
                }
            }

            // Recurse into arm bodies
            for arm in arms {
                count += count_matches_in_expr(&arm.body, enum_name);
            }
            count
        }
        PureExpr::If {
            cond,
            then_branch,
            else_branch,
        } => {
            let mut count = count_matches_in_expr(cond, enum_name);
            count += count_matches_in_block(then_branch, enum_name);
            if let Some(else_expr) = else_branch {
                count += count_matches_in_expr(else_expr, enum_name);
            }
            count
        }
        PureExpr::Block { block, .. } => count_matches_in_block(block, enum_name),
        PureExpr::Call { func, args, .. } => {
            let mut count = count_matches_in_expr(func, enum_name);
            for arg in args {
                count += count_matches_in_expr(arg, enum_name);
            }
            count
        }
        PureExpr::MethodCall { receiver, args, .. } => {
            let mut count = count_matches_in_expr(receiver, enum_name);
            for arg in args {
                count += count_matches_in_expr(arg, enum_name);
            }
            count
        }
        PureExpr::Closure { body, .. } => count_matches_in_expr(body, enum_name),
        PureExpr::Loop { body: block, .. } => count_matches_in_block(block, enum_name),
        PureExpr::While { cond, body, .. } => {
            count_matches_in_expr(cond, enum_name) + count_matches_in_block(body, enum_name)
        }
        PureExpr::For { expr, body, .. } => {
            count_matches_in_expr(expr, enum_name) + count_matches_in_block(body, enum_name)
        }
        _ => 0,
    }
}

fn pattern_references_enum(pattern: &PurePattern, enum_name: &str) -> bool {
    match pattern {
        PurePattern::Path(path) => path.starts_with(&format!("{}::", enum_name)),
        PurePattern::Struct { path, .. } => path.starts_with(&format!("{}::", enum_name)),
        PurePattern::Tuple(elements) | PurePattern::Slice(elements) => elements
            .iter()
            .any(|p| pattern_references_enum(p, enum_name)),
        PurePattern::Or(patterns) => patterns
            .iter()
            .any(|p| pattern_references_enum(p, enum_name)),
        PurePattern::Ref { pattern: inner, .. } => pattern_references_enum(inner, enum_name),
        _ => false,
    }
}

/// Replace all usages of EnumName::VariantName with VariantName in expressions
fn replace_enum_usages(
    ctx: &mut ASTMutationContext,
    enum_name: &str,
    variant_names: &[String],
) -> usize {
    let mut changes = 0;

    // Collect all function symbols to iterate
    let fn_ids: Vec<_> = ctx
        .symbol_registry
        .iter()
        .filter(|(id, _)| matches!(ctx.symbol_registry.kind(*id), Some(SymbolKind::Function)))
        .map(|(id, _)| id)
        .collect();

    for fn_id in fn_ids {
        if let Some(PureItem::Fn(mut func)) = ctx.ast_registry.get(fn_id).cloned() {
            let fn_changes = replace_in_block(&mut func.body, enum_name, variant_names);
            if fn_changes > 0 {
                ctx.set_ast(fn_id, PureItem::Fn(func));
                changes += fn_changes;
            }
        }
    }

    changes
}

fn replace_in_block(block: &mut PureBlock, enum_name: &str, variant_names: &[String]) -> usize {
    let mut changes = 0;
    for stmt in &mut block.stmts {
        changes += replace_in_stmt(stmt, enum_name, variant_names);
    }
    changes
}

fn replace_in_stmt(stmt: &mut PureStmt, enum_name: &str, variant_names: &[String]) -> usize {
    match stmt {
        PureStmt::Local { init, .. } => {
            if let Some(expr) = init {
                return replace_in_expr(expr, enum_name, variant_names);
            }
            0
        }
        PureStmt::Semi(expr) | PureStmt::Expr(expr) => {
            replace_in_expr(expr, enum_name, variant_names)
        }
        PureStmt::Item(_) => 0,
        // Verbatim is opaque raw bytes — leaf for trait_ops (B-3-cont).
        PureStmt::Verbatim(_) => 0,
    }
}

fn replace_in_expr(expr: &mut PureExpr, enum_name: &str, variant_names: &[String]) -> usize {
    match expr {
        // Check for path expressions like Status::Running
        PureExpr::Path(path) => {
            // Check if path matches EnumName::VariantName pattern
            if path.starts_with(&format!("{}::", enum_name)) {
                let variant_part = path.strip_prefix(&format!("{}::", enum_name));
                if let Some(variant) = variant_part {
                    if variant_names.contains(&variant.to_string()) {
                        // Replace EnumName::VariantName with VariantName
                        *path = variant.to_string();
                        return 1;
                    }
                }
            }
            0
        }

        // Recurse into compound expressions
        PureExpr::Call { func, args, .. } => {
            let mut changes = replace_in_expr(func, enum_name, variant_names);
            for arg in args {
                changes += replace_in_expr(arg, enum_name, variant_names);
            }
            changes
        }
        PureExpr::MethodCall { receiver, args, .. } => {
            let mut changes = replace_in_expr(receiver, enum_name, variant_names);
            for arg in args {
                changes += replace_in_expr(arg, enum_name, variant_names);
            }
            changes
        }
        PureExpr::Binary { left, right, .. } => {
            replace_in_expr(left, enum_name, variant_names)
                + replace_in_expr(right, enum_name, variant_names)
        }
        PureExpr::Unary { expr, .. } => replace_in_expr(expr, enum_name, variant_names),
        PureExpr::If {
            cond,
            then_branch,
            else_branch,
        } => {
            let mut changes = replace_in_expr(cond, enum_name, variant_names);
            changes += replace_in_block(then_branch, enum_name, variant_names);
            if let Some(else_expr) = else_branch {
                changes += replace_in_expr(else_expr, enum_name, variant_names);
            }
            changes
        }
        PureExpr::Match { expr, arms } => {
            let mut changes = replace_in_expr(expr, enum_name, variant_names);
            for arm in arms {
                // Replace in pattern (match arms may have Status::Running patterns)
                changes += replace_in_pattern(&mut arm.pattern, enum_name, variant_names);
                changes += replace_in_expr(&mut arm.body, enum_name, variant_names);
            }
            changes
        }
        PureExpr::Block { block, .. } => replace_in_block(block, enum_name, variant_names),
        PureExpr::Return(Some(v)) => replace_in_expr(v, enum_name, variant_names),
        PureExpr::Return(None) => 0,
        PureExpr::Struct { fields, .. } => {
            let mut changes = 0;
            for (_, field_expr) in fields {
                changes += replace_in_expr(field_expr, enum_name, variant_names);
            }
            changes
        }
        PureExpr::Tuple(elements) => {
            let mut changes = 0;
            for elem in elements {
                changes += replace_in_expr(elem, enum_name, variant_names);
            }
            changes
        }
        PureExpr::Array(elements) => {
            let mut changes = 0;
            for elem in elements {
                changes += replace_in_expr(elem, enum_name, variant_names);
            }
            changes
        }
        PureExpr::Index { expr, index, .. } => {
            replace_in_expr(expr, enum_name, variant_names)
                + replace_in_expr(index, enum_name, variant_names)
        }
        PureExpr::Field { expr, .. } => replace_in_expr(expr, enum_name, variant_names),
        PureExpr::Ref { expr, .. } => replace_in_expr(expr, enum_name, variant_names),
        PureExpr::Try(inner) => replace_in_expr(inner, enum_name, variant_names),
        PureExpr::Await(inner) => replace_in_expr(inner, enum_name, variant_names),
        PureExpr::Closure { body, .. } => replace_in_expr(body, enum_name, variant_names),
        PureExpr::Loop { body, .. } => replace_in_block(body, enum_name, variant_names),
        PureExpr::While { cond, body, .. } => {
            replace_in_expr(cond, enum_name, variant_names)
                + replace_in_block(body, enum_name, variant_names)
        }
        PureExpr::For { expr, body, .. } => {
            replace_in_expr(expr, enum_name, variant_names)
                + replace_in_block(body, enum_name, variant_names)
        }
        PureExpr::Let { expr, .. } => replace_in_expr(expr, enum_name, variant_names),
        PureExpr::Range { start, end, .. } => {
            let mut changes = 0;
            if let Some(s) = start {
                changes += replace_in_expr(s, enum_name, variant_names);
            }
            if let Some(e) = end {
                changes += replace_in_expr(e, enum_name, variant_names);
            }
            changes
        }
        PureExpr::Cast { expr, .. } => replace_in_expr(expr, enum_name, variant_names),
        // Literals, macros, and other expressions without sub-expressions
        _ => 0,
    }
}

use ryo_source::pure::PurePattern;

fn replace_in_pattern(
    pattern: &mut PurePattern,
    enum_name: &str,
    variant_names: &[String],
) -> usize {
    match pattern {
        // Struct pattern: `Status::Running { .. }` or `Status::Running`
        PurePattern::Struct { path, fields, .. } => {
            let mut changes = 0;
            if path.starts_with(&format!("{}::", enum_name)) {
                if let Some(variant) = path.strip_prefix(&format!("{}::", enum_name)) {
                    let base_variant = variant
                        .split(|c: char| !c.is_alphanumeric() && c != '_')
                        .next()
                        .unwrap_or(variant);
                    if variant_names.contains(&base_variant.to_string()) {
                        *path = variant.to_string();
                        changes += 1;
                    }
                }
            }
            // Recurse into field patterns
            for (_, field_pattern) in fields {
                changes += replace_in_pattern(field_pattern, enum_name, variant_names);
            }
            changes
        }
        // Tuple pattern: recurse into elements
        PurePattern::Tuple(elements) | PurePattern::Slice(elements) => {
            let mut changes = 0;
            for elem in elements {
                changes += replace_in_pattern(elem, enum_name, variant_names);
            }
            changes
        }
        // Path pattern: simple enum variant like `Status::Running`
        PurePattern::Path(path) => {
            if path.starts_with(&format!("{}::", enum_name)) {
                if let Some(variant) = path.strip_prefix(&format!("{}::", enum_name)) {
                    if variant_names.contains(&variant.to_string()) {
                        *path = variant.to_string();
                        return 1;
                    }
                }
            }
            0
        }
        // Reference pattern: recurse
        PurePattern::Ref { pattern: inner, .. } => {
            replace_in_pattern(inner, enum_name, variant_names)
        }
        // Or pattern: multiple alternatives
        PurePattern::Or(patterns) => {
            let mut changes = 0;
            for p in patterns {
                changes += replace_in_pattern(p, enum_name, variant_names);
            }
            changes
        }
        // Other patterns don't need replacement
        _ => 0,
    }
}

#[cfg(test)]
mod tests {
    use super::*;
    use crate::engine::ASTMutationEngine;
    use ryo_analysis::testing::ContextBuilder;

    #[test]
    fn test_v2_extract_trait() {
        let mut ctx = ContextBuilder::new()
            .with_file(
                "src/lib.rs",
                r#"
struct Foo {
    value: i32,
}

impl Foo {
    fn get_value(&self) -> i32 {
        self.value
    }

    fn set_value(&mut self, v: i32) {
        self.value = v;
    }

    fn helper(&self) {}
}
"#,
            )
            .build();

        // Find the inherent impl's SymbolId
        let impl_id = ctx
            .registry
            .iter()
            .find(|(id, _path)| {
                if !matches!(ctx.registry.kind(*id), Some(SymbolKind::Impl)) {
                    return false;
                }
                if let Some(PureItem::Impl(imp)) = ctx.ast_registry.get(*id) {
                    imp.trait_.is_none() && imp.self_ty == "Foo"
                } else {
                    false
                }
            })
            .map(|(id, _)| id)
            .expect("Should find impl Foo");

        let mutation = ExtractTraitMutation::new(impl_id, "ValueAccessor")
            .with_methods(vec!["get_value".to_string(), "set_value".to_string()]);
        let result = ASTMutationEngine::execute_ast_reg(&mutation, &mut ctx);

        println!("ExtractTrait result: {:?}", result.result);
        // Should create trait + trait impl + update inherent impl
        assert!(result.result.changes >= 2, "Expected at least 2 changes");
    }

    #[test]
    fn test_v2_inline_trait() {
        let mut ctx = ContextBuilder::new()
            .with_file(
                "src/lib.rs",
                r#"
struct Foo;

trait Greet {
    fn greet(&self) -> String;
}

impl Greet for Foo {
    fn greet(&self) -> String {
        "Hello".to_string()
    }
}
"#,
            )
            .build();

        // Find the trait's SymbolId
        let trait_id = ctx
            .registry
            .iter()
            .find(|(id, _path)| matches!(ctx.registry.kind(*id), Some(SymbolKind::Trait)))
            .map(|(id, _)| id)
            .expect("Should find trait Greet");

        let mutation = InlineTraitMutation::new(trait_id, "Foo");
        let result = ASTMutationEngine::execute_ast_reg(&mutation, &mut ctx);

        println!("InlineTrait result: {:?}", result.result);
        // Should move method to inherent impl + remove trait impl + remove trait
        assert!(result.result.changes >= 2, "Expected at least 2 changes");

        // Phase 2d false-positive gate: single-crate fixture has no
        // cross-crate callers, so the description must NOT carry the
        // `[cross-crate callers: ...]` footnote.
        assert!(
            !result.result.description.contains("cross-crate callers"),
            "single-crate inline must not emit cross-crate footnote; got: {}",
            result.result.description
        );
    }

    #[test]
    fn test_v2_inline_trait_keep_trait() {
        let mut ctx = ContextBuilder::new()
            .with_file(
                "src/lib.rs",
                r#"
struct Foo;

trait Greet {
    fn greet(&self) -> String;
}

impl Greet for Foo {
    fn greet(&self) -> String {
        "Hello".to_string()
    }
}
"#,
            )
            .build();

        // Find the trait's SymbolId
        let trait_id = ctx
            .registry
            .iter()
            .find(|(id, _path)| matches!(ctx.registry.kind(*id), Some(SymbolKind::Trait)))
            .map(|(id, _)| id)
            .expect("Should find trait Greet");

        let mutation = InlineTraitMutation::new(trait_id, "Foo").keep_trait();
        let result = ASTMutationEngine::execute_ast_reg(&mutation, &mut ctx);

        println!("InlineTrait (keep_trait) result: {:?}", result.result);
        // Should move method + remove trait impl, but keep trait definition
        assert!(result.result.changes >= 2, "Expected at least 2 changes");
    }

    #[test]
    fn test_v2_enum_to_trait_dynamic_strategy() {
        let mut ctx = ContextBuilder::new()
            .with_file(
                "src/lib.rs",
                r#"
enum Status {
    Running,
    Stopped,
}

fn process(status: Status) -> Status {
    status
}

struct Config {
    current_status: Status,
}
"#,
            )
            .build();

        // Find the enum symbol id
        let enum_id = ctx
            .registry
            .iter()
            .find(|(id, path)| {
                path.name() == "Status" && matches!(ctx.registry.kind(*id), Some(SymbolKind::Enum))
            })
            .map(|(id, _)| id)
            .expect("Enum 'Status' should exist");

        let mutation = EnumToTraitMutation::from_symbol_id(enum_id)
            .with_strategy(EnumToTraitStrategy::Dynamic);
        let result = ASTMutationEngine::execute_ast_reg(&mutation, &mut ctx);

        println!("EnumToTrait (Dynamic) result: {:?}", result.result);
        // Should create: trait, 2 structs, 2 impls, type replacements, enum removal
        assert!(result.result.changes >= 5, "Expected at least 5 changes");
        assert!(
            result.result.description.contains("Box<dyn>"),
            "Should mention Box<dyn> strategy"
        );
    }

    #[test]
    fn test_v2_enum_to_trait_static_strategy() {
        let mut ctx = ContextBuilder::new()
            .with_file(
                "src/lib.rs",
                r#"
enum Filter {
    Active,
    Inactive,
}

fn apply_filter(filter: Filter) {
    let _ = filter;
}
"#,
            )
            .build();

        // Find the enum symbol id
        let enum_id = ctx
            .registry
            .iter()
            .find(|(id, path)| {
                path.name() == "Filter" && matches!(ctx.registry.kind(*id), Some(SymbolKind::Enum))
            })
            .map(|(id, _)| id)
            .expect("Enum 'Filter' should exist");

        let mutation =
            EnumToTraitMutation::from_symbol_id(enum_id).with_strategy(EnumToTraitStrategy::Static);
        let result = ASTMutationEngine::execute_ast_reg(&mutation, &mut ctx);

        println!("EnumToTrait (Static) result: {:?}", result.result);
        // Should create: trait, 2 structs, 2 impls, type replacements, enum removal
        assert!(result.result.changes >= 5, "Expected at least 5 changes");
        assert!(
            result.result.description.contains("impl Trait"),
            "Should mention impl Trait strategy"
        );
    }

    #[test]
    fn test_v2_enum_to_trait_marker_only_strategy() {
        let mut ctx = ContextBuilder::new()
            .with_file(
                "src/lib.rs",
                r#"
enum Mode {
    Fast,
    Slow,
}

fn get_mode() -> Mode {
    Mode::Fast
}
"#,
            )
            .build();

        // Find the enum symbol id
        let enum_id = ctx
            .registry
            .iter()
            .find(|(id, path)| {
                path.name() == "Mode" && matches!(ctx.registry.kind(*id), Some(SymbolKind::Enum))
            })
            .map(|(id, _)| id)
            .expect("Enum 'Mode' should exist");

        let mutation = EnumToTraitMutation::from_symbol_id(enum_id)
            .with_strategy(EnumToTraitStrategy::MarkerOnly);
        let result = ASTMutationEngine::execute_ast_reg(&mutation, &mut ctx);

        println!("EnumToTrait (MarkerOnly) result: {:?}", result.result);
        // Should create: trait, 2 structs, 2 impls, enum removal
        // But no type replacements
        assert!(result.result.changes >= 5, "Expected at least 5 changes");
        assert!(
            result.result.description.contains("marker only"),
            "Should mention marker only strategy"
        );
    }

    #[test]
    fn test_v2_enum_to_trait_generic_strategy() {
        let mut ctx = ContextBuilder::new()
            .with_file(
                "src/lib.rs",
                r#"
enum Status {
    Running,
    Stopped,
}

fn process(status: Status) -> Status {
    status
}

struct Config {
    current_status: Status,
}
"#,
            )
            .build();

        // Find the enum symbol id
        let enum_id = ctx
            .registry
            .iter()
            .find(|(id, path)| {
                path.name() == "Status" && matches!(ctx.registry.kind(*id), Some(SymbolKind::Enum))
            })
            .map(|(id, _)| id)
            .expect("Enum 'Status' should exist");

        let mutation = EnumToTraitMutation::from_symbol_id(enum_id)
            .with_strategy(EnumToTraitStrategy::Generic);
        let result = ASTMutationEngine::execute_ast_reg(&mutation, &mut ctx);

        println!("EnumToTrait (Generic) result: {:?}", result.result);
        // Should create: trait, 2 structs, 2 impls, type replacements with generics, enum removal
        assert!(result.result.changes >= 5, "Expected at least 5 changes");
        assert!(
            result.result.description.contains("generics"),
            "Should mention generics strategy"
        );
    }

    /// RL070 sweep Case06 regression: variant trait impls must be
    /// registered (and survive into the registry) when the enum has an
    /// inherent impl with instance methods. Origin: `parent_path.child(
    /// "<impl X for Y>")` was rejected by `Segment::new` validation and
    /// silently skipped via `Err(_) => continue`, so the converted code
    /// failed with "the trait bound `Variant: Trait` is not satisfied"
    /// at any `Box::new(variant)` coercion site.
    #[test]
    fn test_v2_enum_to_trait_registers_variant_trait_impls() {
        let mut ctx = ContextBuilder::new()
            .with_file(
                "src/lib.rs",
                r#"
enum Status {
    Idle,
    Running,
    Stopped,
    Failed,
}

impl Status {
    fn code(&self) -> u8 {
        0
    }
}

fn make() -> Status {
    Status::Idle
}
"#,
            )
            .build();

        let enum_id = ctx
            .registry
            .iter()
            .find(|(id, path)| {
                path.name() == "Status" && matches!(ctx.registry.kind(*id), Some(SymbolKind::Enum))
            })
            .map(|(id, _)| id)
            .expect("Enum 'Status' should exist");

        let mutation = EnumToTraitMutation::from_symbol_id(enum_id)
            .with_strategy(EnumToTraitStrategy::Dynamic);
        let result = ASTMutationEngine::execute_ast_reg(&mutation, &mut ctx);
        println!(
            "EnumToTrait (Dynamic, with impl) result: {:?}",
            result.result
        );

        // Dump the post-mutation registry for observation
        let mut impl_paths: Vec<String> = Vec::new();
        for (id, path) in ctx.registry.iter() {
            if matches!(ctx.registry.kind(id), Some(SymbolKind::Impl)) {
                impl_paths.push(path.to_string());
            }
        }
        println!("post-mutation Impl symbols: {:?}", impl_paths);

        for variant in ["Idle", "Running", "Stopped", "Failed"] {
            let expected = format!("<impl Status for {}>", variant);
            assert!(
                impl_paths.iter().any(|p| p.contains(&expected)),
                "missing variant trait impl symbol: {} (got {:?})",
                expected,
                impl_paths
            );
        }
    }
}