Update 2 code files

Modified:
  • src/omnipkg/core.py (+1/-1 lines)
  • src/omnipkg/isolation/worker_daemon.py (+20/-14 lines)

[gitship-generated]

Author: 1minds3t

src/omnipkg/core.py

@@ -16223,7 +16223,7 @@ def _run_pip_install(
             else:
                 safe_print(f"[UV-PATH] FFI skipped (unavailable) — trying daemon", file=sys.stderr)
 
-            # ── PATH 2: daemon run_uv (~IPC overhead) ──────────────
+            # ── PATH 2:  run_uv (~IPC overhead) ──────────────
             _t0 = time.perf_counter()
             try:
                 from omnipkg.isolation.worker_daemon import DaemonClient

src/omnipkg/isolation/worker_daemon.py

@@ -333,22 +333,28 @@ def _ensure_worker_config(python_exe: str, site_packages: str, multiversion_base
 
 def _get_venv_temp_dir() -> str:
     """
-    Return a temp dir scoped to this exact (venv, project) pair.
-    Uses sys.prefix — always valid for venv/conda/miniforge/subprocess.
-    Adds project root so the same venv reused across repos stays isolated.
+    Return a temp dir scoped to the current virtual environment.
+    This exactly mirrors ConfigManager._get_env_id() so that the daemon
+    and the core Omnipkg application share the same namespace.
     """
     import hashlib
-    # sys.prefix is the canonical env root — reliable in all contexts
-    identity = sys.prefix
-    # Add project root if we can find it (prevents same venv across repos colliding)
-    try:
-        project_root = Path(__file__).resolve().parent.parent.parent
-        if (project_root / "pyproject.toml").exists():
-            identity = f"{sys.prefix}:{project_root}"
-    except Exception:
-        pass
-    venv_hash = hashlib.sha1(identity.encode()).hexdigest()[:10]
-    d = os.path.join(OMNIPKG_TEMP_DIR, venv_hash)
+    import platform
+    
+    # 1. Respect the override if set (used by ConfigManager)
+    env_id = os.environ.get("OMNIPKG_ENV_ID_OVERRIDE")
+    
+    # 2. Replicate _canonical_path_str from ConfigManager
+    if not env_id:
+        venv_path = Path(sys.prefix)
+        if platform.system() == "Windows":
+            canonical = str(venv_path.resolve()).lower()
+        else:
+            canonical = str(venv_path.resolve())
+            
+        env_id = hashlib.md5(canonical.encode()).hexdigest()[:8]
+
+    # Store daemon files cleanly in a shared env directory
+    d = os.path.join(OMNIPKG_TEMP_DIR, f"env_{env_id}")
     os.makedirs(d, exist_ok=True)
     return d