mirror of
https://github.com/trailofbits/skills.git
synced 2026-09-14 14:28:48 +08:00
9e06dc67a3
* 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>
636 lines
24 KiB
Python
636 lines
24 KiB
Python
#!/usr/bin/env python3
|
|
# /// script
|
|
# requires-python = ">=3.11"
|
|
# dependencies = []
|
|
# ///
|
|
"""Build a deterministic rust-review run plan.
|
|
|
|
Reads ``prompts/clusters/manifest.json`` plus run-level flags, applies gate +
|
|
per-pass filtering, verifies every referenced prompt resolves on disk, and
|
|
emits two artifacts in the run's output directory:
|
|
|
|
* ``plan.json`` — machine-readable selection (cluster ids, prompt paths,
|
|
per-pass bug classes/prefixes, sub-prompt paths). The orchestrator reads
|
|
this to drive Phase 5 (TaskCreate metadata) and Phase 6 (worker spawn).
|
|
* ``worker-prompts/worker-N.txt`` — one ready-to-paste spawn prompt per
|
|
selected cluster, in selection order. The orchestrator passes the file
|
|
contents verbatim as the ``prompt`` argument to ``Agent``.
|
|
|
|
The script aborts non-zero on any malformed manifest entry, missing prompt
|
|
file, or invalid flag combination — so the orchestrator can rely on its
|
|
output without further validation.
|
|
|
|
Usage:
|
|
uv run --no-project build_run_plan.py \\
|
|
--plugin-root /abs/plugins/rust-review \\
|
|
--output-dir /abs/.rust-review-results/<ts> \\
|
|
--threat-model REMOTE \\
|
|
--severity-filter medium \\
|
|
--scope-subpath src \\
|
|
--context-roots . \\
|
|
--has-unsafe false --has-ffi true --has-concurrency true --has-async false \\
|
|
--has-packed-repr false --has-fs-io true
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import argparse
|
|
import json
|
|
import sys
|
|
from pathlib import Path
|
|
from typing import Any, NoReturn
|
|
|
|
THREAT_MODELS = {"REMOTE", "LOCAL_UNPRIVILEGED", "BOTH"}
|
|
SEVERITY_FILTERS = {"all", "medium", "high"}
|
|
|
|
# Single source of truth for the per-run capability flags. Everything that
|
|
# enumerates flags (CLI args, the gate/requires vocabularies, the flags dict,
|
|
# the rendered prompt, and plan["run"]) derives from this tuple so a new flag
|
|
# is added in exactly one place and cannot silently drift across call sites.
|
|
CAPABILITY_FLAGS = (
|
|
"has_unsafe",
|
|
"has_ffi",
|
|
"has_concurrency",
|
|
"has_async",
|
|
"has_packed_repr",
|
|
"has_fs_io",
|
|
)
|
|
GATE_VALUES = {"always", *CAPABILITY_FLAGS}
|
|
KNOWN_REQUIRES = set(CAPABILITY_FLAGS)
|
|
|
|
|
|
def parse_bool(value: str) -> bool:
|
|
v = value.strip().lower()
|
|
if v in ("true", "1", "yes"):
|
|
return True
|
|
if v in ("false", "0", "no"):
|
|
return False
|
|
raise argparse.ArgumentTypeError(f"expected true/false, got {value!r}")
|
|
|
|
|
|
def parse_args() -> argparse.Namespace:
|
|
p = argparse.ArgumentParser(
|
|
description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter
|
|
)
|
|
p.add_argument(
|
|
"--plugin-root",
|
|
required=True,
|
|
type=Path,
|
|
help="Absolute path to the rust-review plugin root (contains prompts/clusters/manifest.json)",
|
|
)
|
|
p.add_argument(
|
|
"--output-dir", required=True, type=Path, help="Absolute path to the run's output directory"
|
|
)
|
|
p.add_argument("--threat-model", required=True, choices=sorted(THREAT_MODELS))
|
|
p.add_argument("--severity-filter", required=True, choices=sorted(SEVERITY_FILTERS))
|
|
p.add_argument(
|
|
"--scope-subpath", required=True, help='Repo-relative scope directory, or "." for repo root'
|
|
)
|
|
p.add_argument(
|
|
"--context-roots",
|
|
default=".",
|
|
help=(
|
|
"Comma-separated repo-relative read-only roots/files workers may inspect for "
|
|
"reachability, build settings, wrappers, and threat-model context. Findings "
|
|
"remain limited to --scope-subpath."
|
|
),
|
|
)
|
|
for flag in CAPABILITY_FLAGS:
|
|
p.add_argument(f"--{flag.replace('_', '-')}", required=True, type=parse_bool)
|
|
p.add_argument(
|
|
"--manifest",
|
|
type=Path,
|
|
default=None,
|
|
help="Override manifest path (defaults to <plugin-root>/prompts/clusters/manifest.json)",
|
|
)
|
|
p.add_argument(
|
|
"--cache-primer",
|
|
type=parse_bool,
|
|
default=True,
|
|
help=(
|
|
"When true (default), the orchestrator spawns a small 'cache primer' worker before "
|
|
"the parallel batch so followers can hit the prompt cache on their first turn. Pass "
|
|
"false to skip and pay full cache-creation on every worker (useful for A/B testing)."
|
|
),
|
|
)
|
|
p.add_argument(
|
|
"--max-passes-per-worker",
|
|
type=int,
|
|
default=4,
|
|
help=(
|
|
"Cap the number of passes assigned to a single worker. Any cluster with more "
|
|
"passes than this is partitioned deterministically into contiguous chunks, each "
|
|
"spawned as its own rust-review-worker with a -{i}-suffixed cluster_id. Clusters "
|
|
"may declare a smaller manifest-level max_passes_per_worker for output-heavy "
|
|
"coverage. Default 4 splits the broad heavy-tail clusters and leaves most clusters "
|
|
"unchanged. Pass 0 to disable all chunking, including manifest overrides. Negative "
|
|
"values are rejected."
|
|
),
|
|
)
|
|
args = p.parse_args()
|
|
if args.max_passes_per_worker < 0:
|
|
raise SystemExit(f"--max-passes-per-worker must be >= 0, got {args.max_passes_per_worker}")
|
|
return args
|
|
|
|
|
|
def fail(msg: str) -> NoReturn:
|
|
print(f"build_run_plan.py: {msg}", file=sys.stderr)
|
|
sys.exit(2)
|
|
|
|
|
|
def gate_passes(cluster_gate: str, *, flags: dict[str, bool]) -> bool:
|
|
if cluster_gate == "always":
|
|
return True
|
|
if cluster_gate in flags:
|
|
return flags[cluster_gate]
|
|
fail(f"unknown cluster gate {cluster_gate!r}")
|
|
|
|
|
|
def pass_filtered_out(p: dict[str, Any], *, flags: dict[str, bool], threat_model: str) -> bool:
|
|
"""Return True if this pass should be hard-dropped from the run."""
|
|
requires = p.get("requires", []) or []
|
|
for req in requires:
|
|
if req not in KNOWN_REQUIRES:
|
|
fail(f"pass {p.get('bug_class', '?')!r}: unknown requires flag {req!r}")
|
|
if not flags[req]:
|
|
return True
|
|
skip_threat_models = p.get("skip_threat_models", []) or []
|
|
return threat_model in skip_threat_models
|
|
|
|
|
|
def cluster_max_passes_per_worker(cluster: dict[str, Any], *, cid: str) -> int | None:
|
|
value = cluster.get("max_passes_per_worker")
|
|
if value is None:
|
|
return None
|
|
if isinstance(value, bool) or not isinstance(value, int) or value <= 0:
|
|
raise ValueError(f"cluster {cid!r}: max_passes_per_worker must be a positive integer")
|
|
return value
|
|
|
|
|
|
def build_selection(
|
|
manifest: dict[str, Any], *, plugin_root: Path, flags: dict[str, bool], threat_model: str
|
|
) -> list[dict[str, Any]]:
|
|
if manifest.get("version") != 1:
|
|
fail(f"unsupported manifest version: {manifest.get('version')!r}")
|
|
if not isinstance(manifest.get("clusters"), list):
|
|
fail("manifest.clusters must be a list")
|
|
|
|
selected: list[dict[str, Any]] = []
|
|
for cluster in manifest["clusters"]:
|
|
cid = cluster.get("cluster_id")
|
|
if not cid:
|
|
fail("cluster missing cluster_id")
|
|
gate = cluster.get("gate")
|
|
if gate not in GATE_VALUES:
|
|
fail(f"cluster {cid!r}: invalid gate {gate!r}")
|
|
if not gate_passes(gate, flags=flags):
|
|
continue
|
|
try:
|
|
cluster_max_passes = cluster_max_passes_per_worker(cluster, cid=cid)
|
|
except ValueError as exc:
|
|
fail(str(exc))
|
|
|
|
consolidated = bool(cluster.get("consolidated", False))
|
|
cluster_prompt_rel = cluster.get("prompt")
|
|
if not cluster_prompt_rel:
|
|
fail(f"cluster {cid!r}: missing prompt path")
|
|
cluster_prompt_abs = (plugin_root / cluster_prompt_rel).resolve()
|
|
if not cluster_prompt_abs.is_file():
|
|
fail(f"cluster {cid!r}: prompt not found at {cluster_prompt_abs}")
|
|
|
|
passes_in = cluster.get("passes") or []
|
|
if not passes_in:
|
|
fail(f"cluster {cid!r}: no passes declared")
|
|
|
|
kept_passes: list[dict[str, Any]] = []
|
|
for raw in passes_in:
|
|
bug_class = raw.get("bug_class")
|
|
prefix = raw.get("prefix")
|
|
if not bug_class or not prefix:
|
|
fail(f"cluster {cid!r}: pass missing bug_class/prefix: {raw!r}")
|
|
if pass_filtered_out(raw, flags=flags, threat_model=threat_model):
|
|
continue
|
|
entry: dict[str, Any] = {"bug_class": bug_class, "prefix": prefix}
|
|
if consolidated:
|
|
# No per-pass prompt file; cluster prompt is self-sufficient.
|
|
if "prompt" in raw:
|
|
fail(
|
|
f"cluster {cid!r} (consolidated): "
|
|
f"pass {bug_class!r} unexpectedly has 'prompt'"
|
|
)
|
|
else:
|
|
pass_prompt_rel = raw.get("prompt")
|
|
if not pass_prompt_rel:
|
|
fail(
|
|
f"cluster {cid!r}: non-consolidated pass {bug_class!r} missing prompt path"
|
|
)
|
|
pass_prompt_abs = (plugin_root / pass_prompt_rel).resolve()
|
|
if not pass_prompt_abs.is_file():
|
|
fail(
|
|
f"cluster {cid!r} pass {bug_class!r}: prompt not found at {pass_prompt_abs}"
|
|
)
|
|
entry["prompt"] = str(pass_prompt_abs)
|
|
kept_passes.append(entry)
|
|
|
|
if not kept_passes:
|
|
# Empty after filtering — drop the cluster entirely (Phase 4 rule).
|
|
continue
|
|
|
|
selected.append(
|
|
{
|
|
"cluster_id": cid,
|
|
"consolidated": consolidated,
|
|
"cluster_prompt": str(cluster_prompt_abs),
|
|
"passes": kept_passes,
|
|
"max_passes_per_worker": cluster_max_passes,
|
|
}
|
|
)
|
|
|
|
if not selected:
|
|
fail("no clusters selected after filtering — refusing to start an empty review")
|
|
return selected
|
|
|
|
|
|
def split_oversized_clusters(
|
|
selected: list[dict[str, Any]], *, max_passes: int
|
|
) -> list[dict[str, Any]]:
|
|
"""Partition clusters whose `passes` exceed their effective chunk size.
|
|
|
|
Each oversized cluster is replaced by pseudo-cluster entries in manifest
|
|
pass order. Each chunk shares the source cluster's `cluster_prompt` and
|
|
`consolidated` flag; its `cluster_id` is the source id with a `-{i}` suffix
|
|
(1-indexed). Clusters whose pass count is already within its effective max
|
|
pass count pass through with bare `cluster_id` and an identical `passes`
|
|
list.
|
|
|
|
**Consolidated clusters (`consolidated: true`) are never chunked**, regardless
|
|
of pass count or any `max_passes_per_worker` override: one worker owns the whole
|
|
cluster so its shared Phase-A inventory grounds every phase (chunking would force
|
|
each chunk to rebuild that inventory, which workers skip in practice). Only
|
|
non-consolidated clusters are partitioned.
|
|
|
|
`max_passes == 0` is the explicit "disable chunking" sentinel: the input
|
|
list is returned unchanged, including any manifest-level overrides.
|
|
`max_passes < 0` is rejected as a programmer error — the CLI layer must
|
|
enforce `>= 0` before calling.
|
|
|
|
Clusters may carry `max_passes_per_worker` from the manifest. When global
|
|
chunking is enabled, that positive integer overrides the global max for
|
|
only that cluster.
|
|
|
|
The transformation is pure and deterministic: same input + same `max_passes`
|
|
always yields an identical list. No randomization, no I/O.
|
|
"""
|
|
if max_passes < 0:
|
|
raise ValueError(f"max_passes must be >= 0, got {max_passes}")
|
|
if max_passes == 0:
|
|
return selected
|
|
|
|
out: list[dict[str, Any]] = []
|
|
for cluster in selected:
|
|
passes = cluster["passes"]
|
|
# Validate any manifest override regardless of `consolidated` (keeps the
|
|
# invalid-override guard live) — but consolidated clusters are not chunked.
|
|
cluster_max_passes = cluster_max_passes_per_worker(cluster, cid=str(cluster["cluster_id"]))
|
|
# Consolidated clusters are NEVER chunked: their shared Phase-A inventory
|
|
# grounds every phase, and splitting forces each chunk to rebuild it (which
|
|
# workers skip in practice — see rust-review-worker.md's chunked-subset rule).
|
|
# One worker owns the whole consolidated cluster, builds the inventory once,
|
|
# and runs all its phases. Pass through with a bare cluster_id.
|
|
if cluster.get("consolidated"):
|
|
out.append(cluster)
|
|
continue
|
|
effective_max_passes = cluster_max_passes if cluster_max_passes is not None else max_passes
|
|
k = len(passes)
|
|
if k <= effective_max_passes:
|
|
out.append(cluster)
|
|
continue
|
|
# Greedy left-to-right contiguous partition. Chunk entries intentionally
|
|
# omit `max_passes_per_worker`: each chunk is already <= the effective max
|
|
# and chunks are never re-chunked, so the key would never be read again.
|
|
n_chunks = (k + effective_max_passes - 1) // effective_max_passes
|
|
chunks = [
|
|
{
|
|
"cluster_id": f"{cluster['cluster_id']}-{i + 1}",
|
|
"consolidated": cluster["consolidated"],
|
|
"cluster_prompt": cluster["cluster_prompt"],
|
|
"passes": passes[i * effective_max_passes : (i + 1) * effective_max_passes],
|
|
}
|
|
for i in range(n_chunks)
|
|
]
|
|
# Post-condition: chunking must neither drop nor duplicate a pass (a lost
|
|
# pass = a whole bug class silently un-analyzed), so the concatenated chunk
|
|
# passes must equal the source passes in order.
|
|
assert [p for c in chunks for p in c["passes"]] == passes, (
|
|
f"cluster {cluster['cluster_id']!r}: chunking changed the pass set"
|
|
)
|
|
out.extend(chunks)
|
|
return out
|
|
|
|
|
|
def _render_shared_prefix_lines(
|
|
*,
|
|
output_dir: Path,
|
|
scope_root: str,
|
|
context_roots: str,
|
|
threat_model: str,
|
|
severity_filter: str,
|
|
flags: dict[str, bool],
|
|
context_md_body: str,
|
|
) -> list[str]:
|
|
"""Lines that are byte-identical across all workers AND the cache primer in this run.
|
|
|
|
Keeping this block stable is what makes the prompt cache hit cross-worker. Any change
|
|
to its shape (formatting, ordering, blank-line placement) invalidates cache for the rest
|
|
of the run. The primer prompt and worker prompts both call this and append divergent
|
|
trailers afterwards.
|
|
"""
|
|
lines: list[str] = []
|
|
lines.append("You are a rust-review worker on a parallel Rust security review.")
|
|
lines.append("Follow the protocol in your system prompt verbatim.")
|
|
lines.append("")
|
|
lines.append(f"Output directory: {output_dir}")
|
|
lines.append(
|
|
f"Finding scope root: {scope_root} — finding locations MUST be inside this subtree."
|
|
)
|
|
lines.append(
|
|
f"Context roots: {context_roots} — read-only context for reachability, callers, "
|
|
"wrappers, build settings, mitigations, and threat-model details. Do not file "
|
|
"findings outside the finding scope."
|
|
)
|
|
lines.append(f"Scope root: {scope_root} — legacy alias for Finding scope root.")
|
|
lines.append(f"Threat model: {threat_model}")
|
|
lines.append(f"Severity filter: {severity_filter}")
|
|
lines.append(
|
|
"Codebase: "
|
|
+ ", ".join(f"{flag}={'true' if flags[flag] else 'false'}" for flag in CAPABILITY_FLAGS)
|
|
)
|
|
lines.append("")
|
|
lines.append("<context>")
|
|
lines.append(
|
|
"Codebase context (from output_dir/context.md — do NOT re-Read it from disk; "
|
|
"this block IS the canonical copy):"
|
|
)
|
|
lines.append("")
|
|
lines.append(context_md_body.rstrip())
|
|
lines.append("</context>")
|
|
lines.append("")
|
|
return lines
|
|
|
|
|
|
def render_cache_primer_prompt(
|
|
*,
|
|
output_dir: Path,
|
|
scope_root: str,
|
|
context_roots: str,
|
|
threat_model: str,
|
|
severity_filter: str,
|
|
flags: dict[str, bool],
|
|
context_md_body: str,
|
|
) -> str:
|
|
"""Tiny single-turn prompt that warms the prompt cache for the parallel batch.
|
|
|
|
Shares its prefix byte-for-byte with every worker prompt (via the helper above) so
|
|
that the workers in Phase 6b read this entry from cache instead of paying full
|
|
cache-creation. The trailer instructs the agent to abort in one text response with
|
|
no tool calls — duration ~3 s, no findings written.
|
|
"""
|
|
lines = _render_shared_prefix_lines(
|
|
output_dir=output_dir,
|
|
scope_root=scope_root,
|
|
context_roots=context_roots,
|
|
threat_model=threat_model,
|
|
severity_filter=severity_filter,
|
|
flags=flags,
|
|
context_md_body=context_md_body,
|
|
)
|
|
# Trailer is primer-only — never reused by workers — so keep it short.
|
|
# The worker system prompt treats this exact marker as a first-class mode.
|
|
lines.append("Cache primer: true")
|
|
lines.append("worker-PRIMER abort: cache primer (no analysis performed)")
|
|
lines.append("")
|
|
return "\n".join(lines)
|
|
|
|
|
|
def render_worker_prompt(
|
|
*,
|
|
worker_n: int,
|
|
cluster: dict[str, Any],
|
|
output_dir: Path,
|
|
scope_root: str,
|
|
context_roots: str,
|
|
threat_model: str,
|
|
severity_filter: str,
|
|
flags: dict[str, bool],
|
|
context_md_body: str,
|
|
) -> str:
|
|
bug_classes = [p["bug_class"] for p in cluster["passes"]]
|
|
prefixes = [p["prefix"] for p in cluster["passes"]]
|
|
|
|
lines = _render_shared_prefix_lines(
|
|
output_dir=output_dir,
|
|
scope_root=scope_root,
|
|
context_roots=context_roots,
|
|
threat_model=threat_model,
|
|
severity_filter=severity_filter,
|
|
flags=flags,
|
|
context_md_body=context_md_body,
|
|
)
|
|
lines.append("— assignment —")
|
|
lines.append(f"Worker id: worker-{worker_n}")
|
|
lines.append(f"Cluster id: {cluster['cluster_id']}")
|
|
lines.append(f"Cluster prompt: {cluster['cluster_prompt']}")
|
|
|
|
if cluster["consolidated"]:
|
|
# Worker.md contract: omit the section entirely for consolidated clusters.
|
|
pass
|
|
else:
|
|
lines.append("Sub-prompt paths:")
|
|
for p in cluster["passes"]:
|
|
lines.append(f" - {p['prompt']}")
|
|
|
|
lines.append(f"Pass bug classes: {', '.join(bug_classes)}")
|
|
lines.append(f"Pass prefixes: {', '.join(prefixes)}")
|
|
# skip_subclasses is always empty: filtering is hard-drop (passes never reach
|
|
# the worker). Field is retained because worker.md "Inputs" requires it.
|
|
lines.append("Skip subclasses: (none)")
|
|
lines.append("")
|
|
return "\n".join(lines)
|
|
|
|
|
|
def _validate_run_inputs(args: argparse.Namespace) -> tuple[Path, Path, Path, dict[str, Any]]:
|
|
plugin_root: Path = args.plugin_root.resolve()
|
|
if not plugin_root.is_dir():
|
|
fail(f"--plugin-root {plugin_root} is not a directory")
|
|
|
|
output_dir: Path = args.output_dir.resolve()
|
|
if not output_dir.is_dir():
|
|
fail(f"--output-dir {output_dir} does not exist (Phase 2 must create it first)")
|
|
|
|
manifest_path: Path = (
|
|
args.manifest or plugin_root / "prompts/clusters/manifest.json"
|
|
).resolve()
|
|
if not manifest_path.is_file():
|
|
fail(f"manifest not found at {manifest_path}")
|
|
|
|
try:
|
|
manifest = json.loads(manifest_path.read_text())
|
|
except json.JSONDecodeError as e:
|
|
fail(f"manifest is not valid JSON: {e}")
|
|
|
|
return plugin_root, output_dir, manifest_path, manifest
|
|
|
|
|
|
def _render_workers(
|
|
selected: list[dict[str, Any]],
|
|
*,
|
|
worker_prompts_dir: Path,
|
|
output_dir: Path,
|
|
scope_subpath: str,
|
|
context_roots: str,
|
|
threat_model: str,
|
|
severity_filter: str,
|
|
flags: dict[str, bool],
|
|
context_md_body: str,
|
|
) -> list[dict[str, Any]]:
|
|
workers: list[dict[str, Any]] = []
|
|
for i, cluster in enumerate(selected, start=1):
|
|
prompt_text = render_worker_prompt(
|
|
worker_n=i,
|
|
cluster=cluster,
|
|
output_dir=output_dir,
|
|
scope_root=scope_subpath,
|
|
context_roots=context_roots,
|
|
threat_model=threat_model,
|
|
severity_filter=severity_filter,
|
|
flags=flags,
|
|
context_md_body=context_md_body,
|
|
)
|
|
prompt_path = worker_prompts_dir / f"worker-{i}.txt"
|
|
prompt_path.write_text(prompt_text)
|
|
workers.append(
|
|
{
|
|
"worker_n": i,
|
|
"cluster_id": cluster["cluster_id"],
|
|
"consolidated": cluster["consolidated"],
|
|
"cluster_prompt": cluster["cluster_prompt"],
|
|
"sub_prompt_paths": [p["prompt"] for p in cluster["passes"] if "prompt" in p],
|
|
"pass_bug_classes": [p["bug_class"] for p in cluster["passes"]],
|
|
"pass_prefixes": [p["prefix"] for p in cluster["passes"]],
|
|
"spawn_prompt_path": str(prompt_path),
|
|
}
|
|
)
|
|
return workers
|
|
|
|
|
|
def _print_summary(
|
|
*,
|
|
plan_path: Path,
|
|
worker_prompts_dir: Path,
|
|
selected: list[dict[str, Any]],
|
|
cache_primer_path: Path | None,
|
|
) -> None:
|
|
spawn_warning = (
|
|
"Spawn workers FOREGROUND only. Each Agent call MUST have no "
|
|
"run_in_background field (or run_in_background=false). Setting it to "
|
|
"true defeats the Phase-6a primer cache and burns ~15K cache-creation "
|
|
"tokens per worker. 'Parallel' = one assistant message with M Agent "
|
|
"calls; that is already concurrent — do not add run_in_background=true."
|
|
)
|
|
|
|
# Stderr banner so the warning shows up in the Bash tool result the
|
|
# orchestrator reads, not just inside the JSON summary.
|
|
print(f"WARNING: {spawn_warning}", file=sys.stderr)
|
|
|
|
summary = {
|
|
"plan_path": str(plan_path),
|
|
"worker_prompts_dir": str(worker_prompts_dir),
|
|
"worker_count": len(selected),
|
|
"cluster_ids": [c["cluster_id"] for c in selected],
|
|
"cache_primer_path": str(cache_primer_path) if cache_primer_path else None,
|
|
"spawn_instructions": spawn_warning,
|
|
}
|
|
print(json.dumps(summary, indent=2))
|
|
|
|
|
|
def main() -> int:
|
|
args = parse_args()
|
|
plugin_root, output_dir, manifest_path, manifest = _validate_run_inputs(args)
|
|
|
|
flags = {flag: getattr(args, flag) for flag in CAPABILITY_FLAGS}
|
|
selected = build_selection(
|
|
manifest, plugin_root=plugin_root, flags=flags, threat_model=args.threat_model
|
|
)
|
|
selected = split_oversized_clusters(selected, max_passes=args.max_passes_per_worker)
|
|
|
|
context_md_path = output_dir / "context.md"
|
|
if not context_md_path.is_file():
|
|
fail(
|
|
f"context.md not found at {context_md_path} — Phase 3 must write it before Phase 4 runs"
|
|
)
|
|
context_md_body = context_md_path.read_text()
|
|
|
|
worker_prompts_dir = output_dir / "worker-prompts"
|
|
worker_prompts_dir.mkdir(exist_ok=True)
|
|
|
|
workers = _render_workers(
|
|
selected,
|
|
worker_prompts_dir=worker_prompts_dir,
|
|
output_dir=output_dir,
|
|
scope_subpath=args.scope_subpath,
|
|
context_roots=args.context_roots,
|
|
threat_model=args.threat_model,
|
|
severity_filter=args.severity_filter,
|
|
flags=flags,
|
|
context_md_body=context_md_body,
|
|
)
|
|
|
|
cache_primer_path: Path | None = None
|
|
if args.cache_primer:
|
|
cache_primer_path = worker_prompts_dir / "cache-primer.txt"
|
|
cache_primer_path.write_text(
|
|
render_cache_primer_prompt(
|
|
output_dir=output_dir,
|
|
scope_root=args.scope_subpath,
|
|
context_roots=args.context_roots,
|
|
threat_model=args.threat_model,
|
|
severity_filter=args.severity_filter,
|
|
flags=flags,
|
|
context_md_body=context_md_body,
|
|
)
|
|
)
|
|
|
|
plan: dict[str, Any] = {
|
|
"version": 1,
|
|
"run": {
|
|
"output_dir": str(output_dir),
|
|
"finding_scope_root": args.scope_subpath,
|
|
"scope_root": args.scope_subpath,
|
|
"context_roots": args.context_roots,
|
|
"threat_model": args.threat_model,
|
|
"severity_filter": args.severity_filter,
|
|
**flags,
|
|
"plugin_root": str(plugin_root),
|
|
"manifest_path": str(manifest_path),
|
|
"cache_primer": args.cache_primer,
|
|
},
|
|
"workers": workers,
|
|
}
|
|
if cache_primer_path is not None:
|
|
plan["cache_primer"] = {"spawn_prompt_path": str(cache_primer_path)}
|
|
|
|
plan_path = output_dir / "plan.json"
|
|
plan_path.write_text(json.dumps(plan, indent=2) + "\n")
|
|
|
|
_print_summary(
|
|
plan_path=plan_path,
|
|
worker_prompts_dir=worker_prompts_dir,
|
|
selected=selected,
|
|
cache_primer_path=cache_primer_path,
|
|
)
|
|
return 0
|
|
|
|
|
|
if __name__ == "__main__":
|
|
sys.exit(main())
|