Fix npx auth verification on Windows

Author: jiwangyihao

.github/workflows/client.py

@@ -105,13 +105,7 @@ def send_jsonrpc(proc: subprocess.Popen, method: str, params: dict, msg_id: int
 
 def read_jsonrpc(proc: subprocess.Popen, timeout: float) -> dict | None:
     """Read a JSON-RPC response from the process (raw JSON, newline-delimited)."""
-    import select
-
-    ready, _, _ = select.select([proc.stdout], [], [], timeout)
-    if not ready:
-        return None
-
-    line = proc.stdout.readline()
+    line = _read_stdout_line(proc, timeout)
     if not line:
         return None
 
@@ -126,6 +120,33 @@ def read_jsonrpc(proc: subprocess.Popen, timeout: float) -> dict | None:
         ) from e
 
 
+def _read_stdout_line(proc: subprocess.Popen, timeout: float) -> str | None:
+    """Read one stdout line with a timeout on both Unix and Windows pipes."""
+    import queue
+    import select
+    import threading
+
+    try:
+        ready, _, _ = select.select([proc.stdout], [], [], timeout)
+    except (OSError, ValueError):
+        line_queue: queue.Queue[str] = queue.Queue(maxsize=1)
+
+        def read_line() -> None:
+            line_queue.put(proc.stdout.readline())
+
+        thread = threading.Thread(target=read_line, daemon=True)
+        thread.start()
+        try:
+            return line_queue.get(timeout=timeout)
+        except queue.Empty:
+            return None
+
+    if not ready:
+        return None
+
+    return proc.stdout.readline()
+
+
 def _collect_proc_diagnostics(proc: subprocess.Popen) -> tuple[str | None, int | None]:
     """Collect stderr tail and exit code from a process (non-blocking).
 

.github/workflows/tests/test_verify_agents.py

@@ -1,11 +1,14 @@
 import os
 import stat
+import sys
 from pathlib import Path
 
 from verify_agents import (
     build_installed_npx_command,
+    build_npx_command,
     ensure_executable,
     npm_package_bin_name,
+    read_jsonrpc,
     resolve_binary_executable,
     should_retry_npx_auth_with_install,
 )
@@ -23,6 +26,9 @@ def test_resolve_binary_executable_renames_single_raw_binary(tmp_path: Path):
 
 
 def test_ensure_executable_adds_execute_bits(tmp_path: Path):
+    if sys.platform == "win32":
+        return
+
     binary = tmp_path / "tool"
     binary.write_text("#!/bin/sh\n")
     binary.chmod(0o644)
@@ -74,3 +80,41 @@ def test_should_retry_npx_auth_with_install_on_shim_error():
         "Timeout after 120s waiting for initialize response",
         "[Junie] Shim not found at /tmp/home/.local/bin/junie\nPlease reinstall: npm install",
     )
+
+
+def test_build_npx_command_uses_resolved_executable():
+    command = build_npx_command("C:/node/npx.cmd", Path("sandbox"), "omp-acp@0.1.2", [])
+
+    assert command == ["C:/node/npx.cmd", "--prefix", "sandbox", "--yes", "omp-acp@0.1.2"]
+
+
+def test_build_npx_command_preserves_distribution_args():
+    command = build_npx_command("/usr/bin/npx", Path("sandbox"), "agent@1.2.3", ["--acp"])
+
+    assert command == ["/usr/bin/npx", "--prefix", "sandbox", "--yes", "agent@1.2.3", "--acp"]
+
+
+class _FakePipe:
+    def __init__(self, line: str):
+        self._line = line
+
+    def fileno(self):
+        if sys.platform == "win32":
+            return -1
+        raise AssertionError("fileno should not be used outside the Windows fallback test")
+
+    def readline(self):
+        line = self._line
+        self._line = ""
+        return line
+
+
+class _FakeProcess:
+    def __init__(self, line: str):
+        self.stdout = _FakePipe(line)
+
+
+def test_read_jsonrpc_falls_back_for_non_socket_windows_pipe():
+    response = read_jsonrpc(_FakeProcess('{"jsonrpc":"2.0","id":1,"result":{}}\n'), 1)
+
+    assert response == {"jsonrpc": "2.0", "id": 1, "result": {}}

.github/workflows/verify_agents.py

@@ -22,7 +22,7 @@
 
 # Import auth client (only needed when --auth-check is used)
 try:
-    from client import run_auth_check
+    from client import read_jsonrpc, run_auth_check
 
     HAS_AUTH_CLIENT = True
 except ImportError:
@@ -69,6 +69,19 @@ def check_command_exists(cmd: str) -> bool:
     """Check if a command exists in PATH."""
     return shutil.which(cmd) is not None
 
+def resolve_command(cmd: str) -> str | None:
+    """Resolve a command name to an executable path usable by subprocess on all platforms."""
+    return shutil.which(cmd)
+
+
+def build_npx_command(npx_executable: str, sandbox: Path, package: str, args: list[str]) -> list[str]:
+    """Build an npx command using the resolved executable path.
+
+    Windows Python subprocess does not resolve PATHEXT entries such as npx.cmd
+    when invoked as a bare command. Passing the resolved path keeps the same
+    behavior on Unix while making host-native Windows verification work.
+    """
+    return [npx_executable, "--prefix", str(sandbox), "--yes", package] + args
 
 def download_file(url: str, dest: Path) -> bool:
     """Download a file from URL with progress."""
@@ -383,8 +396,9 @@ def verify_npx(agent: dict, sandbox: Path, timeout: int, verbose: bool) -> Resul
     """Verify npx distribution."""
     agent_id = agent["id"]
 
-    if not check_command_exists("npm"):
-        return Result(agent_id, "npx", False, "npm not installed", skipped=True)
+    npx_executable = resolve_command("npx")
+    if npx_executable is None:
+        return Result(agent_id, "npx", False, "npx not installed", skipped=True)
 
     npx_dist = agent["distribution"].get("npx", {})
     package = npx_dist.get("package", "")
@@ -393,7 +407,7 @@ def verify_npx(agent: dict, sandbox: Path, timeout: int, verbose: bool) -> Resul
 
     print(f"    → Running: npx {package} {' '.join(args)}")
 
-    cmd = ["npx", "--prefix", str(sandbox), "--yes", package] + args
+    cmd = build_npx_command(npx_executable, sandbox, package, args)
     exit_code, stdout, stderr = run_process(cmd, sandbox, env, timeout)
 
     if exit_code is None:
@@ -505,7 +519,8 @@ def build_agent_command(
         package = npx_dist.get("package", "")
         args = npx_dist.get("args", [])
         env = npx_dist.get("env", {})
-        cmd = ["npx", "--prefix", str(sandbox), "--yes", package] + args
+        npx_executable = resolve_command("npx")
+        cmd = build_npx_command(npx_executable, sandbox, package, args) if npx_executable else []
         cwd = sandbox
     elif dist_type == "uvx":
         uvx_dist = distribution.get("uvx", {})