Refactor Plan

Create a detailed plan for this refactoring task.

Refactor Goal

{{refactor_description}}

Instructions

1. Search the codebase to understand current state
2. Identify all affected files and their dependencies
3. Plan changes in a safe sequence (types first, then implementations, then tests)
4. Include verification steps between changes
5. Consider rollback if something fails

Output Format