* 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).
203 lines
6.6 KiB
Python
203 lines
6.6 KiB
Python
"""Admin REST endpoints for the news_template entity.
|
|
|
|
The single news entity (intro + content) is versioned in `news_template`;
|
|
this module is the HTTP surface for admin authoring. Web rendering of
|
|
the published version happens in `app.web.router.news_page` and the
|
|
`/home` handler — those don't go through this API.
|
|
|
|
Every endpoint is admin-gated; no analyst-side reads here. The /preview
|
|
endpoint runs the sanitizer without persisting so the admin UI can show
|
|
a live render before saving.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import duckdb
|
|
from fastapi import APIRouter, Depends, HTTPException
|
|
from pydantic import BaseModel
|
|
|
|
from app.auth.access import require_admin
|
|
from app.auth.dependencies import _get_db
|
|
from src.repositories.audit import AuditRepository
|
|
from src.repositories.news_template import (
|
|
AlreadyDraftError,
|
|
NewsTemplateRepository,
|
|
NoDraftError,
|
|
NotFoundError,
|
|
VersionConflictError,
|
|
)
|
|
from src.sanitize_news import sanitize
|
|
|
|
|
|
router = APIRouter(prefix="/api/admin/news", tags=["news"])
|
|
|
|
|
|
class NewsBody(BaseModel):
|
|
intro: str = ""
|
|
content: str = ""
|
|
|
|
|
|
def _serialize(row: dict | None) -> dict | None:
|
|
"""Convert datetime fields to ISO strings for JSON. Pydantic does this
|
|
automatically when fields are typed; we use a free-form dict here so
|
|
do it by hand."""
|
|
if row is None:
|
|
return None
|
|
out = dict(row)
|
|
for k in ("created_at", "updated_at", "published_at"):
|
|
v = out.get(k)
|
|
if v is not None and hasattr(v, "isoformat"):
|
|
out[k] = v.isoformat()
|
|
return out
|
|
|
|
|
|
# -- read endpoints -----------------------------------------------------
|
|
|
|
|
|
@router.get("/current", dependencies=[Depends(require_admin)])
|
|
def get_current(conn: duckdb.DuckDBPyConnection = Depends(_get_db)):
|
|
"""Latest published version (or {published: false} if none)."""
|
|
row = NewsTemplateRepository(conn).get_current_published()
|
|
if row is None:
|
|
return {"published": False}
|
|
return _serialize(row)
|
|
|
|
|
|
@router.get("/draft", dependencies=[Depends(require_admin)])
|
|
def get_draft(conn: duckdb.DuckDBPyConnection = Depends(_get_db)):
|
|
"""Active draft. 404 if none — UI shows 'create new draft' button."""
|
|
row = NewsTemplateRepository(conn).get_active_draft()
|
|
if row is None:
|
|
raise HTTPException(status_code=404, detail="no_draft")
|
|
return _serialize(row)
|
|
|
|
|
|
@router.get("/versions", dependencies=[Depends(require_admin)])
|
|
def list_versions(
|
|
limit: int = 50,
|
|
offset: int = 0,
|
|
conn: duckdb.DuckDBPyConnection = Depends(_get_db),
|
|
):
|
|
rows = NewsTemplateRepository(conn).list_versions(limit=limit, offset=offset)
|
|
return {"versions": [_serialize(r) for r in rows]}
|
|
|
|
|
|
@router.get("/versions/{version}", dependencies=[Depends(require_admin)])
|
|
def get_version(
|
|
version: int,
|
|
conn: duckdb.DuckDBPyConnection = Depends(_get_db),
|
|
):
|
|
row = NewsTemplateRepository(conn).get_version(version)
|
|
if row is None:
|
|
raise HTTPException(status_code=404, detail="version_not_found")
|
|
return _serialize(row)
|
|
|
|
|
|
# -- write endpoints ----------------------------------------------------
|
|
|
|
|
|
@router.put("/draft", dependencies=[Depends(require_admin)])
|
|
def put_draft(
|
|
body: NewsBody,
|
|
expected_version: int | None = None,
|
|
user: dict = Depends(require_admin),
|
|
conn: duckdb.DuckDBPyConnection = Depends(_get_db),
|
|
):
|
|
"""Upsert the active draft. Sanitizes both fields BEFORE writing.
|
|
|
|
Optimistic-lock: when `expected_version` is supplied (query string),
|
|
the request fails with 409 unless the active draft is at that
|
|
version. Pass `expected_version=0` when you intend to create the
|
|
first draft and want the call to fail if another admin already
|
|
started one.
|
|
"""
|
|
repo = NewsTemplateRepository(conn)
|
|
try:
|
|
row = repo.save_draft(
|
|
intro=body.intro,
|
|
content=body.content,
|
|
by=user["email"],
|
|
expected_version=expected_version,
|
|
)
|
|
except VersionConflictError as e:
|
|
raise HTTPException(
|
|
status_code=409,
|
|
detail={
|
|
"error": "version_conflict",
|
|
"expected": e.expected,
|
|
"actual": e.actual,
|
|
"actual_by": e.actual_by,
|
|
},
|
|
) from e
|
|
AuditRepository(conn).log(
|
|
user_id=user["id"],
|
|
action="news_draft_saved",
|
|
params={"version": row["version"], "by": user["email"]},
|
|
result="ok",
|
|
)
|
|
return _serialize(row)
|
|
|
|
|
|
@router.post("/publish", dependencies=[Depends(require_admin)])
|
|
def post_publish(
|
|
expected_version: int | None = None,
|
|
user: dict = Depends(require_admin),
|
|
conn: duckdb.DuckDBPyConnection = Depends(_get_db),
|
|
):
|
|
"""Publish the active draft.
|
|
|
|
When `expected_version` is supplied (query string), the request
|
|
fails with 409 unless the active draft is at that version. Use
|
|
this when reviewing a specific draft before flipping it live so
|
|
a concurrent admin's edit doesn't slip through under your name.
|
|
"""
|
|
repo = NewsTemplateRepository(conn)
|
|
try:
|
|
row = repo.publish_draft(by=user["email"], expected_version=expected_version)
|
|
except NoDraftError as e:
|
|
raise HTTPException(status_code=409, detail="no_draft") from e
|
|
except VersionConflictError as e:
|
|
raise HTTPException(
|
|
status_code=409,
|
|
detail={
|
|
"error": "version_conflict",
|
|
"expected": e.expected,
|
|
"actual": e.actual,
|
|
"actual_by": e.actual_by,
|
|
},
|
|
) from e
|
|
AuditRepository(conn).log(
|
|
user_id=user["id"],
|
|
action="news_published",
|
|
params={"version": row["version"], "by": user["email"]},
|
|
result="ok",
|
|
)
|
|
return _serialize(row)
|
|
|
|
|
|
@router.post("/unpublish/{version}", dependencies=[Depends(require_admin)])
|
|
def post_unpublish(
|
|
version: int,
|
|
user: dict = Depends(require_admin),
|
|
conn: duckdb.DuckDBPyConnection = Depends(_get_db),
|
|
):
|
|
repo = NewsTemplateRepository(conn)
|
|
try:
|
|
row = repo.unpublish(version=version, by=user["email"])
|
|
except NotFoundError as e:
|
|
raise HTTPException(status_code=404, detail="version_not_found") from e
|
|
except AlreadyDraftError as e:
|
|
raise HTTPException(status_code=409, detail=str(e)) from e
|
|
AuditRepository(conn).log(
|
|
user_id=user["id"],
|
|
action="news_unpublished",
|
|
params={"version": row["version"], "by": user["email"]},
|
|
result="ok",
|
|
)
|
|
return _serialize(row)
|
|
|
|
|
|
@router.post("/preview", dependencies=[Depends(require_admin)])
|
|
def post_preview(body: NewsBody):
|
|
"""Sanitize candidate intro + content and return — no DB writes."""
|
|
return {"intro": sanitize(body.intro), "content": sanitize(body.content)}
|