diff --git a/.gitea/workflows/adversarial-review.yml b/.gitea/workflows/adversarial-review.yml index 2b5d968..4d78060 100644 --- a/.gitea/workflows/adversarial-review.yml +++ b/.gitea/workflows/adversarial-review.yml @@ -1,12 +1,8 @@ -# Gadfly — agentic adversarial PR reviewer (https://gitea.stevedudenhoeffer.com/steve/gadfly). -# -# Runs the published Gadfly image (pinned to an immutable :sha- tag — act_runner -# caches :latest, and this build is what carries foreman provider-type support) -# as a specialist swarm and posts -# ONE consolidated review comment as gitea-actions. Advisory only — never blocks a -# merge. This reviews majordomo PRs with 6 ollama-cloud models (3-lens suite). -# Gadfly is a simple system — findings are advisory; always double-check before -# acting. +# Gadfly adversarial review — subscribes to steve/gadfly's reusable workflow and +# INHERITS its default swarm. This stub holds only the triggers, the actor gate, +# secret forwarding, and the allow-list; the swarm config (models, lenses, +# concurrency, timeouts) lives centrally in gadfly's review-reusable.yml so it is +# tuned in ONE place. Advisory only — never blocks a merge. name: Adversarial Review (Gadfly) @@ -33,50 +29,25 @@ concurrency: jobs: review: # Security: only trusted users may trigger a secret-bearing run via a PR - # comment (pull_request + workflow_dispatch are already trusted). Mirrors - # GADFLY_ALLOWED_USERS, the in-container belt-and-suspenders check. + # comment (pull_request + workflow_dispatch are already trusted). Mirrors the + # allowed_users input below (the in-container belt-and-suspenders check) — both + # lists must stay in sync; a workflow if: can't read a workflow_call input. if: >- github.event_name != 'issue_comment' || (github.event.issue.pull_request && (github.actor == 'steve' || github.actor == 'fizi' || github.actor == 'dazed')) - runs-on: ubuntu-latest - # Fleet: 6 ollama-cloud models (lens fan-out), no local Macs. (Trimmed the - # weakest reviewers by grade — m5/qwen3.6, gemma4, gpt-oss, kimi-k2.7 — plus - # the earlier M1 drop.) Plenty of headroom for the cloud lanes. - timeout-minutes: 45 - steps: - - uses: docker://gitea.stevedudenhoeffer.com/steve/gadfly:sha-d7f364d - env: - GITEA_API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }} - GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} - OLLAMA_CLOUD_API_KEY: ${{ secrets.OLLAMA_CLOUD_API_KEY }} - # Cloud-only fleet (no local Macs). Cloud concurrency lives in the - # LENSES: models run a few at a time (ollama-cloud=3) with their 3 lenses - # concurrent (LENS ollama-cloud=3) so comments land sooner. - GADFLY_MODELS: "minimax-m3:cloud,glm-5.2:cloud,glm-5.1:cloud,deepseek-v4-pro:cloud,nemotron-3-super:cloud,qwen3-coder:480b-cloud" - GADFLY_PROVIDER_CONCURRENCY: "ollama-cloud=3" - GADFLY_PROVIDER_LENS_CONCURRENCY: "ollama-cloud=3" - # Default => the 3-lens suite (security, correctness, error-handling). - # Set the repo var GADFLY_SPECIALISTS to override (csv / "all" / "auto"). - GADFLY_SPECIALISTS: ${{ vars.GADFLY_SPECIALISTS || 'security,correctness,error-handling' }} - # Per-lens deadline + bounded steps to keep each reviewer's run sane. - GADFLY_TIMEOUT_SECS: "600" - GADFLY_MAX_STEPS: "14" - # Allow-list for the comment trigger (mirrors the job-level if: guard). - GADFLY_ALLOWED_USERS: "steve,fizi,dazed" - # --- findings telemetry: POST runs + findings to the gadfly-reports store --- - # Advisory & off unless GADFLY_FINDINGS_URL is set; failures only log to - # stderr and never affect the review. GADFLY_REPO / GADFLY_PR are derived - # in-container; the URL + token are user-scope secrets. - GADFLY_FINDINGS_URL: ${{ secrets.GADFLY_FINDINGS_URL }} - GADFLY_FINDINGS_TOKEN: ${{ secrets.GADFLY_FINDINGS_TOKEN }} - # --- event context (leave as-is) --- - EVENT_NAME: ${{ github.event_name }} - PR: ${{ github.event.pull_request.number || github.event.issue.number || github.event.inputs.pr_number }} - PR_BRANCH: ${{ github.head_ref }} - IS_DRAFT: ${{ github.event.pull_request.draft }} - COMMENT_BODY: ${{ github.event.comment.body }} - COMMENT_ID: ${{ github.event.comment.id }} - ACTOR: ${{ github.actor }} + # Pinned to an immutable gadfly commit (not @main): a push to gadfly can't + # silently change the code that runs with our forwarded secrets. + uses: steve/gadfly/.gitea/workflows/review-reusable.yml@b02b11d69139843665da4cdbf776bc0b3583490d + # Least privilege: forward only the review secrets (not `secrets: inherit`, + # which would expose every repo secret). GITEA_TOKEN is the automatic token. + secrets: + OLLAMA_CLOUD_API_KEY: ${{ secrets.OLLAMA_CLOUD_API_KEY }} + CLAUDE_CODE_OAUTH_TOKEN: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }} + GADFLY_FINDINGS_URL: ${{ secrets.GADFLY_FINDINGS_URL }} + GADFLY_FINDINGS_TOKEN: ${{ secrets.GADFLY_FINDINGS_TOKEN }} + with: + # Consumer-specific allow-list; everything else is inherited. + allowed_users: "steve,fizi,dazed" diff --git a/CLAUDE.md b/CLAUDE.md index f6f1dad..148c931 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -142,9 +142,11 @@ Ship work through PRs and let Gadfly review it before merge: - **Push to a PR, never straight to `main`.** Branch, push, open a PR. `.gitea/workflows/adversarial-review.yml` runs Gadfly (the standalone - agentic adversarial reviewer) — a fleet of 6 ollama-cloud models, each - running the 3-lens suite (security, correctness, error-handling). Advisory - only; it never blocks the merge. + agentic adversarial reviewer) by subscribing to gadfly's reusable workflow + and inheriting its default swarm — 3 cloud models + the Claude Code engine + (sonnet/opus/opus:max), each running the 5-lens suite (security, correctness, + maintainability, performance, error-handling). The swarm is tuned centrally + in gadfly, not here. Advisory only; it never blocks the merge. - **Wait for Gadfly to finish, then read its output.** Don't merge while the review is still running. Each model posts one consolidated comment; weigh every finding on its merits and fix the real ones (Gadfly is a simple