Update 1 code files

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

[gitship-generated]

Author: 1minds3t

src/omnipkg/dispatcher.c

@@ -970,26 +970,37 @@ static int try_daemon_cli(const char *target_python, int argc, char **argv,
 
 static void fallback_to_python_v(const char *self_dir, char **argv,
                                   const char *inject_version) {
-    /*
-     * Find the Python that owns this venv/bin dir and re-exec
-     * the original dispatcher.py via  python -m omnipkg.dispatcher
-     */
     char py[MAX_PATH];
+    int found = 0;
 
-    /* Try the config first */
-    if (!read_self_config(self_dir, py, sizeof(py)) || !file_exists(py)) {
-        /* Try common names in self_dir */
-        const char *names[] = {"python3.11","python3.10","python3.9",
-                               "python3","python",NULL};
-        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; }
         }
-        if (!found) {
-            fprintf(stderr, "omnipkg: cannot find host Python for fallback\n");
-            exit(1);
-        }
+    }
+
+    if (!found) {
+        /* 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);
+        fprintf(stderr, "  Tried common names in current and parent dirs\n");
+        exit(1);
     }
 
     /* Build new argv: python -m omnipkg.dispatcher <original args> */
@@ -1007,6 +1018,7 @@ static void fallback_to_python_v(const char *self_dir, char **argv,
     for (int i = 1; i < argc; i++)
         new_argv[i + out - 1] = argv[i];
     new_argv[argc + out - 1] = NULL;
+
     execv(py, new_argv);
     perror("omnipkg: execv fallback failed");
     exit(1);