fix: address PR review round 2

- Remove unused SKILL_DESCRIPTIONS dict from base.py (dead code after
  switching to template descriptions for ZIP parity)
- Narrow YAML parse catch from Exception to yaml.YAMLError
- Remove unused shutil import from test_integration_kimi.py
- Remove unused _REGISTRAR_EXEMPT class attr from test_registry.py
- Reword --ai-commands-dir deprecation to be actionable
- Update generic validation error to mention both --ai and --integration

Author: mnriem

src/specify_cli/__init__.py

@@ -2013,8 +2013,8 @@ def init(
                 )
         if ai_commands_dir and resolved_integration.key != "generic":
             console.print(
-                "[dim]Note: --ai-commands-dir is deprecated with --integration; "
-                "use --integration generic with parsed options instead.[/dim]"
+                "[dim]Note: --ai-commands-dir is only supported with the generic integration; "
+                "omit this flag unless you are using --integration generic (or --ai generic).[/dim]"
             )
 
     if project_name == ".":
@@ -2109,11 +2109,15 @@ def init(
     # preserves a clear CLI error with example usage.
     if selected_ai == "generic":
         if not ai_commands_dir:
-            console.print("[red]Error:[/red] --ai-commands-dir is required when using --ai generic")
+            console.print("[red]Error:[/red] --ai-commands-dir is required when using --ai generic or --integration generic")
             console.print("[dim]Example: specify init my-project --ai generic --ai-commands-dir .myagent/commands/[/dim]")
             raise typer.Exit(1)
     elif ai_commands_dir and not use_integration:
-        console.print(f"[red]Error:[/red] --ai-commands-dir can only be used with --ai generic (not '{selected_ai}')")
+        console.print(
+            f"[red]Error:[/red] --ai-commands-dir can only be used with the "
+            f"'generic' integration via --ai generic or --integration generic "
+            f"(not '{selected_ai}')"
+        )
         raise typer.Exit(1)
 
     current_dir = Path.cwd()

src/specify_cli/integrations/base.py

@@ -641,20 +641,6 @@ def setup(
 # SkillsIntegration — skills-format agents (Codex, Kimi, Agy)
 # ---------------------------------------------------------------------------
 
-# Enhanced descriptions for each spec-kit command skill.
-# Shared by all SkillsIntegration subclasses.
-SKILL_DESCRIPTIONS: dict[str, str] = {
-    "specify": "Create or update feature specifications from natural language descriptions. Use when starting new features or refining requirements. Generates spec.md with user stories, functional requirements, and acceptance criteria following spec-driven development methodology.",
-    "plan": "Generate technical implementation plans from feature specifications. Use after creating a spec to define architecture, tech stack, and implementation phases. Creates plan.md with detailed technical design.",
-    "tasks": "Break down implementation plans into actionable task lists. Use after planning to create a structured task breakdown. Generates tasks.md with ordered, dependency-aware tasks.",
-    "implement": "Execute all tasks from the task breakdown to build the feature. Use after task generation to systematically implement the planned solution following TDD approach where applicable.",
-    "analyze": "Perform cross-artifact consistency analysis across spec.md, plan.md, and tasks.md. Use after task generation to identify gaps, duplications, and inconsistencies before implementation.",
-    "clarify": "Structured clarification workflow for underspecified requirements. Use before planning to resolve ambiguities through coverage-based questioning. Records answers in spec clarifications section.",
-    "constitution": "Create or update project governing principles and development guidelines. Use at project start to establish code quality, testing standards, and architectural constraints that guide all development.",
-    "checklist": "Generate custom quality checklists for validating requirements completeness and clarity. Use to create unit tests for English that ensure spec quality before implementation.",
-    "taskstoissues": "Convert tasks from tasks.md into GitHub issues. Use after task breakdown to track work items in GitHub project management.",
-}
-
 
 class SkillsIntegration(IntegrationBase):
     """Concrete base for integrations that install commands as agent skills.
@@ -750,7 +736,7 @@ def setup(
                         fm = yaml.safe_load(parts[1])
                         if isinstance(fm, dict):
                             frontmatter = fm
-                    except Exception:
+                    except yaml.YAMLError:
                         pass
 
             # Process body through the standard template pipeline

tests/integrations/test_integration_kimi.py

@@ -1,7 +1,5 @@
 """Tests for KimiIntegration — skills integration with legacy migration."""
 
-import shutil
-
 from specify_cli.integrations import get_integration
 from specify_cli.integrations.kimi import _migrate_legacy_kimi_dotted_skills
 from specify_cli.integrations.manifest import IntegrationManifest

tests/integrations/test_registry.py

@@ -71,8 +71,6 @@ class TestRegistrarKeyAlignment:
     output path comes from ``--commands-dir`` at runtime.
     """
 
-    _REGISTRAR_EXEMPT = {"generic"}
-
     @pytest.mark.parametrize(
         "key",
         [k for k in ALL_INTEGRATION_KEYS if k != "generic"],