* feat(store): flea-market upload guardrails + soft delete + JOIN-based admin queue
Adds an end-to-end guardrails pipeline for store uploads (manifest +
static-security + LLM review), persists blocked bundles for forensics,
introduces soft-delete (Archive) semantics, consolidates the legacy
/store/{id} surface into /marketplace/flea/{id}, and reworks the admin
queue so lifecycle filters read live entity visibility via LEFT JOIN
rather than a denormalized submission column.
Schema v29 → v35:
* v29 store_submissions table + store_entities.visibility_status
* v30 file_size, bundle_sha256, bundle_purged_at on submissions
* v31 reshape store_submissions (drop legacy unique on entity_id)
* v32 store_entities.archived_at/by + 'archived' visibility value
* v33 drop store_submissions.retry_count (unused)
* v34 ensure idx_store_submissions_entity exists post column-drop
* v35 broaden visibility_status enum + JOIN architecture cutover
Pipeline (src/store_guardrails/):
* Inline checks: manifest_check, static_scan, quality_check
* LLM review configurable haiku|sonnet|opus (default haiku)
* BackgroundTasks-driven async path with structured-output JSON
* Per-submitter daily quota (default 50)
* 30-day TTL purge job (POST /api/admin/run-blocked-purge)
* Bundle SHA256 + size persisted; sha256 survives purge for forensics
Visibility model:
* pending | approved | hidden | archived
* _enforce_visibility returns 404 (no leak) for non-owner non-admin
* Owner sees own non-approved entries via include_owner_id widening
* Install refused with 409 entity_not_approved when not approved
Soft-delete (DELETE /api/store/entities/{id}):
* Default = soft (visibility_status='archived'); existing installs
keep getting served the bundle so users don't lose the plugin
* ?hard=true admin-only: drops bundle + cascades user_store_installs
* Hard-delete preserves entity_id on submission as tombstone so
audit_log linkage survives for the activity timeline
Admin queue lifecycle (the JOIN refactor):
* Verdict (store_submissions.status) is immutable forensic record
* Lifecycle (store_entities.visibility_status) is live state
* /admin/store/submissions Archived chip translates to
`e.visibility_status='archived'` via LEFT JOIN — any path that
flips visibility surfaces in the queue immediately
* Detail page renders Status (verdict) and Entity lifecycle side by
side so admins see "approved at review, now archived" at a glance
URL consolidation:
* /store/{id} deleted (no redirect, stale bookmarks 404)
* /marketplace/flea/{id} is the canonical detail surface
* Three in-tree callers (upload-success, my-stack card, store
listing card) updated to point at the new URL
* Quarantine banner extracted to _quarantine_banner.html partial,
self-guarded, included from both flea detail templates
* Banner JS auto-refreshes when the verdict lands by polling
/api/marketplace/flea/{id}/detail (visibility_status +
submission_status — the latter is needed because blocked_llm
keeps the entity at visibility_status='pending')
Audit log resource format:
* runner.py emits prefixed `store_submission:{id}` (post-fix)
* Detail-page timeline query handles three patterns: prefixed
submission, helper-emitted `store_entity:{sub_id}`, and bare-id
legacy rows — all surface in the activity timeline
UX fixes:
* Owner sees Under review / Quarantined / Hidden banner with status
* Install button gray-disabled (not blue) when non-approved
* Owner cannot delete quarantined entries (403); admin can
* Admin queue: filter chips, sortable columns, paging, page-size
* Auto-refresh queue every 5s while pending rows are visible
* Store upload page file picker no longer opens twice (label →
input default action collided with explicit JS handler)
Tests: 168 passed across the guardrails suites (admin submissions,
store API, inline / LLM / purge guardrails, store repositories,
marketplace filter, schema version). New regression coverage
includes: archive surfaces via JOIN even when API path is bypassed;
deleted submission renders activity timeline (tombstone); flea
detail surfaces submission_status only for owner/admin; detail page
renders Entity lifecycle row; audit log resource format covers both
helper and runner paths.
* fix(store-guardrails): PR #233 follow-up — prompt injection, atomic PUT, BG race, schema, reaper, sort whitelist
Addresses 9 of the 23 findings from the PR #233 review (spec at
docs/superpowers/specs/2026-05-09-pr233-guardrails-fixes-spec.md).
Merge-gate items #1-#6 plus high-value mediums #7, #9-#12, #23.
Architectural items (#8 enum split, #14 factory) and pure
maintainability (#15-#22) deferred to follow-ups.
Security:
* #1 prompt injection — SYSTEM_PROMPT now passed via the SDK's
dedicated system= parameter; bundle wrapped in <bundle>...</bundle>
sentinels declared data-only by the system prompt; literal
sentinel strings in user content are escaped so an adversarial
README can't forge a close tag.
* #6 static scan honesty — module docstring + admin copy + docs
declare static scan as signal not gate; .md/.txt/.rst/.html/.json/
.yaml/.yml/.toml skipped to avoid false positives on prose.
AST mode for Python deferred (separate flag, FP comparison work).
Correctness:
* #2 PUT atomicity — bundles bake into plugin.staging-<rand>/
alongside live, atomic-rename on success; failed checks leave
live tree byte-for-byte intact.
* #3 BG-task race — set_visibility_if_pending guards verdict flips
to the (pending, hidden) review window; admin archives during
review survive; skipped flips audit-logged.
* #4 v35 NOT NULL/DEFAULT — schema v35→v36 re-applies them on
store_entities.visibility_status. CHECK constraint enforced
application-side (DuckDB ADD CHECK on existing column unsupported).
* #7 stuck-review reaper — reap_stuck_llm_reviews flips pending_llm
rows older than guardrails.stuck_review_grace_seconds (default
1800) to review_error. Scheduler runs every 15 min via new
/api/admin/run-reap-stuck-reviews. Set knob to 0 to disable.
* #9 quota counter — count_blocked_for_submitter_since now counts
blocked_inline + blocked_llm + review_error so a submitter
triggering only LLM-blocked verdicts is bounded.
* #10 missing risk_level — surfaces as review_error with
error='missing_risk_level' instead of silently defaulting to
'medium' (which looked like a model-decided block).
* #11 archived_at clear — set_visibility nulls archived_at +
archived_by when transitioning out of 'archived' so a future
read doesn't show stale archive forensics on an approved row.
Maintainability:
* #12 FSM doc comment — accurate insert/transition/lifecycle
description in src/db.py near store_submissions schema.
* #23 sort-key whitelist — admin queue rejects unknown sort keys
with 400 invalid_sort_key; substring-replace footgun removed.
Deferred (separate PRs):
* #5 quota race — proper fix requires asyncio.Lock spanning the
full pipeline; threading.Lock blocks event loop, DuckDB MVCC
doesn't help. API-level slowapi bounds worst case for now.
* #6 part 3 (AST static scan), #8 (enum split), #13 (import
bundle docs), #14 (factory consolidation), #15-#22 (maint).
Tests:
* New: tests/test_store_guardrails_prompt_injection.py (corpus +
trust-boundary invariants), tests/test_store_put_atomic.py,
tests/test_store_guardrails_reaper.py.
* Extended: test_store_guardrails_llm.py (system param, missing
risk_level, BG race), test_admin_store_submissions.py (quota
counter widening, sort whitelist 400), test_store_repositories.py
(un-archive metadata clear), test_db_schema_version.py (v36).
* Full suite: 3738 passed; 17 pre-existing baseline failures
unchanged (db migration tests, cli binary rename, catalog export,
user mgmt v5 backfill — confirmed by stash + rerun on clean tree).
16 KiB
Store / Flea-Market Upload Guardrails
Every POST / PUT to /api/store/entities (and the matching webapp
upload form) goes through a four-stage check pipeline before the entity
becomes visible in the public flea browse or the served Claude Code
marketplace. The goal: keep the open submission surface from leaking
secrets, shipping prompt-injection payloads, or dropping low-effort spam
into every analyst's /plugin install list.
This page is for two audiences:
- Operators wiring up an instance — what config knobs control the pipeline, how to read the admin triage page, and how cost scales with the model tier.
- Uploaders — what gets checked, what blocks publication, and how to iterate on a rejected upload.
Architecture (one diagram)
POST /api/store/entities
│
├── ZIP safety + size cap ─┐
├── (1) Manifest & metadata │ inline,
├── (2) Static security scan (regex + AST) │ deterministic
├── (3) Quality + templating recommendation │ (~50 ms)
│ │
│ any inline check fails ─► 422 + structured detail
│ + store_submissions row (status='blocked_inline')
│ + audit_log entry
│ ▲ entity NOT created — bundle deleted from disk
│
├── inline checks pass:
│ create store_entities row (visibility_status='pending')
│ create store_submissions row (status='pending_llm')
│ BackgroundTasks.add_task(run_llm_review, …)
│ return 202 with submission_id
│
└── BackgroundTasks worker (single-shot, ~5–30 s):
(4) LLM security review (Anthropic, configurable tier)
• on safe / low risk with no high|critical findings:
status='approved' + visibility flips to 'approved'
→ entity now appears in flea browse + served marketplace
• on risky verdict:
status='blocked_llm' + entity stays hidden
→ admin can override (audit-logged) or uploader can edit + resubmit
• on LLM error / timeout:
status='review_error' + retry_count++
→ admin can retry from /admin/store/submissions
The flea-market browse query (GET /api/store/entities) filters to
visibility_status='approved' for non-admin, non-self-owner callers.
Owners always see their own submissions regardless of state so they can
fix and resubmit; admins see everything. The same filter applies to
UserStoreInstallsRepository.list_for_user, so an installed entity that
gets blocked or hidden by review stops being served to Claude Code via
marketplace.zip / marketplace.git until an admin override.
Configuration
instance.yaml:
guardrails:
# Master kill-switch. When false, inline checks still run (they're
# free) but the LLM step is skipped and uploads auto-approve. Useful
# for local dev without an LLM key.
enabled: true
# Anthropic model tier for the LLM security review.
# haiku — ~$0.001/review, default, good enough for routine uploads
# sonnet — ~$0.015/review, deeper reasoning, fewer false negatives
# opus — ~$0.075/review, only for high-stakes deployments
# Or pin a concrete model ID like "claude-haiku-4-5-20251001".
review_model: "haiku"
# v30: per-submitter daily cap on inline-blocked uploads. Rejects
# the upload at the API boundary (HTTP 429) when a single submitter
# accumulates ≥ N blocked_inline rows in the trailing 24h. Bounds
# disk + admin-queue spam from a bot looping on malformed ZIPs.
# Set to 0 to disable.
blocked_quota_per_day: 50
# v30: how many days to keep blocked-bundle bytes on disk before
# the daily TTL job purges them. Submission row + bundle_sha256 +
# file_size always survive — only the bundle bytes get removed.
# The detail UI then renders "Bundle purged on YYYY-MM-DD" instead
# of the Download button. Set to 0 to retain forever (admin Delete
# only).
blocked_bundle_ttl_days: 30
Required environment variable (when guardrails enabled):
ANTHROPIC_API_KEY=sk-ant-… # or LLM_API_KEY for the proxy case
If guardrails.enabled: true but neither key is set, the pipeline
auto-falls back to disabled with a warning at startup — uploads
auto-approve until the operator wires up the LLM. This keeps tests +
first-boot sane; it does NOT silently let unreviewed uploads through
when the operator clearly intended review (the env var is missing, not
the YAML).
What gets checked
1. Manifest & metadata (inline, deterministic)
| Rule | Skill | Plugin | Agent |
|---|---|---|---|
Required file present (SKILL.md / .claude-plugin/plugin.json / *.md) |
✓ | ✓ | ✓ |
plugin.json parses as valid JSON |
— | ✓ | — |
plugin.json.name matches [a-zA-Z0-9_-]{1,64} |
— | ✓ | — |
plugin.json.version (if present) matches loose semver |
— | ✓ | — |
Bundle within MAX_ZIP_SIZE (50 MB) and MAX_ZIP_UNCOMPRESSED (200 MB) |
✓ | ✓ | ✓ |
Failure here is a hard block: HTTP 422 with the failing rule names.
2. Static security scan (inline, deterministic)
Static scan is signal, not gate. Regex matches flag candidates for the LLM reviewer; treat them as suggestive, not authoritative. Any attacker willing to obfuscate (
getattr(__builtins__, "ev"+"al"), dynamic imports, base64-decoded eval) trivially bypasses substring matching. The pipeline still inline-blocks on a finding because shipping known-bad patterns to the LLM is wasteful — but operators readinginline_checks.static_securityshould NOT assume "no findings" means "safe". The LLM verdict carries that determination.
Regex patterns aimed at high-confidence danger signals. False positives
exist; admin override is the recovery path. Documentation files (.md,
.txt, .rst, .html, .json, .yaml, .yml, .toml) are skipped
to avoid flagging prose that legitimately discusses eval/exec. Code
files (.py, .js, .sh, …) remain in scope.
- Code execution —
eval(,exec(,os.system(, basheval $X,subprocess.run(... shell=True ...),pickle.loads(, base64-decoded payloads passed to eval/exec. - Hardcoded secrets — Anthropic / OpenAI keys (
sk-…), AWS access keys (AKIA…), GitHub PATs (ghp_…), Slack tokens (xox[bapres]-…), embedded RSA / EC / OpenSSH private-key blocks. - Destructive filesystem ops —
rm -rf $HOME/~//,shutil.rmtree($HOME). - Path traversal — sequences of three or more
../segments. - Reverse shells / suspicious networking — bash reverse-shell idiom
(
bash -i >& /dev/tcp/…), netcat with listen flags, raw IP URLs,.onionURLs in scripts.
Template-aware. Lines whose only "exec-like" tokens come from inside
a {{...}} Jinja-style placeholder are stripped before pattern matching
— first-use customization is a feature, not an exfil vector.
Any finding here blocks publication. The 422 response cites every match with file + line + reason so the uploader can fix and resubmit.
3. LLM security review (async, configurable tier — Haiku default)
A single-shot agentic review over the baked plugin tree. Reads the manifest, primary doc, and every text file in the bundle (capped at 50 KB total prompt payload, with the most signal-dense files prioritised). The model returns strict JSON:
{
"risk_level": "safe|low|medium|high|critical",
"summary": "...",
"findings": [
{"severity": "high", "category": "exfiltration",
"file": "run.sh", "explanation": "...", "fix_hint": "..."}
],
"template_placeholders_found": 3
}
Pass condition: risk_level IN (safe, low) and no individual finding
has severity high|critical. Medium findings under a safe verdict pass
through (the "noise but no exploit" band you opt into when picking
Haiku). Operators who want a stricter floor pin Sonnet or Opus.
Cost: scales with the chosen tier. At Haiku rates a typical 20 KB plugin costs ~$0.001 per review. At Opus rates ~$0.075. Re-uploads (PUT with a new bundle) re-run the review; description-only edits do not.
The system prompt explicitly tells the model to ignore Jinja-style
{{var}} placeholders as benign and not to invent findings to look
thorough. The full prompt lives in src/store_guardrails/prompts.py.
4. Quality + templating (inline, deterministic, never blocks)
- Description ≥ 20 chars.
- Primary doc (
SKILL.md/agent.md) ≥ 200 chars. - AI-slop heuristics — flags
lorem ipsum,<INSERT_X_HERE>, loneTODO:lines. - Templating recommendation — counts
{{var}}tokens across.md,.json,.yaml,.sh,.py,.txtfiles. If zero, the response carries a non-blocking hint: "Consider adding{{...}}placeholders for user-specific values (project IDs, channel names, key contacts). Agnes will prompt the user to fill them in on first install — your skill becomes much more effective with parameterization."
Quality is a warn status — these issues surface in the 422 response or
admin UI but never block on their own.
Verdict vs. lifecycle — two axes
The pipeline writes to two columns and they mean different things:
| Axis | Column | Values | Mutability |
|---|---|---|---|
| Verdict | store_submissions.status |
pending_inline, blocked_inline, pending_llm, approved, blocked_llm, review_error, overridden, deleted |
Immutable forensic record of what was decided at review time. Set once, never re-flipped to track later lifecycle changes. |
| Lifecycle | store_entities.visibility_status |
pending, approved, hidden, archived |
Live state. Flipped by Archive (owner soft-delete), admin override (un-archive), rescan, future bulk ops. |
'deleted' is the one verdict value that does double duty —
hard-delete drops the entity row, so the JOIN can't reach it; the
submission keeps an explicit 'deleted' marker so the Deleted
chip can surface the row.
The admin queue at /admin/store/submissions filters lifecycle via
LEFT JOIN on store_entities rather than reading a denormalized
column. The Archived chip translates to
entity.visibility_status = 'archived'; the default queue excludes
that and status='deleted'. Any code path that flips entity
visibility (admin override, manual SQL fix, future workflows) shows
up in the queue immediately — no backfill required, no drift surface.
The submission detail page renders Status (verdict) and Entity lifecycle side by side, so admins triaging a row see "this was approved at review time, but it's now archived" at a glance.
Admin triage — /admin/store/submissions
Every submission row is visible here, newest first, filterable by status. For each row admins see who, what type, name + version, status badge, the inline-check verdicts, the LLM findings (when the review has run), and which model produced the verdict.
Action buttons:
- Override (on
blocked_inline/blocked_llm/review_error) — Force-publishes the entity. Requires a reason ≥ 4 chars; reason + prior verdict are both written toaudit_logso the trail of "who force-published what, and why" is permanent. - Rescan (any submission with a live bundle) — Re-runs all checks (inline + LLM) against the current bundle. Use after check rules change to re-evaluate prior verdicts.
- Retry LLM (on
review_error/blocked_llm) — Re-queues the LLM review only. Useful when the model timed out or the verdict looks like a false negative under a different model tier (bumpguardrails.review_modeland retry). - Download bundle (any submission with a live, un-purged bundle) — Streams the on-disk bundle as a fresh ZIP for forensic inspection. Audit-logged.
- Delete — Hard-deletes the submission row + the bundle on disk + any installs. Audit row preserves what was deleted.
Retention model (v30)
Blocked bundles persist on disk so admins can Rescan / Override /
Download for as long as they're useful. The daily TTL job
(store-blocked-purge, runs at 04:00 UTC against
POST /api/admin/run-blocked-purge) removes the bundle bytes once
the submission's created_at is older than
guardrails.blocked_bundle_ttl_days (default 30) AND the status is
still in {blocked_inline, blocked_llm, review_error}. Approved and
overridden submissions are never purged.
What survives the purge:
- The submission row (audit trail)
bundle_sha256— for cross-submission correlationfile_size— so the size column stays sortable
What goes away:
- The bundle directory under
${DATA_DIR}/store/<entity_id>/ - The
store_entitiesrow (it's hidden; nothing references it) entity_idis nulled on the submission row
The detail page renders "Bundle purged on YYYY-MM-DD" in place of the Download button so admins know why action is unavailable.
For privacy-sensitive accidental uploads (a submitter pasted a secret), admins can use Delete on the detail page to remove the bundle (and the row) immediately rather than waiting for the TTL.
To bound spam, guardrails.blocked_quota_per_day (default 50)
returns HTTP 429 quota_exceeded when a single submitter has ≥ N
inline-blocked rows in the last 24h. Set to 0 to disable.
The /admin/scheduler-runs page already shows scheduler-driven audit
events; submission events live alongside them in audit_log under the
actions:
store.submission.accepted
store.submission.blocked_inline
store.submission.approved
store.submission.blocked_llm
store.submission.review_error
store.submission.overridden
store.submission.bundle_downloaded
store.submission.rescan
store.submission.retry
store.submission.deleted
run_blocked_purge
store.submission.retry
store.submission.deleted
Uploader-facing 422 contract
A blocked submission returns a structured detail the upload UI can render directly:
{
"detail": {
"code": "submission_blocked",
"submission_id": "abcd…",
"checks": {
"manifest": {"status": "pass"},
"static_security": {"status": "fail",
"findings": [{"file": "run.sh", "line": 12,
"category": "code_exec",
"severity": "high",
"reason": "shell eval expanding a variable",
"snippet": "eval $1"}]},
"quality": {"status": "warn",
"template_placeholders": 0,
"template_recommendation": "Consider adding {{...}} placeholders ..."}
}
}
}
The submission row stays in the admin queue under
status='blocked_inline' so admin triage can see what people tried to
upload (useful for telemetry on what to harden checks against).
Disabling the pipeline
Three ways:
guardrails.enabled: falseininstance.yaml— explicit operator choice. Inline checks still run; LLM step + pending hold are skipped.- Don't set
ANTHROPIC_API_KEY/LLM_API_KEY— auto-falls back to disabled with a startup warning. - Per-submission admin override — for known-good uploads that trip a false positive.
There is no per-uploader bypass and no bypass for admins on their own uploads. Admins do see their own pending submissions in the flea browse (filter shortcut), but the visibility flip still requires either review approval or override.
Extending the check set
Adding a new inline rule:
- Add the rule to
src/store_guardrails/static_scan.py:_RULES(or a new*_check.pyfor a different category). - Add a test fixture to
tests/test_store_guardrails_inline.py:TestStaticScancovering the true-positive case. - Confirm the template-aware path doesn't strip your rule's trigger
tokens — the
_TEMPLATE_REsubstitution happens BEFORE pattern matching, so a rule that fires on text that's only ever inside{{...}}will never trip.
Tightening the LLM verdict floor:
- Bump
guardrails.review_modeltosonnetoropus— same prompt, more reasoning budget. - Or change the pass condition in
src/store_guardrails/llm_review.py:is_safe(e.g. rejectmediumfindings outright). Update tests intests/test_store_guardrails_llm.pyto match.