fix: preserve preset refactor seams

Assisted-by: GitHub Copilot (model: GPT-5.6 Sol, autonomous)

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Author: mnriem

src/specify_cli/presets/command_add.py

@@ -368,7 +368,7 @@ def _validate_download_redirect(old_url, new_url):
         # exits, so one call here covers --dev, --from, and catalog installs
         # alike. Warns rather than fails: the preset is installed and its
         # overrides fall through to the core workflow without the extension.
-        _warn_unmet_extension_dependencies(manager, manifest)
+        _commands._warn_unmet_extension_dependencies(manager, manifest)
 
     except PresetCompatibilityError as e:
         console.print(f"[red]Compatibility Error:[/red] {_escape_markup(str(e))}")

tests/specify_cli/presets/_fixtures.py

@@ -0,0 +1,82 @@
+"""Shared pytest fixtures for preset domain and command suites."""
+
+from __future__ import annotations
+
+import shutil
+import tempfile
+from pathlib import Path
+
+import pytest
+import yaml
+
+
+@pytest.fixture
+def temp_dir():
+    """Create a temporary directory for tests."""
+    tmpdir = tempfile.mkdtemp()
+    yield Path(tmpdir)
+    shutil.rmtree(tmpdir)
+
+
+@pytest.fixture
+def valid_pack_data():
+    """Return valid preset manifest data."""
+    return {
+        "schema_version": "1.0",
+        "preset": {
+            "id": "test-pack",
+            "name": "Test Preset",
+            "version": "1.0.0",
+            "description": "A test preset",
+            "author": "Test Author",
+            "repository": "https://github.com/test/test-pack",
+            "license": "MIT",
+        },
+        "requires": {"speckit_version": ">=0.1.0"},
+        "provides": {
+            "templates": [
+                {
+                    "type": "template",
+                    "name": "spec-template",
+                    "file": "templates/spec-template.md",
+                    "description": "Custom spec template",
+                    "replaces": "spec-template",
+                }
+            ]
+        },
+        "tags": ["testing", "example"],
+    }
+
+
+@pytest.fixture
+def pack_dir(temp_dir, valid_pack_data):
+    """Create a complete preset directory structure."""
+    preset_dir = temp_dir / "test-pack"
+    preset_dir.mkdir()
+    (preset_dir / "preset.yml").write_text(
+        yaml.safe_dump(valid_pack_data), encoding="utf-8"
+    )
+    templates_dir = preset_dir / "templates"
+    templates_dir.mkdir()
+    (templates_dir / "spec-template.md").write_text(
+        "# Custom Spec Template\n\nThis is a custom template.\n",
+        encoding="utf-8",
+    )
+    return preset_dir
+
+
+@pytest.fixture
+def project_dir(temp_dir):
+    """Create a mock spec-kit project directory."""
+    project = temp_dir / "project"
+    project.mkdir()
+    templates_dir = project / ".specify" / "templates"
+    templates_dir.mkdir(parents=True)
+    (templates_dir / "spec-template.md").write_text(
+        "# Core Spec Template\n", encoding="utf-8"
+    )
+    (templates_dir / "plan-template.md").write_text(
+        "# Core Plan Template\n", encoding="utf-8"
+    )
+    (templates_dir / "commands").mkdir()
+    return project

tests/specify_cli/presets/_helpers.py

@@ -2,12 +2,19 @@
 
 from __future__ import annotations
 
+import json
 import warnings
+from datetime import UTC, datetime
 from pathlib import Path
 
 import yaml
 
-from specify_cli.presets import PresetManager, PresetManifest
+from specify_cli.presets import (
+    PresetCatalog,
+    PresetCatalogEntry,
+    PresetManager,
+    PresetManifest,
+)
 
 REPO_ROOT = Path(__file__).parents[3]
 SELF_TEST_PRESET_DIR = REPO_ROOT / "presets" / "self-test"
@@ -26,6 +33,48 @@
 ]
 
 
+def seed_catalog(
+    project_dir: Path,
+    tags: object,
+    extra: dict[str, object] | None = None,
+) -> PresetCatalog:
+    """Seed cached catalog metadata used by search and info command tests."""
+    catalog = PresetCatalog(project_dir)
+    catalog.cache_dir.mkdir(parents=True, exist_ok=True)
+    pack = {
+        "name": "Numeric Tags",
+        "description": "Preset with non-string tags",
+        "version": "1.0.0",
+        "tags": tags,
+    }
+    if extra:
+        pack.update(extra)
+    catalog.cache_file.write_text(
+        json.dumps(
+            {
+                "schema_version": "1.0",
+                "presets": {"numeric-tags": pack},
+            }
+        )
+    )
+    catalog.cache_metadata_file.write_text(
+        json.dumps({"cached_at": datetime.now(UTC).isoformat()})
+    )
+    return catalog
+
+
+def default_catalog_entries(catalog: PresetCatalog) -> list[PresetCatalogEntry]:
+    """Return the default catalog as the only active catalog."""
+    return [
+        PresetCatalogEntry(
+            url=catalog.DEFAULT_CATALOG_URL,
+            name="default",
+            priority=1,
+            install_allowed=True,
+        )
+    ]
+
+
 def install_self_test_preset(
     manager: PresetManager, speckit_version: str = "0.1.5"
 ) -> PresetManifest:

tests/specify_cli/presets/conftest.py

@@ -1,82 +1,10 @@
-"""Shared fixtures for mirrored preset command tests."""
+"""Load shared fixtures for mirrored preset command tests."""
 
 from __future__ import annotations
 
-import shutil
-import tempfile
-from pathlib import Path
+from . import _fixtures
 
-import pytest
-import yaml
-
-
-@pytest.fixture
-def temp_dir():
-    """Create a temporary directory for tests."""
-    tmpdir = tempfile.mkdtemp()
-    yield Path(tmpdir)
-    shutil.rmtree(tmpdir)
-
-
-@pytest.fixture
-def valid_pack_data():
-    """Return valid preset manifest data."""
-    return {
-        "schema_version": "1.0",
-        "preset": {
-            "id": "test-pack",
-            "name": "Test Preset",
-            "version": "1.0.0",
-            "description": "A test preset",
-            "author": "Test Author",
-            "repository": "https://github.com/test/test-pack",
-            "license": "MIT",
-        },
-        "requires": {"speckit_version": ">=0.1.0"},
-        "provides": {
-            "templates": [
-                {
-                    "type": "template",
-                    "name": "spec-template",
-                    "file": "templates/spec-template.md",
-                    "description": "Custom spec template",
-                    "replaces": "spec-template",
-                }
-            ]
-        },
-        "tags": ["testing", "example"],
-    }
-
-
-@pytest.fixture
-def pack_dir(temp_dir, valid_pack_data):
-    """Create a complete preset directory structure."""
-    preset_dir = temp_dir / "test-pack"
-    preset_dir.mkdir()
-    (preset_dir / "preset.yml").write_text(
-        yaml.safe_dump(valid_pack_data), encoding="utf-8"
-    )
-    templates_dir = preset_dir / "templates"
-    templates_dir.mkdir()
-    (templates_dir / "spec-template.md").write_text(
-        "# Custom Spec Template\n\nThis is a custom template.\n",
-        encoding="utf-8",
-    )
-    return preset_dir
-
-
-@pytest.fixture
-def project_dir(temp_dir):
-    """Create a mock spec-kit project directory."""
-    project = temp_dir / "project"
-    project.mkdir()
-    templates_dir = project / ".specify" / "templates"
-    templates_dir.mkdir(parents=True)
-    (templates_dir / "spec-template.md").write_text(
-        "# Core Spec Template\n", encoding="utf-8"
-    )
-    (templates_dir / "plan-template.md").write_text(
-        "# Core Plan Template\n", encoding="utf-8"
-    )
-    (templates_dir / "commands").mkdir()
-    return project
+temp_dir = _fixtures.temp_dir
+valid_pack_data = _fixtures.valid_pack_data
+pack_dir = _fixtures.pack_dir
+project_dir = _fixtures.project_dir

tests/specify_cli/presets/test_command_add.py

@@ -5,7 +5,7 @@
 import zipfile
 from pathlib import Path
 from types import SimpleNamespace
-from unittest.mock import MagicMock
+from unittest.mock import ANY, MagicMock
 
 import pytest
 import yaml
@@ -253,6 +253,38 @@ def fake_install_from_zip(
 
         assert captured == {"priority": 7, "catalog_name": "preset-catalog"}
 
+    def test_preset_add_uses_legacy_dependency_warning_seam(
+        self, project_dir, pack_dir, monkeypatch
+    ):
+        """The extracted handler must honor patches at the legacy helper path."""
+        from specify_cli.presets import _commands as preset_commands
+
+        manifest = SimpleNamespace(name="Test Preset", version="1.0.0")
+        warning = MagicMock()
+        monkeypatch.setattr(
+            "specify_cli._require_specify_project", lambda: project_dir
+        )
+        monkeypatch.setattr("specify_cli.get_speckit_version", lambda: "1.0.0")
+        monkeypatch.setattr(
+            PresetManager,
+            "install_from_directory",
+            lambda _self, _path, _version, _priority: manifest,
+        )
+        monkeypatch.setattr(
+            preset_commands,
+            "_warn_unmet_extension_dependencies",
+            warning,
+        )
+
+        preset_commands.preset_add(
+            preset_id=None,
+            from_url=None,
+            dev=str(pack_dir),
+            priority=10,
+        )
+
+        warning.assert_called_once_with(ANY, manifest)
+
     def test_preset_add_from_url_rejects_insecure_redirect(
         self, project_dir, monkeypatch
     ):