* 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).
139 lines
5.3 KiB
Python
139 lines
5.3 KiB
Python
"""Stuck-review reaper (#7 from PR #233 review).
|
|
|
|
A submission stuck at ``status='pending_llm'`` past the configured
|
|
grace gets flipped to ``review_error`` so admin can retry. Sweeps
|
|
every 15 min via scheduler.
|
|
|
|
Tests:
|
|
* row older than grace → flipped + audit written
|
|
* row younger than grace → untouched
|
|
* no pending_llm rows → no-op
|
|
* grace_seconds=0 → reaper short-circuits
|
|
* idempotent: running twice doesn't double-flip
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
from datetime import datetime, timedelta, timezone
|
|
|
|
import pytest
|
|
|
|
from src import db as src_db
|
|
from src.repositories.store_entities import StoreEntitiesRepository
|
|
from src.repositories.store_submissions import StoreSubmissionsRepository
|
|
from src.repositories.users import UserRepository
|
|
from src.store_guardrails.reaper import reap_stuck_llm_reviews
|
|
|
|
|
|
@pytest.fixture
|
|
def conn(tmp_path, monkeypatch):
|
|
monkeypatch.setenv("DATA_DIR", str(tmp_path))
|
|
src_db._system_db_conn = None
|
|
src_db._system_db_path = None
|
|
c = src_db.get_system_db()
|
|
yield c
|
|
c.close()
|
|
|
|
|
|
def _seed_pending(conn, name: str, age_seconds: int) -> str:
|
|
"""Stage a pending_llm submission whose created_at is `age_seconds`
|
|
in the past. Returns the submission id."""
|
|
UserRepository(conn).create(
|
|
id=f"u-{name}", email=f"{name}@x.com", name=name,
|
|
)
|
|
StoreEntitiesRepository(conn).create(
|
|
id=f"e-{name}", owner_user_id=f"u-{name}", owner_username=name,
|
|
type="skill", name=name, description="x", category=None,
|
|
version="1.0.0", file_size=10, visibility_status="pending",
|
|
)
|
|
sub_id = StoreSubmissionsRepository(conn).create(
|
|
submitter_id=f"u-{name}", submitter_email=f"{name}@x.com",
|
|
type="skill", name=name, version="1.0.0",
|
|
status="pending_llm", entity_id=f"e-{name}",
|
|
inline_checks={"manifest": {"status": "pass"}},
|
|
)
|
|
# Backdate created_at — repo timestamps with NOW(), so we override.
|
|
backdated = datetime.now(timezone.utc) - timedelta(seconds=age_seconds)
|
|
conn.execute(
|
|
"UPDATE store_submissions SET created_at = ? WHERE id = ?",
|
|
[backdated, sub_id],
|
|
)
|
|
return sub_id
|
|
|
|
|
|
class TestReaper:
|
|
def test_reaps_old_pending_llm(self, conn):
|
|
sub_id = _seed_pending(conn, "old-stuck", age_seconds=3600)
|
|
result = reap_stuck_llm_reviews(conn, grace_seconds=1800)
|
|
assert result["reaped"] == 1
|
|
|
|
sub = StoreSubmissionsRepository(conn).get(sub_id)
|
|
assert sub["status"] == "review_error"
|
|
assert (sub["llm_findings"] or {}).get("error") == "timeout_or_crash"
|
|
|
|
audits = conn.execute(
|
|
"SELECT params FROM audit_log "
|
|
"WHERE resource = ? AND action = 'store.submission.review_error'",
|
|
[f"store_submission:{sub_id}"],
|
|
).fetchall()
|
|
assert audits, "missing reaper audit row"
|
|
|
|
def test_skips_recent_pending_llm(self, conn):
|
|
sub_id = _seed_pending(conn, "fresh", age_seconds=60) # 1 min old
|
|
result = reap_stuck_llm_reviews(conn, grace_seconds=1800)
|
|
assert result["reaped"] == 0
|
|
|
|
sub = StoreSubmissionsRepository(conn).get(sub_id)
|
|
assert sub["status"] == "pending_llm"
|
|
|
|
def test_grace_zero_short_circuits(self, conn):
|
|
sub_id = _seed_pending(conn, "old-but-disabled", age_seconds=10000)
|
|
result = reap_stuck_llm_reviews(conn, grace_seconds=0)
|
|
assert result["skipped"] is True
|
|
|
|
sub = StoreSubmissionsRepository(conn).get(sub_id)
|
|
assert sub["status"] == "pending_llm"
|
|
|
|
def test_idempotent(self, conn):
|
|
sub_id = _seed_pending(conn, "twice", age_seconds=3600)
|
|
first = reap_stuck_llm_reviews(conn, grace_seconds=1800)
|
|
second = reap_stuck_llm_reviews(conn, grace_seconds=1800)
|
|
assert first["reaped"] == 1
|
|
assert second["reaped"] == 0
|
|
|
|
sub = StoreSubmissionsRepository(conn).get(sub_id)
|
|
assert sub["status"] == "review_error"
|
|
|
|
def test_no_pending_rows_is_noop(self, conn):
|
|
result = reap_stuck_llm_reviews(conn, grace_seconds=1800)
|
|
assert result["reaped"] == 0
|
|
assert result["skipped"] is False
|
|
|
|
def test_does_not_flip_other_statuses(self, conn):
|
|
"""Approved / blocked / overridden rows older than grace must
|
|
not be touched — the reaper is scoped to pending_llm only."""
|
|
UserRepository(conn).create(id="u1", email="u1@x.com", name="u1")
|
|
StoreEntitiesRepository(conn).create(
|
|
id="e1", owner_user_id="u1", owner_username="u1",
|
|
type="skill", name="approved-old", description="x",
|
|
category=None, version="1.0.0", file_size=10,
|
|
visibility_status="approved",
|
|
)
|
|
sub_id = StoreSubmissionsRepository(conn).create(
|
|
submitter_id="u1", submitter_email="u1@x.com",
|
|
type="skill", name="approved-old", version="1.0.0",
|
|
status="approved", entity_id="e1",
|
|
inline_checks={"manifest": {"status": "pass"}},
|
|
)
|
|
backdated = datetime.now(timezone.utc) - timedelta(hours=24)
|
|
conn.execute(
|
|
"UPDATE store_submissions SET created_at = ? WHERE id = ?",
|
|
[backdated, sub_id],
|
|
)
|
|
|
|
result = reap_stuck_llm_reviews(conn, grace_seconds=1800)
|
|
assert result["reaped"] == 0
|
|
|
|
sub = StoreSubmissionsRepository(conn).get(sub_id)
|
|
assert sub["status"] == "approved"
|