fix: avoid recursive promptfoo wrapper

Author: mldangelo

src/promptfoo/cli.py

@@ -2,13 +2,16 @@
 CLI wrapper for promptfoo
 
 This module provides a thin wrapper around the promptfoo Node.js CLI tool.
-It executes the npx promptfoo command and passes through all arguments.
+It executes a global promptfoo binary when available, falling back to npx.
 """
 
+import os
 import shutil
 import subprocess
 import sys
-from typing import NoReturn
+from typing import NoReturn, Optional
+
+_WRAPPER_ENV = "PROMPTFOO_PY_WRAPPER"
 
 
 def check_node_installed() -> bool:
@@ -34,6 +37,42 @@ def print_installation_help() -> None:
     print("  https://github.com/nvm-sh/nvm", file=sys.stderr)
 
 
+def _normalize_path(path: str) -> str:
+    return os.path.normcase(os.path.abspath(path))
+
+
+def _resolve_argv0() -> Optional[str]:
+    if not sys.argv:
+        return None
+    argv0 = sys.argv[0]
+    if not argv0:
+        return None
+    if os.path.sep in argv0 or (os.path.altsep and os.path.altsep in argv0):
+        return _normalize_path(argv0)
+    resolved = shutil.which(argv0)
+    if resolved:
+        return _normalize_path(resolved)
+    return None
+
+
+def _find_external_promptfoo() -> Optional[str]:
+    promptfoo_path = shutil.which("promptfoo")
+    if not promptfoo_path:
+        return None
+    argv0_path = _resolve_argv0()
+    if argv0_path and _normalize_path(promptfoo_path) == argv0_path:
+        wrapper_dir = _normalize_path(os.path.dirname(promptfoo_path))
+        path_entries = [
+            entry
+            for entry in os.environ.get("PATH", "").split(os.pathsep)
+            if entry and _normalize_path(entry) != wrapper_dir
+        ]
+        if not path_entries:
+            return None
+        return shutil.which("promptfoo", path=os.pathsep.join(path_entries))
+    return promptfoo_path
+
+
 def main() -> NoReturn:
     """
     Main entry point for the promptfoo CLI wrapper.
@@ -45,19 +84,22 @@ def main() -> NoReturn:
         print_installation_help()
         sys.exit(1)
 
-    # Build command: try global promptfoo first, fall back to npx
-    if shutil.which("promptfoo"):
-        cmd = ["promptfoo"] + sys.argv[1:]
+    # Build command: try external promptfoo first, fall back to npx
+    promptfoo_path = None if os.environ.get(_WRAPPER_ENV) else _find_external_promptfoo()
+    if promptfoo_path:
+        cmd = [promptfoo_path] + sys.argv[1:]
+        env = os.environ.copy()
+        env[_WRAPPER_ENV] = "1"
+        result = subprocess.run(cmd, env=env)
     elif shutil.which("npx"):
         cmd = ["npx", "-y", "promptfoo@latest"] + sys.argv[1:]
+        result = subprocess.run(cmd)
     else:
         print("ERROR: Neither promptfoo nor npx is available.", file=sys.stderr)
         print("Please install promptfoo: npm install -g promptfoo", file=sys.stderr)
         print("Or ensure Node.js is properly installed.", file=sys.stderr)
         sys.exit(1)
 
-    # Execute with absolute minimal configuration
-    result = subprocess.run(cmd)
     sys.exit(result.returncode)