github/github-spec-kit
1
0
Fork 0
mirror of https://github.com/github/spec-kit.git synced 2026-08-03 06:26:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(extensions): resolve core-command dirs via _assets helpers (#3274) (#3287)

Browse Source 
`_load_core_command_names()` computed its candidate command dirs with
bespoke `Path(__file__)` arithmetic. The #3014 move of this module from
`specify_cli/extensions.py` to `specify_cli/extensions/__init__.py`
pushed the file one directory deeper but left the `.parent` counts
unchanged, so both candidates resolved to non-existent paths:

  wheel  -> specify_cli/extensions/core_pack/commands (real: specify_cli/core_pack/commands)
  source -> src/templates/commands                    (real: repo-root templates/commands)

Neither exists, so every call silently fell through to
`_FALLBACK_CORE_COMMAND_NAMES`. Discovery is latent-dead: the fallback
happens to equal the real stems today, but the shadowing guard (#1994)
that depends on it now relies on someone hand-editing the fallback on
every core-command add/remove (as already happened for `converge`, #3001).

Delegate path resolution to the canonical `_locate_core_pack` /
`_repo_root` resolvers in `_assets` — the same ones the presets and
bundle loaders use. They are anchored to the package root, so discovery
survives future module moves.

Add regression tests that point the resolvers at a temp tree with
*different* command names, proving discovery reads from disk rather than
returning the fallback (they fail on the pre-fix code).

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Noor ul ain
2026-07-01 23:53:39 +05:00
committed by GitHub
parent 1849543611
commit f59fd81608
2 changed files with 85 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/specify_cli/extensions/__init__.py
View File

@@ -26,6 +26,7 @@ import yaml
from packaging import version as pkg_version
from packaging.specifiers import InvalidSpecifier, SpecifierSet
from .._assets import _locate_core_pack, _repo_root
from .._init_options import is_ai_skills_enabled
from .._invocation_style import is_dollar_skills_agent, is_slash_skills_agent
from .._utils import dump_frontmatter, relative_extension_path_violation, version_satisfies
@@ -62,14 +63,28 @@ def _load_core_command_names() -> frozenset[str]:
Prefer the wheel-time ``core_pack`` bundle when present, and fall back to
the source checkout when running from the repository. If neither is
available, use the baked-in fallback set so validation still works.
Path resolution is delegated to the canonical ``_assets`` resolvers
(``_locate_core_pack`` / ``_repo_root``) — the same ones the presets and
bundle loaders use — rather than bespoke ``Path(__file__)`` arithmetic.
Hand-counted ``.parent`` chains silently broke discovery once already: the
#3014 move of this module from ``specify_cli/extensions.py`` to
``specify_cli/extensions/__init__.py`` pushed the file one directory deeper
without updating the counts, so both candidates resolved to non-existent
paths and every call fell through to the fallback (#3274). The shared
resolvers are anchored to the package root, so discovery survives future
module moves.
"""
core_pack = _locate_core_pack()
candidate_dirs = [
Path(__file__).parent / "core_pack" / "commands",
Path(__file__).resolve().parent.parent.parent / "templates" / "commands",
# Wheel install: force-include maps templates/commands → core_pack/commands.
core_pack / "commands" if core_pack is not None else None,
# Source checkout / editable install: repo-root templates/commands.
_repo_root() / "templates" / "commands",
]
for commands_dir in candidate_dirs:
if not commands_dir.is_dir():
if commands_dir is None or not commands_dir.is_dir():
continue
command_names = {