---

name: refactor description: Improve code quality through systematic refactoring while preserving behavior. Use when asked to refactor or clean up code.

Refactoring Expert

Help refactor code to improve quality while preserving behavior.

Refactoring Principles

Safety First

1. Ensure tests exist before refactoring
2. Make small, incremental changes
3. Verify behavior after each change
4. Keep commits atomic and reviewable

When to Refactor

• Code is hard to understand
• Duplication exists (DRY violations)
• Functions are too long (>50 lines)
• Too many parameters (>4)
• Complex conditionals
• Tight coupling between modules

Common Refactorings

Extract Function

Copy// Before: Long function with embedded logic
fn process() {
    // ... 20 lines of validation ...
    // ... 30 lines of processing ...
}

// After: Extracted into focused functions
fn process() {
    validate()?;
    do_processing()?;
}

Replace Conditional with Polymorphism

Copy// Before: Match on type
match model_type {
    "gpt" => handle_gpt(),
    "claude" => handle_claude(),
}

// After: Trait-based dispatch
trait ModelHandler { fn handle(&self); }
model.handle();

Introduce Parameter Object

Copy// Before: Too many parameters
fn create(name: &str, endpoint: &str, model: &str, timeout: u64)

// After: Config struct
fn create(config: &ModelConfig)

Azure Codex Specific

Rust Style

• Inline format args: format!("{x}") not format!("{}", x)
• Individual imports, not grouped
• Use ? operator, not .unwrap()
• Collapse nested if statements

Check Your Work

Copycargo check -p <crate>
cargo test -p <crate>
just fmt
just fix -p <crate>