Files
Dan Guido 9e06dc67a3 Make every documented command runnable under our own python shims (#258)
* Make every documented command runnable under our own python shims

The modern-python plugin ships PATH shims that refuse `python <script>`,
`pip install`, `python -m pip` and `uv pip install`. Twelve other plugins
in this marketplace issued exactly those forms, so installing our own
plugin broke our own skills — and CI was green throughout.

The worst case was not theoretical. c-review and rust-review both call
their Phase 4 planner as `python3 "${PLUGIN_ROOT}/scripts/build_run_plan.py"`,
so with the shim installed every run died before spawning a worker.
Verified both directions: the new form exits 0 with the shim on PATH, the
old form exits 1.

Phase 1's reading pass named 16 skills. A mechanical sweep found 96
candidate lines across 44 files, and scanning shell scripts as well as
markdown found 10 more the docs sweep had missed. That gap is the reason
the check below exists.

The fix is not one substitution. Four classes needed different treatment:

- Our own scripts become `uv run --no-project <script>`. Not bare `uv run`,
  because these execute inside the *target* repo, which may be a Python
  project that cannot resolve; verified against a broken pyproject.toml and
  against validate_artifacts.py's sibling import of generate_sarif.
- Package installs become `uv add` for a dependency, `uv tool install` for a
  CLI, `uv sync` for a project's own editable install.
- Third-party CLIs we merely document — OSS-Fuzz's infra/helper.py, yarGen —
  become `uv run --no-project python <script>`, which keeps upstream's exact
  semantics rather than handing their script an environment we manage.
- atheris's instrumented build keeps its source build, as
  `uv add --no-binary-package cbor2`. Dropping that flag would silently
  produce an uninstrumented fuzzer, which is worse than a visible failure.
  Its prose was updated to name the flag it now uses.

Two factual corrections fell out. `pip install caracal` was wrong twice
over: caracal is a Rust tool (Cargo.toml at its root), so it is now
upstream's own `cargo install --git`, not a uv equivalent that would fetch
an unrelated PyPI package. And `pip install uv` cannot bootstrap uv under
a shim that intercepts pip, so culture-index now points at the official
installer.

Thirteen lines stay as they are, each deliberately: Dockerfile `RUN` lines
and oss-fuzz's build.sh run in containers where our shims are absent;
codeql's pip calls install the *analysed* project's dependencies, and that
project is arbitrary; trailmark's dispatch skills must keep saying "Do NOT
run `pip install`"; and modern-python documents what it intercepts.

`make shell-suites` passes again as a result — exit 0 with the 1.6.0 shim,
where AGENTS.md previously recorded it as broken by variant-analysis.

The guardrail: check_python_invocations scans 698 markdown and shell files
and fails on the four refused forms, with structural exemptions for
dockerfile fences and an `allow-legacy-python: <reason>` marker that scopes
to its code block. Eleven self-test fixtures cover it, four asserting it
fires and seven asserting it stays quiet on the compliant forms. It was
mutation-tested in both languages, and it caught its own worst bug during
development: unanchored patterns first flagged `uv run --no-project python
fuzz.py`, the very form the advice recommends. Self-test goes 45 -> 56.

* Review pass: fix the atheris flow, drop a stray exemption, trim comments

Three corrections from reviewing the branch diff:

- atheris's install now opens with `uv init --bare`, without which the
  documented `uv add atheris` errors in a bare harness directory. The old
  pip form assumed an activated venv, so setup was always implicit; now
  it is one explicit line.
- ossfuzz carried an allow-legacy-python marker on a C++ build block that
  contains no python at all — yesterday's insertion matched the first of
  three "Build in build.sh" headings instead of the python one. The
  exemption now sits only on the block that needs it.
- The anti-vacuity message said "read no markdown" for a scan that also
  covers shell scripts.

The rest is weight: the new check's comment blocks, the hardcoded-path
constants' commentary, the AGENTS.md bullets and the three exemption
markers all said the same things at two to three times the length. Each
keeps its one-line why; the narratives are gone. No behavioural change —
self-test still passes 56 assertions and the full scan is unchanged.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

* Address the review: fix where packages land, widen the check to match the shim

The review's core insight was right twice over. Several substitutions had
changed WHERE a package lands, breaking the documented next step, and the
checker enforced a narrower invariant than the shim it exists to mirror.

Where packages land:

- trailmark is imported as a library from five skills, and a `uv tool
  install` environment is not importable — the retry loop at
  trailmark/SKILL.md:47-51 would have spun forever on the exact error it
  names. The CLI install stays `uv tool install`; the import snippets now
  run under `uv run --with trailmark python -`.
- `uv add` writes to the manifest of whatever project you are standing
  in, which for sarif-parsing is the audited repo. Its scripting rows,
  ijson comment and jsonschema example now use `uv run --with <pkg>`,
  which leaves no trace. atheris keeps `uv add` deliberately: the fuzzing
  harness is the user's own project, made explicit by `uv init --bare`.
- `uv sync` leaves ct-analyzer in .venv/bin, so the README's very next
  line failed with command not found. Now `uv tool install .`, verified
  end to end: the console script lands on PATH and --help runs.
- yarGen needs pefile/lxml/yara-python, which `--no-project` had detached;
  now `uv run --with-requirements requirements.txt`.
- The cbor2 source-build preference now persists via
  `no-binary-package = ["cbor2"]` under [tool.uv] (field verified against
  uv's accepted-settings list), so a later `uv sync` cannot silently swap
  in an uninstrumented wheel.

The checker, widened to the shim's actual behaviour:

- `python3 --version` and `python3 -u foo.py` are refused by the shim but
  passed the old patterns; one live instance (constant-time-analysis
  README) proved it. Both forms are now caught.
- Every `uv pip` subcommand is refused, not just install; `-t` joins the
  allowed tool-managed flags.
- .py files are scanned too: usage strings and error messages told users
  to run refused commands from ten scripts, including the --help of the
  very planner this PR fixed. All rewritten.
- The evals/tests exemption now tests path parts relative to plugins/, so
  a checkout under a directory named tests no longer exempts every file.
- An allow-marker's scope ends at a blank line as well as a fence, so one
  marker cannot blanket a whole file; quality-assessment.md gains the
  second marker that scoping made necessary.

Also from the review: zeroize's preflight gets `which python3` back (a
helper script still needs the binary; the shim never required removing
it), the Makefile's shell-suites note no longer describes an interception
that is gone, and the cairo CI example warns that it rebuilds caracal
from source each run.

Self-test 56 -> 63; every new pattern and exemption is fixture-covered
and was mutation-probed against the real tree. Full scan: 0 findings over
773 files.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

* Address the second review: prerequisite probe, checker parity, package placement

The review's P2 was a regression this PR introduced for a population the
first fix ignored: c-review and rust-review now require uv, and a box
with python3 but no uv would die at Phase 4 exactly the way shimmed boxes
died before. Phase 1 (Prerequisites) in both skills now probes
`command -v uv` and aborts with install guidance. zeroize-audit's
preflight already checked uv. The four converted shell suites gain the
same guard with a clear message instead of a bare 127 mid-run.

Checker parity with the shims, second pass:

- pipx and the non-install pip subcommands are refused by catch-all shim
  arms and passed the checker; both get named-subcommand patterns.
- A script named by variable or path (`python3 "$MERGE"`) has no `.py`
  token; a new pattern covers it and immediately caught one live
  instance — a codeql test stub that fakes uv itself, now carrying an
  allow-marker with its reason.
- finditer everywhere: a compliant `uv run` earlier on a line no longer
  masks a refused command later on it, which was exactly the table-cell
  case the unanchored design exists for.
- Prohibition phrases now test the text BEFORE the match, so
  "Use `pip install semgrep` instead of the tarball" is flagged while
  "Do NOT run `pip install`" stays exempt.
- The uv-pip allowance matches whole flags after the command, so
  `--target-dir` no longer counts as `--target` and a trailing `-t /tmp`
  does; `uv pip` precedes `pip` in the pattern order so its lines get
  the right advice; a pip match directly after `uv ` defers to the
  uv-pip verdict instead of double-reporting.

Package placement, continued from the same insight as round one:

- yarGen regains --no-project alongside --with-requirements, plus a cd
  into the checkout so requirements.txt resolves where it lives.
- sarif-parsing's jsonschema example no longer names a script that does
  not exist, and the table's run-forms show a concrete script.py.
- culture-index's two messages now agree and name the actual remedy
  (`uv run --project` on the scripts directory) instead of re-adding a
  dependency its pyproject already declares.
- merge_sarif's usage line gains --no-project; the generator plugin's
  install section stops prescribing a venv its own runner never uses.
- generate_poc declared requires-python >=3.9 while using `str | None`
  in a signature, a TypeError on 3.9 that uv's interpreter selection
  made reachable; now >=3.10.
- The GitLab CI example exports ~/.local/bin onto PATH, without which
  `uv tool install` warns and the next line dies command-not-found.

Self-test 63 -> 71; the masking, prohibition-direction, flag-position
and pipx cases are all fixtures, and each new pattern was probed live
against the tree (plant, error, remove, clean — 0 findings over 773
files).

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

* Address the third review: importable trailmark, honest probes, sturdier scan

The P2 was the residue of round two's own fix, applied to the siblings
but not the flagship: trailmark/SKILL.md told the model to cure an import
error with `uv tool install`, which cannot cure it — a tool env is not
importable — while forbidding every fallback. The install block now says
what each remedy is for: `uv tool install` for the CLI, `uv run --with
trailmark python -` for the snippets, and the other five library-first
docs carry the same one-line annotation next to their install command.

Empirically settled rather than taken from the review: `uv run python3
<script>` works fine under the shims — uv prepends its environment's bin
directory, so python3 resolves to a real interpreter, not the shim. The
review's claim to the contrary would have meant rewriting the Makefile
and a bats suite; a two-minute transcript said no. Also declined: a
zeroize uv-prerequisite (its preflight already lists uv and uvx; the
C/C++ `which` line now names uv too).

Real and fixed:

- ct-analyzer's availability probe ran `python3 --version` by subprocess
  — the one refused form — so under the shims it reported "Python is not
  available" on machines where it plainly is. It now probes
  sys.executable, the interpreter the analyzer itself runs under.
  Verified under the shim: probe returns True.
- The flag step-over in both script patterns handles long and
  value-taking flags (`python3 -W ignore harness.py`, `--verbose
  tool.py`), matching the shim's two-slot consumption.
- A bare `allow-legacy-python:` with no reason no longer exempts
  anything; the reason the docs demand is now enforced.
- `uv run {baseDir}/...` gets --no-project at the ten semgrep and
  culture-index call sites that round two missed, and the culture-index
  remediation strings now name that same runnable command instead of a
  --project mechanism nothing uses.
- pip gains cache/config; the pattern comment now says the subcommand
  list is deliberately a subset.
- Both filesystem scans skip .venv/node_modules-style directories, after
  a stray local .venv (left by this session's own uv probe, and invisible
  to CI) turned the path scan red.

Smaller review items: the uv-probe prose says "Phase 4 onward" rather
than a wrong phase range, run_fixtures' comment stops claiming PEP 723
headers its stdlib-only helpers do not have, the yarGen one-liners say
to run from the checkout, `uv tool install` sites note or export the
tool bin dir the way a fresh container needs, and sarif-parsing's table
column says Install / run and stops naming a file that does not exist.

Self-test 71 -> 74. Full scan: 0 findings over 773 files.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
2026-08-19 13:39:07 -04:00

284 lines
8.6 KiB
Bash
Executable File

#!/usr/bin/env bash
# Variant-analysis eval: run each fixture codebase through Claude twice — once
# with the /variant-analysis:variants workflow, once with the skill alone — and
# score both against ground truth.
#
# NOT named run_*.sh on purpose. `make shell-suites` and CI execute every
# plugins/*/tests/*/run_*.sh they find; this one spawns dozens of subagents and
# costs real money, so it must stay out of that net. run_fixtures.sh is the
# CI-safe half.
#
# Usage:
# ./eval.sh # all codebases, both modes, 1 run each
# ./eval.sh --codebase gradio # one codebase (see ground-truth.json for names)
# ./eval.sh --mode workflow # skip the baseline
# ./eval.sh --mode "workflow baseline" # both, explicitly (quote the pair)
# ./eval.sh --runs 3 # repeat for a variance estimate
# ./eval.sh --strict-decoy # also require the decoy in the ruled-out section
# ./eval.sh --keep # keep the work dir even when the eval passes
#
# The work dir is deleted on a passing run unless --keep is given. A failing run
# always keeps it: that is when the transcripts are worth reading. A dir given
# with --out is never deleted.
set -euo pipefail
command -v uv >/dev/null 2>&1 || {
echo "uv is required (https://docs.astral.sh/uv/)" >&2
exit 1
}
TESTS_DIR="$(cd "$(dirname "$0")" && pwd)"
PLUGIN_DIR="$(cd "$TESTS_DIR/.." && pwd)"
GROUND_TRUTH="$TESTS_DIR/ground-truth.json"
CODEBASES=""
MODES="workflow baseline"
RUNS=1
KEEP=0
MODEL=""
STRICT_DECOY=0
OUT_DIR="${TMPDIR:-/tmp}/variant-analysis-eval.$$"
OUT_GIVEN=0
# Print the leading comment block as usage. Walks to the first non-comment line
# rather than a hardcoded range, which silently spilled `set -euo pipefail` and
# the variable block into --help every time the header changed length.
usage() {
awk 'NR > 1 && /^#/ { sub(/^# ?/, ""); print; next } NR > 1 { exit }' "$0"
}
while [ $# -gt 0 ]; do
case "$1" in
--codebase)
CODEBASES="$2"
shift 2
;;
--mode)
MODES="$2"
shift 2
;;
--runs)
RUNS="$2"
shift 2
;;
--model)
MODEL="$2"
shift 2
;;
--keep)
KEEP=1
shift
;;
--strict-decoy)
STRICT_DECOY=1
shift
;;
--out)
OUT_DIR="$2"
OUT_GIVEN=1
shift 2
;;
-h | --help)
usage
exit 0
;;
*)
echo "unknown option: $1" >&2
exit 2
;;
esac
done
# Reject an unknown mode rather than falling through build_prompt's else branch.
# `--mode wokflow` used to run the BASELINE prompt, tag the rows "wokflow", and
# then pass summarize.py a summary with no workflow rows — a typo that scored a
# green baseline-vs-nothing run as a success.
HAS_WORKFLOW=0
for mode in $MODES; do
case "$mode" in
workflow) HAS_WORKFLOW=1 ;;
baseline) ;;
*)
echo "unknown mode: $mode (expected 'workflow', 'baseline', or both)" >&2
exit 2
;;
esac
done
command -v claude >/dev/null || {
echo "claude CLI not found on PATH" >&2
exit 2
}
command -v jq >/dev/null || {
echo "jq not found on PATH" >&2
exit 2
}
if [ -z "$CODEBASES" ]; then
CODEBASES="$(jq -r '.codebases[].name' "$GROUND_TRUTH")"
fi
STRICT_FLAG=""
if [ "$STRICT_DECOY" -eq 1 ]; then
STRICT_FLAG="--strict-decoy"
fi
mkdir -p "$OUT_DIR"
SUMMARY="$OUT_DIR/summary.jsonl"
: >"$SUMMARY"
echo "eval output: $OUT_DIR"
echo
# Fail fast if the fixtures drifted — otherwise the whole run measures nothing.
uv run --no-project "$TESTS_DIR/verify_fixtures.py" >"$OUT_DIR/fixtures.log" 2>&1 || {
echo "fixture verification failed; see $OUT_DIR/fixtures.log" >&2
exit 1
}
build_prompt() {
# $1 = mode, $2 = seed bug text, $3 = absolute report path
if [ "$1" = "workflow" ]; then
cat <<EOF
/variant-analysis:variants
Hunt for variants of this known bug in the current directory:
$2
Set the report output to $3
EOF
else
cat <<EOF
Find all variants of this known bug in the current directory:
$2
Use the variant-analysis skill's methodology. Do NOT use the
/variant-analysis:variants workflow — work through it directly.
Write your findings to $3, following the structure of the variant report
template: a '## Findings' section with one entry per confirmed variant giving
its file and line, and a '## False Positive Patterns' section listing what you
examined and ruled out.
EOF
fi
}
for name in $CODEBASES; do
entry="$(jq -r --arg n "$name" '.codebases[] | select(.name == $n)' "$GROUND_TRUTH")"
if [ -z "$entry" ]; then
echo "unknown codebase: $name" >&2
exit 2
fi
src="$TESTS_DIR/$(echo "$entry" | jq -r '.path')"
seed="$(echo "$entry" | jq -r '.seed_bug')"
for mode in $MODES; do
run=1
while [ "$run" -le "$RUNS" ]; do
work="$OUT_DIR/$name/$mode/run$run"
mkdir -p "$work"
printf '%-14s %-9s run %s ... ' "$name" "$mode" "$run"
# Run IN the checkout rather than a copy: the fixture is ~283 MB, and
# duplicating it per run costs more than the eval. The report is written to
# an absolute path under $work instead, so nothing lands in the tree, and
# the fixture is re-verified after every run to catch an agent that edited
# the code it was asked to audit.
#
# CLAUDE_CODE_PRINT_BG_WAIT_CEILING_MS=0: workflows run in the BACKGROUND,
# so `claude -p` returns as soon as the main turn ends and by default gives
# up on background tasks after 600s — "Background tasks still running after
# 600s; terminating". The report then never lands and the run scores
# ungradeable even though the hunt was working fine. 0 waits indefinitely.
set +e
(
cd "$src" || exit 127
export CLAUDE_CODE_PRINT_BG_WAIT_CEILING_MS=0
# shellcheck disable=SC2086
build_prompt "$mode" "$seed" "$work/REPORT.md" | claude -p \
--plugin-dir "$PLUGIN_DIR" \
--permission-mode bypassPermissions \
--output-format json \
${MODEL:+--model "$MODEL"} \
>"$work/transcript.json" 2>"$work/claude.err"
)
claude_rc=$?
set -e
# Did the run mutate the codebase it was auditing? Silent drift would make
# every later run in this sweep grade against different code.
if ! uv run --no-project "$TESTS_DIR/verify_fixtures.py" >"$work/fixture-after.log" 2>&1; then
echo "FIXTURE DRIFTED after this run — see $work/fixture-after.log" >&2
echo " restore with: ./setup-gradio.sh --force" >&2
exit 1
fi
if [ "$claude_rc" -ne 0 ]; then
echo "claude exited $claude_rc (see $work/claude.err)"
printf '{"codebase":"%s","mode":"%s","run":%s,"gradeable":false,"error":"claude exit %s"}\n' \
"$name" "$mode" "$run" "$claude_rc" >>"$SUMMARY"
run=$((run + 1))
continue
fi
set +e
# shellcheck disable=SC2086 # $STRICT_FLAG is a bare flag or empty, by design
uv run --no-project "$TESTS_DIR/score.py" \
--report "$work/REPORT.md" \
--codebase "$name" \
--ground-truth "$GROUND_TRUTH" \
$STRICT_FLAG \
>"$work/score.json" 2>"$work/score.err"
score_rc=$?
set -e
if [ "$score_rc" -ge 2 ]; then
echo "ungradeable ($(jq -r '.error // "no report"' "$work/score.json" 2>/dev/null))"
else
tp=$(jq -r '.true_positives' "$work/score.json")
fp=$(jq -r '.false_positives' "$work/score.json")
recall=$(jq -r '.non_seed_recall' "$work/score.json")
dec=$(jq -r 'if .decoy_examined_and_ruled_out then "ruled-out" elif .decoy_reported_as_real then "REPORTED" else "unseen" end' "$work/score.json")
printf 'tp=%s fp=%s new=%s decoy=%s\n' "$tp" "$fp" "$recall" "$dec"
fi
jq -c --arg c "$name" --arg m "$mode" --argjson r "$run" \
'. + {codebase:$c, mode:$m, run:$r}' \
"$work/score.json" >>"$SUMMARY" 2>/dev/null ||
printf '{"codebase":"%s","mode":"%s","run":%s,"gradeable":false}\n' \
"$name" "$mode" "$run" >>"$SUMMARY"
run=$((run + 1))
done
done
done
echo
echo "=== summary ==="
# set +e: a failing eval is a normal outcome here, not a reason to abort before
# reporting where the artifacts landed.
set +e
if [ "$HAS_WORKFLOW" -eq 1 ]; then
uv run --no-project "$TESTS_DIR/summarize.py" "$SUMMARY"
else
uv run --no-project "$TESTS_DIR/summarize.py" --baseline-only "$SUMMARY"
fi
rc=$?
set -e
echo
if [ "$KEEP" -eq 1 ] || [ "$rc" -ne 0 ] || [ "$OUT_GIVEN" -eq 1 ]; then
echo "work dir kept at $OUT_DIR"
else
# Only ever removes a directory this script created under $TMPDIR. A --out path
# belongs to the caller and is left alone.
rm -rf "$OUT_DIR"
echo "work dir removed (pass --keep to inspect it)"
fi
exit $rc