Update 1 code files

Modified:
  • src/omnipkg/dispatcher.py (+25/-8 lines)

[gitship-generated]

Author: 1minds3t

src/omnipkg/dispatcher.py

@@ -551,10 +551,20 @@ def _maybe_install_c_dispatcher():
             # Native bin is up to date. On Windows, hand off to the C dispatcher
             # if it exists — it is never locked since 8pkg.exe is what ran us.
             if sys.platform == "win32":
-                _win_try_handoff_to_c_dispatcher(bin_dir, debug)
-                # If we reach here, _omnipkg_dispatch.exe doesn't exist yet or
-                # failed the sanity check — fall through to compile below.
-                # Do NOT return; let the compile path run.
+                # Only hand off if we were invoked as the 8pkg/omnipkg entrypoint,
+                # not if we're already a subprocess of the C dispatcher or pip.
+                # Check: argv[0] must be the .exe entrypoint, not python -m ...
+                _argv0 = Path(sys.argv[0]).name.lower().replace(".exe", "")
+                _is_entrypoint = _argv0 in ("8pkg", "omnipkg", "8pkg_", "omnipkg_")
+                _is_detached = os.environ.get("OMNIPKG_WIN_DETACHED_COMPILE") == "1"
+                if _is_entrypoint and not _is_detached:
+                    _win_try_handoff_to_c_dispatcher(bin_dir, debug)
+                # If we reach here: not the entrypoint, or dispatch_exe missing/bad.
+                # Fall through to compile below (or just return if not entrypoint).
+                if not _is_entrypoint:
+                    if debug:
+                        print(f"[C-INSTALL] Windows: not entrypoint (argv[0]={sys.argv[0]}) — skip handoff", file=sys.stderr)
+                    return
             else:
                 # Non-Windows: push to adopted dirs then return normally.
                 for adopted_bin in _collect_all_dispatcher_bin_dirs()[1:]:
@@ -579,12 +589,19 @@ def _maybe_install_c_dispatcher():
             # First run after pip install: we are locked. Spawn detached compiler
             # which will write _omnipkg_dispatch.exe after we exit, then return
             # so the user's command still runs normally via Python this one time.
-            # Guard: if WE are the detached compiler, don't spawn again — compile.
-            if os.environ.get("OMNIPKG_WIN_DETACHED_COMPILE") == "1":
-                pass  # fall through to compile below
-            else:
+            _argv0 = Path(sys.argv[0]).name.lower().replace(".exe", "")
+            _is_entrypoint = _argv0 in ("8pkg", "omnipkg", "8pkg_", "omnipkg_")
+            _is_detached = os.environ.get("OMNIPKG_WIN_DETACHED_COMPILE") == "1"
+            if _is_detached:
+                pass  # we ARE the detached compiler — fall through to compile
+            elif _is_entrypoint:
                 _win_spawn_detached_compiler(debug)
                 return
+            else:
+                # Called from pip build or python -m — don't spawn, just return
+                if debug:
+                    print(f"[C-INSTALL] Windows: not entrypoint, skip first-run spawn", file=sys.stderr)
+                return
         # _omnipkg_dispatch.exe exists but hash was stale — we can overwrite it
         # freely since it is never the running process.
         binary_tmp = dispatch_exe.with_name("_omnipkg_dispatch_tmp.exe")