Skip to content

Commit 8c92ead

Browse files
marcelsafinCopilot
andcommitted
fix: apply extension subdir path rewrite when composing over extension base
PresetResolver.resolve_content() read the effective base layer's raw content directly via path.read_text() before composing append/prepend/ wrap overlays on top of it, and its outright-replace shortcut did the same. When that base layer was extension-provided, neither read path applied rewrite_extension_paths(), so composing a preset over an extension command (or an extension winning outright through resolve_content) left bare, unresolvable agents/... and knowledge-base/... references in the composed output. All three call sites (PresetManager._register_commands()'s composed path, _reconcile_composed_commands()'s composed path, and skills-mode reading the .composed file written by either) consume resolve_content's return value, so fixing the read at its source covers command output, skill output, and both initial-install and reconcile flows without threading extension identity through each caller. Tagged extension layers in collect_all_layers() with extension_id/ extension_dir, and added a _read_layer_content() helper in resolve_content() that applies rewrite_extension_paths() whenever a layer carries that extension identity — used at both raw-read sites (outright-replace shortcut and composition base). Composing (append/prepend/wrap) layers are never extension-provided (extensions are always inserted with strategy "replace"), so no other read site needs the rewrite. Added regression tests: a parametrized resolve_content() test covering append/prepend/wrap composing over an extension base, a skills-mode test asserting the composed SKILL.md resolves the extension's subdir references, and a non-skill-agent (Gemini) install-time test matching the reported live repro. Assisted-by: GitHub Copilot (model: Claude Sonnet 5, autonomous) Co-authored-by: Copilot <[email protected]>
1 parent 3645a3c commit 8c92ead

2 files changed

Lines changed: 266 additions & 2 deletions

File tree

‎src/specify_cli/presets/__init__.py‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3052,6 +3052,8 @@ def _find_in_subdirs(base_dir: Path) -> Optional[Path]:
30523052
"path": candidate,
30533053
"source": source,
30543054
"strategy": "replace",
3055+
"extension_id": ext_id,
3056+
"extension_dir": ext_dir,
30553057
})
30563058

30573059
# Priority 4: Core templates (always "replace")
@@ -3171,10 +3173,32 @@ def resolve_content(
31713173
if not layers:
31723174
return None
31733175

3176+
def _read_layer_content(layer: Dict[str, Any]) -> str:
3177+
"""Read a layer's raw text, rewriting extension-relative subdir
3178+
references (agents/, knowledge-base/, etc.) to their installed
3179+
location when the layer is extension-provided (#2101).
3180+
3181+
Extension layers are always inserted with strategy "replace"
3182+
(see collect_all_layers), so a layer only ever needs this
3183+
rewrite when it wins outright above or serves as the
3184+
composition base below — never as a mid-stack composing
3185+
(append/prepend/wrap) layer.
3186+
"""
3187+
text = layer["path"].read_text(encoding="utf-8")
3188+
extension_id = layer.get("extension_id")
3189+
extension_dir = layer.get("extension_dir")
3190+
if extension_id and extension_dir:
3191+
from ..agents import CommandRegistrar
3192+
3193+
text = CommandRegistrar.rewrite_extension_paths(
3194+
text, extension_id, extension_dir
3195+
)
3196+
return text
3197+
31743198
# If the top (highest-priority) layer is replace, it wins entirely —
31753199
# lower layers are irrelevant regardless of their strategies.
31763200
if layers[0]["strategy"] == "replace":
3177-
return layers[0]["path"].read_text(encoding="utf-8")
3201+
return _read_layer_content(layers[0])
31783202

31793203
# Composition: build content bottom-up from the effective base.
31803204
# The base is the nearest replace layer scanning from highest priority
@@ -3197,7 +3221,7 @@ def resolve_content(
31973221

31983222
# Convert to reversed_layers index
31993223
base_reversed_idx = len(layers) - 1 - base_layer_idx
3200-
content = layers[base_layer_idx]["path"].read_text(encoding="utf-8")
3224+
content = _read_layer_content(layers[base_layer_idx])
32013225
# Compose only the layers above the base (higher priority = lower index in layers,
32023226
# higher index in reversed_layers). Process bottom-up from base+1.
32033227
start_idx = base_reversed_idx + 1

‎tests/test_presets.py‎

Lines changed: 240 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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+
"---\ndescription: 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+
"---\ndescription: 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+
"---\ndescription: 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"---\ndescription: 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

59506109
class 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+
"---\ndescription: 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+
"---\ndescription: 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

Comments
 (0)