* feat(home+news): state-aware /home + /news + admin-edited news section
Squash of the vr/home-page feature work for clean rebase onto main.
Original 18-commit history preserved in branch backup/vr-home-page-pre-rebase.
What's in this PR:
**State-aware /home page**
- New `/home` route with hero + auto-mode + connectors (Asana / GWS /
Atlassian) + lookarounds. Onboarded vs not-onboarded state-machine
branches a single template (`home_not_onboarded.html`); the install
steps, "Setup a new Claude Code" CTA (90-day PAT mint), and per-
connector setup prompts hide once `users.onboarded=TRUE`. A
completion badge replaces them.
- "Mark me as offboarded" button reverses the flag without an SQL UPDATE.
- `users.onboarded BOOLEAN` column added; default FALSE; flipped by the
CLI's `agnes init` post-success POST and the `/admin/users` API.
- Connector setup prompts pre-check whether the tool is already
installed/connected before re-running setup.
- GWS scope set widened to include Google Chat (`chat.spaces`,
`chat.messages`).
**Single template + design tokens**
- `dashboard.html` now extends `base.html` via the new
`{% block layout %}` opt-out (full-width pages skip the 800px
`.container`). Net: every page shares one shell.
- `style-custom.css` `:root` extended with `--space-{7,9,10,12}`,
`--radius-2xl`, `--shadow-{card,elevated}`, `--text-{muted,disabled}`,
`--focus-ring`, `--transition-*`, `--width-{narrow,app,wide}` so
inline page styles can migrate incrementally.
**Auth redirects honor AGNES_HOME_ROUTE**
- `safe_next_path` resolves the configured home route when no `default=`
is passed; OAuth callbacks, magic-link clicks, password form, and
LOCAL_DEV_MODE shortcuts now land on `/home` (or whatever the operator
picked) instead of always /dashboard.
**News section + /news permalink + /admin/news editor**
- Schema-bumped `news_template` table (single versioned entity, draft +
publish gate). `published BOOLEAN` distinguishes draft from public;
monotonically-increasing `version` per save; rows >30d pruned on
save except the currently-displayed published version.
- `/home` bottom-of-page renders the latest published intro with a
"Read more →" link to `/news` (which renders the full body).
- `/admin/news` editor with sandboxed live preview, versions table,
per-row Unpublish, Format-help cheatsheet.
- `agnes admin news show / draft / edit / publish / unpublish /
versions / export` (CLI). Talks to the live server via the
`/api/admin/news/*` endpoints (PAT-authed) — no direct DB access
so it coexists with a running uvicorn.
- **Optimistic-lock guard**: `agnes admin news publish --version N` and
PUT/PATCH endpoints accept `expected_version` and 409 with structured
`{error: "version_conflict", expected, actual, actual_by}` when a
concurrent admin replaced the draft. Edit refuses to overwrite a
draft authored by someone else without `--force` or
`--expect-version`.
- nh3 (Rust-backed ammonia) HTML sanitizer; iframe pre-pass strips
any iframe whose src is not on the YouTube/Vimeo/Loom allowlist;
javascript:/data: schemes blocked everywhere.
- Author CSS vocabulary: `.news-hero` (blue gradient hero block),
`.callout`/`.callout-{info,warn,success,danger}`,
`.video-embed`, `.news-section`, `.news-grid-{2,3}`, `.news-cta` —
all consolidated in `style-custom.css` under "News content
vocabulary (shared)" so /home perex, /news body, and /admin/news
preview share one source of styling.
- Code-inside-`<pre>` contrast fix (was unreadable amber-on-silver).
- `.news-content` table styling (border, header band, row-hover).
**`scripts/dev/run-local.sh`** — local uvicorn launcher. Pulls Google
OAuth client id/secret from GCP Secret Manager
(`AGNES_OAUTH_GCP_PROJECT`-driven, no vendor defaults), points
`AGNES_CLI_DIST_DIR` at `./dist` so the wheel endpoint resolves, and
`--dev` flips `LOCAL_DEV_MODE=1` + `AGNES_HOME_ROUTE=/home` for one-
command iteration. `LOCAL_DEV_MODE=1` also enables the FastAPI debug
toolbar.
**CLAUDE.md "Run tests before every push" section** codifies
`pytest tests/ -n auto -q` as non-negotiable before each push.
**Tests**: 51 + 14 + 8 = 73 new tests across news-template repo,
sanitizer, API, web, CLI; plus updated home/auth/template tests for
the new shared-shell architecture.
Origin docs (gitignored, customer-fork content):
docs/brainstorms/home-page-requirements.md,
docs/plans/2026-05-07-001-feat-home-page-plan.md.
* feat(cli): agnes onboarded {on,off,status} — self-scoped flag toggle
User-facing equivalent of the in-page "Mark me as (off)boarded" button
on /home. POSTs /api/me/onboarded with {onboarded, source}; --source
overrides the audit-log marker so flips made from the CLI vs the web
button vs agnes init automation stay distinguishable.
`status` reads via /api/me/profile (when present); falls back to a
quick body-marker scan of /home so the read path doesn't write an
audit_log row. PAT-authed via cli.client.api_post — same convention
as agnes admin news / agnes admin add-user etc.
Tests: 5 covering on/off/status round-trip, idempotency, and
audit-log source recording. Full suite holds at 12 pre-existing
failures (same set as before).
* ui(nav+home): primary nav reorg + green What's new band + /marketplace link fix
Primary nav (post-rebase audit + per-user feedback):
- Items: Home → Marketplace → Data Packages → Memory. Admin dropdown
for admins only. The "Dashboard" label was renamed Home — point still
resolves through `home_route` so customer instances on /dashboard
still land there.
- Activity Center moved into the Admin dropdown. Per-team adoption
analytics is admin-consumed in practice; the route still allows
any authed user for direct deep-links so existing /home tile +
bookmarks keep working.
- Memory link added (→ /corporate-memory) — was previously buried in
the /home "Look around" tiles.
- Setup local agent + My Stack dropped from main nav. Setup is the
/home install flow's home now; My Stack lives as a tab inside
/marketplace.
/home tweaks:
- Plugin marketplace tile now points at /marketplace (was /store —
legacy from before the marketplace rebrand landed in #230).
- "What's new" section header gets a green band (success-flavored
D1FAE5 background, A7F3D0 border, darker green title) so the
bottom-of-page news block visibly distinguishes from the blue
install-hero at the top. Header strip only — body stays white.
Test fix: test_home_route_resolution renamed `dashboard_link_uses_home_route`
→ `home_link_uses_home_route` and asserts `href="/home">Home` instead
of `href="/home">Dashboard` after the label change.
* fix(home): decouple Step 3 + Connect-tools collapse from server onboarded flag
The server-side `users.onboarded` flip happens through two paths:
1. Explicit user click on "Mark me as onboarded" or `agnes onboarded on`.
2. Implicit `agnes init` POST → /api/me/onboarded on success.
Path 2 produced a UX surprise: an analyst running `agnes init` mid-flow
reloaded /home and saw Step 3 (auto-mode) + Connect-your-tools auto-
collapse to summary bars. They were actively working through those
sections — the install POST never signalled "I'm done with the rest
of setup", just "Agnes itself is installed".
Decouple the section-collapse decision from the server flag:
- Step 1 + Step 2 install blocks: still hidden on `onboarded=TRUE`
(their completion is a hard server signal — Agnes IS installed).
- Step 3 + Connect-your-tools: render flat by default in BOTH states.
Wrapped in `<details class="setup-collapsible" open>` so the
browser's native disclosure handles per-section toggle without JS,
but the `<summary>` is CSS-hidden until the page-level
`data-setup-minimized="1"` attribute is set on `.home-mock`.
- New "Minimize setup view" toggle inside the blue install-hero,
rendered only when onboarded. Click flips the data-attr on
`.home-mock` AND removes the `open` attribute from each
`<details>`. State persists in `localStorage["agnes_home_setup_minimized"]`
so the choice survives reloads but is per-device.
- "Show full setup view" (the same button when minimized) re-opens
both `<details>` and clears localStorage.
When minimized, each `<details>` still has its own native expand/
collapse — click the gray summary bar to peek at one section without
toggling the page-level minimize off.
Tests:
- test_step3_and_connectors_render_flat_when_onboarded_by_default —
asserts `<details class="setup-collapsible" ... open>` for both
sections post-onboarding and the absence of any server-rendered
`data-setup-minimized` attribute on the `.home-mock` root.
- test_minimize_toggle_visible_only_when_onboarded — toggle button
rendered only when onboarded.
Full pytest holds at 12 pre-existing failures (same set).
314 lines
11 KiB
Python
314 lines
11 KiB
Python
"""NewsTemplateRepository — repository-level tests for the v29 news entity.
|
|
|
|
Covers the draft singleton invariant, monotonic versioning, publish /
|
|
unpublish flow, sanitization on save, and the prune rule (drop >30d
|
|
EXCEPT the currently-displayed published version).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import tempfile
|
|
|
|
import pytest
|
|
|
|
|
|
@pytest.fixture
|
|
def fresh_db(monkeypatch):
|
|
with tempfile.TemporaryDirectory() as tmp:
|
|
monkeypatch.setenv("DATA_DIR", tmp)
|
|
monkeypatch.setenv("TESTING", "1")
|
|
monkeypatch.setenv("JWT_SECRET_KEY", "test-jwt-secret-key-minimum-32-chars!!")
|
|
yield tmp
|
|
|
|
|
|
def _conn():
|
|
from src.db import get_system_db
|
|
return get_system_db()
|
|
|
|
|
|
def test_initial_state_no_published_no_draft(fresh_db):
|
|
from src.repositories.news_template import NewsTemplateRepository
|
|
conn = _conn()
|
|
try:
|
|
repo = NewsTemplateRepository(conn)
|
|
assert repo.get_current_published() is None
|
|
assert repo.get_active_draft() is None
|
|
assert repo.list_versions() == []
|
|
finally:
|
|
conn.close()
|
|
|
|
|
|
def test_save_draft_creates_row_then_updates_in_place(fresh_db):
|
|
from src.repositories.news_template import NewsTemplateRepository
|
|
conn = _conn()
|
|
try:
|
|
repo = NewsTemplateRepository(conn)
|
|
a = repo.save_draft(intro="<p>a</p>", content="<p>A</p>", by="alice@x")
|
|
assert a["version"] == 1
|
|
assert a["published"] is False
|
|
assert a["created_by"] == "alice@x"
|
|
|
|
# Second save while draft active must update the same row.
|
|
b = repo.save_draft(intro="<p>b</p>", content="<p>B</p>", by="alice@x")
|
|
assert b["version"] == 1, "draft should update in place, not bump version"
|
|
assert b["intro"] == "<p>b</p>"
|
|
|
|
rows = repo.list_versions()
|
|
assert len(rows) == 1
|
|
assert rows[0]["status"] == "draft"
|
|
finally:
|
|
conn.close()
|
|
|
|
|
|
def test_publish_then_new_draft_increments_version(fresh_db):
|
|
from src.repositories.news_template import NewsTemplateRepository
|
|
conn = _conn()
|
|
try:
|
|
repo = NewsTemplateRepository(conn)
|
|
repo.save_draft(intro="<p>v1</p>", content="<p>V1</p>", by="alice@x")
|
|
p1 = repo.publish_draft(by="alice@x")
|
|
assert p1["version"] == 1
|
|
assert p1["published"] is True
|
|
assert repo.get_active_draft() is None
|
|
|
|
d2 = repo.save_draft(intro="<p>v2</p>", content="<p>V2</p>", by="alice@x")
|
|
assert d2["version"] == 2
|
|
assert d2["published"] is False
|
|
|
|
# Web sees only the published v1 until v2 is published.
|
|
cp = repo.get_current_published()
|
|
assert cp is not None and cp["version"] == 1
|
|
finally:
|
|
conn.close()
|
|
|
|
|
|
def test_publish_with_no_draft_raises(fresh_db):
|
|
from src.repositories.news_template import NewsTemplateRepository, NoDraftError
|
|
conn = _conn()
|
|
try:
|
|
repo = NewsTemplateRepository(conn)
|
|
with pytest.raises(NoDraftError):
|
|
repo.publish_draft(by="alice@x")
|
|
finally:
|
|
conn.close()
|
|
|
|
|
|
def test_unpublish_falls_back_to_prior_published(fresh_db):
|
|
from src.repositories.news_template import NewsTemplateRepository
|
|
conn = _conn()
|
|
try:
|
|
repo = NewsTemplateRepository(conn)
|
|
repo.save_draft(intro="<p>v1</p>", content="V1", by="alice@x")
|
|
repo.publish_draft(by="alice@x")
|
|
repo.save_draft(intro="<p>v2</p>", content="V2", by="alice@x")
|
|
repo.publish_draft(by="alice@x")
|
|
|
|
cp = repo.get_current_published()
|
|
assert cp["version"] == 2
|
|
|
|
# Unpublish v2 — web should fall back to v1.
|
|
repo.unpublish(version=2, by="alice@x")
|
|
cp2 = repo.get_current_published()
|
|
assert cp2 is not None and cp2["version"] == 1
|
|
finally:
|
|
conn.close()
|
|
|
|
|
|
def test_unpublish_blocked_when_draft_active(fresh_db):
|
|
from src.repositories.news_template import (
|
|
AlreadyDraftError,
|
|
NewsTemplateRepository,
|
|
)
|
|
conn = _conn()
|
|
try:
|
|
repo = NewsTemplateRepository(conn)
|
|
repo.save_draft(intro="<p>v1</p>", content="V1", by="alice@x")
|
|
repo.publish_draft(by="alice@x")
|
|
repo.save_draft(intro="<p>v2 draft</p>", content="V2", by="alice@x")
|
|
|
|
with pytest.raises(AlreadyDraftError):
|
|
repo.unpublish(version=1, by="alice@x")
|
|
finally:
|
|
conn.close()
|
|
|
|
|
|
def test_unpublish_unknown_version_raises_not_found(fresh_db):
|
|
from src.repositories.news_template import NewsTemplateRepository, NotFoundError
|
|
conn = _conn()
|
|
try:
|
|
repo = NewsTemplateRepository(conn)
|
|
with pytest.raises(NotFoundError):
|
|
repo.unpublish(version=99, by="alice@x")
|
|
finally:
|
|
conn.close()
|
|
|
|
|
|
def test_unpublish_already_draft_raises(fresh_db):
|
|
from src.repositories.news_template import (
|
|
AlreadyDraftError,
|
|
NewsTemplateRepository,
|
|
)
|
|
conn = _conn()
|
|
try:
|
|
repo = NewsTemplateRepository(conn)
|
|
repo.save_draft(intro="<p>v1</p>", content="V1", by="alice@x")
|
|
# version 1 is a draft, not published — unpublish should refuse
|
|
with pytest.raises(AlreadyDraftError):
|
|
repo.unpublish(version=1, by="alice@x")
|
|
finally:
|
|
conn.close()
|
|
|
|
|
|
def test_save_draft_sanitizes_input(fresh_db):
|
|
from src.repositories.news_template import NewsTemplateRepository
|
|
conn = _conn()
|
|
try:
|
|
repo = NewsTemplateRepository(conn)
|
|
repo.save_draft(
|
|
intro="<p>hi</p><script>alert(1)</script>",
|
|
content='<iframe src="https://evil.com/x"></iframe><p>ok</p>',
|
|
by="alice@x",
|
|
)
|
|
d = repo.get_active_draft()
|
|
assert "<script>" not in d["intro"]
|
|
assert "evil.com" not in d["content"]
|
|
# Allowlisted iframe survives.
|
|
repo.save_draft(
|
|
intro="",
|
|
content='<iframe src="https://www.youtube.com/embed/abc"></iframe>',
|
|
by="alice@x",
|
|
)
|
|
d2 = repo.get_active_draft()
|
|
assert "youtube.com/embed/abc" in d2["content"]
|
|
finally:
|
|
conn.close()
|
|
|
|
|
|
def test_prune_skips_current_published(fresh_db):
|
|
"""Even when the only published version is older than the threshold,
|
|
it must NOT be pruned. The system keeps showing it indefinitely
|
|
until a newer version is published."""
|
|
from src.repositories.news_template import NewsTemplateRepository
|
|
conn = _conn()
|
|
try:
|
|
repo = NewsTemplateRepository(conn)
|
|
repo.save_draft(intro="<p>v1</p>", content="V1", by="alice@x")
|
|
repo.publish_draft(by="alice@x")
|
|
|
|
# Force-age the v1 row so prune would see it as old.
|
|
conn.execute(
|
|
"UPDATE news_template SET created_at = current_timestamp - INTERVAL '60 days'"
|
|
)
|
|
|
|
repo.prune_old(threshold_days=30)
|
|
|
|
cp = repo.get_current_published()
|
|
assert cp is not None and cp["version"] == 1, "current published was wrongly pruned"
|
|
finally:
|
|
conn.close()
|
|
|
|
|
|
def test_save_draft_expected_version_blocks_concurrent_overwrite(fresh_db):
|
|
"""If admin A saves a draft (v1) and admin B then saves believing
|
|
nothing's there (`expected_version=0`), B's call must fail with
|
|
a VersionConflictError that names A as the actual author."""
|
|
from src.repositories.news_template import (
|
|
NewsTemplateRepository,
|
|
VersionConflictError,
|
|
)
|
|
conn = _conn()
|
|
try:
|
|
repo = NewsTemplateRepository(conn)
|
|
repo.save_draft(intro="<p>A1</p>", content="A1", by="alice@x")
|
|
with pytest.raises(VersionConflictError) as exc:
|
|
repo.save_draft(
|
|
intro="<p>B's draft</p>",
|
|
content="B",
|
|
by="bob@x",
|
|
expected_version=0,
|
|
)
|
|
assert exc.value.actual == 1
|
|
assert exc.value.actual_by == "alice@x"
|
|
finally:
|
|
conn.close()
|
|
|
|
|
|
def test_save_draft_expected_version_matches_passes(fresh_db):
|
|
"""expected_version equal to the current draft version succeeds."""
|
|
from src.repositories.news_template import NewsTemplateRepository
|
|
conn = _conn()
|
|
try:
|
|
repo = NewsTemplateRepository(conn)
|
|
first = repo.save_draft(intro="<p>v1</p>", content="V1", by="alice@x")
|
|
# Same author re-saving with the matching expected_version goes through.
|
|
second = repo.save_draft(
|
|
intro="<p>v1 edited</p>",
|
|
content="V1",
|
|
by="alice@x",
|
|
expected_version=first["version"],
|
|
)
|
|
assert second["intro"] == "<p>v1 edited</p>"
|
|
assert second["version"] == first["version"]
|
|
finally:
|
|
conn.close()
|
|
|
|
|
|
def test_publish_draft_expected_version_blocks_replaced_draft(fresh_db):
|
|
"""Admin reviews v2 draft; concurrent admin replaces it. publish
|
|
with --version 2 must refuse rather than ship the replacement."""
|
|
from src.repositories.news_template import (
|
|
NewsTemplateRepository,
|
|
VersionConflictError,
|
|
)
|
|
conn = _conn()
|
|
try:
|
|
repo = NewsTemplateRepository(conn)
|
|
repo.save_draft(intro="<p>v1</p>", content="V1", by="alice@x")
|
|
repo.publish_draft(by="alice@x")
|
|
repo.save_draft(intro="<p>v2 reviewed</p>", content="V2", by="alice@x")
|
|
# Carol overwrites v2's draft (uses --force / different author).
|
|
# The repo allows the overwrite at the row level; the version
|
|
# number stays the same, but contents + updated_by would differ
|
|
# in a real scenario. To simulate the "different draft" shape
|
|
# we publish v2 then create a fresh draft v3 — alice's --version 2
|
|
# publish should now refuse since the active draft is v3.
|
|
repo.publish_draft(by="alice@x")
|
|
repo.save_draft(intro="<p>v3 carol</p>", content="V3", by="carol@x")
|
|
|
|
with pytest.raises(VersionConflictError) as exc:
|
|
repo.publish_draft(by="alice@x", expected_version=2)
|
|
assert exc.value.actual == 3
|
|
assert exc.value.actual_by == "carol@x"
|
|
finally:
|
|
conn.close()
|
|
|
|
|
|
def test_prune_drops_old_superseded_and_old_drafts(fresh_db):
|
|
"""An old draft + an old superseded published row should both go;
|
|
the most-recent published row stays."""
|
|
from src.repositories.news_template import NewsTemplateRepository
|
|
conn = _conn()
|
|
try:
|
|
repo = NewsTemplateRepository(conn)
|
|
# v1 published, then v2 published (v1 becomes "superseded"), then v3 draft.
|
|
repo.save_draft(intro="<p>v1</p>", content="V1", by="alice@x")
|
|
repo.publish_draft(by="alice@x")
|
|
repo.save_draft(intro="<p>v2</p>", content="V2", by="alice@x")
|
|
repo.publish_draft(by="alice@x")
|
|
repo.save_draft(intro="<p>v3 draft</p>", content="V3 draft", by="alice@x")
|
|
|
|
# Age v1 + v3 to >30d. Leave v2 fresh.
|
|
conn.execute(
|
|
"UPDATE news_template "
|
|
"SET created_at = current_timestamp - INTERVAL '60 days' "
|
|
"WHERE version IN (1, 3)"
|
|
)
|
|
|
|
repo.prune_old(threshold_days=30)
|
|
|
|
versions = {row["version"] for row in repo.list_versions()}
|
|
assert 2 in versions, "current published v2 must remain"
|
|
assert 1 not in versions, "old superseded v1 should be pruned"
|
|
assert 3 not in versions, "old abandoned draft v3 should be pruned"
|
|
finally:
|
|
conn.close()
|