Update 2 code files

Modified:
  • src/omnipkg/dispatcher.c (+28/-22 lines)
  • src/omnipkg/isolation/worker_daemon.py (+16/-22 lines)

[gitship-generated]

Author: 1minds3t

src/omnipkg/dispatcher.c

@@ -973,29 +973,35 @@ static void fallback_to_python_v(const char *self_dir, char **argv,
     char py[MAX_PATH];
     int found = 0;
 
-    /* 1. Try the config first */
-    if (read_self_config(self_dir, py, sizeof(py)) && file_exists(py)) {
-        found = 1;
-    } else {
-        /* 2. Try common names in both the current directory AND the parent directory */
-        const char *names[] = {"python3.11", "python3.10", "python3.9", 
-                               "python3", "python", "python.exe", NULL};
-        
-        /* We check the current dir (self_dir) and the parent dir (self_dir/..) */
-        const char *search_paths[] = {self_dir, NULL}; // We will handle parent manually for safety
-        
-        for (int i = 0; names[i]; i++) {
-            // Try current directory: .../Scripts/python.exe
-            snprintf(py, sizeof(py), "%s/%s", self_dir, names[i]);
-            if (file_exists(py)) { found = 1; break; }
-            
-            // Try parent directory: .../Scripts/../python.exe
-            snprintf(py, sizeof(py), "%s/../%s", self_dir, names[i]);
-            if (file_exists(py)) { found = 1; break; }
+    /* 1. Try local / parent search (works for venvs) */
+    const char *names[] = {"python3.11", "python3.10", "python3.9", "python3", "python", "python.exe", NULL};
+    for (int i = 0; names[i]; i++) {
+        snprintf(py, sizeof(py), "%s/%s", self_dir, names[i]);
+        if (file_exists(py)) { found = 1; break; }
+        snprintf(py, sizeof(py), "%s/../%s", self_dir, names[i]);
+        if (file_exists(py)) { found = 1; break; }
+    }
+
+    /* 2. CROSS-DRIVE FIX: If still not found, ask Windows where 'python' is */
+    if (!found) {
+        FILE *fp = _popen("where python", "r");
+        if (fp) {
+            if (fgets(py, sizeof(py), fp)) {
+                // Remove newline characters
+                py[strcspn(py, "\r\n")] = 0;
+                if (file_exists(py)) {
+                    found = 1;
+                }
+            }
+            _pclose(fp);
         }
     }
 
     if (!found) {
+        fprintf(stderr, "omnipkg: cannot find host Python for fallback\n");
+        fprintf(stderr, "  Self Dir: %s\n", self_dir);
+        exit(1);
+    }
         /* VERBOSE DIAGNOSTICS: Tell the user EXACTLY where we looked */
         fprintf(stderr, "omnipkg: cannot find host Python for fallback\n");
         fprintf(stderr, "  Checked directory: %s\n", self_dir);

src/omnipkg/isolation/worker_daemon.py

@@ -332,29 +332,23 @@ def _ensure_worker_config(python_exe: str, site_packages: str, multiversion_base
 OMNIPKG_TEMP_DIR = os.path.join(tempfile.gettempdir(), "omnipkg")
 
 def _get_venv_temp_dir() -> str:
-    """
-    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
-    import platform
-    
-    # 1. Respect the override if set (used by ConfigManager)
-    env_id = os.environ.get("OMNIPKG_ENV_ID_OVERRIDE")
+    # 1. Check for the override first (Symmetry with ConfigManager)
+    override = os.environ.get("OMNIPKG_ENV_ID_OVERRIDE")
+    if override:
+        venv_hash = override
+    else:
+        # Fallback to the original hash logic
+        import hashlib
+        identity = sys.prefix
+        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]
 
-    # 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}")
+    d = os.path.join(OMNIPKG_TEMP_DIR, venv_hash)
     os.makedirs(d, exist_ok=True)
     return d