Fix legacy hook invocations for skills integrations

Author: nike-17

src/specify_cli/extensions.py

@@ -2552,22 +2552,32 @@ def _render_hook_invocation(self, command: Any) -> str:
                 pass
 
         init_options = self._load_init_options()
+        skill_name = self._skill_name_from_command(command_id)
         selected_ai = init_options.get("ai")
-        codex_skill_mode = selected_ai == "codex" and bool(init_options.get("ai_skills"))
-        claude_skill_mode = selected_ai == "claude" and bool(init_options.get("ai_skills"))
-        kimi_skill_mode = selected_ai == "kimi"
-        cursor_skill_mode = selected_ai == "cursor-agent" and bool(init_options.get("ai_skills"))
-        cline_mode = selected_ai == "cline"
+        ai_skills = bool(init_options.get("ai_skills"))
+        if skill_name and isinstance(selected_ai, str):
+            try:
+                from .integrations import get_integration
+                from .integrations.base import SkillsIntegration
 
-        skill_name = self._skill_name_from_command(command_id)
-        if codex_skill_mode and skill_name:
-            return f"${skill_name}"
-        if claude_skill_mode and skill_name:
-            return f"/{skill_name}"
-        if kimi_skill_mode and skill_name:
-            return f"/skill:{skill_name}"
-        if cursor_skill_mode and skill_name:
-            return f"/{skill_name}"
+                integration = get_integration(selected_ai)
+            except Exception:
+                integration = None
+
+            if integration is not None:
+                parsed_options = {"skills": True} if ai_skills else None
+                if isinstance(integration, SkillsIntegration) and (ai_skills or selected_ai == "kimi"):
+                    return integration.build_user_command_invocation(
+                        command_id,
+                        parsed_options=parsed_options,
+                    )
+                if selected_ai == "copilot" and ai_skills:
+                    return integration.build_user_command_invocation(
+                        command_id,
+                        parsed_options=parsed_options,
+                    )
+
+        cline_mode = selected_ai == "cline"
         if cline_mode:
             from .integrations.cline import format_cline_command_name
 

src/specify_cli/integrations/agy/__init__.py

@@ -64,21 +64,4 @@ def setup(
             fg="yellow",
             err=True,
         )
-        created = super().setup(project_root, manifest, parsed_options=parsed_options, **opts)
-
-        skills_dir = self.skills_dest(project_root).resolve()
-        for path in created:
-            try:
-                path.resolve().relative_to(skills_dir)
-            except ValueError:
-                continue
-            if path.name != "SKILL.md":
-                continue
-
-            content = path.read_bytes().decode("utf-8")
-            updated = self.post_process_skill_content(content)
-            if updated != content:
-                path.write_bytes(updated.encode("utf-8"))
-                self.record_file_in_manifest(path, project_root, manifest)
-
-        return created
+        return super().setup(project_root, manifest, parsed_options=parsed_options, **opts)

tests/integrations/test_integration_agy.py

@@ -100,6 +100,7 @@ def test_hook_note_injected_in_skills_with_hooks(self, tmp_path):
         assert "replace dots" in content, (
             "speckit-specify should have dot-to-hyphen hook note"
         )
+        assert "$speckit-git-commit" in content
 
     def test_hook_note_not_in_skills_without_hooks(self):
         """Skills without hook sections should not get the note."""
@@ -120,6 +121,7 @@ def test_hook_note_idempotent(self):
         once = AgyIntegration._inject_hook_command_note(content)
         twice = AgyIntegration._inject_hook_command_note(once)
         assert once == twice, "Hook note injection should be idempotent"
+        assert "$speckit-git-commit" in once
 
     def test_hook_note_preserves_indentation(self):
         """The injected note must match the indentation of the target line."""

tests/integrations/test_integration_subcommand.py

@@ -229,7 +229,9 @@ def test_install_multi_safe_integration(self, tmp_path):
         assert data["integration_state_schema"] == 1
         assert data["installed_integrations"] == ["claude", "codex"]
         assert data["integration_settings"]["claude"]["invoke_separator"] == "-"
+        assert data["integration_settings"]["claude"]["command_prefix"] == "/"
         assert data["integration_settings"]["codex"]["invoke_separator"] == "-"
+        assert data["integration_settings"]["codex"]["command_prefix"] == "$"
 
         assert (project / ".claude" / "skills" / "speckit-plan" / "SKILL.md").exists()
         assert (project / ".agents" / "skills" / "speckit-plan" / "SKILL.md").exists()

tests/test_extensions.py

@@ -4884,6 +4884,42 @@ def test_codex_hooks_render_dollar_skill_invocation(self, project_dir):
         assert execution["command"] == "speckit.tasks"
         assert execution["invocation"] == "$speckit-tasks"
 
+    @pytest.mark.parametrize(
+        ("ai", "expected"),
+        [
+            ("agy", "$speckit-git-commit"),
+            ("trae", "$speckit-git-commit"),
+            ("devin", "/speckit-git-commit"),
+        ],
+    )
+    def test_skills_hooks_render_from_legacy_init_options(self, project_dir, ai, expected):
+        """Skills integrations should render native invocations without integration.json."""
+        init_options = project_dir / ".specify" / "init-options.json"
+        init_options.parent.mkdir(parents=True, exist_ok=True)
+        init_options.write_text(json.dumps({"ai": ai, "ai_skills": True}))
+
+        hook_executor = HookExecutor(project_dir)
+        execution = hook_executor.execute_hook(
+            {
+                "extension": "test-ext",
+                "command": "speckit.git.commit",
+                "optional": False,
+            }
+        )
+
+        assert execution["command"] == "speckit.git.commit"
+        assert execution["invocation"] == expected
+
+    def test_legacy_codex_without_skills_keeps_dotted_invocation(self, project_dir):
+        """Legacy Codex command-mode metadata should not be promoted during fallback."""
+        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}))
+
+        hook_executor = HookExecutor(project_dir)
+
+        assert hook_executor._render_hook_invocation("speckit.tasks") == "/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"