crackerjack 0.31.18__py3-none-any.whl → 0.33.0__py3-none-any.whl

crackerjack/core/phase_coordinator.py

@@ -7,6 +7,7 @@ from rich.console import Console
 
 from crackerjack.code_cleaner import CodeCleaner, PackageCleaningResult
 from crackerjack.core.autofix_coordinator import AutofixCoordinator
+from crackerjack.mixins import ErrorHandlingMixin
 from crackerjack.models.protocols import (
     ConfigMergeServiceProtocol,
     FileSystemInterface,
@@ -16,12 +17,20 @@ from crackerjack.models.protocols import (
     PublishManager,
     TestManagerProtocol,
 )
-from crackerjack.services.config import ConfigurationService
+from crackerjack.services.memory_optimizer import (
+    create_lazy_service,
+    get_memory_optimizer,
+)
+from crackerjack.services.parallel_executor import (
+    get_async_executor,
+    get_parallel_executor,
+)
+from crackerjack.services.performance_cache import get_filesystem_cache, get_git_cache
 
 from .session_coordinator import SessionCoordinator
 
 
-class PhaseCoordinator:
+class PhaseCoordinator(ErrorHandlingMixin):
     def __init__(
         self,
         console: Console,
@@ -55,13 +64,31 @@ class PhaseCoordinator:
             security_logger=None,
             backup_service=None,
         )
+        # Initialize configuration service - could be injected via DI
+        from crackerjack.services.config import ConfigurationService
+
         self.config_service = ConfigurationService(console=console, pkg_path=pkg_path)
-        self.autofix_coordinator = AutofixCoordinator(
-            console=console, pkg_path=pkg_path
-        )
+        # Lazy-loaded autofix coordinator (now using lazy service)
+        # self.autofix_coordinator will be accessed via property
 
         self.logger = logging.getLogger("crackerjack.phases")
 
+        # Performance optimization services
+        self._memory_optimizer = get_memory_optimizer()
+        self._parallel_executor = get_parallel_executor()
+        self._async_executor = get_async_executor()
+        self._git_cache = get_git_cache()
+        self._filesystem_cache = get_filesystem_cache()
+
+        # Lazy-loaded heavy services
+        self._lazy_autofix = create_lazy_service(
+            lambda: AutofixCoordinator(console=console, pkg_path=pkg_path),
+            "autofix_coordinator",
+        )
+
+        # Initialize ErrorHandlingMixin
+        super().__init__()
+
     def run_cleaning_phase(self, options: OptionsProtocol) -> bool:
         if not options.clean:
             return True
@@ -71,16 +98,16 @@ class PhaseCoordinator:
             self._display_cleaning_header()
             return self._execute_cleaning_process()
         except Exception as e:
-            self.console.print(f"[red]❌[/ red] Cleaning failed: {e}")
+            self.handle_subprocess_error(e, [], "Code cleaning", critical=False)
             self.session.fail_task("cleaning", str(e))
             return False
 
     def _display_cleaning_header(self) -> None:
-        self.console.print("\n" + "-" * 80)
+        self.console.print("\n" + "-" * 40)
         self.console.print(
             "[bold bright_magenta]🛠️ SETUP[/bold bright_magenta] [bold bright_white]Initializing project structure[/bold bright_white]",
         )
-        self.console.print("-" * 80 + "\n")
+        self.console.print("-" * 40 + "\n")
         self.console.print("[yellow]🧹[/yellow] Starting code cleaning...")
 
     def _execute_cleaning_process(self) -> bool:
@@ -156,6 +183,7 @@ class PhaseCoordinator:
             self._complete_configuration_task(success)
             return success
         except Exception as e:
+            self.handle_subprocess_error(e, [], "Configuration phase", critical=False)
             self.session.fail_task("configuration", str(e))
             return False
 
@@ -370,32 +398,28 @@ class PhaseCoordinator:
         if options.skip_hooks:
             return True
 
-        return self._execute_hooks_with_retry(
-            "fast",
-            self.hook_manager.run_fast_hooks,
-            options,
-        )
+        # Use standard execution for now - parallel support can be added later
+        hook_results = self.hook_manager.run_fast_hooks()
+        return all(r.status == "passed" for r in hook_results)
 
     def run_comprehensive_hooks_only(self, options: OptionsProtocol) -> bool:
         if options.skip_hooks:
             return True
 
-        return self._execute_hooks_with_retry(
-            "comprehensive",
-            self.hook_manager.run_comprehensive_hooks,
-            options,
-        )
+        # Use standard execution for now - parallel support can be added later
+        hook_results = self.hook_manager.run_comprehensive_hooks()
+        return all(r.status == "passed" for r in hook_results)
 
     def run_testing_phase(self, options: OptionsProtocol) -> bool:
         if not options.test:
             return True
         self.session.track_task("testing", "Test execution")
         try:
-            self.console.print("\n" + "-" * 80)
+            self.console.print("\n" + "-" * 40)
             self.console.print(
                 "[bold bright_blue]🧪 TESTS[/ bold bright_blue] [bold bright_white]Running test suite[/ bold bright_white]",
             )
-            self.console.print("-" * 80 + "\n")
+            self.console.print("-" * 40 + "\n")
             if not self.test_manager.validate_test_environment():
                 self.session.fail_task("testing", "Test environment validation failed")
                 return False
@@ -445,6 +469,13 @@ class PhaseCoordinator:
     ) -> bool:
         new_version = self.publish_manager.bump_version(version_type)
 
+        # Stage all changes after version bumping and code cleaning (if enabled)
+        self.console.print("[blue]📂[/ blue] Staging all changes for publishing...")
+        if not self.git_service.add_all_files():
+            self.console.print(
+                "[yellow]⚠️[/ yellow] Failed to stage files, continuing with publish..."
+            )
+
         if not options.no_git_tags:
             self.publish_manager.create_git_tag(new_version)
 
@@ -483,6 +514,27 @@ class PhaseCoordinator:
 
     def _handle_no_changes_to_commit(self) -> bool:
         self.console.print("[yellow]ℹ️[/ yellow] No changes to commit")
+
+        # Check if there are unpushed commits
+        from contextlib import suppress
+
+        with suppress(ValueError, Exception):
+            commit_count = self.git_service.get_unpushed_commit_count()
+            if commit_count > 0:
+                self.console.print(
+                    f"[blue]📤[/ blue] Found {commit_count} unpushed commit(s), attempting push..."
+                )
+                if self.git_service.push():
+                    self.session.complete_task(
+                        "commit",
+                        f"No new changes, pushed {commit_count} existing commit(s)",
+                    )
+                    return True
+                else:
+                    self.console.print(
+                        "[yellow]⚠️[/ yellow] Push failed for existing commits"
+                    )
+
         self.session.complete_task("commit", "No changes to commit")
         return True
 
@@ -587,33 +639,60 @@ class PhaseCoordinator:
 
         for attempt in range(max_retries):
             try:
-                results = hook_runner()
-                summary = self.hook_manager.get_hook_summary(results)
-
-                if self._has_hook_failures(summary):
-                    if self._should_retry_hooks(
-                        hook_type,
-                        attempt,
-                        max_retries,
-                        results,
-                    ):
-                        continue
-
-                    return self._handle_hook_failures(
-                        hook_type,
-                        options,
-                        summary,
-                        results,
-                        attempt,
-                        max_retries,
-                    )
-                return self._handle_hook_success(hook_type, summary)
+                execution_result = self._execute_single_hook_attempt(hook_runner)
+                if execution_result is None:
+                    return False
+
+                results, summary = execution_result
+                should_continue = self._process_hook_results(
+                    hook_type, options, summary, results, attempt, max_retries
+                )
+
+                if should_continue == "continue":
+                    continue
+                elif should_continue == "success":
+                    return True
+                else:
+                    return False
 
             except Exception as e:
                 return self._handle_hook_exception(hook_type, e)
 
         return False
 
+    def _execute_single_hook_attempt(
+        self, hook_runner: t.Callable[[], list[t.Any]]
+    ) -> tuple[list[t.Any], dict[str, t.Any]] | None:
+        """Execute a single hook attempt and return results and summary."""
+        try:
+            results = hook_runner()
+            summary = self.hook_manager.get_hook_summary(results)
+            return results, summary
+        except Exception:
+            return None
+
+    def _process_hook_results(
+        self,
+        hook_type: str,
+        options: OptionsProtocol,
+        summary: dict[str, t.Any],
+        results: list[t.Any],
+        attempt: int,
+        max_retries: int,
+    ) -> str:
+        """Process hook results and return action: 'continue', 'success', or 'failure'."""
+        if not self._has_hook_failures(summary):
+            self._handle_hook_success(hook_type, summary)
+            return "success"
+
+        if self._should_retry_hooks(hook_type, attempt, max_retries, results):
+            return "continue"
+
+        self._handle_hook_failures(
+            hook_type, options, summary, results, attempt, max_retries
+        )
+        return "failure"
+
     def _initialize_hook_execution(self, hook_type: str) -> None:
         self.logger.info(f"Starting {hook_type} hooks execution")
         self.session.track_task(
@@ -643,11 +722,12 @@ class PhaseCoordinator:
         return False
 
     def _attempt_autofix_for_fast_hooks(self, results: list[t.Any]) -> bool:
-        """Attempt to autofix fast hook failures."""
+        """Attempt to autofix fast hook failures using lazy-loaded coordinator."""
         try:
             self.logger.info("Attempting autofix for fast hook failures")
-            # Apply autofixes for fast hooks
-            return self.autofix_coordinator.apply_fast_stage_fixes()
+            # Apply autofixes for fast hooks using lazy-loaded service
+            autofix_coordinator = self._lazy_autofix.get()
+            return autofix_coordinator.apply_fast_stage_fixes()
         except Exception as e:
             self.logger.warning(f"Autofix attempt failed: {e}")
             return False
@@ -770,3 +850,90 @@ class PhaseCoordinator:
         self.console.print(f"[red]❌[/ red] {hook_type.title()} hooks error: {e}")
         self.session.fail_task(f"{hook_type}_hooks", str(e))
         return False
+
+    # Performance-optimized hook execution methods
+    async def _execute_hooks_with_parallel_support(
+        self,
+        hook_type: str,
+        hook_runner: t.Callable[[], list[t.Any]],
+        options: OptionsProtocol,
+    ) -> bool:
+        """Execute hooks with parallel optimization where safe."""
+        self._initialize_hook_execution(hook_type)
+
+        try:
+            # Execute hooks and handle results
+            return await self._process_parallel_hook_execution(
+                hook_type, hook_runner, options
+            )
+
+        except Exception as e:
+            return self._handle_hook_exception(hook_type, e)
+
+    async def _process_parallel_hook_execution(
+        self,
+        hook_type: str,
+        hook_runner: t.Callable[[], list[t.Any]],
+        options: OptionsProtocol,
+    ) -> bool:
+        """Process hook execution with autofix retry logic."""
+        # For now, maintain sequential execution for safety
+        # Future enhancement: implement parallel execution for independent hooks
+        results = hook_runner()
+        summary = self.hook_manager.get_hook_summary(results)
+
+        if not self._has_hook_failures(summary):
+            return self._handle_hook_success(hook_type, summary)
+
+        # Handle failures with potential autofix retry
+        return self._handle_parallel_hook_failures(
+            hook_type, hook_runner, options, results, summary
+        )
+
+    def _handle_parallel_hook_failures(
+        self,
+        hook_type: str,
+        hook_runner: t.Callable[[], list[t.Any]],
+        options: OptionsProtocol,
+        results: list[t.Any],
+        summary: dict[str, t.Any],
+    ) -> bool:
+        """Handle hook failures with autofix retry for fast hooks."""
+        if hook_type != "fast":
+            return self._handle_hook_failures(
+                hook_type, options, summary, results, 0, 1
+            )
+
+        # Try autofix for fast hooks
+        if not self._attempt_autofix_for_fast_hooks(results):
+            return self._handle_hook_failures(
+                hook_type, options, summary, results, 0, 1
+            )
+
+        # Retry after successful autofix
+        return self._retry_hooks_after_autofix(hook_type, hook_runner, options)
+
+    def _retry_hooks_after_autofix(
+        self,
+        hook_type: str,
+        hook_runner: t.Callable[[], list[t.Any]],
+        options: OptionsProtocol,
+    ) -> bool:
+        """Retry hooks after autofix was applied."""
+        self.console.print(
+            "[yellow]🔧[/ yellow] Applied autofixes for fast hooks, retrying..."
+        )
+
+        # Retry after autofix
+        results = hook_runner()
+        summary = self.hook_manager.get_hook_summary(results)
+
+        if not self._has_hook_failures(summary):
+            return self._handle_hook_success(hook_type, summary)
+
+        return self._handle_hook_failures(hook_type, options, summary, results, 0, 1)
+
+    @property
+    def autofix_coordinator(self):
+        """Lazy property for autofix coordinator."""
+        return self._lazy_autofix.get()