@@ -1033,6 +1033,32 @@ def test_resolve_skips_hidden_extension_dirs(self, project_dir):
10331033 result = resolver .resolve ("hidden-template" )
10341034 assert result is None
10351035
1036+ def test_collect_all_layers_finds_bundled_core_without_specify_commands (
1037+ self , project_dir
1038+ ):
1039+ """Tier-5 fallback locates the bundled core command when
1040+ .specify/templates/commands/ has no matching file.
1041+
1042+ Regression test for #3086: a stale ``.parent`` chain made the
1043+ source-checkout fallback resolve to ``src/templates/...`` (which does
1044+ not exist), so ``wrap`` presets found no base layer. The fallback must
1045+ resolve against the real repo-root ``templates/commands`` tree.
1046+ """
1047+ # project_dir's commands dir is empty, so tier-4 cannot satisfy this.
1048+ resolver = PresetResolver (project_dir )
1049+ layers = resolver .collect_all_layers ("speckit.implement" , "command" )
1050+ assert layers , "expected a bundled core base layer to be found"
1051+ assert layers [- 1 ]["source" ] == "core (bundled)"
1052+ assert layers [- 1 ]["path" ].parts [- 2 :] == ("commands" , "implement.md" )
1053+
1054+ def test_resolve_command_falls_back_to_bundled_core (self , project_dir ):
1055+ """resolve() tier-5 returns the bundled core command when
1056+ .specify/templates/commands/ lacks it (regression for #3086)."""
1057+ resolver = PresetResolver (project_dir )
1058+ result = resolver .resolve ("speckit.implement" , "command" )
1059+ assert result is not None
1060+ assert result .parts [- 2 :] == ("commands" , "implement.md" )
1061+
10361062
10371063class TestResolveCore :
10381064 """Test PresetResolver.resolve_core() skips the installed-presets tier."""
@@ -1094,32 +1120,6 @@ def test_resolve_core_returns_none_when_nothing_found(self, project_dir):
10941120 result = resolver .resolve_core ("nonexistent" , "command" )
10951121 assert result is None
10961122
1097- def test_collect_all_layers_finds_bundled_core_without_specify_commands (
1098- self , project_dir
1099- ):
1100- """Tier-5 fallback locates the bundled core command when
1101- .specify/templates/commands/ has no matching file.
1102-
1103- Regression test for #3086: a stale ``.parent`` chain made the
1104- source-checkout fallback resolve to ``src/templates/...`` (which does
1105- not exist), so ``wrap`` presets found no base layer. The fallback must
1106- resolve against the real repo-root ``templates/commands`` tree.
1107- """
1108- # project_dir's commands dir is empty, so tier-4 cannot satisfy this.
1109- resolver = PresetResolver (project_dir )
1110- layers = resolver .collect_all_layers ("speckit.implement" , "command" )
1111- assert layers , "expected a bundled core base layer to be found"
1112- assert layers [- 1 ]["source" ] == "core (bundled)"
1113- assert layers [- 1 ]["path" ].parts [- 2 :] == ("commands" , "implement.md" )
1114-
1115- def test_resolve_command_falls_back_to_bundled_core (self , project_dir ):
1116- """resolve() tier-5 returns the bundled core command when
1117- .specify/templates/commands/ lacks it (regression for #3086)."""
1118- resolver = PresetResolver (project_dir )
1119- result = resolver .resolve ("speckit.implement" , "command" )
1120- assert result is not None
1121- assert result .parts [- 2 :] == ("commands" , "implement.md" )
1122-
11231123 def test_resolve_extension_command_via_manifest_skips_oserror_manifests (self , project_dir ):
11241124 """resolve_extension_command_via_manifest skips extensions whose manifest raises OSError."""
11251125 import unittest .mock as mock
0 commit comments