mirror of
https://github.com/github/spec-kit.git
synced 2026-07-03 12:28:06 +08:00
fix: recover active skills registration for extensions (#2803)
Extension command registration now resolves the active skills directory before writing command artifacts. This lets initialized skills-backed agents recover a missing active skills directory while preserving the existing preset registration behavior. Add regression coverage for missing active skills directories, shared skills directories, and symlinked parent guards. Fixes #2769. Co-authored-by: OpenAI Codex <codex@openai.com>
This commit is contained in:
@@ -121,6 +121,11 @@ class TestBasePrimitives:
|
||||
assert len(templates) > 0
|
||||
assert all(t.suffix == ".md" for t in templates)
|
||||
|
||||
def test_list_command_templates_keeps_checklist_after_plan(self):
|
||||
i = StubIntegration()
|
||||
stems = [template.stem for template in i.list_command_templates()]
|
||||
assert stems.index("plan") < stems.index("checklist")
|
||||
|
||||
def test_command_filename_default(self):
|
||||
i = StubIntegration()
|
||||
assert i.command_filename("plan") == "speckit.plan.md"
|
||||
|
||||
@@ -254,8 +254,8 @@ class MarkdownIntegrationTests:
|
||||
|
||||
COMMAND_STEMS = [
|
||||
"agent-context.update",
|
||||
"analyze", "checklist", "clarify", "constitution",
|
||||
"implement", "plan", "specify", "tasks", "taskstoissues",
|
||||
"analyze", "clarify", "constitution", "implement",
|
||||
"plan", "checklist", "specify", "tasks", "taskstoissues",
|
||||
]
|
||||
|
||||
def _expected_files(self, script_variant: str) -> list[str]:
|
||||
|
||||
@@ -100,8 +100,8 @@ class SkillsIntegrationTests:
|
||||
skill_files = [f for f in created if "scripts" not in f.parts]
|
||||
|
||||
expected_commands = {
|
||||
"analyze", "checklist", "clarify", "constitution",
|
||||
"implement", "plan", "specify", "tasks", "taskstoissues",
|
||||
"analyze", "clarify", "constitution", "implement",
|
||||
"plan", "checklist", "specify", "tasks", "taskstoissues",
|
||||
}
|
||||
|
||||
# Derive command names from the skill directory names
|
||||
@@ -393,8 +393,8 @@ class SkillsIntegrationTests:
|
||||
# -- Complete file inventory ------------------------------------------
|
||||
|
||||
_SKILL_COMMANDS = [
|
||||
"analyze", "checklist", "clarify", "constitution",
|
||||
"implement", "plan", "specify", "tasks", "taskstoissues",
|
||||
"analyze", "clarify", "constitution", "implement",
|
||||
"plan", "checklist", "specify", "tasks", "taskstoissues",
|
||||
]
|
||||
|
||||
def _expected_files(self, script_variant: str) -> list[str]:
|
||||
|
||||
@@ -486,11 +486,11 @@ class TomlIntegrationTests:
|
||||
COMMAND_STEMS = [
|
||||
"agent-context.update",
|
||||
"analyze",
|
||||
"checklist",
|
||||
"clarify",
|
||||
"constitution",
|
||||
"implement",
|
||||
"plan",
|
||||
"checklist",
|
||||
"specify",
|
||||
"tasks",
|
||||
"taskstoissues",
|
||||
|
||||
@@ -365,11 +365,11 @@ class YamlIntegrationTests:
|
||||
COMMAND_STEMS = [
|
||||
"agent-context.update",
|
||||
"analyze",
|
||||
"checklist",
|
||||
"clarify",
|
||||
"constitution",
|
||||
"implement",
|
||||
"plan",
|
||||
"checklist",
|
||||
"specify",
|
||||
"tasks",
|
||||
"taskstoissues",
|
||||
|
||||
@@ -127,8 +127,8 @@ class TestCopilotIntegration:
|
||||
agent_files = sorted(agents_dir.glob("speckit.*.agent.md"))
|
||||
assert len(agent_files) == 9
|
||||
expected_commands = {
|
||||
"analyze", "checklist", "clarify", "constitution",
|
||||
"implement", "plan", "specify", "tasks", "taskstoissues",
|
||||
"analyze", "clarify", "constitution", "implement",
|
||||
"plan", "checklist", "specify", "tasks", "taskstoissues",
|
||||
}
|
||||
actual_commands = {f.name.removeprefix("speckit.").removesuffix(".agent.md") for f in agent_files}
|
||||
assert actual_commands == expected_commands
|
||||
@@ -321,8 +321,8 @@ class TestCopilotSkillsMode:
|
||||
"""Tests for Copilot integration in --skills mode."""
|
||||
|
||||
_SKILL_COMMANDS = [
|
||||
"analyze", "checklist", "clarify", "constitution",
|
||||
"implement", "plan", "specify", "tasks", "taskstoissues",
|
||||
"analyze", "clarify", "constitution", "implement",
|
||||
"plan", "checklist", "specify", "tasks", "taskstoissues",
|
||||
]
|
||||
|
||||
def _make_copilot(self):
|
||||
|
||||
@@ -213,10 +213,10 @@ class TestGenericIntegration:
|
||||
"command_stem",
|
||||
[
|
||||
"analyze",
|
||||
"checklist",
|
||||
"clarify",
|
||||
"implement",
|
||||
"plan",
|
||||
"checklist",
|
||||
"specify",
|
||||
"tasks",
|
||||
"taskstoissues",
|
||||
|
||||
@@ -17,6 +17,7 @@ import tempfile
|
||||
import shutil
|
||||
import yaml
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
|
||||
from specify_cli.extensions import (
|
||||
ExtensionManifest,
|
||||
@@ -26,7 +27,9 @@ from specify_cli.extensions import (
|
||||
|
||||
# ===== Helpers =====
|
||||
|
||||
def _create_init_options(project_root: Path, ai: str = "claude", ai_skills: bool = True):
|
||||
def _create_init_options(
|
||||
project_root: Path, ai: str = "claude", ai_skills: Any = True
|
||||
):
|
||||
"""Write a .specify/init-options.json file."""
|
||||
opts_dir = project_root / ".specify"
|
||||
opts_dir.mkdir(parents=True, exist_ok=True)
|
||||
@@ -35,7 +38,7 @@ def _create_init_options(project_root: Path, ai: str = "claude", ai_skills: bool
|
||||
"ai": ai,
|
||||
"ai_skills": ai_skills,
|
||||
"script": "sh",
|
||||
}))
|
||||
}), encoding="utf-8")
|
||||
|
||||
|
||||
def _create_skills_dir(project_root: Path, ai: str = "claude") -> Path:
|
||||
@@ -220,11 +223,20 @@ class TestExtensionManagerGetSkillsDir:
|
||||
result = manager._get_skills_dir()
|
||||
assert result == skills_dir
|
||||
|
||||
def test_returns_none_when_ai_skills_is_non_boolean_truthy(self, project_dir):
|
||||
"""Corrupted truthy ai_skills values should not enable skills mode."""
|
||||
_create_init_options(project_dir, ai="claude", ai_skills="false")
|
||||
|
||||
manager = ExtensionManager(project_dir)
|
||||
result = manager._get_skills_dir()
|
||||
assert result is None
|
||||
assert not (project_dir / ".claude" / "skills").exists()
|
||||
|
||||
def test_returns_none_for_non_dict_init_options(self, project_dir):
|
||||
"""Corrupted-but-parseable init-options should not crash skill-dir lookup."""
|
||||
opts_file = project_dir / ".specify" / "init-options.json"
|
||||
opts_file.parent.mkdir(parents=True, exist_ok=True)
|
||||
opts_file.write_text("[]")
|
||||
opts_file.write_text("[]", encoding="utf-8")
|
||||
_create_skills_dir(project_dir, ai="claude")
|
||||
manager = ExtensionManager(project_dir)
|
||||
result = manager._get_skills_dir()
|
||||
@@ -655,6 +667,393 @@ class TestExtensionSkillRegistration:
|
||||
assert "speckit-early-ext-hello" in metadata["registered_skills"]
|
||||
assert "speckit-early-ext-world" in metadata["registered_skills"]
|
||||
|
||||
def test_commands_registered_when_claude_skills_dir_missing(self, project_dir, temp_dir):
|
||||
"""Extension install should not silently skip Claude when skills dir is missing."""
|
||||
_create_init_options(project_dir, ai="claude", ai_skills=True)
|
||||
(project_dir / ".claude").mkdir()
|
||||
# Deliberately do NOT create .claude/skills
|
||||
ext_dir = _create_extension_dir(temp_dir, ext_id="early-ext")
|
||||
|
||||
manager = ExtensionManager(project_dir)
|
||||
manifest = manager.install_from_directory(
|
||||
ext_dir, "0.1.0", register_commands=True
|
||||
)
|
||||
|
||||
skills_dir = project_dir / ".claude" / "skills"
|
||||
assert skills_dir.is_dir()
|
||||
|
||||
metadata = manager.registry.get(manifest.id)
|
||||
assert metadata["registered_commands"] == {
|
||||
"claude": [
|
||||
"speckit.early-ext.hello",
|
||||
"speckit.early-ext.world",
|
||||
]
|
||||
}
|
||||
assert metadata["registered_skills"] == []
|
||||
|
||||
skill_file = skills_dir / "speckit-early-ext-hello" / "SKILL.md"
|
||||
assert skill_file.exists()
|
||||
content = skill_file.read_text(encoding="utf-8")
|
||||
assert "source: early-ext:commands/hello.md" in content
|
||||
|
||||
def test_hermes_global_skills_dir_used_when_marker_is_recovered(
|
||||
self, project_dir, temp_dir, monkeypatch
|
||||
):
|
||||
"""Hermes recovery must not use the project marker as the output dir."""
|
||||
home = temp_dir / "home"
|
||||
home.mkdir()
|
||||
monkeypatch.setattr(Path, "home", lambda: home)
|
||||
_create_init_options(project_dir, ai="hermes", ai_skills=True)
|
||||
ext_dir = _create_extension_dir(temp_dir, ext_id="early-ext")
|
||||
|
||||
manager = ExtensionManager(project_dir)
|
||||
manifest = manager.install_from_directory(
|
||||
ext_dir, "0.1.0", register_commands=True
|
||||
)
|
||||
|
||||
metadata = manager.registry.get(manifest.id)
|
||||
assert metadata is not None
|
||||
assert metadata["registered_commands"] == {
|
||||
"hermes": [
|
||||
"speckit.early-ext.hello",
|
||||
"speckit.early-ext.world",
|
||||
]
|
||||
}
|
||||
assert metadata["registered_skills"] == []
|
||||
|
||||
global_skills_dir = home / ".hermes" / "skills"
|
||||
assert (
|
||||
global_skills_dir / "speckit-early-ext-hello" / "SKILL.md"
|
||||
).exists()
|
||||
assert (
|
||||
global_skills_dir / "speckit-early-ext-world" / "SKILL.md"
|
||||
).exists()
|
||||
|
||||
marker = project_dir / ".hermes" / "skills"
|
||||
assert marker.is_dir()
|
||||
assert list(marker.glob("speckit-*/SKILL.md")) == []
|
||||
|
||||
def test_hermes_get_skills_dir_creates_global_output_dir(
|
||||
self, project_dir, temp_dir, monkeypatch
|
||||
):
|
||||
"""ExtensionManager should create the agent-specific output dir it returns."""
|
||||
home = temp_dir / "home"
|
||||
home.mkdir()
|
||||
monkeypatch.setattr(Path, "home", lambda: home)
|
||||
_create_init_options(project_dir, ai="hermes", ai_skills=True)
|
||||
|
||||
manager = ExtensionManager(project_dir)
|
||||
skills_dir = manager._get_skills_dir()
|
||||
|
||||
assert skills_dir == home / ".hermes" / "skills"
|
||||
assert skills_dir.is_dir()
|
||||
assert (project_dir / ".hermes" / "skills").is_dir()
|
||||
|
||||
def test_unusable_hermes_global_skills_dir_skips_skill_registration(
|
||||
self, project_dir, temp_dir, monkeypatch, capsys
|
||||
):
|
||||
"""An unusable agent-specific output dir should warn and skip skills."""
|
||||
home = temp_dir / "home"
|
||||
hermes_dir = home / ".hermes"
|
||||
hermes_dir.mkdir(parents=True)
|
||||
(hermes_dir / "skills").write_text("not a directory", encoding="utf-8")
|
||||
monkeypatch.setattr(Path, "home", lambda: home)
|
||||
_create_init_options(project_dir, ai="hermes", ai_skills=True)
|
||||
ext_dir = _create_extension_dir(temp_dir, ext_id="blocked-ext")
|
||||
|
||||
manager = ExtensionManager(project_dir)
|
||||
manifest = manager.install_from_directory(
|
||||
ext_dir, "0.1.0", register_commands=False
|
||||
)
|
||||
|
||||
metadata = manager.registry.get(manifest.id)
|
||||
assert metadata is not None
|
||||
assert metadata["registered_skills"] == []
|
||||
captured = capsys.readouterr()
|
||||
assert "Warning:" in captured.out
|
||||
assert "Continuing without skill registration." in captured.out
|
||||
|
||||
def test_detect_dir_marker_file_does_not_register_hermes_commands(
|
||||
self, project_dir, temp_dir, monkeypatch
|
||||
):
|
||||
"""Regular files at detect_dir marker paths should not detect agents."""
|
||||
home = temp_dir / "home"
|
||||
global_skills_dir = home / ".hermes" / "skills"
|
||||
global_skills_dir.mkdir(parents=True)
|
||||
monkeypatch.setattr(Path, "home", lambda: home)
|
||||
_create_init_options(project_dir, ai="hermes", ai_skills=True)
|
||||
marker_parent = project_dir / ".hermes"
|
||||
marker_parent.mkdir()
|
||||
marker_file = marker_parent / "skills"
|
||||
marker_file.write_text("not a directory", encoding="utf-8")
|
||||
ext_dir = _create_extension_dir(temp_dir, ext_id="early-ext")
|
||||
|
||||
manager = ExtensionManager(project_dir)
|
||||
manifest = manager.install_from_directory(
|
||||
ext_dir, "0.1.0", register_commands=True
|
||||
)
|
||||
|
||||
assert marker_file.is_file()
|
||||
assert marker_file.read_text(encoding="utf-8") == "not a directory"
|
||||
assert not (
|
||||
global_skills_dir / "speckit-early-ext-hello" / "SKILL.md"
|
||||
).exists()
|
||||
assert not (
|
||||
global_skills_dir / "speckit-early-ext-world" / "SKILL.md"
|
||||
).exists()
|
||||
|
||||
metadata = manager.registry.get(manifest.id)
|
||||
assert metadata is not None
|
||||
assert metadata["registered_commands"] == {}
|
||||
assert metadata["registered_skills"] == []
|
||||
|
||||
def test_non_boolean_ai_skills_does_not_recover_missing_skills_dir(
|
||||
self, project_dir, temp_dir
|
||||
):
|
||||
"""Corrupted truthy ai_skills values should not recover skills dirs."""
|
||||
_create_init_options(project_dir, ai="claude", ai_skills="false")
|
||||
(project_dir / ".claude").mkdir()
|
||||
# Deliberately do NOT create .claude/skills.
|
||||
ext_dir = _create_extension_dir(temp_dir, ext_id="early-ext")
|
||||
|
||||
manager = ExtensionManager(project_dir)
|
||||
manifest = manager.install_from_directory(
|
||||
ext_dir, "0.1.0", register_commands=True
|
||||
)
|
||||
|
||||
metadata = manager.registry.get(manifest.id)
|
||||
assert metadata is not None
|
||||
assert metadata["registered_commands"] == {}
|
||||
assert metadata["registered_skills"] == []
|
||||
assert not (project_dir / ".claude" / "skills").exists()
|
||||
|
||||
def test_non_boolean_ai_skills_does_not_skip_default_agent_reregistration(
|
||||
self, project_dir, temp_dir
|
||||
):
|
||||
"""Corrupted ai_skills values should not trigger skills-mode skips."""
|
||||
_create_init_options(project_dir, ai="copilot", ai_skills="false")
|
||||
ext_dir = _create_extension_dir(temp_dir, ext_id="early-ext")
|
||||
|
||||
manager = ExtensionManager(project_dir)
|
||||
manifest = manager.install_from_directory(
|
||||
ext_dir, "0.1.0", register_commands=False
|
||||
)
|
||||
manager.register_enabled_extensions_for_agent("copilot")
|
||||
|
||||
metadata = manager.registry.get(manifest.id)
|
||||
assert metadata is not None
|
||||
assert metadata["registered_commands"] == {
|
||||
"copilot": [
|
||||
"speckit.early-ext.hello",
|
||||
"speckit.early-ext.world",
|
||||
]
|
||||
}
|
||||
assert metadata["registered_skills"] == []
|
||||
assert (project_dir / ".github" / "agents").is_dir()
|
||||
|
||||
def test_existing_agent_command_path_file_is_not_detected(
|
||||
self, project_dir, temp_dir
|
||||
):
|
||||
"""Existing files at command-dir paths should not count as detected agents."""
|
||||
_create_init_options(project_dir, ai="claude", ai_skills=False)
|
||||
claude_dir = project_dir / ".claude"
|
||||
claude_dir.mkdir()
|
||||
skills_file = claude_dir / "skills"
|
||||
skills_file.write_text("not a directory", encoding="utf-8")
|
||||
ext_dir = _create_extension_dir(temp_dir, ext_id="early-ext")
|
||||
|
||||
manager = ExtensionManager(project_dir)
|
||||
manifest = manager.install_from_directory(
|
||||
ext_dir, "0.1.0", register_commands=True
|
||||
)
|
||||
|
||||
assert skills_file.read_text(encoding="utf-8") == "not a directory"
|
||||
metadata = manager.registry.get(manifest.id)
|
||||
assert metadata is not None
|
||||
assert metadata["registered_commands"] == {}
|
||||
assert metadata["registered_skills"] == []
|
||||
|
||||
def test_missing_shared_skills_dir_registers_only_active_agent(self, project_dir, temp_dir):
|
||||
"""Recreating shared skills dirs should not activate unrelated agents."""
|
||||
_create_init_options(project_dir, ai="agy", ai_skills=True)
|
||||
(project_dir / ".agents").mkdir()
|
||||
# Deliberately do NOT create .agents/skills, shared by agy and codex.
|
||||
ext_dir = _create_extension_dir(temp_dir, ext_id="early-ext")
|
||||
|
||||
manager = ExtensionManager(project_dir)
|
||||
manifest = manager.install_from_directory(
|
||||
ext_dir, "0.1.0", register_commands=True
|
||||
)
|
||||
|
||||
skills_dir = project_dir / ".agents" / "skills"
|
||||
assert skills_dir.is_dir()
|
||||
|
||||
metadata = manager.registry.get(manifest.id)
|
||||
assert metadata["registered_commands"] == {
|
||||
"agy": [
|
||||
"speckit.early-ext.hello",
|
||||
"speckit.early-ext.world",
|
||||
]
|
||||
}
|
||||
assert metadata["registered_skills"] == []
|
||||
|
||||
def test_missing_shared_skills_dir_uses_normalized_guard_for_later_agents(
|
||||
self, project_dir, temp_dir, monkeypatch
|
||||
):
|
||||
"""Shared-dir suppression should tolerate lexical path differences."""
|
||||
_create_init_options(project_dir, ai="agy", ai_skills=True)
|
||||
(project_dir / ".agents").mkdir()
|
||||
ext_dir = _create_extension_dir(temp_dir, ext_id="early-ext")
|
||||
|
||||
from specify_cli.agents import CommandRegistrar as AgentRegistrar
|
||||
|
||||
original_resolve_agent_dir = AgentRegistrar._resolve_agent_dir
|
||||
original_register_commands = AgentRegistrar.register_commands
|
||||
attempted_agents = []
|
||||
|
||||
def resolve_codex_with_parent_segment(self, agent_name, agent_config, root):
|
||||
if agent_name == "codex":
|
||||
return root / ".agents" / ".." / ".agents" / "skills"
|
||||
return original_resolve_agent_dir(agent_name, agent_config, root)
|
||||
|
||||
def record_registration(self, agent_name, *args, **kwargs):
|
||||
attempted_agents.append(agent_name)
|
||||
return original_register_commands(self, agent_name, *args, **kwargs)
|
||||
|
||||
monkeypatch.setattr(
|
||||
AgentRegistrar, "_resolve_agent_dir", resolve_codex_with_parent_segment
|
||||
)
|
||||
monkeypatch.setattr(AgentRegistrar, "register_commands", record_registration)
|
||||
|
||||
manager = ExtensionManager(project_dir)
|
||||
manifest = manager.install_from_directory(
|
||||
ext_dir, "0.1.0", register_commands=True
|
||||
)
|
||||
|
||||
assert attempted_agents == ["agy"]
|
||||
metadata = manager.registry.get(manifest.id)
|
||||
assert metadata is not None
|
||||
assert metadata["registered_commands"] == {
|
||||
"agy": [
|
||||
"speckit.early-ext.hello",
|
||||
"speckit.early-ext.world",
|
||||
]
|
||||
}
|
||||
assert metadata["registered_skills"] == []
|
||||
|
||||
def test_missing_shared_skills_dir_write_oserror_does_not_register_other_agents(
|
||||
self, project_dir, temp_dir, monkeypatch
|
||||
):
|
||||
"""Failed active registration must not make shared skills dirs detected."""
|
||||
_create_init_options(project_dir, ai="agy", ai_skills=True)
|
||||
(project_dir / ".agents").mkdir()
|
||||
# Deliberately do NOT create .agents/skills, shared by agy and codex.
|
||||
ext_dir = _create_extension_dir(temp_dir, ext_id="early-ext")
|
||||
|
||||
from specify_cli.agents import CommandRegistrar as AgentRegistrar
|
||||
|
||||
original_register_commands = AgentRegistrar.register_commands
|
||||
attempted_agents = []
|
||||
|
||||
def fail_recovered_agy_registration(self, agent_name, *args, **kwargs):
|
||||
attempted_agents.append(agent_name)
|
||||
if agent_name == "agy":
|
||||
raise PermissionError("denied")
|
||||
return original_register_commands(self, agent_name, *args, **kwargs)
|
||||
|
||||
monkeypatch.setattr(
|
||||
AgentRegistrar, "register_commands", fail_recovered_agy_registration
|
||||
)
|
||||
|
||||
manager = ExtensionManager(project_dir)
|
||||
manifest = manager.install_from_directory(
|
||||
ext_dir, "0.1.0", register_commands=True
|
||||
)
|
||||
|
||||
skills_dir = project_dir / ".agents" / "skills"
|
||||
assert skills_dir.is_dir()
|
||||
assert attempted_agents == ["agy"]
|
||||
|
||||
metadata = manager.registry.get(manifest.id)
|
||||
assert metadata is not None
|
||||
assert metadata["registered_commands"] == {}
|
||||
assert "speckit-early-ext-hello" in metadata["registered_skills"]
|
||||
assert "speckit-early-ext-world" in metadata["registered_skills"]
|
||||
|
||||
def test_missing_active_skills_dir_does_not_follow_symlinked_parent(
|
||||
self, project_dir, temp_dir
|
||||
):
|
||||
"""Recovered command registration must reuse active skills-dir safety checks."""
|
||||
if not hasattr(os, "symlink"):
|
||||
pytest.skip("symlinks are unavailable")
|
||||
|
||||
_create_init_options(project_dir, ai="claude", ai_skills=True)
|
||||
outside = temp_dir / "outside-claude"
|
||||
outside.mkdir()
|
||||
try:
|
||||
os.symlink(outside, project_dir / ".claude", target_is_directory=True)
|
||||
except OSError:
|
||||
pytest.skip("Current platform/user cannot create directory symlinks")
|
||||
ext_dir = _create_extension_dir(temp_dir, ext_id="early-ext")
|
||||
|
||||
manager = ExtensionManager(project_dir)
|
||||
manifest = manager.install_from_directory(
|
||||
ext_dir, "0.1.0", register_commands=True
|
||||
)
|
||||
|
||||
metadata = manager.registry.get(manifest.id)
|
||||
assert metadata["registered_commands"] == {}
|
||||
assert metadata["registered_skills"] == []
|
||||
assert not (outside / "skills").exists()
|
||||
|
||||
def test_missing_active_skills_dir_invalid_parent_skips_without_aborting(
|
||||
self, project_dir, temp_dir
|
||||
):
|
||||
"""Invalid active skill parents should not abort extension installation."""
|
||||
_create_init_options(project_dir, ai="claude", ai_skills=True)
|
||||
(project_dir / ".claude").write_text("not a directory", encoding="utf-8")
|
||||
ext_dir = _create_extension_dir(temp_dir, ext_id="early-ext")
|
||||
|
||||
manager = ExtensionManager(project_dir)
|
||||
manifest = manager.install_from_directory(
|
||||
ext_dir, "0.1.0", register_commands=True
|
||||
)
|
||||
|
||||
metadata = manager.registry.get(manifest.id)
|
||||
assert metadata["registered_commands"] == {}
|
||||
assert metadata["registered_skills"] == []
|
||||
|
||||
def test_missing_active_skills_dir_write_oserror_skips_without_aborting(
|
||||
self, project_dir, temp_dir, monkeypatch
|
||||
):
|
||||
"""Filesystem failures in recovered command registration should skip safely."""
|
||||
_create_init_options(project_dir, ai="claude", ai_skills=True)
|
||||
(project_dir / ".claude").mkdir()
|
||||
ext_dir = _create_extension_dir(temp_dir, ext_id="early-ext")
|
||||
|
||||
from specify_cli.agents import CommandRegistrar as AgentRegistrar
|
||||
|
||||
original_register_commands = AgentRegistrar.register_commands
|
||||
|
||||
def fail_recovered_claude_registration(self, agent_name, *args, **kwargs):
|
||||
if agent_name == "claude":
|
||||
raise PermissionError("denied")
|
||||
return original_register_commands(self, agent_name, *args, **kwargs)
|
||||
|
||||
monkeypatch.setattr(
|
||||
AgentRegistrar, "register_commands", fail_recovered_claude_registration
|
||||
)
|
||||
|
||||
manager = ExtensionManager(project_dir)
|
||||
manifest = manager.install_from_directory(
|
||||
ext_dir, "0.1.0", register_commands=True
|
||||
)
|
||||
|
||||
metadata = manager.registry.get(manifest.id)
|
||||
assert metadata["registered_commands"] == {}
|
||||
assert "speckit-early-ext-hello" in metadata["registered_skills"]
|
||||
assert "speckit-early-ext-world" in metadata["registered_skills"]
|
||||
|
||||
|
||||
# ===== Extension Skill Unregistration Tests =====
|
||||
|
||||
@@ -738,7 +1137,7 @@ class TestExtensionSkillEdgeCases:
|
||||
"""Corrupted init-options payloads should disable skill registration, not crash install."""
|
||||
opts_file = project_dir / ".specify" / "init-options.json"
|
||||
opts_file.parent.mkdir(parents=True, exist_ok=True)
|
||||
opts_file.write_text("[]")
|
||||
opts_file.write_text("[]", encoding="utf-8")
|
||||
_create_skills_dir(project_dir, ai="claude")
|
||||
|
||||
manager = ExtensionManager(project_dir)
|
||||
|
||||
@@ -782,6 +782,71 @@ class TestExtensionManager:
|
||||
assert (ext_dir / "extension.yml").exists()
|
||||
assert (ext_dir / "commands" / "hello.md").exists()
|
||||
|
||||
def test_install_from_directory_explicitly_recovers_active_skills_dir(
|
||||
self, extension_dir, project_dir, monkeypatch
|
||||
):
|
||||
"""Extension install should explicitly request active skills-dir recovery."""
|
||||
captured = {}
|
||||
|
||||
def fake_register_all(
|
||||
self,
|
||||
manifest,
|
||||
extension_dir,
|
||||
project_root,
|
||||
link_outputs=False,
|
||||
create_missing_active_skills_dir=False,
|
||||
):
|
||||
captured["create_missing_active_skills_dir"] = (
|
||||
create_missing_active_skills_dir
|
||||
)
|
||||
return {}
|
||||
|
||||
monkeypatch.setattr(
|
||||
CommandRegistrar,
|
||||
"register_commands_for_all_agents",
|
||||
fake_register_all,
|
||||
)
|
||||
|
||||
manager = ExtensionManager(project_dir)
|
||||
manager.install_from_directory(extension_dir, "0.1.0", register_commands=True)
|
||||
|
||||
assert captured["create_missing_active_skills_dir"] is True
|
||||
|
||||
def test_command_registrar_default_does_not_recover_active_skills_dir(
|
||||
self, extension_dir, project_dir, monkeypatch
|
||||
):
|
||||
"""The extension wrapper should preserve the core registrar's conservative default."""
|
||||
from specify_cli.agents import CommandRegistrar as AgentCommandRegistrar
|
||||
|
||||
captured = {}
|
||||
|
||||
def fake_register_all(
|
||||
self,
|
||||
commands,
|
||||
source_id,
|
||||
source_dir,
|
||||
project_root,
|
||||
context_note=None,
|
||||
link_outputs=False,
|
||||
create_missing_active_skills_dir=False,
|
||||
):
|
||||
captured["create_missing_active_skills_dir"] = (
|
||||
create_missing_active_skills_dir
|
||||
)
|
||||
return {}
|
||||
|
||||
monkeypatch.setattr(
|
||||
AgentCommandRegistrar,
|
||||
"register_commands_for_all_agents",
|
||||
fake_register_all,
|
||||
)
|
||||
|
||||
manifest = ExtensionManifest(extension_dir / "extension.yml")
|
||||
registrar = CommandRegistrar()
|
||||
registrar.register_commands_for_all_agents(manifest, extension_dir, project_dir)
|
||||
|
||||
assert captured["create_missing_active_skills_dir"] is False
|
||||
|
||||
def test_install_duplicate(self, extension_dir, project_dir):
|
||||
"""Test installing already installed extension."""
|
||||
manager = ExtensionManager(project_dir)
|
||||
@@ -4884,6 +4949,26 @@ class TestHookInvocationRendering:
|
||||
assert execution["command"] == "speckit.tasks"
|
||||
assert execution["invocation"] == "$speckit-tasks"
|
||||
|
||||
def test_non_boolean_ai_skills_keeps_default_hook_invocation(self, project_dir):
|
||||
"""Corrupted truthy ai_skills values should not enable skill invocation."""
|
||||
init_options = project_dir / ".specify" / "init-options.json"
|
||||
init_options.parent.mkdir(parents=True, exist_ok=True)
|
||||
init_options.write_text(
|
||||
json.dumps({"ai": "codex", "ai_skills": "false"}), encoding="utf-8"
|
||||
)
|
||||
|
||||
hook_executor = HookExecutor(project_dir)
|
||||
execution = hook_executor.execute_hook(
|
||||
{
|
||||
"extension": "test-ext",
|
||||
"command": "speckit.tasks",
|
||||
"optional": False,
|
||||
}
|
||||
)
|
||||
|
||||
assert execution["command"] == "speckit.tasks"
|
||||
assert execution["invocation"] == "/speckit.tasks"
|
||||
|
||||
def test_cline_hooks_render_hyphenated_invocation(self, project_dir):
|
||||
"""Cline projects should render /speckit-* invocations."""
|
||||
init_options = project_dir / ".specify" / "init-options.json"
|
||||
|
||||
@@ -2255,6 +2255,51 @@ class TestInitOptions:
|
||||
assert loaded["ai"] == "claude"
|
||||
assert loaded["ai_skills"] is True
|
||||
|
||||
def test_save_and_load_available_from_init_options_module(self, project_dir):
|
||||
from specify_cli._init_options import load_init_options, save_init_options
|
||||
|
||||
opts = {"ai": "codex", "ai_skills": True, "script": "sh"}
|
||||
save_init_options(project_dir, opts)
|
||||
|
||||
assert load_init_options(project_dir) == opts
|
||||
|
||||
def test_save_uses_utf8_encoding(self, project_dir, monkeypatch):
|
||||
from specify_cli import save_init_options
|
||||
|
||||
original_write_text = Path.write_text
|
||||
seen: dict[str, str | None] = {}
|
||||
|
||||
def spy_write_text(path, data, *args, **kwargs):
|
||||
if path == project_dir / ".specify" / "init-options.json":
|
||||
seen["encoding"] = kwargs.get("encoding")
|
||||
return original_write_text(path, data, *args, **kwargs)
|
||||
|
||||
monkeypatch.setattr(Path, "write_text", spy_write_text)
|
||||
|
||||
save_init_options(project_dir, {"label": "中文测试"})
|
||||
|
||||
assert seen["encoding"] == "utf-8"
|
||||
|
||||
def test_load_uses_utf8_encoding(self, project_dir, monkeypatch):
|
||||
from specify_cli import load_init_options
|
||||
|
||||
opts_file = project_dir / ".specify" / "init-options.json"
|
||||
opts_file.parent.mkdir(parents=True, exist_ok=True)
|
||||
opts_file.write_text('{"ai": "codex"}', encoding="utf-8")
|
||||
|
||||
original_read_text = Path.read_text
|
||||
seen: dict[str, str | None] = {}
|
||||
|
||||
def spy_read_text(path, *args, **kwargs):
|
||||
if path == opts_file:
|
||||
seen["encoding"] = kwargs.get("encoding")
|
||||
return original_read_text(path, *args, **kwargs)
|
||||
|
||||
monkeypatch.setattr(Path, "read_text", spy_read_text)
|
||||
|
||||
assert load_init_options(project_dir) == {"ai": "codex"}
|
||||
assert seen["encoding"] == "utf-8"
|
||||
|
||||
def test_load_returns_empty_when_missing(self, project_dir):
|
||||
from specify_cli import load_init_options
|
||||
|
||||
@@ -2348,6 +2393,51 @@ class TestInitOptions:
|
||||
|
||||
assert load_init_options(project_dir) == {}
|
||||
|
||||
@pytest.mark.parametrize("payload", ["[]", '"value"', "42", "true", "null"])
|
||||
def test_load_returns_empty_on_non_object_json(self, project_dir, payload):
|
||||
from specify_cli import load_init_options
|
||||
|
||||
opts_file = project_dir / ".specify" / "init-options.json"
|
||||
opts_file.parent.mkdir(parents=True, exist_ok=True)
|
||||
opts_file.write_text(payload, encoding="utf-8")
|
||||
|
||||
assert load_init_options(project_dir) == {}
|
||||
|
||||
def test_load_returns_empty_on_unicode_decode_error(self, project_dir, monkeypatch):
|
||||
from specify_cli import load_init_options
|
||||
|
||||
opts_file = project_dir / ".specify" / "init-options.json"
|
||||
opts_file.parent.mkdir(parents=True, exist_ok=True)
|
||||
opts_file.write_bytes(b"{}")
|
||||
|
||||
original_read_text = Path.read_text
|
||||
|
||||
def raise_decode_error(path, *args, **kwargs):
|
||||
if path == opts_file:
|
||||
raise UnicodeDecodeError("utf-8", b"\xff", 0, 1, "invalid start byte")
|
||||
return original_read_text(path, *args, **kwargs)
|
||||
|
||||
monkeypatch.setattr(Path, "read_text", raise_decode_error)
|
||||
|
||||
assert load_init_options(project_dir) == {}
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
("value", "expected"),
|
||||
[
|
||||
(True, True),
|
||||
(False, False),
|
||||
("true", False),
|
||||
("false", False),
|
||||
(1, False),
|
||||
(0, False),
|
||||
(None, False),
|
||||
],
|
||||
)
|
||||
def test_is_ai_skills_enabled_requires_boolean_true(self, value, expected):
|
||||
from specify_cli._init_options import is_ai_skills_enabled
|
||||
|
||||
assert is_ai_skills_enabled({"ai_skills": value}) is expected
|
||||
|
||||
|
||||
class TestPresetSkills:
|
||||
"""Tests for preset skill registration and unregistration.
|
||||
|
||||
Reference in New Issue
Block a user