Refactor monolithic create command into clean subpackage architecture with specialized modules #573
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
Author
|
Warning This pull request is not mergeable via GitHub because a downstack PR is open. Once all requirements are satisfied, merge this PR as a stack on Graphite.
This stack of pull requests is managed by Graphite. Learn more about stacking. |
… with specialized modules Decompose the 732-line create.py into a 1,589-line subpackage with 12 focused modules that each handle specific responsibilities. This refactoring improves maintainability, testability, and code clarity while preserving all existing functionality. ## Architecture ### New Module Organization - **types.py** - Centralized data structures (CreationRequest, CreationResult, variants) - **validation.py** - All input validation and option conflict checking - **orchestrator.py** - CLI entry point that parses arguments and dispatches to variants - **worktree_ops.py** - Git worktree creation and branch management - **output.py** - Result formatting (JSON, shell scripts, human-readable) - **post_creation.py** - .env file generation and post-create command execution - **variants/** - Five specialized handlers for different creation modes: - `regular.py` - Standard worktree with optional branch creation - `from_current_branch.py` - Move current branch to new worktree - `from_branch.py` - Create worktree from existing branch - `plan.py` - Create from plan file with .plan/ folder setup - `with_dot_plan.py` - Copy .plan/ folder from source workstack ### Key Design Improvements 1. **Data-Driven Flow** - CreationRequest struct eliminates parameter passing through deep call stacks 2. **Single Responsibility** - Each module handles one concern (validation, output, branch ops, etc.) 3. **Variant Dispatch** - Clear separation of creation modes enables independent testing and enhancement 4. **Strong Typing** - Frozen dataclasses provide compile-time safety and clarity 5. **Error Boundaries** - Validation concentrated early before complex operations ## Files Changed ### Added (13 files) - `create/__init__.py` - Package exports - `create/types.py` - Data structures - `create/orchestrator.py` - CLI orchestration - `create/validation.py` - Input validation - `create/worktree_ops.py` - Git operations - `create/output.py` - Output formatting - `create/post_creation.py` - Post-create handling - `create/variants/__init__.py` - Variants package - `create/variants/regular.py` - Regular creation - `create/variants/from_current_branch.py` - Move branch - `create/variants/from_branch.py` - From existing branch - `create/variants/plan.py` - Plan file creation - `create/variants/with_dot_plan.py` - .plan/ folder copying ### Deleted (1 file) - `create.py` - Original monolithic command ### Modified (10 files) - `jump.py`, `rename.py` - Import path updates - `.github/workflows/*` - Git attribute normalization - `kit.yaml` - Devrun hook updates - Test fixtures - JSON formatting ## Critical Notes - All functionality preserved - existing CLI behavior unchanged - No breaking changes to command-line interface - Easier to test individual creation variants independently - Future enhancements (new --flag options) can now be handled with minimal coupling
schrockn
force-pushed
the
add-with-dot-flag-to-workstack-25-11-16
branch
from
8011e11 to
6ab9122
Compare
schrockn
force-pushed
the
refactor-create-function-25-11-16
branch
from
5728497 to
6582bd3
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Decompose the 732-line create.py into a 1,589-line subpackage with 12 focused modules that each handle specific responsibilities. This refactoring improves maintainability, testability, and code clarity while preserving all existing functionality.
Architecture
New Module Organization
regular.py- Standard worktree with optional branch creationfrom_current_branch.py- Move current branch to new worktreefrom_branch.py- Create worktree from existing branchplan.py- Create from plan file with .plan/ folder setupwith_dot_plan.py- Copy .plan/ folder from source workstackKey Design Improvements
Files Changed
Added (13 files)
create/__init__.py- Package exportscreate/types.py- Data structurescreate/orchestrator.py- CLI orchestrationcreate/validation.py- Input validationcreate/worktree_ops.py- Git operationscreate/output.py- Output formattingcreate/post_creation.py- Post-create handlingcreate/variants/__init__.py- Variants packagecreate/variants/regular.py- Regular creationcreate/variants/from_current_branch.py- Move branchcreate/variants/from_branch.py- From existing branchcreate/variants/plan.py- Plan file creationcreate/variants/with_dot_plan.py- .plan/ folder copyingDeleted (1 file)
create.py- Original monolithic commandModified (10 files)
jump.py,rename.py- Import path updates.github/workflows/*- Git attribute normalizationkit.yaml- Devrun hook updatesCritical Notes