Harden skill path and preset checks

Author: RbBtSn0w

src/specify_cli/__init__.py

@@ -2151,10 +2151,6 @@ def init(
 
             if ai_skills:
                 if selected_ai in NATIVE_SKILLS_AGENTS:
-                    if skills_dir is None:
-                        raise RuntimeError(
-                            f"Could not resolve skills directory for agent: {selected_ai}"
-                        )
                     bundled_found = _has_bundled_skills(project_path, selected_ai)
                     if bundled_found:
                         detail = f"bundled skills → {skills_dir.relative_to(project_path)}"

src/specify_cli/agents.py

@@ -251,9 +251,11 @@ def _rewrite_project_relative_paths(text: str) -> str:
         ):
             text = text.replace(old, new)
 
-        text = re.sub(r"(?<![\w.])/?memory/", ".specify/memory/", text)
-        text = re.sub(r"(?<![\w.])/?scripts/", ".specify/scripts/", text)
-        text = re.sub(r"(?<![\w.])/?templates/", ".specify/templates/", text)
+        # Only rewrite top-level style references so extension-local paths like
+        # ".specify/extensions/<ext>/scripts/..." remain intact.
+        text = re.sub(r'(^|[\s`"\'(])(?:\.?/)?memory/', r"\1.specify/memory/", text)
+        text = re.sub(r'(^|[\s`"\'(])(?:\.?/)?scripts/', r"\1.specify/scripts/", text)
+        text = re.sub(r'(^|[\s`"\'(])(?:\.?/)?templates/', r"\1.specify/templates/", text)
 
         return text.replace(".specify/.specify/", ".specify/").replace(".specify.specify/", ".specify/")
 

src/specify_cli/presets.py

@@ -574,7 +574,7 @@ def _get_skills_dir(self) -> Optional[Path]:
 
         opts = load_init_options(self.project_root)
         agent = opts.get("ai")
-        if not agent:
+        if not isinstance(agent, str) or not agent:
             return None
 
         ai_skills_enabled = bool(opts.get("ai_skills"))

tests/test_extensions.py

@@ -778,6 +778,36 @@ def test_adjust_script_paths_does_not_mutate_input(self):
         assert adjusted["scripts"]["sh"] == ".specify/scripts/bash/setup-plan.sh {ARGS}"
         assert adjusted["scripts"]["ps"] == ".specify/scripts/powershell/setup-plan.ps1 {ARGS}"
 
+    def test_adjust_script_paths_preserves_extension_local_paths(self):
+        """Extension-local script paths should not be rewritten into .specify/.specify."""
+        from specify_cli.agents import CommandRegistrar as AgentCommandRegistrar
+        registrar = AgentCommandRegistrar()
+        original = {
+            "scripts": {
+                "sh": ".specify/extensions/test-ext/scripts/setup.sh {ARGS}",
+                "ps": "scripts/powershell/setup-plan.ps1 {ARGS}",
+            }
+        }
+
+        adjusted = registrar._adjust_script_paths(original)
+
+        assert adjusted["scripts"]["sh"] == ".specify/extensions/test-ext/scripts/setup.sh {ARGS}"
+        assert adjusted["scripts"]["ps"] == ".specify/scripts/powershell/setup-plan.ps1 {ARGS}"
+
+    def test_rewrite_project_relative_paths_preserves_extension_local_body_paths(self):
+        """Body rewrites should preserve extension-local assets while fixing top-level refs."""
+        from specify_cli.agents import CommandRegistrar as AgentCommandRegistrar
+
+        body = (
+            "Read `.specify/extensions/test-ext/templates/spec.md`\n"
+            "Run scripts/bash/setup-plan.sh\n"
+        )
+
+        rewritten = AgentCommandRegistrar._rewrite_project_relative_paths(body)
+
+        assert ".specify/extensions/test-ext/templates/spec.md" in rewritten
+        assert ".specify/scripts/bash/setup-plan.sh" in rewritten
+
     def test_render_toml_command_handles_embedded_triple_double_quotes(self):
         """TOML renderer should stay valid when body includes triple double-quotes."""
         from specify_cli.agents import CommandRegistrar as AgentCommandRegistrar

tests/test_presets.py

@@ -1995,6 +1995,16 @@ def test_skill_not_updated_when_ai_skills_disabled(self, project_dir, temp_dir):
         content = skill_file.read_text()
         assert "untouched" in content, "Skill should not be modified when ai_skills=False"
 
+    def test_get_skills_dir_returns_none_for_non_string_ai(self, project_dir):
+        """Corrupted init-options ai values should not crash preset skill resolution."""
+        init_options = project_dir / ".specify" / "init-options.json"
+        init_options.parent.mkdir(parents=True, exist_ok=True)
+        init_options.write_text('{"ai":["codex"],"ai_skills":true,"script":"sh"}')
+
+        manager = PresetManager(project_dir)
+
+        assert manager._get_skills_dir() is None
+
     def test_skill_not_updated_without_init_options(self, project_dir, temp_dir):
         """When no init-options.json exists, preset install should not touch skills."""
         skills_dir = project_dir / ".claude" / "skills"