verify.py v0.6: JS/TS dependency install (lockfile-detected), rust target cleanup, keep upstream conventions

scripts/verify.py

@@ -1,4 +1,4 @@
-"""PatchBench row verification + context expansion harness (v0.5).
+"""PatchBench row verification + context expansion harness (v0.6).
 
 For each candidate row:
   1. clone the repo at base_commit
@@ -20,6 +20,10 @@ Native (non-Docker) reproduction of the upstream env:
   - the upstream /testbed convention is rewritten to the local checkout path
   - after test_cmds, the harness cats reports/* (rows redirect `go test -json >
     reports/<lang>-test-results.json`; the row's print_cmds list is often empty)
+  - JS/TS: if package.json exists without node_modules, deps are installed with the
+    repo's own package manager (detected from lockfile)
+  - rust: cargo target dirs are wiped between rows to stay inside the ephemeral
+    storage quota
 
 Usage (inside a job with the right language toolchain image):
   python verify.py --lang go --file pilot/candidates/go.jsonl --limit 6
@@ -78,8 +82,11 @@ def apply_patch(text, cwd):
     return (out + out2)[-2000:]
 
 
-def clean_state(repo_dir):
+def clean_state(repo_dir, lang=None):
     run("git checkout -f HEAD -- . && git clean -fdxq", repo_dir, 120)
+    if lang == "rust":
+        # cargo target dirs can be 10-30GB per repo; the job has 50G ephemeral storage
+        run("find . -name target -type d -prune -exec rm -rf {} +", repo_dir, 300)
 
 
 def get_parser(row):
@@ -90,13 +97,36 @@ def get_parser(row):
     return ns["parser"]
 
 
-def run_tests(row, repo_dir):
+def ensure_js_deps(repo_dir):
+    """Upstream JS/TS images ship node_modules; natively we must install them.
+    Detect the package manager from the lockfile. Returns error string or None."""
+    if not os.path.exists(os.path.join(repo_dir, "package.json")):
+        return None
+    if os.path.exists(os.path.join(repo_dir, "node_modules")):
+        return None
+    if os.path.exists(os.path.join(repo_dir, "pnpm-lock.yaml")):
+        cmds = ["corepack enable 2>/dev/null; corepack prepare pnpm@latest --activate 2>/dev/null || npm install -g pnpm",
+                "pnpm install --frozen-lockfile || pnpm install"]
+    elif os.path.exists(os.path.join(repo_dir, "yarn.lock")):
+        cmds = ["yarn install --frozen-lockfile || yarn install"]
+    elif os.path.exists(os.path.join(repo_dir, "package-lock.json")):
+        cmds = ["npm ci || npm install"]
+    else:
+        cmds = ["npm install"]
+    ok, err = sh(cmds, repo_dir, 1800)
+    return None if ok else f"js deps install failed: {err}"
+
+
+def run_tests(row, repo_dir, lang):
     """Run rebuild_cmds, test_cmds, print_cmds, then surface any reports/* the test
     commands wrote. Returns (tests_dict, combined_output_tail)."""
     parser = get_parser(row)
+    dep_err = ensure_js_deps(repo_dir)
     sh(row.get("rebuild_cmds"), repo_dir)
     run("mkdir -p reports", repo_dir, 30)
     out = ""
+    if dep_err:
+        out += dep_err + "\n"
     for c in (row.get("test_cmds") or []):
         _, o, _ = run(c, repo_dir, CMD_TIMEOUT_S)
         out += o + "\n"
@@ -199,7 +229,7 @@ def verify_row(row, lang):
     rec["timing"]["setup"] = round(time.time() - t0, 1)
 
     # ---- PRE-FIX (twice) ----
-    clean_state(repo_dir)
+    clean_state(repo_dir, lang)
     err = apply_patch(row["test_patch"], repo_dir)
     if err:
         rec["error"] = f"test_patch failed to apply: {err}"
@@ -207,7 +237,7 @@ def verify_row(row, lang):
     pre_runs = []
     for i in range(2):
         s = time.time()
-        tests, tail = run_tests(row, repo_dir)
+        tests, tail = run_tests(row, repo_dir, lang)
         pre_runs.append((tests, tail))
         rec["timing"][f"pre_test_{i}"] = round(time.time() - s, 1)
     pre_detail = grade(pre_runs[0][0], row["fail_to_pass"], "fail", allow_missing=True)[1]
@@ -217,11 +247,10 @@ def verify_row(row, lang):
     # P2P scoped to this environment: keep only tests that pass in BOTH pre-fix runs
     p2p_scoped = [t for t in row["pass_to_pass"]
                   if pre_runs[0][0].get(t) == "pass" and pre_runs[1][0].get(t) == "pass"]
-    rec["p2p_env_dropped"] = [t for t in row["pass_to_pass"] if t not in set(p2p_scoped)]
-    rec["p2p_scoped_count"] = len(p2p_scoped)
+    rec["p2p_env_dropped_count"] = len(row["pass_to_pass"]) - len(p2p_scoped)
 
     # ---- POST-FIX (twice) ----
-    clean_state(repo_dir)
+    clean_state(repo_dir, lang)
     err = apply_patch(row["test_patch"], repo_dir)
     if err:
         rec["error"] = f"test_patch re-apply failed: {err}"
@@ -233,7 +262,7 @@ def verify_row(row, lang):
     post_runs = []
     for i in range(2):
         s = time.time()
-        tests, tail = run_tests(row, repo_dir)
+        tests, tail = run_tests(row, repo_dir, lang)
         post_runs.append((tests, tail))
         rec["timing"][f"post_test_{i}"] = round(time.time() - s, 1)
     f2p_ok_post = all(grade(t, row["fail_to_pass"], "pass")[0] for t, _ in post_runs)