Fix CI: tests now pass without .pact/ directory

- Add src/apprentice/ as fallback path in conftest.py for GitHub Actions
- Add cli_models.py shim that re-exports from apprentice.cli.cli_models
  (avoids Pydantic strict-mode class identity mismatch)
- Fix _get_cli_module_path() to use main.__module__ for correct patching

2064 passed, 0 failed in both local (.pact/) and CI (no .pact/) modes.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: jmc-wander

src/apprentice/cli_models.py

@@ -0,0 +1,9 @@
+"""Re-export CLI models from the canonical location.
+
+This shim ensures that `from src.cli_models import ...` (used by composition
+modules) resolves to the *same* Pydantic classes that `apprentice.cli.cli`
+uses internally.  Without this, Pydantic strict-mode rejects cross-module
+instances because the class objects differ.
+"""
+
+from apprentice.cli.cli_models import *  # noqa: F401,F403

tests/conftest.py

@@ -11,6 +11,7 @@
 _project_root = Path(__file__).parent.parent
 _impls = _project_root / ".pact" / "implementations"
 _comps = _project_root / ".pact" / "compositions"
+_pkg = _project_root / "src" / "apprentice"
 
 # Create a virtual 'src' package that lazily loads from implementations
 if "src" not in sys.modules:
@@ -32,6 +33,14 @@
                 if src_str not in sys.path:
                     sys.path.append(src_str)
 
+# Fallback: add src/apprentice/ so tests work on CI where .pact/ doesn't exist
+if _pkg.is_dir():
+    _pkg_str = str(_pkg)
+    if _pkg_str not in sys.modules["src"].__path__:
+        sys.modules["src"].__path__.append(_pkg_str)
+    if _pkg_str not in sys.path:
+        sys.path.append(_pkg_str)
+
 
 @pytest.fixture(autouse=True)
 def _wire_root_components(request):

tests/test_cli.py

@@ -741,11 +741,8 @@ class TestMain:
 
     def _get_cli_module_path(self):
         """Determine the module path for patching."""
-        try:
-            import src.cli
-            return "src.cli"
-        except ImportError:
-            return "cli"
+        # Use the actual module where main() is defined, not the re-export alias
+        return main.__module__
 
     def test_main_usage_error_no_args(self):
         """main() returns exit code 2 on missing arguments (no subcommand)."""