π« Toolkit to help you get started with SDD or any other process!
fix: allow Claude to chain skills for hook execution (#2227)
Manfred Riem8fc2bd3489c8
diff --git a/extensions/git/scripts/bash/auto-commit.sh b/extensions/git/scripts/bash/auto-commit.shindex 49c32fe63..f0b423187 100755--- a/extensions/git/scripts/bash/auto-commit.sh+++ b/extensions/git/scripts/bash/auto-commit.sh@@ -137,4 +137,4 @@ fi_git_out=$(git add . 2>&1) || { echo "[specify] Error: git add failed: $_git_out" >&2; exit 1; }_git_out=$(git commit -q -m "$_commit_msg" 2>&1) || { echo "[specify] Error: git commit failed: $_git_out" >&2; exit 1; }-echo "β Changes committed ${_phase} ${_command_name}" >&2+echo "[OK] Changes committed ${_phase} ${_command_name}" >&2diff --git a/extensions/git/scripts/powershell/auto-commit.ps1 b/extensions/git/scripts/powershell/auto-commit.ps1index e9777ff9b..2229ed2b8 100644--- a/extensions/git/scripts/powershell/auto-commit.ps1+++ b/extensions/git/scripts/powershell/auto-commit.ps1@@ -146,4 +146,4 @@ try {exit 1}-Write-Host "β Changes committed $phase $commandName"+Write-Host "[OK] Changes committed $phase $commandName"diff --git a/src/specify_cli/agents.py b/src/specify_cli/agents.pyindex c177e2a27..32fc6cdbf 100644--- a/src/specify_cli/agents.py+++ b/src/specify_cli/agents.py@@ -317,11 +317,6 @@ class CommandRegistrar:"source": source,},}- if agent_name == "claude":- # Claude skills should be user-invocable (accessible via /command)- # and only run when explicitly invoked (not auto-triggered by the model).- skill_frontmatter["user-invocable"] = True- skill_frontmatter["disable-model-invocation"] = Truereturn skill_frontmatter@staticmethoddiff --git a/src/specify_cli/extensions.py b/src/specify_cli/extensions.pyindex 852699c39..d5543cd0b 100644--- a/src/specify_cli/extensions.py+++ b/src/specify_cli/extensions.py@@ -850,6 +850,7 @@ class ExtensionManager:from . import load_init_optionsfrom .agents import CommandRegistrar+ from .integrations import get_integrationimport yamlwritten: List[str] = []@@ -860,6 +861,7 @@ class ExtensionManager:if not isinstance(selected_ai, str) or not selected_ai:return []registrar = CommandRegistrar()+ integration = get_integration(selected_ai)for cmd_info in manifest.commands:cmd_name = cmd_info["name"]@@ -939,6 +941,10 @@ class ExtensionManager:f"# {title_name} Skill\n\n"f"{body}\n")+ if integration is not None and hasattr(integration, "post_process_skill_content"):+ skill_content = integration.post_process_skill_content(+ skill_content+ )skill_file.write_text(skill_content, encoding="utf-8")written.append(skill_name)diff --git a/src/specify_cli/integrations/base.py b/src/specify_cli/integrations/base.pyindex 26501e623..2c01e25b0 100644--- a/src/specify_cli/integrations/base.py+++ b/src/specify_cli/integrations/base.py@@ -1102,6 +1102,16 @@ class SkillsIntegration(IntegrationBase):invocation = f"{invocation} {args}"return invocation+ def post_process_skill_content(self, content: str) -> str:+ """Post-process a SKILL.md file's content after generation.++ Called by external skill generators (presets, extensions) to let+ the integration inject agent-specific frontmatter or body+ transformations. The default implementation returns *content*+ unchanged. Subclasses may override β see ``ClaudeIntegration``.+ """+ return content+def setup(self,project_root: Path,diff --git a/src/specify_cli/integrations/claude/__init__.py b/src/specify_cli/integrations/claude/__init__.pyindex 31972c4b0..3e39db717 100644--- a/src/specify_cli/integrations/claude/__init__.py+++ b/src/specify_cli/integrations/claude/__init__.py@@ -5,11 +5,21 @@ from __future__ import annotationsfrom pathlib import Pathfrom typing import Any+import re+import yamlfrom ..base import SkillsIntegrationfrom ..manifest import IntegrationManifest+# Note injected into hook sections so Claude maps dot-notation command+# names (from extensions.yml) to the hyphenated skill names it uses.+_HOOK_COMMAND_NOTE = (+ "- When constructing slash commands from hook command names, "+ "replace dots (`.`) with hyphens (`-`). "+ "For example, `speckit.git.commit` β `/speckit-git-commit`.\n"+)+# Mapping of command template stem β argument-hint text shown inline# when a user invokes the slash command in Claude Code.ARGUMENT_HINTS: dict[str, str] = {@@ -148,6 +158,43 @@ class ClaudeIntegration(SkillsIntegration):out.append(line)return "".join(out)+ @staticmethod+ def _inject_hook_command_note(content: str) -> str:+ """Insert a dot-to-hyphen note before each hook output instruction.++ Targets the line ``- For each executable hook, output the following``+ and inserts the note on the line before it, matching its indentation.+ Skips if the note is already present.+ """+ if "replace dots" in content:+ return content++ def repl(m: re.Match[str]) -> str:+ indent = m.group(1)+ instruction = m.group(2)+ eol = m.group(3)+ return (+ indent+ + _HOOK_COMMAND_NOTE.rstrip("\n")+ + eol+ + indent+ + instruction+ + eol+ )++ return re.sub(+ r"(?m)^(\s*)(- For each executable hook, output the following[^\r\n]*)(\r\n|\n|$)",+ repl,+ content,+ )++ def post_process_skill_content(self, content: str) -> str:+ """Inject Claude-specific frontmatter flags and hook notes."""+ updated = self._inject_frontmatter_flag(content, "user-invocable")+ updated = self._inject_frontmatter_flag(updated, "disable-model-invocation", "false")+ updated = self._inject_hook_command_note(updated)+ return updated+def setup(self,project_root: Path,@@ -155,7 +202,7 @@ class ClaudeIntegration(SkillsIntegration):parsed_options: dict[str, Any] | None = None,**opts: Any,) -> list[Path]:- """Install Claude skills, then inject user-invocable, disable-model-invocation, and argument-hint."""+ """Install Claude skills, then inject Claude-specific flags and argument-hints."""created = super().setup(project_root, manifest, parsed_options, **opts)# Post-process generated skill files@@ -173,11 +220,7 @@ class ClaudeIntegration(SkillsIntegration):content_bytes = path.read_bytes()content = content_bytes.decode("utf-8")- # Inject user-invocable: true (Claude skills are accessible via /command)- updated = self._inject_frontmatter_flag(content, "user-invocable")-- # Inject disable-model-invocation: true (Claude skills run only when invoked)- updated = self._inject_frontmatter_flag(updated, "disable-model-invocation")+ updated = self.post_process_skill_content(content)# Inject argument-hint if available for this skillskill_dir_name = path.parent.name # e.g. "speckit-plan"diff --git a/src/specify_cli/presets.py b/src/specify_cli/presets.pyindex 3a0f469a7..d5513c832 100644--- a/src/specify_cli/presets.py+++ b/src/specify_cli/presets.py@@ -707,6 +707,7 @@ class PresetManager:from . import SKILL_DESCRIPTIONS, load_init_optionsfrom .agents import CommandRegistrar+ from .integrations import get_integrationinit_opts = load_init_options(self.project_root)if not isinstance(init_opts, dict):@@ -716,6 +717,7 @@ class PresetManager:return []ai_skills_enabled = bool(init_opts.get("ai_skills"))registrar = CommandRegistrar()+ integration = get_integration(selected_ai)agent_config = registrar.AGENT_CONFIGS.get(selected_ai, {})# Native skill agents (e.g. codex/kimi/agy/trae) materialize brand-new# preset skills in _register_commands() because their detected agent@@ -789,6 +791,10 @@ class PresetManager:f"# Speckit {skill_title} Skill\n\n"f"{body}\n")+ if integration is not None and hasattr(integration, "post_process_skill_content"):+ skill_content = integration.post_process_skill_content(+ skill_content+ )skill_file = skill_subdir / "SKILL.md"skill_file.write_text(skill_content, encoding="utf-8")@@ -816,6 +822,7 @@ class PresetManager:from . import SKILL_DESCRIPTIONS, load_init_optionsfrom .agents import CommandRegistrar+ from .integrations import get_integration# Locate core command templates from the project's installed templatescore_templates_dir = self.project_root / ".specify" / "templates" / "commands"@@ -824,6 +831,7 @@ class PresetManager:init_opts = {}selected_ai = init_opts.get("ai")registrar = CommandRegistrar()+ integration = get_integration(selected_ai) if isinstance(selected_ai, str) else Noneextension_restore_index = self._build_extension_skill_restore_index()for skill_name in skill_names:@@ -877,6 +885,10 @@ class PresetManager:f"# Speckit {skill_title} Skill\n\n"f"{body}\n")+ if integration is not None and hasattr(integration, "post_process_skill_content"):+ skill_content = integration.post_process_skill_content(+ skill_content+ )skill_file.write_text(skill_content, encoding="utf-8")continue@@ -906,6 +918,10 @@ class PresetManager:f"# {title_name} Skill\n\n"f"{body}\n")+ if integration is not None and hasattr(integration, "post_process_skill_content"):+ skill_content = integration.post_process_skill_content(+ skill_content+ )skill_file.write_text(skill_content, encoding="utf-8")else:# No core or extension template β remove the skill entirelydiff --git a/tests/extensions/git/test_git_extension.py b/tests/extensions/git/test_git_extension.pyindex 50ab9c7b6..a04acba10 100644--- a/tests/extensions/git/test_git_extension.py+++ b/tests/extensions/git/test_git_extension.py@@ -491,6 +491,34 @@ class TestAutoCommitBash:result = _run_bash("auto-commit.sh", project)assert result.returncode != 0+ def test_success_message_uses_ok_prefix(self, tmp_path: Path):+ """auto-commit.sh success message uses [OK] (not Unicode)."""+ project = _setup_project(tmp_path)+ _write_config(project, (+ "auto_commit:\n"+ " default: false\n"+ " after_specify:\n"+ " enabled: true\n"+ ))+ (project / "new-file.txt").write_text("content")+ result = _run_bash("auto-commit.sh", project, "after_specify")+ assert result.returncode == 0+ assert "[OK] Changes committed" in result.stderr++ def test_success_message_no_unicode_checkmark(self, tmp_path: Path):+ """auto-commit.sh must not use Unicode checkmark in output."""+ project = _setup_project(tmp_path)+ _write_config(project, (+ "auto_commit:\n"+ " default: false\n"+ " after_plan:\n"+ " enabled: true\n"+ ))+ (project / "new-file.txt").write_text("content")+ result = _run_bash("auto-commit.sh", project, "after_plan")+ assert result.returncode == 0+ assert "\u2713" not in result.stderr, "Must not use Unicode checkmark"+@pytest.mark.skipif(not HAS_PWSH, reason="pwsh not available")class TestAutoCommitPowerShell:@@ -523,6 +551,34 @@ class TestAutoCommitPowerShell:)assert "ps commit" in log.stdout+ def test_success_message_uses_ok_prefix(self, tmp_path: Path):+ """auto-commit.ps1 success message uses [OK] (not Unicode)."""+ project = _setup_project(tmp_path)+ _write_config(project, (+ "auto_commit:\n"+ " default: false\n"+ " after_specify:\n"+ " enabled: true\n"+ ))+ (project / "new-file.txt").write_text("content")+ result = _run_pwsh("auto-commit.ps1", project, "after_specify")+ assert result.returncode == 0+ assert "[OK] Changes committed" in result.stdout++ def test_success_message_no_unicode_checkmark(self, tmp_path: Path):+ """auto-commit.ps1 must not use Unicode checkmark in output."""+ project = _setup_project(tmp_path)+ _write_config(project, (+ "auto_commit:\n"+ " default: false\n"+ " after_plan:\n"+ " enabled: true\n"+ ))+ (project / "new-file.txt").write_text("content")+ result = _run_pwsh("auto-commit.ps1", project, "after_plan")+ assert result.returncode == 0+ assert "\u2713" not in result.stdout, "Must not use Unicode checkmark"+# ββ git-common.sh Tests ββββββββββββββββββββββββββββββββββββββββββββββββββββββdiff --git a/tests/integrations/test_integration_claude.py b/tests/integrations/test_integration_claude.pyindex 7fd69df17..d3b01097f 100644--- a/tests/integrations/test_integration_claude.py+++ b/tests/integrations/test_integration_claude.py@@ -59,7 +59,7 @@ class TestClaudeIntegration:parsed = yaml.safe_load(parts[1])assert parsed["name"] == "speckit-plan"assert parsed["user-invocable"] is True- assert parsed["disable-model-invocation"] is True+ assert parsed["disable-model-invocation"] is Falseassert parsed["metadata"]["source"] == "templates/commands/plan.md"def test_setup_installs_update_context_scripts(self, tmp_path):@@ -179,7 +179,7 @@ class TestClaudeIntegration:assert skill_file.exists()skill_content = skill_file.read_text(encoding="utf-8")assert "user-invocable: true" in skill_content- assert "disable-model-invocation: true" in skill_content+ assert "disable-model-invocation: false" in skill_contentinit_options = json.loads((project / ".specify" / "init-options.json").read_text(encoding="utf-8")@@ -280,7 +280,7 @@ class TestClaudeIntegration:assert "preset:claude-skill-command" in contentassert "name: speckit-research" in contentassert "user-invocable: true" in content- assert "disable-model-invocation: true" in content+ assert "disable-model-invocation: false" in contentmetadata = manager.registry.get("claude-skill-command")assert "speckit-research" in metadata.get("registered_skills", [])@@ -400,3 +400,115 @@ class TestClaudeArgumentHints:lines = result.splitlines()hint_count = sum(1 for ln in lines if ln.startswith("argument-hint:"))assert hint_count == 1+++class TestClaudeDisableModelInvocation:+ """Verify disable-model-invocation is false for Claude skills."""++ def test_setup_sets_disable_model_invocation_false(self, tmp_path):+ """Generated SKILL.md files must have disable-model-invocation: false."""+ i = get_integration("claude")+ m = IntegrationManifest("claude", tmp_path)+ created = i.setup(tmp_path, m, script_type="sh")+ skill_files = [f for f in created if f.name == "SKILL.md"]+ assert len(skill_files) > 0+ for f in skill_files:+ content = f.read_text(encoding="utf-8")+ parts = content.split("---", 2)+ parsed = yaml.safe_load(parts[1])+ assert parsed["disable-model-invocation"] is False, (+ f"{f.parent.name}: expected disable-model-invocation: false"+ )++ def test_disable_model_invocation_not_true(self, tmp_path):+ """No Claude skill should have disable-model-invocation: true."""+ i = get_integration("claude")+ m = IntegrationManifest("claude", tmp_path)+ created = i.setup(tmp_path, m, script_type="sh")+ for f in created:+ if f.name != "SKILL.md":+ continue+ content = f.read_text(encoding="utf-8")+ assert "disable-model-invocation: true" not in content, (+ f"{f.parent.name}: must not have disable-model-invocation: true"+ )++ def test_non_claude_agents_lack_disable_model_invocation(self, tmp_path):+ """Non-Claude skill agents should not get disable-model-invocation."""+ from specify_cli.agents import CommandRegistrar++ fm = CommandRegistrar.build_skill_frontmatter(+ "codex", "speckit-plan", "desc", "templates/commands/plan.md"+ )+ assert "disable-model-invocation" not in fm+ assert "user-invocable" not in fm++ def test_non_claude_post_process_is_identity(self, tmp_path):+ """Non-Claude integrations should not modify skill content."""+ codex = get_integration("codex")+ if codex is None:+ return # codex not registered in this build+ content = "---\nname: test\n---\nBody"+ assert codex.post_process_skill_content(content) == content+++class TestClaudeHookCommandNote:+ """Verify dot-to-hyphen normalization note is injected in hook sections."""++ def test_hook_note_injected_in_skills_with_hooks(self, tmp_path):+ """Skills that have hook sections should get the normalization note."""+ i = get_integration("claude")+ m = IntegrationManifest("claude", tmp_path)+ created = i.setup(tmp_path, m, script_type="sh")+ specify_skill = tmp_path / ".claude/skills/speckit-specify/SKILL.md"+ assert specify_skill.exists()+ content = specify_skill.read_text(encoding="utf-8")+ # specify.md has hook sections+ assert "replace dots" in content, (+ "speckit-specify should have dot-to-hyphen hook note"+ )++ def test_hook_note_not_in_skills_without_hooks(self, tmp_path):+ """Skills without hook sections should not get the note."""+ from specify_cli.integrations.claude import ClaudeIntegration++ content = "---\nname: test\ndescription: test\n---\n\nNo hooks here.\n"+ result = ClaudeIntegration._inject_hook_command_note(content)+ assert "replace dots" not in result++ def test_hook_note_idempotent(self, tmp_path):+ """Injecting the note twice should not duplicate it."""+ from specify_cli.integrations.claude import ClaudeIntegration++ content = (+ "---\nname: test\n---\n\n"+ "- For each executable hook, output the following based on its flag:\n"+ )+ once = ClaudeIntegration._inject_hook_command_note(content)+ twice = ClaudeIntegration._inject_hook_command_note(once)+ assert once == twice, "Hook note injection should be idempotent"++ def test_hook_note_preserves_indentation(self, tmp_path):+ """The injected note should match the indentation of the target line."""+ from specify_cli.integrations.claude import ClaudeIntegration++ content = (+ "---\nname: test\n---\n\n"+ " - For each executable hook, output the following\n"+ )+ result = ClaudeIntegration._inject_hook_command_note(content)+ lines = result.splitlines()+ note_line = [l for l in lines if "replace dots" in l][0]+ assert note_line.startswith(" "), "Note should preserve indentation"++ def test_post_process_injects_all_claude_flags(self):+ """post_process_skill_content should inject all Claude-specific fields."""+ i = get_integration("claude")+ content = (+ "---\nname: test\ndescription: test\n---\n\n"+ "- For each executable hook, output the following\n"+ )+ result = i.post_process_skill_content(content)+ assert "user-invocable: true" in result+ assert "disable-model-invocation: false" in result+ assert "replace dots" in resultdiff --git a/tests/test_extension_skills.py b/tests/test_extension_skills.pyindex 8a9f19e74..c9d13382a 100644--- a/tests/test_extension_skills.py+++ b/tests/test_extension_skills.py@@ -269,7 +269,7 @@ class TestExtensionSkillRegistration:assert isinstance(parsed, dict)assert parsed["name"] == "speckit-test-ext-hello"assert "description" in parsed- assert parsed["disable-model-invocation"] is True+ assert parsed["disable-model-invocation"] is Falsedef test_no_skills_when_ai_skills_disabled(self, no_skills_project, extension_dir):"""No skills should be created when ai_skills is false."""diff --git a/tests/test_presets.py b/tests/test_presets.pyindex c7383a1f4..b883d554b 100644--- a/tests/test_presets.py+++ b/tests/test_presets.py@@ -1975,7 +1975,7 @@ class TestPresetSkills:assert skill_file.exists()content = skill_file.read_text()assert "preset:self-test" in content, "Skill should reference preset source"- assert "disable-model-invocation: true" in content+ assert "disable-model-invocation: false" in content# Verify it was recorded in registrymetadata = manager.registry.get("self-test")@@ -2057,7 +2057,7 @@ class TestPresetSkills:content = skill_file.read_text()assert "preset:self-test" not in content, "Preset content should be gone"assert "templates/commands/specify.md" in content, "Should reference core template"- assert "disable-model-invocation: true" in content+ assert "disable-model-invocation: false" in contentdef test_skill_restored_on_remove_resolves_script_placeholders(self, project_dir):"""Core restore should resolve {SCRIPT}/{ARGS} placeholders like other skill paths."""