Sync main → development (auto-merge conflict fixes)

Author: github-actions[bot]

src/omnipkg/core.py

@@ -1226,7 +1226,6 @@ def _find_project_root(self):
         """
         Find the project root directory by looking for setup.py, pyproject.toml, or .git
         """
-
         current_dir = Path.cwd()
         module_dir = Path(__file__).parent.parent
         search_paths = [current_dir, module_dir]
@@ -2392,7 +2391,6 @@ def get_actual_current_site_packages(self) -> Path:
         This is more reliable than calculating it from sys.prefix when hotswapping is involved.
         Cross-platform compatible with special handling for Windows.
         """
-
         is_windows = platform.system() == "Windows"
 
         try:
@@ -2513,7 +2511,6 @@ def _get_paths_for_interpreter(self, python_exe_path: str) -> Optional[Dict[str,
         Runs an interpreter in a subprocess to ask for its version and calculates its site-packages path.
         This is the only reliable way to get paths for an interpreter that isn't the currently running one.
         """
-
         try:
             # Step 1: Get version and prefix (this part works fine)
             cmd = [
@@ -2634,7 +2631,6 @@ def _first_time_setup(self, interactive=True) -> Dict:
 
         AUTO-DETECTS non-interactive environments (Docker, CI, piped input, etc.)
         """
-        
         # ============================================================================
         # CRITICAL: Auto-detect non-interactive environments
         # ============================================================================
@@ -3209,7 +3205,6 @@ def _extract_version_from_path(self, exe_path: Path) -> Optional[str]:
         - /path/to/.omnipkg/interpreters/cpython-3.10-managed/bin/python3.10 → "3.10"
         - /path/to/bin/python3.11 → "3.11"
         """
-        
         # Try to extract from the executable name itself
         match = re.search(r'python(\d+\.\d+)', exe_path.name)
         if match:
@@ -5054,7 +5049,6 @@ def _get_import_candidates_for_bubble(
         (Authoritative) Finds import candidates by reading top_level.txt from the
         package's .dist-info directory. Handles PyPI's inconsistent naming conventions.
         """
-
         # Strategy 1: Find ANY .dist-info directory that might match this package
         version = pkg_info["version"]
         canonical = canonicalize_name(pkg_name)
@@ -5221,7 +5215,6 @@ def _fix_bubble_import_failures(
 
     def _extract_missing_module_name(self, error_msg: str) -> str:
         """Extract the specific missing module name from error messages."""
-
         # Try different patterns for extracting module names
         patterns = [
             r"No module named '([^']+)'",
@@ -6359,7 +6352,6 @@ def _self_heal_omnipkg_installation(self):
         2. Managed interpreters (in .omnipkg/) NEVER trigger syncs
         3. On Windows, extra conservative - can be disabled entirely
         """
-
         overall_start = time.perf_counter_ns()
 
         # === SAFETY CHECK 1: Determine if we're the native interpreter ===
@@ -9185,7 +9177,6 @@ def show_package_info(
         """
         Enhanced package data display with interactive selection.
         """
-
         c_name = canonicalize_name(pkg_name)
 
         # Find all installations
@@ -12112,7 +12103,6 @@ def _schedule_background_kb_scan(self, bubble_paths: Dict[str, Path], python_ver
         """
         Launches a non-blocking background process to scan nested packages inside bubbles.
         """
-        
         bubble_list = [f"{name}:{path}" for name, path in bubble_paths.items()]
 
         # Create a background scan script
@@ -13227,7 +13217,6 @@ def _register_package_in_knowledge_base(
 
     def _get_current_timestamp(self) -> str:
         """Helper to get current timestamp for knowledge base entries."""
-
         return datetime.datetime.now().isoformat()
 
     def _find_package_installations(

src/omnipkg/integration/ci_integration.py

@@ -36,7 +36,6 @@ def run(
         8pkg run black --check .
         8pkg run pytest tests/
     """
-
     # Combine command and args for execution
     all_args = [command] + (args or [])
     exit_code = handle_run_command(all_args)
@@ -60,7 +59,6 @@ def activate(shell: Optional[str] = typer.Option(None, help="Shell type (bash, z
         lollama start-mining  # Auto-heals conflicts!
         black .               # Auto-heals conflicts!
     """
-
     sys.exit(cmd_activate([shell] if shell else []))
 
 

src/omnipkg/isolation/worker_daemon.py

@@ -1645,7 +1645,6 @@ def execute_with_activity_monitoring(
         Returns:
             Response dict from worker
         """
-
         import psutil
 
         try:
@@ -1733,7 +1732,6 @@ def _discover_cuda_paths(self) -> List[str]:
         Discover CUDA library paths for this package spec.
         Dynamically detects CUDA version requirement (cu11 vs cu12).
         """
-
         cuda_paths = []
 
         # 1. Detect required CUDA version from spec
@@ -4376,7 +4374,6 @@ def cli_status():
 
 def cli_logs(follow: bool = False, tail_lines: int = 50):
     """View or follow the daemon logs."""
-
     log_path = Path(DAEMON_LOG_FILE)
     if not log_path.exists():
         safe_print(_('❌ Log file not found at: {}').format(log_path))

src/omnipkg/loader.py

@@ -1400,7 +1400,6 @@ def _get_version_from_original_env(self, package_name: str, requested_version: s
         CRITICAL FIX: Strictly checks self.site_packages_root to avoid confusion
         from parent loaders' bubbles in sys.path.
         """
-
         canonical_target = canonicalize_name(package_name)
         filesystem_name = package_name.replace("-", "_")
 

src/omnipkg/package_meta_builder.py

@@ -1844,7 +1844,6 @@ def _get_instance_hash(self, dist: importlib.metadata.Distribution) -> str:
         (AUTHORITATIVE) Generates the one true, consistent instance hash for any
         distribution by using its real, canonical path.
         """
-
         # This is the single source of truth for a package's physical location.
         # os.path.realpath resolves symlinks and gives the canonical path.
         resolved_path_str = os.path.realpath(str(dist._path))

src/tests/test_loader_stress_test.py

@@ -3521,7 +3521,6 @@ def chaos_test_21_gpu_resident_pipeline():
     📍 PHASE 4: Zero-Copy Data Pipeline
      NOW ACTUALLY USES PyTorch 1.13's native CUDA IPC!
     """
-
     safe_print(f"\n{'═'*66}")
     safe_print("║  TEST 21: 🔥 GPU-RESIDENT MULTI-VERSION PIPELINE           ║")
     safe_print("║  PyTorch 1.13.1 with NATIVE CUDA IPC (True Zero-Copy!)     ║")
@@ -3751,7 +3750,6 @@ def chaos_test_22_complete_ipc_benchmark():
 
     Tests the same 3-stage pipeline across all modes with proper warmup.
     """
-
     safe_print(f"\n{'═'*66}")
     safe_print("║  TEST 22: 🔥 COMPLETE IPC MODE BENCHMARK              ║")
     safe_print("║  Same Pipeline × 4 Different Execution Modes          ║")