refactor: move preset command handlers to presets/_commands.py (PR-6/8) by darion-yaphet · Pull Request #2826 · github/spec-kit

darion-yaphet · 2026-06-03T02:54:27Z

Summary

PR-6 of the __init__.py split (continues PR-5's integration co-location). Moves the preset command group out of src/specify_cli/__init__.py into a co-located presets/_commands.py, trimming __init__.py toward a thin registration layer.

Two commits:

presets.py → presets/ package — pure structural move so command handlers can live beside the preset domain logic (mirrors integrations/). presets.py becomes presets/__init__.py; package-relative imports rebased one level deeper. Public import surface (from specify_cli.presets import ...) unchanged.
Move handlers to presets/_commands.py — the preset_app / preset_catalog_app Typer groups and all 12 handlers (list, add, remove, search, resolve, info, set-priority, enable, disable, catalog list/add/remove) move out; __init__.py registers them via _register_preset_cmds(app).

__init__.py drops ~620 lines in the preset region.

Design notes

Handlers lazy-import root helpers (_require_specify_project, get_speckit_version, _locate_bundled_preset, _display_project_path) via from .. import inside each function, so test monkeypatching of specify_cli.<helper> keeps working — same pattern PR-5 used.
_locate_bundled_preset kept as an explicit re-export in __init__.py for that resolution path.

Test plan

python -c "import specify_cli" — OK
specify preset --help — full command surface intact
uvx ruff check src/ — All checks passed
Full suite: 3344 passed, 40 skipped
No patch-path updates needed (lazy imports preserve monkeypatch targets)

Copilot

Pull request overview

Refactors the CLI by moving the specify preset ... Typer command groups and handlers out of src/specify_cli/__init__.py into a co-located src/specify_cli/presets/_commands.py, continuing the effort to slim __init__.py into a thin registration layer while keeping the public specify_cli.presets import surface stable.

Changes:

Introduces presets/_commands.py containing the preset / preset catalog Typer apps and all associated handlers, plus a register(app) entry point.
Repackages presets.py into the presets/ package and rebases internal imports accordingly.
Updates specify_cli/__init__.py to register preset commands via presets._commands.register() and keeps _locate_bundled_preset re-exported.

Show a summary per file

File	Description
src/specify_cli/presets/_commands.py	New home for preset CLI Typer apps + command handlers, plus `register(app)` wiring.
src/specify_cli/presets/init.py	Rebased imports to account for `presets/` becoming a package.
src/specify_cli/init.py	Removes inlined preset command handlers and registers them via `presets/_commands.py`.

Copilot's findings

Tip

Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Files reviewed: 3/3 changed files
Comments generated: 4

Copilot

Copilot's findings

Files reviewed: 4/4 changed files
Comments generated: 0 new

Copilot

Copilot's findings

Files reviewed: 4/4 changed files
Comments generated: 2

Copilot

Copilot's findings

Files reviewed: 4/4 changed files
Comments generated: 2

Copilot

Copilot's findings

Files reviewed: 6/7 changed files
Comments generated: 0 new

mnriem

Please pull in upstream/main and resolve conflicts

darion-yaphet · 2026-06-10T04:02:12Z

Scope change: the URL-hardening commits previously on this branch have been extracted to #2911 so they can be reviewed and merged independently. This PR is now back to a pure code-move (2 commits).

While splitting, we found the moved copy of preset_add in presets/_commands.py was stale — it predated the GitHub release-asset resolution (resolve_github_release_asset_api_url + Accept: application/octet-stream header) that landed on main, so merging the old branch state would have silently reverted that behavior. The move commit has been amended so _commands.py now matches main's __init__.py line-for-line (only import paths differ). Full suite: 3711 passed, 45 skipped.

Suggested merge order: #2911 first, then this PR rebased on top.

mnriem · 2026-06-10T14:21:43Z

Setting to draft so it does NOT get merged before PR #2911

Pure structural move to mirror integrations/. presets.py becomes presets/__init__.py with relative imports rebased one level deeper. No behavior change; public import surface (from .presets import ...) preserved. Prepares for co-locating preset command handlers in PR-6/8.

Cut the preset_app / preset_catalog_app Typer groups and all 12 command handlers out of __init__.py into presets/_commands.py, exposing register(app) — mirrors the integration co-location from PR-5. __init__.py now registers via _register_preset_cmds(app), dropping ~620 lines (3282 -> 2663). Handlers lazy-import root helpers (_require_specify_project, get_speckit_version, _locate_bundled_preset, _display_project_path) via 'from .. import' so test monkeypatching of specify_cli.<helper> keeps working. _locate_bundled_preset kept as an explicit re-export in __init__.py for that resolution path. CLI surface and public imports unchanged. Full suite: 3162 passed, 40 skipped.

Copilot

✅ Ready to approve

The change is a straightforward refactor with consistent registration wiring and corresponding test updates, without introducing behavioral changes in the moved handlers.

Note: this review does not count toward required approvals for merging.

Copilot's findings

Files reviewed: 4/4 changed files
Comments generated: 0 new

Note

Your feedback helps us improve the quality of this feature.
Please use 👍 or 👎 to tell us whether this assessment is correct.

…ack (#3086) (#3091) * fix(presets): use _repo_root() for bundled-core source-checkout fallback The tier-5 fallback in PresetResolver.resolve() and _find_bundled_core() computed the repo root as Path(__file__).parent.parent.parent. After presets.py was moved to presets/__init__.py (#2826) that chain is one level short, resolving to src/ and looking for src/templates/commands/<cmd>.md, which never exists. As a result, wrap-strategy presets found no core base layer in source/editable installs. Use the shared _repo_root() helper so both fallbacks resolve against the actual repo-root templates/ tree. Wheel installs were unaffected (core_pack path), so this only impacts source/editable checkouts. Refs #3086 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * test(presets): restore dropped def for oserror-manifest test A prior edit accidentally removed the def test_resolve_extension_command_via_manifest_skips_oserror_manifests line, orphaning its body inside the new bundled-core test. Restore the test definition so pytest collects it again. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * test(presets): move bundled-core tests into TestPresetResolver The two tier-5 fallback regression tests exercise collect_all_layers() and resolve(), not resolve_core(), so they belong in TestPresetResolver rather than TestResolveCore. Relocate them for clearer suite navigation. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

darion-yaphet requested a review from mnriem as a code owner June 3, 2026 02:54

mnriem requested a review from Copilot June 3, 2026 13:55

Copilot started reviewing on behalf of mnriem June 3, 2026 13:55 View session

Copilot AI reviewed Jun 3, 2026

View reviewed changes

Comment thread src/specify_cli/presets/_commands.py Outdated

Comment thread src/specify_cli/presets/_commands.py Outdated

Comment thread src/specify_cli/presets/_commands.py Outdated

Comment thread src/specify_cli/presets/_commands.py Outdated

darion-yaphet force-pushed the refactor/split-init-pr6 branch from 35a36e1 to 566974e Compare June 3, 2026 16:10

mnriem requested a review from Copilot June 3, 2026 19:52

Copilot started reviewing on behalf of mnriem June 3, 2026 19:52 View session

Copilot AI reviewed Jun 3, 2026

View reviewed changes

darion-yaphet force-pushed the refactor/split-init-pr6 branch from 566974e to 844e316 Compare June 5, 2026 17:20

mnriem requested a review from Copilot June 8, 2026 14:57

Copilot started reviewing on behalf of mnriem June 8, 2026 14:57 View session

Copilot AI reviewed Jun 8, 2026

View reviewed changes

Comment thread src/specify_cli/presets/_commands.py

Comment thread src/specify_cli/presets/_commands.py

darion-yaphet force-pushed the refactor/split-init-pr6 branch 2 times, most recently from 844e316 to 74629bc Compare June 8, 2026 16:27

mnriem requested a review from Copilot June 9, 2026 12:41

Copilot started reviewing on behalf of mnriem June 9, 2026 12:42 View session

Copilot AI reviewed Jun 9, 2026

View reviewed changes

Comment thread src/specify_cli/presets/_commands.py

Comment thread src/specify_cli/presets/_commands.py Outdated

darion-yaphet force-pushed the refactor/split-init-pr6 branch from 74629bc to 0387473 Compare June 9, 2026 13:24

mnriem requested a review from Copilot June 9, 2026 19:42

Copilot started reviewing on behalf of mnriem June 9, 2026 19:42 View session

Copilot AI reviewed Jun 9, 2026

View reviewed changes

mnriem requested changes Jun 9, 2026

View reviewed changes

darion-yaphet force-pushed the refactor/split-init-pr6 branch from 7d8d62c to 5574970 Compare June 10, 2026 02:39

darion-yaphet mentioned this pull request Jun 10, 2026

fix(presets): harden preset URL installs against unsafe redirects #2911

Merged

2 tasks

darion-yaphet force-pushed the refactor/split-init-pr6 branch from 5574970 to ce3d46d Compare June 10, 2026 04:02

mnriem marked this pull request as draft June 10, 2026 14:21

darion-yaphet marked this pull request as ready for review June 10, 2026 15:47

darion-yaphet marked this pull request as draft June 10, 2026 15:48

darion-yaphet added 2 commits June 11, 2026 21:30

darion-yaphet force-pushed the refactor/split-init-pr6 branch from ce3d46d to 4381b82 Compare June 11, 2026 13:44

darion-yaphet marked this pull request as ready for review June 11, 2026 14:24

mnriem requested a review from Copilot June 16, 2026 11:49

Copilot started reviewing on behalf of mnriem June 16, 2026 11:49 View session

Copilot AI approved these changes Jun 16, 2026

View reviewed changes

mnriem self-requested a review June 16, 2026 19:46

mnriem approved these changes Jun 16, 2026

View reviewed changes

mnriem merged commit f20e8ee into github:main Jun 16, 2026
11 checks passed

fuleinist mentioned this pull request Jun 22, 2026

feat(workflows): add --dry-run flag to specify workflow run #2704

Closed

Uh oh!

Conversation

darion-yaphet commented Jun 3, 2026

Summary

Design notes

Test plan

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Copilot's findings

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Copilot's findings

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Copilot's findings

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Copilot's findings

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Copilot's findings

Uh oh!

mnriem left a comment

Choose a reason for hiding this comment

Uh oh!

darion-yaphet commented Jun 10, 2026

Uh oh!

mnriem commented Jun 10, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

✅ Ready to approve

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants