crackerjack 0.31.10__py3-none-any.whl → 0.31.12__py3-none-any.whl

crackerjack/dynamic_config.py

@@ -5,6 +5,30 @@ from pathlib import Path
 import jinja2
 
 
+def _get_project_root() -> Path:
+    """Get the absolute path to the crackerjack project root."""
+    # Start from this file and go up to find the real project root
+    current_path = Path(__file__).resolve()
+    for parent in current_path.parents:
+        if (parent / "pyproject.toml").exists() and (parent / "tools").exists():
+            # Verify it's the crackerjack project by checking for unique markers and tools dir
+            try:
+                pyproject_content = (parent / "pyproject.toml").read_text()
+                if (
+                    'name = "crackerjack"' in pyproject_content
+                    and (
+                        parent / "tools" / "validate_regex_patterns_standalone.py"
+                    ).exists()
+                ):
+                    return parent
+            except Exception:
+                # If we can't read the file, continue searching
+                continue
+
+    # Fallback to the parent of the crackerjack package directory
+    return Path(__file__).resolve().parent.parent
+
+
 class HookMetadata(t.TypedDict):
     id: str
     name: str | None
@@ -32,6 +56,23 @@ class ConfigMode(t.TypedDict):
 
 HOOKS_REGISTRY: dict[str, list[HookMetadata]] = {
     "structure": [
+        {
+            "id": "validate-regex-patterns",
+            "name": "validate-regex-patterns",
+            "repo": "local",
+            "rev": "",
+            "tier": 1,
+            "time_estimate": 0.3,
+            "stages": None,
+            "args": None,
+            "files": r"\.py$",
+            "exclude": r"^\.venv/",
+            "additional_dependencies": None,
+            "types_or": None,
+            "language": "system",
+            "entry": f"uv run python {_get_project_root() / 'tools' / 'validate_regex_patterns_standalone.py'}",
+            "experimental": False,
+        },
         {
             "id": "trailing-whitespace",
             "name": "trailing-whitespace",
@@ -123,12 +164,12 @@ HOOKS_REGISTRY: dict[str, list[HookMetadata]] = {
             "id": "uv-lock",
             "name": None,
             "repo": "https://github.com/astral-sh/uv-pre-commit",
-            "rev": "0.8.14",
+            "rev": "0.8.15",
             "tier": 1,
             "time_estimate": 0.5,
             "stages": None,
             "args": None,
-            "files": r"^pyproject\.toml$",
+            "files": r"^ pyproject\.toml$",
             "exclude": None,
             "additional_dependencies": None,
             "types_or": None,
@@ -284,9 +325,9 @@ HOOKS_REGISTRY: dict[str, list[HookMetadata]] = {
             "repo": "https://github.com/rohaquinlop/complexipy-pre-commit",
             "rev": "v3.3.0",
             "tier": 3,
-            "time_estimate": 2.0,
+            "time_estimate": 1.0,
             "stages": ["pre-push", "manual"],
-            "args": ["-d", "low"],
+            "args": ["-d", "low", "--max-complexity-allowed", "15"],
             "files": r"^crackerjack/.*\.py$",
             "exclude": r"^(\.venv/|tests/)",
             "additional_dependencies": None,
@@ -392,7 +433,7 @@ CONFIG_MODES: dict[str, ConfigMode] = {
 PRE_COMMIT_TEMPLATE = """repos:
 {%- for repo in repos %}
   {%- if repo.comment %}
-  # {{ repo.comment }}
+
   {%- endif %}
   - repo: {{ repo.repo }}
     {%- if repo.rev %}
@@ -430,7 +471,7 @@ PRE_COMMIT_TEMPLATE = """repos:
         {%- endif %}
     {%- endfor %}
 
-{%- endfor %}
+{%-endfor %}
 """
 
 

crackerjack/errors.py

@@ -314,9 +314,9 @@ def _format_error_for_console(error: CrackerjackError, verbose: bool) -> Panel:
     content = [error.message]
 
     if verbose and error.details:
-        content.extend(("\n[white]Details: [/white]", str(error.details)))
+        content.extend(("\n[white]Details: [/ white]", str(error.details)))
     if error.recovery:
-        content.extend(("\n[green]Recovery suggestion: [/green]", str(error.recovery)))
+        content.extend(("\n[green]Recovery suggestion: [/ green]", str(error.recovery)))
 
     return Panel(
         "\n".join(content),
@@ -336,7 +336,7 @@ def handle_error(
 ) -> None:
     if ai_agent:
         formatted_json = _format_error_for_ai_agent(error, verbose)
-        console.print(f"[json]{formatted_json}[/json]")
+        console.print(f"[json]{formatted_json}[/ json]")
     else:
         panel = _format_error_for_console(error, verbose)
         console.print(panel)
@@ -375,5 +375,4 @@ def check_command_result(
 
 
 def format_error_report(error: CrackerjackError) -> str:
-    """Format an error for reporting purposes."""
     return f"Error {error.error_code.value}: {error.message}"

crackerjack/executors/async_hook_executor.py

@@ -7,6 +7,7 @@ from pathlib import Path
 from rich.console import Console
 
 from crackerjack.config.hooks import HookDefinition, HookStrategy, RetryPolicy
+from crackerjack.models.protocols import HookLockManagerProtocol
 from crackerjack.models.task import HookResult
 from crackerjack.services.logging import LoggingContext, get_logger
 
@@ -58,6 +59,7 @@ class AsyncHookExecutor:
         max_concurrent: int = 4,
         timeout: int = 300,
         quiet: bool = False,
+        hook_lock_manager: HookLockManagerProtocol | None = None,
     ) -> None:
         self.console = console
         self.pkg_path = pkg_path
@@ -68,6 +70,17 @@ class AsyncHookExecutor:
 
         self._semaphore = asyncio.Semaphore(max_concurrent)
 
+        # Use dependency injection for hook lock manager
+        if hook_lock_manager is None:
+            # Import here to avoid circular imports
+            from crackerjack.executors.hook_lock_manager import (
+                hook_lock_manager as default_manager,
+            )
+
+            self.hook_lock_manager = default_manager
+        else:
+            self.hook_lock_manager = hook_lock_manager
+
     async def execute_strategy(
         self,
         strategy: HookStrategy,
@@ -129,19 +142,34 @@ class AsyncHookExecutor:
                 performance_gain=performance_gain,
             )
 
+    def get_lock_statistics(self) -> dict[str, t.Any]:
+        """Get comprehensive lock usage statistics for monitoring."""
+        return self.hook_lock_manager.get_lock_stats()
+
+    def get_comprehensive_status(self) -> dict[str, t.Any]:
+        """Get comprehensive status including lock manager status."""
+        return {
+            "executor_config": {
+                "max_concurrent": self.max_concurrent,
+                "timeout": self.timeout,
+                "quiet": self.quiet,
+            },
+            "lock_manager_status": self.hook_lock_manager.get_lock_stats(),
+        }
+
     def _print_strategy_header(self, strategy: HookStrategy) -> None:
         self.console.print("\n" + "-" * 80)
         if strategy.name == "fast":
             self.console.print(
-                "[bold bright_cyan]🔍 HOOKS[/bold bright_cyan] [bold bright_white]Running code quality checks (async)[/bold bright_white]",
+                "[bold bright_cyan]🔍 HOOKS[/ bold bright_cyan] [bold bright_white]Running code quality checks (async)[/ bold bright_white]",
             )
         elif strategy.name == "comprehensive":
             self.console.print(
-                "[bold bright_cyan]🔍 HOOKS[/bold bright_cyan] [bold bright_white]Running comprehensive quality checks (async)[/bold bright_white]",
+                "[bold bright_cyan]🔍 HOOKS[/ bold bright_cyan] [bold bright_white]Running comprehensive quality checks (async)[/ bold bright_white]",
             )
         else:
             self.console.print(
-                f"[bold bright_cyan]🔍 HOOKS[/bold bright_cyan] [bold bright_white]Running {strategy.name} hooks (async)[/bold bright_white]",
+                f"[bold bright_cyan]🔍 HOOKS[/ bold bright_cyan] [bold bright_white]Running {strategy.name} hooks (async)[/ bold bright_white]",
             )
         self.console.print("-" * 80 + "\n")
 
@@ -194,7 +222,30 @@ class AsyncHookExecutor:
 
     async def _execute_single_hook(self, hook: HookDefinition) -> HookResult:
         async with self._semaphore:
-            return await self._run_hook_subprocess(hook)
+            # Check if hook requires sequential execution
+            if self.hook_lock_manager.requires_lock(hook.name):
+                self.logger.debug(
+                    f"Hook {hook.name} requires sequential execution lock"
+                )
+                if not self.quiet:
+                    self.console.print(
+                        f"[dim]🔒 {hook.name} (sequential execution)[/dim]"
+                    )
+
+            # Acquire hook-specific lock if required (e.g., for complexipy)
+            if self.hook_lock_manager.requires_lock(hook.name):
+                self.logger.debug(
+                    f"Hook {hook.name} requires sequential execution lock"
+                )
+                if not self.quiet:
+                    self.console.print(
+                        f"[dim]🔒 {hook.name} (sequential execution)[/dim]"
+                    )
+
+                async with self.hook_lock_manager.acquire_hook_lock(hook.name):  # type: ignore
+                    return await self._run_hook_subprocess(hook)
+            else:
+                return await self._run_hook_subprocess(hook)
 
     async def _run_hook_subprocess(self, hook: HookDefinition) -> HookResult:
         start_time = time.time()
@@ -210,9 +261,15 @@ class AsyncHookExecutor:
                 timeout=timeout_val,
             )
 
+            # Pre-commit must run from repository root, not package directory
+            repo_root = (
+                self.pkg_path.parent
+                if self.pkg_path.name == "crackerjack"
+                else self.pkg_path
+            )
             process = await asyncio.create_subprocess_exec(
                 *cmd,
-                cwd=self.pkg_path,
+                cwd=repo_root,
                 stdout=asyncio.subprocess.PIPE,
                 stderr=asyncio.subprocess.PIPE,
             )
@@ -419,13 +476,6 @@ class AsyncHookExecutor:
     ) -> None:
         if success:
             self.console.print(
-                f"[green]✅[/green] {strategy.name.title()} hooks passed: {len(results)} / {len(results)} "
-                f"(async, {performance_gain: .1f} % faster)",
-            )
-        else:
-            failed_count = sum(1 for r in results if r.status == "failed")
-            error_count = sum(1 for r in results if r.status in ("timeout", "error"))
-            self.console.print(
-                f"[red]❌[/red] {strategy.name.title()} hooks failed: {failed_count} failed, {error_count} errors "
+                f"[green]✅[/ green] {strategy.name.title()} hooks passed: {len(results)} / {len(results)} "
                 f"(async, {performance_gain: .1f} % faster)",
             )

crackerjack/executors/cached_hook_executor.py

@@ -95,7 +95,7 @@ class CachedHookExecutor:
         success = all(result.status == "passed" for result in results)
 
         self.logger.info(
-            f"Cached strategy '{strategy.name}' completed in {total_time: .2f}s - "
+            f"Cached strategy '{strategy.name}' completed in {total_time: .2f}s-"
             f"Success: {success}, Cache hits: {cache_hits}, Cache misses: {cache_misses}",
         )
 
@@ -124,8 +124,8 @@ class CachedHookExecutor:
 
     def _strategy_affects_python_only(self, strategy: HookStrategy) -> bool:
         python_only_hooks = {
-            "ruff - format",
-            "ruff - check",
+            "ruff-format",
+            "ruff-check",
             "pyright",
             "bandit",
             "vulture",
@@ -140,17 +140,17 @@ class CachedHookExecutor:
 
     def _should_ignore_file(self, file_path: Path) -> bool:
         ignore_patterns = [
-            ".git/",
-            ".venv/",
-            "__pycache__/",
-            ".pytest_cache/",
+            ".git /",
+            ".venv /",
+            "__pycache__ /",
+            ".pytest_cache /",
             ".coverage",
-            ".crackerjack_cache/",
-            "node_modules/",
-            ".tox/",
-            "dist/",
-            "build/",
-            ".egg - info/",
+            ".crackerjack_cache /",
+            "node_modules /",
+            ".tox /",
+            "dist /",
+            "build /",
+            ".egg-info /",
         ]
 
         path_str = str(file_path)
@@ -188,7 +188,7 @@ class SmartCacheManager:
         hook_name: str,
         project_state: dict[str, t.Any],
     ) -> bool:
-        external_hooks = {"detect - secrets"}
+        external_hooks = {"detect-secrets"}
         if hook_name in external_hooks:
             return False
 

crackerjack/executors/hook_executor.py

@@ -10,6 +10,7 @@ from rich.console import Console
 
 from crackerjack.config.hooks import HookDefinition, HookStrategy, RetryPolicy
 from crackerjack.models.task import HookResult
+from crackerjack.services.security_logger import get_security_logger
 
 
 @dataclass
@@ -169,22 +170,43 @@ class HookExecutor:
     def _run_hook_subprocess(
         self, hook: HookDefinition
     ) -> subprocess.CompletedProcess[str]:
-        """Execute hook subprocess with clean environment."""
+        """Run hook subprocess with comprehensive security validation."""
+        # Get sanitized environment
         clean_env = self._get_clean_environment()
-        return subprocess.run(
-            hook.get_command(),
-            check=False,
-            cwd=self.pkg_path,
-            text=True,
-            timeout=hook.timeout,
-            env=clean_env,
-            capture_output=True,
-        )
+
+        # Use secure subprocess execution
+        try:
+            # Pre-commit must run from repository root
+            # For crackerjack package structure, the repo root is pkg_path itself
+            repo_root = self.pkg_path
+            # Pre-commit has compatibility issues with secure subprocess
+            # Use direct subprocess execution for hooks
+            return subprocess.run(
+                hook.get_command(),
+                cwd=repo_root,
+                env=clean_env,
+                timeout=hook.timeout,
+                capture_output=True,
+                text=True,
+                check=False,  # Don't raise on non-zero exit codes
+            )
+        except Exception as e:
+            # Log security issues but convert to subprocess-compatible result
+            security_logger = get_security_logger()
+            security_logger.log_subprocess_failure(
+                command=hook.get_command(),
+                exit_code=-1,
+                error_output=str(e),
+            )
+
+            # Return a failed CompletedProcess for consistency
+            return subprocess.CompletedProcess(
+                args=hook.get_command(), returncode=1, stdout="", stderr=str(e)
+            )
 
     def _display_hook_output_if_needed(
         self, result: subprocess.CompletedProcess[str]
     ) -> None:
-        """Display hook output in verbose mode for failed hooks."""
         if result.returncode == 0 or not self.verbose:
             return
 
@@ -199,9 +221,18 @@ class HookExecutor:
         result: subprocess.CompletedProcess[str],
         duration: float,
     ) -> HookResult:
-        """Create HookResult from successful subprocess execution."""
-        status = "passed" if result.returncode == 0 else "failed"
-        issues_found = self._extract_issues_from_process_output(result)
+        # Formatting hooks return 1 when they fix files, which is success
+        if hook.is_formatting and result.returncode == 1:
+            # Check if files were modified (successful formatting)
+            output_text = result.stdout + result.stderr
+            if "files were modified by this hook" in output_text:
+                status = "passed"
+            else:
+                status = "failed"
+        else:
+            status = "passed" if result.returncode == 0 else "failed"
+
+        issues_found = self._extract_issues_from_process_output(hook, result, status)
 
         return HookResult(
             id=hook.name,
@@ -214,37 +245,41 @@ class HookExecutor:
         )
 
     def _extract_issues_from_process_output(
-        self, result: subprocess.CompletedProcess[str]
+        self,
+        hook: HookDefinition,
+        result: subprocess.CompletedProcess[str],
+        status: str,
     ) -> list[str]:
-        """Extract specific issues from subprocess output for failed hooks."""
-        if result.returncode == 0:
+        if status == "passed":
             return []
 
         error_output = (result.stdout + result.stderr).strip()
+
+        # For formatting hooks that successfully modified files, don't report as issues
+        if hook.is_formatting and "files were modified by this hook" in error_output:
+            return []
+
         if error_output:
             return [line.strip() for line in error_output.split("\n") if line.strip()]
 
-        # Fallback to generic message if no output captured
         return [f"Hook failed with code {result.returncode}"]
 
     def _create_timeout_result(
         self, hook: HookDefinition, start_time: float
     ) -> HookResult:
-        """Create HookResult for timeout scenarios."""
         duration = time.time() - start_time
         return HookResult(
             id=hook.name,
             name=hook.name,
             status="timeout",
             duration=duration,
-            issues_found=[f"Hook timed out after {duration:.1f}s"],
+            issues_found=[f"Hook timed out after {duration: .1f}s"],
             stage=hook.stage.value,
         )
 
     def _create_error_result(
         self, hook: HookDefinition, start_time: float, error: Exception
     ) -> HookResult:
-        """Create HookResult for general exception scenarios."""
         duration = time.time() - start_time
         return HookResult(
             id=hook.name,
@@ -271,14 +306,11 @@ class HookExecutor:
     def _display_hook_result(self, result: HookResult) -> None:
         status_icon = "✅" if result.status == "passed" else "❌"
 
-        # Create dot-filled line like classic pre-commit format
-        max_width = 70  # Leave room for terminal margins
+        max_width = 70
 
         if len(result.name) > max_width:
-            # Truncate long names
             line = result.name[: max_width - 3] + "..."
         else:
-            # Fill with dots to reach max width
             dots_needed = max_width - len(result.name)
             line = result.name + ("." * dots_needed)
 
@@ -344,6 +376,13 @@ class HookExecutor:
         return updated_results
 
     def _get_clean_environment(self) -> dict[str, str]:
+        """
+        Get a sanitized environment for hook execution.
+
+        This method now delegates to the secure subprocess utilities
+        for comprehensive environment sanitization with security logging.
+        """
+        # Create base environment with essential variables
         clean_env = {
             "HOME": os.environ.get("HOME", ""),
             "USER": os.environ.get("USER", ""),
@@ -353,12 +392,14 @@ class HookExecutor:
             "TERM": os.environ.get("TERM", "xterm-256color"),
         }
 
+        # Handle PATH sanitization with venv filtering
         system_path = os.environ.get("PATH", "")
         if system_path:
             venv_bin = str(Path(self.pkg_path) / ".venv" / "bin")
             path_parts = [p for p in system_path.split(":") if p != venv_bin]
             clean_env["PATH"] = ":".join(path_parts)
 
+        # Define Python-specific variables to exclude
         python_vars_to_exclude = {
             "VIRTUAL_ENV",
             "PYTHONPATH",
@@ -366,12 +407,41 @@ class HookExecutor:
             "PIP_CONFIG_FILE",
             "PYTHONHOME",
             "CONDA_DEFAULT_ENV",
+            "PIPENV_ACTIVE",
+            "POETRY_ACTIVE",
         }
 
+        # Add other safe environment variables
+        security_logger = get_security_logger()
+        original_count = len(os.environ)
+        filtered_count = 0
+
         for key, value in os.environ.items():
             if key not in python_vars_to_exclude and key not in clean_env:
-                if not key.startswith(("PYTHON", "PIP_", "CONDA_", "VIRTUAL_")):
-                    clean_env[key] = value
+                # Additional security filtering
+                if not key.startswith(
+                    ("PYTHON", "PIP_", "CONDA_", "VIRTUAL_", "__PYVENV")
+                ):
+                    # Check for dangerous environment variables
+                    if key not in {"LD_PRELOAD", "DYLD_INSERT_LIBRARIES", "IFS", "PS4"}:
+                        clean_env[key] = value
+                    else:
+                        filtered_count += 1
+                        security_logger.log_environment_variable_filtered(
+                            variable_name=key,
+                            reason="dangerous environment variable",
+                            value_preview=(value[:50] if value else "")[:50],
+                        )
+                else:
+                    filtered_count += 1
+
+        # Log environment sanitization if significant filtering occurred
+        if filtered_count > 5:  # Only log if substantial filtering
+            security_logger.log_subprocess_environment_sanitized(
+                original_count=original_count,
+                sanitized_count=len(clean_env),
+                filtered_vars=[],  # Don't expose all filtered vars for performance
+            )
 
         return clean_env
 
@@ -381,13 +451,6 @@ class HookExecutor:
         results: list[HookResult],
         success: bool,
     ) -> None:
-        if success:
-            self.console.print(
-                f"[green]✅[/green] {strategy.name.title()} hooks passed: {len(results)} / {len(results)}",
-            )
-        else:
-            failed_count = sum(1 for r in results if r.status == "failed")
-            error_count = sum(1 for r in results if r.status in ("timeout", "error"))
-            self.console.print(
-                f"[red]❌[/red] {strategy.name.title()} hooks failed: {failed_count} failed, {error_count} errors",
-            )
+        # Summary is handled by PhaseCoordinator to avoid duplicate messages
+        # Individual hook results are already displayed above
+        pass