* Add /marketplace browse page + Model B opt-in stack composition
New /marketplace browse surface unifies the curated marketplaces
(admin-managed git mirrors) and the community Flea Market behind
three tabs — Curated / Flea / My Stack — with per-tab category
filter, search across both sources with scope checkboxes, and
numeric pagination, all driven by URL query state. Plugin detail
at /marketplace/curated/<slug>/<plugin> and /marketplace/flea/<id>;
nested skill / agent detail at /marketplace/curated/<slug>/<plugin>/
{skill,agent}/<name> and the flea-side single-page detail.
Model B opt-in: an RBAC grant on a curated plugin is now only
*eligibility*. The user must click "Add to my stack" for it to
enter their served Claude Code marketplace. Composition flips
from (rbac ∖ opt_outs) ∪ store_installs to
(rbac ∩ subscriptions) ∪ store_installs. The legacy
user_plugin_optouts table is renamed user_curated_subscriptions
(schema v27) — same table shape, inverted semantic, repository
methods become subscribe / unsubscribe / is_subscribed.
UX vocabulary: Install → Add to my stack, Installed → In your
stack, card "Installed" badge → "In stack" (amber pill), tab
"My Subscriptions" → "My Stack". Bridges the two-step model
(server-side bookmark vs. on-laptop install) the previous label
hid. Click triggers an inline post-add hint panel under the
description with the agnes refresh-marketplace recipe + Copy
chip, dismissible per-browser via localStorage.
Per-tab info blocks above the filter row:
- Curated: trust signal — "Each plugin here has a named curator
accountable for it." (blue accent + See-all-curators link)
- Flea: open-shelf signal — "Anyone in the company can upload
here." (purple accent + Tips-for-sharing link)
- My Stack: personal-shelf orientation — "Your AI stack —
everything you've added." (slate accent, no link)
Tabs carry per-tab Heroicons (shield-check / building-storefront
/ rectangle-stack) tinted to match each tab's accent; flips white
when the tab is active for contrast.
Hero illustration anchored to the right of the blue hero panel
(absolute, 47% wide, behind the search row content). Hidden
under 900px viewport.
Action-row CTAs realigned to publication intent: curated
"How to add new content" → "Submit a plugin" (links to the
guide page); flea button removed since +Upload sits next to it.
Empty-state CTAs match. /marketplace/guide/{curated,flea}
routes now host publication-flow guide pages with placeholder
ledes — full copy to be authored separately.
Categories: Heroicons-based icons mapped per category in
src/category_icons.py (zero new dependencies; SVG path strings
inlined). Marketplace cards, filter pills, and detail pages
read from the same source.
API endpoints under /api/marketplace:
- GET /items per-tab listing (curated / flea / my)
- GET /categories per-tab non-zero counts
- GET /curated/{slug}/{plugin} plugin detail
- POST/DELETE /curated/{slug}/{plugin}/install subscribe toggle
- GET /curated/{slug}/{plugin}/{skill,agent}/{name} inner item
The tab=my branch reads directly from
user_curated_subscriptions ∪ user_store_installs (not
resolve_user_marketplace, which bundles flea skills/agents into
a single store-bundle synthetic entry useful for serving the
Claude Code marketplace ZIP/git but wrong for browsing where
each item should appear as its own card).
Detail pages: plugin detail surfaces inner skills/agents as
clickable nested cards; commands/hooks/MCPs render as plain
name lists. Skill/agent detail mirrors the plugin layout with
kind-tinted accents (skill = green, agent = purple), Description
+ Details sidebar, Files + Docs sections, and the "How to call
it" copy-able invocation chip showing /<plugin>:<inner-name>
exactly as Claude Code namespaces it post-install. Curated
nested has no install button — links back to the parent plugin.
Navbar: standalone "My AI Stack" relabelled "My Stack" and
points at /marketplace?tab=my; "Store" link removed (Store
flow is reachable via the Flea Market tab's +Upload button).
The standalone /my-ai-stack and /store routes still work for
old bookmarks.
Tests cover the new browse / categories / install / RBAC paths
under tests/test_marketplace_api.py; existing marketplace and
store tests updated for Model B (explicit subscribe in fixtures).
Schema bumped v26 → v27 with idempotent migration that wipes
existing user_plugin_optouts rows on flip and adds
marketplace_plugins.created_at with registered_at backfill.
* Fix v28 migration + post-rebase test fallout
v28 ALTER TABLE marketplace_plugins ADD COLUMN created_at conflicted with
_SYSTEM_SCHEMA's earlier CREATE that already includes the column on fresh
installs (test fixtures starting at any pre-v28 version trip on it).
Switch to ADD COLUMN IF NOT EXISTS — same idiom as the upstream v27
Keboola sync-strategy migration on the same ladder.
Two test patches needed after the rebase bumped SCHEMA_VERSION 27 → 28:
- test_keboola_v27_migration.py: test_schema_version_constant_is_27 was
pinning ==27. Loosened to >=27 (the test's purpose is to verify the
v27 Keboola migration, not to pin the current SCHEMA_VERSION).
- test_setup_page_unified.py: was monkeypatching resolve_allowed_plugins
but compute_default_agent_prompt now reads from resolve_user_marketplace
(Model B-aware). Stub the right function so the test exercises the
v28 served-set path.
* Harden curated skill/agent inner endpoints against path traversal
`_read_inner`, the `skill_dir` walk in `curated_skill_detail`, and the
`agent_path.stat` in `curated_agent_detail` joined URL path-params onto
`plugin_root` without verifying the resolved candidate stayed inside it.
Starlette's `[^/]+` on `{skill_name}` / `{agent_name}` blocks the direct
URL exploit (encoded `/` 404s before the handler), but a curator-planted
symlink inside a curated marketplace's git mirror could still dereference
outside the plugin tree on read.
Adds `_safe_join(plugin_root, *parts)` doing
`Path.resolve(strict=True)` + `relative_to(plugin_root.resolve())`, used
by all three call sites so the boundary is enforced once and consistently.
Tests cover the helper directly (normal path resolves, escaping `..`
returns None, escaping symlink returns None, missing file returns None)
plus an end-to-end check that the symlink case actually 404s on the
HTTP endpoint. Symlink tests skip on Windows where symlink creation
needs elevated permissions; they run on Linux CI.
---------
Co-authored-by: Minas Arustamyan <arustamyan.minas@gmail.com>
121 lines
4.9 KiB
Python
121 lines
4.9 KiB
Python
"""Tests for the unified `/setup` route.
|
|
|
|
The previous `?role=analyst|admin` query parameter is gone. The route
|
|
renders a single layout for everyone — admin-vs-analyst is no longer a
|
|
branch. The marketplace + plugins block is gated by per-user
|
|
`resource_grants` resolved inside `compute_default_agent_prompt`.
|
|
"""
|
|
|
|
import pytest
|
|
from fastapi.testclient import TestClient
|
|
|
|
|
|
@pytest.fixture
|
|
def client(tmp_path, monkeypatch):
|
|
"""TestClient against a freshly-built FastAPI app rooted at tmp_path.
|
|
|
|
Mirrors the `web_client` fixture in tests/test_web_ui.py — we re-create
|
|
the app so the DuckDB singleton picks up the per-test DATA_DIR rather
|
|
than leaking state across tests on the same xdist worker.
|
|
"""
|
|
monkeypatch.setenv("DATA_DIR", str(tmp_path))
|
|
monkeypatch.setenv("TESTING", "1")
|
|
monkeypatch.setenv("JWT_SECRET_KEY", "test-secret-key-min-32-characters!!")
|
|
(tmp_path / "state").mkdir()
|
|
(tmp_path / "analytics").mkdir()
|
|
(tmp_path / "extracts").mkdir()
|
|
from src.db import close_system_db
|
|
close_system_db()
|
|
from app.main import create_app
|
|
app = create_app()
|
|
yield TestClient(app)
|
|
close_system_db()
|
|
|
|
|
|
def test_setup_page_renders_unified_layout(client):
|
|
"""Bare `/setup` (no query param) renders the unified flow:
|
|
|
|
- `agnes init` is mandatory (subsumes the old admin-only
|
|
`agnes auth import-token` + `agnes auth whoami` pair).
|
|
- Anonymous visitors with no plugin grants get the no-marketplace
|
|
layout (Confirm = step 6).
|
|
"""
|
|
resp = client.get("/setup", follow_redirects=True)
|
|
assert resp.status_code == 200
|
|
text = resp.text
|
|
# Unified flow markers.
|
|
assert "agnes init" in text
|
|
# Legacy admin-only login verbs are gone from the rendered prompt.
|
|
assert "agnes auth import-token" not in text
|
|
# No-marketplace layout: Confirm = step 6.
|
|
assert "6) Confirm:" in text
|
|
|
|
|
|
def test_setup_page_ignores_role_query_param(client):
|
|
"""`?role=...` is no longer accepted by the route signature. FastAPI
|
|
ignores unknown query params silently — `/setup?role=admin` still
|
|
serves the unified layout. No 422, no redirect, no behavior delta
|
|
vs. bare `/setup`."""
|
|
bare = client.get("/setup", follow_redirects=True)
|
|
with_role = client.get("/setup?role=admin", follow_redirects=True)
|
|
assert bare.status_code == 200
|
|
assert with_role.status_code == 200
|
|
# Both responses contain the unified-flow marker.
|
|
assert "agnes init" in bare.text
|
|
assert "agnes init" in with_role.text
|
|
# Legacy admin-only login verbs are gone from both.
|
|
assert "agnes auth import-token" not in bare.text
|
|
assert "agnes auth import-token" not in with_role.text
|
|
|
|
|
|
def test_setup_page_renders_marketplace_for_user_with_grants(client, monkeypatch):
|
|
"""When the caller has plugin grants in `resource_grants`, the
|
|
unified flow inserts the marketplace + plugins block (step 5) and
|
|
Confirm shifts to step 8.
|
|
|
|
Stub `marketplace_filter.resolve_user_marketplace` to return a
|
|
plugin so we don't have to seed the full marketplace plumbing in
|
|
this test — we're verifying the layout switch, not the RBAC
|
|
resolver itself (covered by `test_marketplace_filter`).
|
|
|
|
Post-Model B (v28+): the setup page reads from
|
|
`resolve_user_marketplace` (which gates on explicit subscriptions)
|
|
rather than `resolve_allowed_plugins` (RBAC-only)."""
|
|
from app.web.router import get_optional_user
|
|
from fastapi import Request
|
|
from src import marketplace_filter
|
|
|
|
async def _admin_user(request: Request): # type: ignore[no-redef]
|
|
return {"id": "admin-1", "email": "admin@example.com",
|
|
"is_admin": True, "name": "Admin", "groups": ["Admin"]}
|
|
|
|
monkeypatch.setattr(
|
|
marketplace_filter,
|
|
"resolve_user_marketplace",
|
|
lambda conn, user: [{"manifest_name": "demo-plugin"}],
|
|
)
|
|
|
|
client.app.dependency_overrides[get_optional_user] = _admin_user
|
|
try:
|
|
resp = client.get("/setup", follow_redirects=True)
|
|
finally:
|
|
client.app.dependency_overrides.pop(get_optional_user, None)
|
|
|
|
assert resp.status_code == 200
|
|
text = resp.text
|
|
# Marketplace block marker. The per-plugin install lines moved inside
|
|
# `agnes refresh-marketplace --bootstrap`, so we check the section
|
|
# header + the one-liner instead of `claude plugin install <name>@agnes`.
|
|
assert "Register the Agnes Claude Code marketplace" in text
|
|
assert "agnes refresh-marketplace --bootstrap" in text
|
|
# Layout shift: Confirm is now step 8 (was 6 without marketplace).
|
|
assert "8) Confirm:" in text
|
|
# Pre-flight is in the rendered prompt at step 4.
|
|
assert "Make sure git and claude are installed" in text
|
|
|
|
|
|
def test_install_legacy_path_redirects_to_setup(client):
|
|
"""`/install` legacy path keeps redirecting to `/setup` (302/307)."""
|
|
resp = client.get("/install", follow_redirects=False)
|
|
assert resp.status_code in (302, 307)
|
|
assert "/setup" in resp.headers["location"]
|