invar-tools 1.17.23__py3-none-any.whl → 1.17.25__py3-none-any.whl

invar/shell/config.py

@@ -435,24 +435,42 @@ _DEFAULT_EXCLUDE_PATHS = [
 ]
 
 
+# @shell_complexity: Config fallthrough requires checking multiple sources
 def _get_classification_config(project_root: Path) -> Result[dict[str, Any], str]:
-    """Get classification-related config (paths and patterns)."""
-    find_result = _find_config_source(project_root)
-    if isinstance(find_result, Failure):
-        return Success({})  # Return empty on error
-    config_path, source = find_result.unwrap()
+    """Get classification-related config (paths and patterns).
 
-    if source == "default":
-        return Success({})
+    Uses fallthrough logic: if pyproject.toml exists but has no [tool.invar.guard],
+    continues to check invar.toml and .invar/config.toml.
+    """
+    # Build list of config sources to try (same order as load_config)
+    sources_to_try: list[tuple[Path, ConfigSource]] = []
+
+    pyproject = project_root / "pyproject.toml"
+    if pyproject.exists():
+        sources_to_try.append((pyproject, "pyproject"))
 
-    assert config_path is not None
-    result = _read_toml(config_path)
+    invar_toml = project_root / "invar.toml"
+    if invar_toml.exists():
+        sources_to_try.append((invar_toml, "invar"))
 
-    if isinstance(result, Failure):
-        return Success({})  # Return empty on error
+    invar_config = project_root / ".invar" / "config.toml"
+    if invar_config.exists():
+        sources_to_try.append((invar_config, "invar_dir"))
+
+    # Try each source, fallback if no guard config found
+    for config_path, source in sources_to_try:
+        result = _read_toml(config_path)
+        if isinstance(result, Failure):
+            continue  # Skip unreadable files
+
+        data = result.unwrap()
+        guard_config = extract_guard_section(data, source)
+
+        if guard_config:  # Found valid guard config
+            return Success(guard_config)
 
-    data = result.unwrap()
-    return Success(extract_guard_section(data, source))
+    # No config found in any source, return empty dict
+    return Success({})
 
 
 def get_path_classification(project_root: Path) -> Result[tuple[list[str], list[str]], str]:

invar/shell/guard_helpers.py

@@ -178,7 +178,24 @@ def run_crosshair_phase(
         return True, {"status": "skipped", "reason": "no files to verify"}
 
     # Only verify Core files (pure logic)
-    core_files = [f for f in checked_files if "core" in str(f)]
+    # BUG-57: Use config-based core detection instead of hardcoded "core" in path
+    from invar.core.utils import matches_path_prefix
+    from invar.shell.config import get_path_classification
+
+    path_result = get_path_classification(path)
+    if isinstance(path_result, Success):
+        core_paths, _ = path_result.unwrap()
+    else:
+        core_paths = ["src/core", "core"]
+
+    def is_core_file(f: Path) -> bool:
+        try:
+            rel = str(f.relative_to(path))
+        except ValueError:
+            rel = str(f)
+        return matches_path_prefix(rel, core_paths)
+
+    core_files = [f for f in checked_files if is_core_file(f)]
     if not core_files:
         return True, {"status": "skipped", "reason": "no core files found"}
 
@@ -306,7 +323,24 @@ def run_property_tests_phase(
         return True, {"status": "skipped", "reason": "no files"}, None
 
     # Only test Core files (with contracts)
-    core_files = [f for f in checked_files if "core" in str(f)]
+    # BUG-57: Use config-based core detection instead of hardcoded "core" in path
+    from invar.core.utils import matches_path_prefix
+    from invar.shell.config import get_path_classification
+
+    path_result = get_path_classification(project_root)
+    if isinstance(path_result, Success):
+        core_paths, _ = path_result.unwrap()
+    else:
+        core_paths = ["src/core", "core"]
+
+    def is_core_file(f: Path) -> bool:
+        try:
+            rel = str(f.relative_to(project_root))
+        except ValueError:
+            rel = str(f)
+        return matches_path_prefix(rel, core_paths)
+
+    core_files = [f for f in checked_files if is_core_file(f)]
     if not core_files:
         return True, {"status": "skipped", "reason": "no core files"}, None
 

invar/shell/property_tests.py

@@ -97,7 +97,7 @@ def run_property_tests_on_file(
 
     root = project_root or file_path.parent
     with _inject_project_site_packages(root):
-        module = _import_module_from_path(file_path)
+        module = _import_module_from_path(file_path, project_root=root)
 
     if module is None:
         return Failure(f"Could not import module: {file_path}")
@@ -218,15 +218,56 @@ def _accumulate_report(
     combined_report.errors.extend(file_report.errors)
 
 
-def _import_module_from_path(file_path: Path) -> object | None:
+# @shell_complexity: BUG-57 fix requires package hierarchy setup for relative imports
+def _import_module_from_path(file_path: Path, project_root: Path | None = None) -> object | None:
     """
     Import a Python module from a file path.
 
+    BUG-57: Properly handles relative imports by setting up package context.
+
     Returns None if import fails.
     """
     try:
-        module_name = file_path.stem
-        spec = importlib.util.spec_from_file_location(module_name, file_path)
+        # Calculate the full module name from project root
+        if project_root and file_path.is_relative_to(project_root):
+            # Convert path to module name: my_package/main.py -> my_package.main
+            relative = file_path.relative_to(project_root)
+            parts = list(relative.with_suffix("").parts)
+            module_name = ".".join(parts)
+        else:
+            module_name = file_path.stem
+
+        # Ensure project root is in sys.path for relative imports
+        if project_root:
+            root_str = str(project_root)
+            if root_str not in sys.path:
+                sys.path.insert(0, root_str)
+
+        # For packages with relative imports, we need to set up parent packages first
+        if "." in module_name:
+            # Import parent packages first
+            parts = module_name.split(".")
+            for i in range(1, len(parts)):
+                parent_name = ".".join(parts[:i])
+                if parent_name not in sys.modules:
+                    parent_path = project_root / "/".join(parts[:i]) if project_root else None
+                    if parent_path and (parent_path / "__init__.py").exists():
+                        parent_spec = importlib.util.spec_from_file_location(
+                            parent_name,
+                            parent_path / "__init__.py",
+                            submodule_search_locations=[str(parent_path)],
+                        )
+                        if parent_spec and parent_spec.loader:
+                            parent_module = importlib.util.module_from_spec(parent_spec)
+                            sys.modules[parent_name] = parent_module
+                            parent_spec.loader.exec_module(parent_module)
+
+        # Now import the target module
+        spec = importlib.util.spec_from_file_location(
+            module_name,
+            file_path,
+            submodule_search_locations=[str(file_path.parent)],
+        )
         if spec is None or spec.loader is None:
             return None
 

{invar_tools-1.17.23.dist-info → invar_tools-1.17.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: invar-tools
-Version: 1.17.23
+Version: 1.17.25
 Summary: AI-native software engineering tools with design-by-contract verification
 Project-URL: Homepage, https://github.com/tefx/invar
 Project-URL: Documentation, https://github.com/tefx/invar#readme

{invar_tools-1.17.23.dist-info → invar_tools-1.17.25.dist-info}/RECORD

@@ -2657,20 +2657,20 @@ invar/node_tools/quick-check/cli.js,sha256=dwV3hdJleFQga2cKUn3PPfQDvvujhzKdjQcIv
 invar/node_tools/ts-analyzer/cli.js,sha256=SvZ6HyjmobpP8NAZqXFiy8BwH_t5Hb17Ytar_18udaQ,4092887
 invar/shell/__init__.py,sha256=FFw1mNbh_97PeKPcHIqQpQ7mw-JoIvyLM1yOdxLw5uk,204
 invar/shell/claude_hooks.py,sha256=hV4DfG3cVng32f0Rxoo070tliVlYFC5v9slIWEbAD7E,18899
-invar/shell/config.py,sha256=Q8HI_bYz3mwKTAuG4JYjiXt0kXCdQdWZ0hZn3xy9r-M,18570
+invar/shell/config.py,sha256=fPKY1AAqM28vcIIasvitYqqCv3g5VAjCdS8M7dNbQWA,19331
 invar/shell/contract_coverage.py,sha256=81OQkQqUVYUKytG5aiJyRK62gwh9UzbSG926vkvFTc8,12088
 invar/shell/coverage.py,sha256=m01o898IFIdBztEBQLwwL1Vt5PWrpUntO4lv4nWEkls,11344
 invar/shell/doc_tools.py,sha256=16gvo_ay9-_EK6lX16WkiRGg4OfTAKK_i0ucQkE7lbI,15149
 invar/shell/fs.py,sha256=ctqU-EX0NnKC4txudRCRpbWxWSgBZTInXMeOUnl3IM0,6196
 invar/shell/git.py,sha256=R-ynlYa65xtCdnNjHeu42uPyrqoo9KZDzl7BZUW0oWU,2866
-invar/shell/guard_helpers.py,sha256=lpaFIe328ZISzim92TAxZHTT8jC4N0_TcQ7PV7u327w,16083
+invar/shell/guard_helpers.py,sha256=IWiQEhDXnvN7QizGFrTNgfkSRN3ZVRF66gj-CeTjuJE,17261
 invar/shell/guard_output.py,sha256=v3gG5P-_47nIFo8eAMKwdA_hLf2KZ0cQ-45Z6JjKp4w,12520
 invar/shell/mcp_config.py,sha256=-hC7Y5BGuVs285b6gBARk7ZyzVxHwPgXSyt_GoN0jfs,4580
 invar/shell/mutation.py,sha256=Lfyk2b8j8-hxAq-iwAgQeOhr7Ci6c5tRF1TXe3CxQCs,8914
 invar/shell/pattern_integration.py,sha256=pRcjfq3NvMW_tvQCnaXZnD1k5AVEWK8CYOE2jN6VTro,7842
 invar/shell/pi_hooks.py,sha256=ulZc1sP8mTRJTBsjwFHQzUgg-h8ajRIMp7iF1Y4UUtw,6885
 invar/shell/pi_tools.py,sha256=a3ACDDXykFV8fUB5UpBmgMvppwkmLvT1k_BWm0IY47k,4068
-invar/shell/property_tests.py,sha256=SB-3tS5TupYQP1jpEUNpQs6fWCwLWxck0akNsgVwGGM,10533
+invar/shell/property_tests.py,sha256=qt0CP5RH9Md2ZZV64ziNsjQ_-x0onCYtZwbQfqw9gbY,12586
 invar/shell/py_refs.py,sha256=Vjz50lmt9prDBcBv4nkkODdiJ7_DKu5zO4UPZBjAfmM,4638
 invar/shell/skill_manager.py,sha256=Mr7Mh9rxPSKSAOTJCAM5ZHiG5nfUf6KQVCuD4LBNHSI,12440
 invar/shell/subprocess_env.py,sha256=hendEERSyAG4a8UFhYfPtOAlfspVRB03aVCYpj3uqk4,12745
@@ -2778,10 +2778,10 @@ invar/templates/skills/invar-reflect/template.md,sha256=Rr5hvbllvmd8jSLf_0ZjyKt6
 invar/templates/skills/investigate/SKILL.md.jinja,sha256=cp6TBEixBYh1rLeeHOR1yqEnFqv1NZYePORMnavLkQI,3231
 invar/templates/skills/propose/SKILL.md.jinja,sha256=6BuKiCqO1AEu3VtzMHy1QWGqr_xqG9eJlhbsKT4jev4,3463
 invar/templates/skills/review/SKILL.md.jinja,sha256=ET5mbdSe_eKgJbi2LbgFC-z1aviKcHOBw7J5Q28fr4U,14105
-invar_tools-1.17.23.dist-info/METADATA,sha256=GEpstDi-UqTQlgkBB_WpmhT30NWcAkX3ULm9CxAklBc,28582
-invar_tools-1.17.23.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-invar_tools-1.17.23.dist-info/entry_points.txt,sha256=RwH_EhqgtFPsnO6RcrwrAb70Zyfb8Mh6uUtztWnUxGk,102
-invar_tools-1.17.23.dist-info/licenses/LICENSE,sha256=qeFksp4H4kfTgQxPCIu3OdagXyiZcgBlVfsQ6M5oFyk,10767
-invar_tools-1.17.23.dist-info/licenses/LICENSE-GPL,sha256=IvZfC6ZbP7CLjytoHVzvpDZpD-Z3R_qa1GdMdWlWQ6Q,35157
-invar_tools-1.17.23.dist-info/licenses/NOTICE,sha256=joEyMyFhFY8Vd8tTJ-a3SirI0m2Sd0WjzqYt3sdcglc,2561
-invar_tools-1.17.23.dist-info/RECORD,,
+invar_tools-1.17.25.dist-info/METADATA,sha256=t7Kc8ideD0woPDbz-PQiXfyQzlyBOPis0VZjDQHHCPU,28582
+invar_tools-1.17.25.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+invar_tools-1.17.25.dist-info/entry_points.txt,sha256=RwH_EhqgtFPsnO6RcrwrAb70Zyfb8Mh6uUtztWnUxGk,102
+invar_tools-1.17.25.dist-info/licenses/LICENSE,sha256=qeFksp4H4kfTgQxPCIu3OdagXyiZcgBlVfsQ6M5oFyk,10767
+invar_tools-1.17.25.dist-info/licenses/LICENSE-GPL,sha256=IvZfC6ZbP7CLjytoHVzvpDZpD-Z3R_qa1GdMdWlWQ6Q,35157
+invar_tools-1.17.25.dist-info/licenses/NOTICE,sha256=joEyMyFhFY8Vd8tTJ-a3SirI0m2Sd0WjzqYt3sdcglc,2561
+invar_tools-1.17.25.dist-info/RECORD,,