* 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).
275 lines
11 KiB
Python
275 lines
11 KiB
Python
"""`agnes admin news {show,draft,edit,publish,unpublish,versions,export}`.
|
|
|
|
Talks to the live server through the `/api/admin/news/*` endpoints
|
|
(PAT-authed). Direct-DB access is the wrong contract here because the
|
|
running server holds the DuckDB write lock — the CLI must coexist with
|
|
it. Same pattern as `agnes admin add-user`, `agnes admin set-password`,
|
|
etc.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
import typer
|
|
|
|
from cli.client import api_get, api_post, api_put
|
|
|
|
admin_news_app = typer.Typer(help="Admin: edit the /home + /news content")
|
|
|
|
|
|
def _exit_on_error(resp, expected_status: tuple[int, ...] = (200,)) -> dict:
|
|
"""Print server-side error detail and exit if `resp.status_code` is
|
|
outside `expected_status`. Returns the parsed JSON body otherwise."""
|
|
if resp.status_code in expected_status:
|
|
try:
|
|
return resp.json()
|
|
except Exception:
|
|
return {}
|
|
detail = ""
|
|
try:
|
|
body = resp.json()
|
|
detail = body.get("detail") if isinstance(body, dict) else body
|
|
except Exception:
|
|
detail = resp.text
|
|
typer.echo(f"server returned {resp.status_code}: {detail}", err=True)
|
|
raise typer.Exit(2)
|
|
|
|
|
|
def _print_row(row: dict | None, label: str = "news") -> None:
|
|
if not row or row.get("published") is False and not row.get("intro") and not row.get("content"):
|
|
# `current` returns {published: False} envelope when nothing's published.
|
|
if row is None or (isinstance(row, dict) and row.get("published") is False and "version" not in row):
|
|
typer.echo(f"({label}: none)")
|
|
return
|
|
typer.echo(f"version : {row.get('version')}")
|
|
typer.echo(f"status : {'published' if row.get('published') else 'draft'}")
|
|
typer.echo(f"created_at : {row.get('created_at') or ''}")
|
|
typer.echo(f"updated_at : {row.get('updated_at') or ''}")
|
|
typer.echo(f"created_by : {row.get('created_by') or ''}")
|
|
if row.get("published"):
|
|
typer.echo(f"pub_at : {row.get('published_at') or ''}")
|
|
typer.echo(f"pub_by : {row.get('published_by') or ''}")
|
|
typer.echo("-- intro --")
|
|
typer.echo(row.get("intro") or "")
|
|
typer.echo("-- content --")
|
|
typer.echo(row.get("content") or "")
|
|
|
|
|
|
def _load_from_file(path: str) -> tuple[str, str]:
|
|
"""Parse `--from FILE` (or `-` for stdin). YAML or JSON object with
|
|
`intro` + `content` keys. Returns (intro, content)."""
|
|
if path == "-":
|
|
text = sys.stdin.read()
|
|
else:
|
|
text = Path(path).read_text(encoding="utf-8")
|
|
# Try YAML first (it is a superset of JSON). Fall back to JSON only
|
|
# for YAMLError to avoid swallowing unrelated exceptions like
|
|
# ImportError or KeyboardInterrupt.
|
|
import yaml
|
|
try:
|
|
data = yaml.safe_load(text)
|
|
except yaml.YAMLError:
|
|
data = json.loads(text)
|
|
if not isinstance(data, dict):
|
|
raise typer.BadParameter("file must contain a mapping with `intro` and `content` keys")
|
|
return str(data.get("intro") or ""), str(data.get("content") or "")
|
|
|
|
|
|
@admin_news_app.command("show")
|
|
def show(
|
|
version: int = typer.Option(None, "--version", "-v", help="Show a specific version (default: current published)"),
|
|
):
|
|
"""Print the current published version, or a specific version."""
|
|
if version is not None:
|
|
resp = api_get(f"/api/admin/news/versions/{version}")
|
|
else:
|
|
resp = api_get("/api/admin/news/current")
|
|
body = _exit_on_error(resp)
|
|
if isinstance(body, dict) and body.get("published") is False and "version" not in body:
|
|
typer.echo("(published: none)")
|
|
return
|
|
_print_row(body, label="published")
|
|
|
|
|
|
@admin_news_app.command("draft")
|
|
def draft():
|
|
"""Print the active draft (or 'no draft' if none)."""
|
|
resp = api_get("/api/admin/news/draft")
|
|
if resp.status_code == 404:
|
|
typer.echo("(draft: none)")
|
|
return
|
|
body = _exit_on_error(resp)
|
|
_print_row(body, label="draft")
|
|
|
|
|
|
@admin_news_app.command("edit")
|
|
def edit(
|
|
intro: str = typer.Option(None, "--intro", help="Intro HTML (used on /home)"),
|
|
content: str = typer.Option(None, "--content", help="Full content HTML (used on /news)"),
|
|
from_file: str = typer.Option(None, "--from", help="Read {intro, content} from YAML/JSON file (`-` for stdin)"),
|
|
expect_version: int = typer.Option(
|
|
None, "--expect-version",
|
|
help="Refuse the edit unless the active draft is at this version "
|
|
"(0 = expect no draft). Guards against overwriting a draft a "
|
|
"concurrent admin started or edited after your last fetch.",
|
|
),
|
|
force: bool = typer.Option(
|
|
False, "--force",
|
|
help="Skip the local collision check that warns when a draft was "
|
|
"created by another author. --expect-version still applies.",
|
|
),
|
|
):
|
|
"""Upsert the active draft. One of --from / (--intro and --content) is required.
|
|
|
|
Without --expect-version or --force the CLI checks the active draft
|
|
first and refuses to overwrite a draft authored by someone else,
|
|
printing what's there. Pass --expect-version N (matching the version
|
|
you reviewed) to confirm the overwrite, or --force to commit anyway.
|
|
"""
|
|
if from_file is not None:
|
|
intro_v, content_v = _load_from_file(from_file)
|
|
elif intro is None and content is None:
|
|
typer.echo("error: provide --from FILE or --intro / --content", err=True)
|
|
raise typer.Exit(2)
|
|
else:
|
|
intro_v = intro or ""
|
|
content_v = content or ""
|
|
|
|
# Local collision check before sending the write. The server-side
|
|
# expected_version guard is the authoritative race-free check; this
|
|
# local pass exists so the CLI can show a friendlier "draft was
|
|
# started by X" hint when the operator forgot --force.
|
|
if not force and expect_version is None:
|
|
resp = api_get("/api/admin/news/draft")
|
|
if resp.status_code == 200:
|
|
existing = resp.json()
|
|
# Caller's identity comes from the PAT they're authenticated
|
|
# with — we don't have that locally, so just show the draft
|
|
# author and let the operator decide.
|
|
typer.echo(
|
|
f"warning: active draft v{existing['version']} was started "
|
|
f"by {existing.get('created_by') or '(unknown)'} "
|
|
f"(updated {existing.get('updated_at') or ''}). "
|
|
f"Saving will overwrite their changes. Re-run with "
|
|
f"`--expect-version {existing['version']}` to confirm or "
|
|
f"`--force` to suppress this check.",
|
|
err=True,
|
|
)
|
|
raise typer.Exit(2)
|
|
|
|
qs = ""
|
|
if expect_version is not None:
|
|
qs = f"?expected_version={expect_version}"
|
|
resp = api_put(
|
|
f"/api/admin/news/draft{qs}",
|
|
json={"intro": intro_v, "content": content_v},
|
|
)
|
|
if resp.status_code == 409:
|
|
body = resp.json().get("detail") or {}
|
|
typer.echo(
|
|
f"error: version conflict: expected v{body.get('expected')}, "
|
|
f"active draft is v{body.get('actual')} "
|
|
f"(by {body.get('actual_by') or '?'}). "
|
|
f"Run `agnes admin news draft` to inspect.",
|
|
err=True,
|
|
)
|
|
raise typer.Exit(2)
|
|
body = _exit_on_error(resp)
|
|
typer.echo(f"saved draft v{body['version']}")
|
|
|
|
|
|
@admin_news_app.command("publish")
|
|
def publish(
|
|
version: int = typer.Option(
|
|
None, "--version",
|
|
help="Refuse to publish unless the active draft is at this version. "
|
|
"Guards against publishing a draft a concurrent admin replaced "
|
|
"after you reviewed it. Without --version, publishes whatever "
|
|
"the active draft is.",
|
|
),
|
|
):
|
|
"""Publish the active draft.
|
|
|
|
With `--version N`, the publish only proceeds when the active draft
|
|
is exactly v{N}. If another admin replaced the draft since your
|
|
last review, the call refuses and tells you what's now active.
|
|
"""
|
|
qs = "" if version is None else f"?expected_version={version}"
|
|
resp = api_post(f"/api/admin/news/publish{qs}")
|
|
if resp.status_code == 409:
|
|
body = resp.json().get("detail")
|
|
if body == "no_draft":
|
|
typer.echo("no active draft to publish", err=True)
|
|
raise typer.Exit(1)
|
|
if isinstance(body, dict) and body.get("error") == "version_conflict":
|
|
typer.echo(
|
|
f"error: version conflict: expected draft v{body.get('expected')}, "
|
|
f"active draft is v{body.get('actual')} "
|
|
f"(by {body.get('actual_by') or '?'}). "
|
|
f"Inspect with `agnes admin news draft`, then re-run with the "
|
|
f"matching `--version`.",
|
|
err=True,
|
|
)
|
|
raise typer.Exit(2)
|
|
body = _exit_on_error(resp)
|
|
typer.echo(f"published v{body['version']}")
|
|
|
|
|
|
@admin_news_app.command("unpublish")
|
|
def unpublish(
|
|
version: int = typer.Argument(..., help="Version number to unpublish (becomes a draft)"),
|
|
):
|
|
"""Flip a published version back to draft state."""
|
|
resp = api_post(f"/api/admin/news/unpublish/{version}")
|
|
if resp.status_code == 404:
|
|
typer.echo(f"version {version} not found", err=True)
|
|
raise typer.Exit(1)
|
|
if resp.status_code == 409:
|
|
typer.echo(resp.json().get("detail") or "conflict", err=True)
|
|
raise typer.Exit(2)
|
|
body = _exit_on_error(resp)
|
|
typer.echo(f"unpublished v{body['version']}")
|
|
|
|
|
|
@admin_news_app.command("versions")
|
|
def versions(limit: int = typer.Option(20, "--limit", help="Max rows to print")):
|
|
"""Table of versions: number, status, created_at, by, published_at."""
|
|
resp = api_get(f"/api/admin/news/versions?limit={limit}")
|
|
body = _exit_on_error(resp)
|
|
rows = body.get("versions", [])
|
|
if not rows:
|
|
typer.echo("(no versions)")
|
|
return
|
|
typer.echo(f"{'v':>4} {'status':<10} {'created':<19} {'by':<28} {'published':<19} intro")
|
|
typer.echo("-" * 110)
|
|
for r in rows:
|
|
ca = (r.get("created_at") or "")[:19]
|
|
pa = (r.get("published_at") or "")[:19]
|
|
typer.echo(
|
|
f"{r['version']:>4} {r['status']:<10} {ca:<19} {(r.get('created_by') or ''):<28} "
|
|
f"{pa:<19} {r.get('intro_preview') or ''}"
|
|
)
|
|
|
|
|
|
@admin_news_app.command("export")
|
|
def export(path: str = typer.Argument(..., help="YAML file to write {intro, content} into")):
|
|
"""Dump the currently-published version to a YAML file."""
|
|
import yaml
|
|
resp = api_get("/api/admin/news/current")
|
|
body = _exit_on_error(resp)
|
|
if isinstance(body, dict) and body.get("published") is False and "version" not in body:
|
|
typer.echo("no published version to export", err=True)
|
|
raise typer.Exit(1)
|
|
Path(path).write_text(
|
|
yaml.safe_dump(
|
|
{"intro": body.get("intro") or "", "content": body.get("content") or ""},
|
|
allow_unicode=True,
|
|
sort_keys=False,
|
|
width=200,
|
|
),
|
|
encoding="utf-8",
|
|
)
|
|
typer.echo(f"exported v{body.get('version')} to {path}")
|