@@ -3746,6 +3746,85 @@ def test_extension_skill_restored_on_preset_remove(self, project_dir, temp_dir):
37463746 assert "Read agents/control" not in content
37473747 assert "# Fakeext Cmd Skill" in content
37483748
3749+ def test_skill_composed_over_extension_base_rewrites_subdir_paths (
3750+ self , project_dir , temp_dir
3751+ ):
3752+ """When a preset composes (append) over an extension-provided base
3753+ command, the resulting skill (read from the .composed output) must
3754+ still resolve the extension's own subdir references (#2101), not
3755+ just when the extension wins outright (replace)."""
3756+ self ._write_init_options (project_dir , ai = "codex" )
3757+ skills_dir = project_dir / ".agents" / "skills"
3758+ self ._create_skill (skills_dir , "speckit-fakeext-cmd" , body = "original extension skill" )
3759+
3760+ extension_dir = project_dir / ".specify" / "extensions" / "fakeext"
3761+ (extension_dir / "commands" ).mkdir (parents = True , exist_ok = True )
3762+ (extension_dir / "agents" / "control" ).mkdir (parents = True , exist_ok = True )
3763+ (extension_dir / "agents" / "control" / "commander.md" ).write_text ("# Commander\n " )
3764+ (extension_dir / "commands" / "cmd.md" ).write_text (
3765+ "---\n description: Extension fakeext cmd\n ---\n \n "
3766+ "Read agents/control/commander.md for context.\n "
3767+ )
3768+ extension_manifest = {
3769+ "schema_version" : "1.0" ,
3770+ "extension" : {
3771+ "id" : "fakeext" ,
3772+ "name" : "Fake Extension" ,
3773+ "version" : "1.0.0" ,
3774+ "description" : "Test" ,
3775+ },
3776+ "requires" : {"speckit_version" : ">=0.1.0" },
3777+ "provides" : {
3778+ "commands" : [
3779+ {
3780+ "name" : "speckit.fakeext.cmd" ,
3781+ "file" : "commands/cmd.md" ,
3782+ "description" : "Fake extension command" ,
3783+ }
3784+ ]
3785+ },
3786+ }
3787+ with open (extension_dir / "extension.yml" , "w" ) as f :
3788+ yaml .dump (extension_manifest , f )
3789+
3790+ preset_dir = temp_dir / "ext-base-append-skill"
3791+ preset_dir .mkdir ()
3792+ (preset_dir / "commands" ).mkdir ()
3793+ (preset_dir / "commands" / "speckit.fakeext.cmd.md" ).write_text (
3794+ "---\n description: Preset overlay\n ---\n \n ## Extra\n "
3795+ )
3796+ preset_manifest = {
3797+ "schema_version" : "1.0" ,
3798+ "preset" : {
3799+ "id" : "ext-base-append-skill" ,
3800+ "name" : "Ext Base Append Skill" ,
3801+ "version" : "1.0.0" ,
3802+ "description" : "Test" ,
3803+ },
3804+ "requires" : {"speckit_version" : ">=0.1.0" },
3805+ "provides" : {
3806+ "templates" : [
3807+ {
3808+ "type" : "command" ,
3809+ "name" : "speckit.fakeext.cmd" ,
3810+ "file" : "commands/speckit.fakeext.cmd.md" ,
3811+ "strategy" : "append" ,
3812+ }
3813+ ]
3814+ },
3815+ }
3816+ with open (preset_dir / "preset.yml" , "w" ) as f :
3817+ yaml .dump (preset_manifest , f )
3818+
3819+ manager = PresetManager (project_dir )
3820+ manager .install_from_directory (preset_dir , "0.1.5" )
3821+
3822+ skill_file = skills_dir / "speckit-fakeext-cmd" / "SKILL.md"
3823+ content = skill_file .read_text ()
3824+ assert ".specify/extensions/fakeext/agents/control/commander.md" in content
3825+ assert "Read agents/control" not in content
3826+ assert "## Extra" in content
3827+
37493828 def test_preset_remove_skips_skill_dir_without_skill_file (self , project_dir , temp_dir ):
37503829 """Preset removal should not delete arbitrary directories missing SKILL.md."""
37513830 self ._write_init_options (project_dir , ai = "codex" )
@@ -5946,6 +6025,86 @@ def test_resolve_content_replace_over_wrap(self, project_dir, temp_dir, valid_pa
59466025 content = resolver .resolve_content ("spec-template" )
59476026 assert content == "# Replaced content\n "
59486027
6028+ @pytest .mark .parametrize ("strategy" , ["append" , "prepend" , "wrap" ])
6029+ def test_resolve_content_rewrites_extension_base_subdir_paths (
6030+ self , project_dir , temp_dir , strategy
6031+ ):
6032+ """Composing over an extension-provided base command must resolve the
6033+ extension's own subdir references (agents/, knowledge-base/) to their
6034+ installed location (#2101), not just when the extension wins outright.
6035+ """
6036+ extension_dir = project_dir / ".specify" / "extensions" / "fakeext"
6037+ (extension_dir / "commands" ).mkdir (parents = True , exist_ok = True )
6038+ (extension_dir / "agents" / "control" ).mkdir (parents = True , exist_ok = True )
6039+ (extension_dir / "agents" / "control" / "commander.md" ).write_text ("# Commander\n " )
6040+ (extension_dir / "commands" / "cmd.md" ).write_text (
6041+ "---\n description: Extension fakeext cmd\n ---\n \n "
6042+ "Read agents/control/commander.md for context.\n "
6043+ )
6044+ extension_manifest = {
6045+ "schema_version" : "1.0" ,
6046+ "extension" : {
6047+ "id" : "fakeext" ,
6048+ "name" : "Fake Extension" ,
6049+ "version" : "1.0.0" ,
6050+ "description" : "Test" ,
6051+ },
6052+ "requires" : {"speckit_version" : ">=0.1.0" },
6053+ "provides" : {
6054+ "commands" : [
6055+ {
6056+ "name" : "speckit.fakeext.cmd" ,
6057+ "file" : "commands/cmd.md" ,
6058+ "description" : "Fake extension command" ,
6059+ }
6060+ ]
6061+ },
6062+ }
6063+ with open (extension_dir / "extension.yml" , "w" ) as f :
6064+ yaml .dump (extension_manifest , f )
6065+
6066+ preset_dir = temp_dir / f"ext-base-{ strategy } "
6067+ preset_dir .mkdir ()
6068+ (preset_dir / "commands" ).mkdir ()
6069+ overlay_body = (
6070+ "{CORE_TEMPLATE}\n ## Extra\n " if strategy == "wrap" else "## Extra\n "
6071+ )
6072+ (preset_dir / "commands" / "speckit.fakeext.cmd.md" ).write_text (
6073+ f"---\n description: Preset overlay\n ---\n \n { overlay_body } "
6074+ )
6075+ preset_manifest = {
6076+ "schema_version" : "1.0" ,
6077+ "preset" : {
6078+ "id" : f"ext-base-{ strategy } " ,
6079+ "name" : "Ext Base" ,
6080+ "version" : "1.0.0" ,
6081+ "description" : "Test" ,
6082+ },
6083+ "requires" : {"speckit_version" : ">=0.1.0" },
6084+ "provides" : {
6085+ "templates" : [
6086+ {
6087+ "type" : "command" ,
6088+ "name" : "speckit.fakeext.cmd" ,
6089+ "file" : "commands/speckit.fakeext.cmd.md" ,
6090+ "strategy" : strategy ,
6091+ }
6092+ ]
6093+ },
6094+ }
6095+ with open (preset_dir / "preset.yml" , "w" ) as f :
6096+ yaml .dump (preset_manifest , f )
6097+
6098+ manager = PresetManager (project_dir )
6099+ manager .install_from_directory (preset_dir , "0.1.5" )
6100+
6101+ resolver = PresetResolver (project_dir )
6102+ content = resolver .resolve_content ("speckit.fakeext.cmd" , "command" )
6103+ assert content is not None
6104+ assert ".specify/extensions/fakeext/agents/control/commander.md" in content
6105+ assert "Read agents/control" not in content
6106+ assert "## Extra" in content
6107+
59496108
59506109class TestCollectAllLayers :
59516110 """Test PresetResolver.collect_all_layers() method."""
@@ -6111,6 +6270,87 @@ def test_remove_restores_extension_command_subdir_paths_for_non_skill_agent(
61116270 assert ".specify/extensions/fakeext/agents/control/commander.md" in content
61126271 assert "Read agents/control" not in content
61136272
6273+ def test_install_composes_extension_command_and_rewrites_subdir_paths_for_non_skill_agent (
6274+ self , project_dir , temp_dir
6275+ ):
6276+ """When a preset overlays (append) an extension-provided base command,
6277+ the initial composed non-skill-agent command file must have the
6278+ extension's own subdir references rewritten to their installed
6279+ location (#2101), matching the live repro: extension body
6280+ 'Read agents/control/commander.md', preset appends to
6281+ speckit.fakeext.cmd, generated Gemini content retains the bare path."""
6282+ gemini_dir = project_dir / ".gemini" / "commands"
6283+ gemini_dir .mkdir (parents = True )
6284+
6285+ extension_dir = project_dir / ".specify" / "extensions" / "fakeext"
6286+ (extension_dir / "commands" ).mkdir (parents = True , exist_ok = True )
6287+ (extension_dir / "agents" / "control" ).mkdir (parents = True , exist_ok = True )
6288+ (extension_dir / "agents" / "control" / "commander.md" ).write_text ("# Commander\n " )
6289+ (extension_dir / "commands" / "cmd.md" ).write_text (
6290+ "---\n description: Extension fakeext cmd\n ---\n \n "
6291+ "Read agents/control/commander.md for context.\n "
6292+ )
6293+ extension_manifest = {
6294+ "schema_version" : "1.0" ,
6295+ "extension" : {
6296+ "id" : "fakeext" ,
6297+ "name" : "Fake Extension" ,
6298+ "version" : "1.0.0" ,
6299+ "description" : "Test" ,
6300+ },
6301+ "requires" : {"speckit_version" : ">=0.1.0" },
6302+ "provides" : {
6303+ "commands" : [
6304+ {
6305+ "name" : "speckit.fakeext.cmd" ,
6306+ "file" : "commands/cmd.md" ,
6307+ "description" : "Fake extension command" ,
6308+ }
6309+ ]
6310+ },
6311+ }
6312+ with open (extension_dir / "extension.yml" , "w" ) as f :
6313+ yaml .dump (extension_manifest , f )
6314+
6315+ preset_dir = temp_dir / "ext-cmd-append"
6316+ preset_dir .mkdir ()
6317+ (preset_dir / "commands" ).mkdir ()
6318+ (preset_dir / "commands" / "speckit.fakeext.cmd.md" ).write_text (
6319+ "---\n description: Append fakeext cmd\n ---\n \n ## Extra\n "
6320+ )
6321+ preset_manifest = {
6322+ "schema_version" : "1.0" ,
6323+ "preset" : {
6324+ "id" : "ext-cmd-append" ,
6325+ "name" : "Ext Cmd Append" ,
6326+ "version" : "1.0.0" ,
6327+ "description" : "Test" ,
6328+ },
6329+ "requires" : {"speckit_version" : ">=0.1.0" },
6330+ "provides" : {
6331+ "templates" : [
6332+ {
6333+ "type" : "command" ,
6334+ "name" : "speckit.fakeext.cmd" ,
6335+ "file" : "commands/speckit.fakeext.cmd.md" ,
6336+ "strategy" : "append" ,
6337+ }
6338+ ]
6339+ },
6340+ }
6341+ with open (preset_dir / "preset.yml" , "w" ) as f :
6342+ yaml .dump (preset_manifest , f )
6343+
6344+ manager = PresetManager (project_dir )
6345+ manager .install_from_directory (preset_dir , "0.1.5" )
6346+
6347+ cmd_files = list (gemini_dir .glob ("*fakeext*" ))
6348+ assert cmd_files , "Command file should exist in gemini dir"
6349+ content = cmd_files [0 ].read_text ()
6350+ assert ".specify/extensions/fakeext/agents/control/commander.md" in content
6351+ assert "Read agents/control" not in content
6352+ assert "## Extra" in content
6353+
61146354 def test_remove_restores_lower_priority_command (
61156355 self , project_dir , temp_dir , valid_pack_data
61166356 ):
0 commit comments