* 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).
285 lines
11 KiB
Python
285 lines
11 KiB
Python
"""``get_home_route`` and the ``/`` redirect chain.
|
|
|
|
Resolution order is env > yaml > default ``/dashboard``. The env path is
|
|
the Terraform-overrideable knob — operators set ``AGNES_HOME_ROUTE`` on
|
|
the VM without forking instance.yaml. Bad values fall through to the
|
|
default rather than producing an external-host redirect.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import tempfile
|
|
import uuid
|
|
|
|
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!!")
|
|
# Ensure the env-var override is unset between tests.
|
|
monkeypatch.delenv("AGNES_HOME_ROUTE", raising=False)
|
|
yield tmp
|
|
|
|
|
|
def _make_user_and_session(conn, email="u@example.com"):
|
|
from src.repositories.users import UserRepository
|
|
from app.auth.jwt import create_access_token
|
|
|
|
uid = str(uuid.uuid4())
|
|
UserRepository(conn).create(id=uid, email=email, name=email.split("@")[0])
|
|
return uid, create_access_token(user_id=uid, email=email)
|
|
|
|
|
|
def _client():
|
|
from fastapi.testclient import TestClient
|
|
from app.main import app
|
|
|
|
return TestClient(app, follow_redirects=False)
|
|
|
|
|
|
def test_default_home_route_is_dashboard(fresh_db, monkeypatch):
|
|
monkeypatch.delenv("AGNES_HOME_ROUTE", raising=False)
|
|
from app.instance_config import get_home_route
|
|
assert get_home_route() == "/dashboard"
|
|
|
|
|
|
def test_env_overrides_default(fresh_db, monkeypatch):
|
|
monkeypatch.setenv("AGNES_HOME_ROUTE", "/home")
|
|
from app.instance_config import get_home_route
|
|
assert get_home_route() == "/home"
|
|
|
|
|
|
def test_env_rejects_external_redirect(fresh_db, monkeypatch):
|
|
"""An attacker controlling the env var (or a typo) must not pivot
|
|
the root redirect to ``//evil.com`` or ``https://evil.com``."""
|
|
monkeypatch.setenv("AGNES_HOME_ROUTE", "//evil.com/path")
|
|
from app.instance_config import get_home_route
|
|
assert get_home_route() == "/dashboard"
|
|
|
|
monkeypatch.setenv("AGNES_HOME_ROUTE", "https://evil.com")
|
|
assert get_home_route() == "/dashboard"
|
|
|
|
|
|
def test_root_redirect_authed_user_uses_home_route(fresh_db, monkeypatch):
|
|
"""``GET /`` for an authenticated user redirects to the configured
|
|
home route, not the hard-coded ``/dashboard``."""
|
|
monkeypatch.setenv("AGNES_HOME_ROUTE", "/home")
|
|
|
|
from src.db import get_system_db, close_system_db
|
|
|
|
conn = get_system_db()
|
|
try:
|
|
_, sess = _make_user_and_session(conn)
|
|
finally:
|
|
conn.close()
|
|
close_system_db()
|
|
|
|
c = _client()
|
|
resp = c.get("/", cookies={"access_token": sess})
|
|
assert resp.status_code == 302
|
|
assert resp.headers["location"] == "/home"
|
|
|
|
|
|
def test_root_redirect_unauthed_goes_to_login(fresh_db):
|
|
c = _client()
|
|
resp = c.get("/")
|
|
assert resp.status_code == 302
|
|
assert resp.headers["location"] == "/login"
|
|
|
|
|
|
def test_gws_oauth_default_unset(fresh_db, monkeypatch):
|
|
monkeypatch.delenv("AGNES_GWS_CLIENT_ID", raising=False)
|
|
monkeypatch.delenv("AGNES_GWS_CLIENT_SECRET", raising=False)
|
|
from app.instance_config import get_gws_oauth_credentials
|
|
creds = get_gws_oauth_credentials()
|
|
assert creds["configured"] is False
|
|
assert creds["client_id"] == ""
|
|
assert creds["client_secret"] == ""
|
|
# OAUTHLIB_INSECURE_TRANSPORT defaults to "1" (gws CLI uses HTTP loopback)
|
|
assert creds["oauthlib_insecure_transport"] == "1"
|
|
|
|
|
|
def test_gws_oauth_env_overrides(fresh_db, monkeypatch):
|
|
monkeypatch.setenv("AGNES_GWS_CLIENT_ID", "abc.apps.googleusercontent.com")
|
|
monkeypatch.setenv("AGNES_GWS_CLIENT_SECRET", "GOCSPX-secret")
|
|
from app.instance_config import get_gws_oauth_credentials
|
|
creds = get_gws_oauth_credentials()
|
|
assert creds["configured"] is True
|
|
assert creds["client_id"] == "abc.apps.googleusercontent.com"
|
|
assert creds["client_secret"] == "GOCSPX-secret"
|
|
|
|
|
|
def test_gws_oauth_project_id_derived_from_client_id(fresh_db, monkeypatch):
|
|
"""Numeric project_id is the prefix of the client_id before the first '-'.
|
|
Required by the gws CLI's client_secret.json schema (non-Option in Rust)."""
|
|
monkeypatch.setenv(
|
|
"AGNES_GWS_CLIENT_ID", "123456789012-abcd5678efgh.apps.googleusercontent.com"
|
|
)
|
|
monkeypatch.setenv("AGNES_GWS_CLIENT_SECRET", "GOCSPX-x")
|
|
monkeypatch.delenv("AGNES_GWS_PROJECT_ID", raising=False)
|
|
from app.instance_config import get_gws_oauth_credentials
|
|
assert get_gws_oauth_credentials()["project_id"] == "123456789012"
|
|
|
|
|
|
def test_gws_oauth_project_id_explicit_override(fresh_db, monkeypatch):
|
|
"""Explicit AGNES_GWS_PROJECT_ID wins over the derived value — covers
|
|
edge cases where the client_id doesn't contain a numeric prefix."""
|
|
monkeypatch.setenv(
|
|
"AGNES_GWS_CLIENT_ID", "abc-x.apps.googleusercontent.com"
|
|
)
|
|
monkeypatch.setenv("AGNES_GWS_CLIENT_SECRET", "GOCSPX-x")
|
|
monkeypatch.setenv("AGNES_GWS_PROJECT_ID", "explicit-id")
|
|
from app.instance_config import get_gws_oauth_credentials
|
|
assert get_gws_oauth_credentials()["project_id"] == "explicit-id"
|
|
|
|
|
|
def test_gws_oauth_half_configured_falls_back(fresh_db, monkeypatch):
|
|
"""Only client_id, no secret → not configured. Half-configuration must
|
|
not engage the shortcut branch."""
|
|
monkeypatch.setenv("AGNES_GWS_CLIENT_ID", "abc.apps.googleusercontent.com")
|
|
monkeypatch.delenv("AGNES_GWS_CLIENT_SECRET", raising=False)
|
|
from app.instance_config import get_gws_oauth_credentials
|
|
assert get_gws_oauth_credentials()["configured"] is False
|
|
|
|
|
|
def test_home_renders_configured_gws_branch(fresh_db, monkeypatch):
|
|
"""Configured branch writes ~/.config/gws/client_secret.json directly
|
|
instead of exporting env vars. Claude Code's security layer redacts
|
|
env vars whose name contains 'SECRET', so the file-write path is the
|
|
only reliable way to seed the OAuth app credentials."""
|
|
monkeypatch.setenv(
|
|
"AGNES_GWS_CLIENT_ID", "123456789012-abcd5678efgh.apps.googleusercontent.com"
|
|
)
|
|
monkeypatch.setenv("AGNES_GWS_CLIENT_SECRET", "GOCSPX-secret-xyz")
|
|
|
|
from src.db import get_system_db, close_system_db
|
|
|
|
conn = get_system_db()
|
|
try:
|
|
_, sess = _make_user_and_session(conn)
|
|
finally:
|
|
conn.close()
|
|
close_system_db()
|
|
|
|
c = _client()
|
|
resp = c.get("/home", cookies={"access_token": sess})
|
|
assert resp.status_code == 200
|
|
body = resp.text
|
|
# Configured branch — JSON file path
|
|
assert "~/.config/gws/client_secret.json" in body
|
|
assert '"client_id": "123456789012-abcd5678efgh.apps.googleusercontent.com"' in body
|
|
assert '"client_secret": "GOCSPX-secret-xyz"' in body
|
|
# Project ID derived from client_id prefix
|
|
assert '"project_id": "123456789012"' in body
|
|
# Full read+write scopes — no --readonly flag (Agnes needs Drive/Gmail
|
|
# write so the agent can create, edit, and send on the user's behalf).
|
|
assert "gws auth login --readonly" not in body
|
|
assert "OAUTHLIB_INSECURE_TRANSPORT=1 gws auth login" in body
|
|
# Manual-setup walkthrough should NOT appear in the configured branch
|
|
assert "Run `gws auth setup` for me" not in body
|
|
# Old env-var approach should not leak back in
|
|
assert "export GOOGLE_WORKSPACE_CLI_CLIENT_SECRET=" not in body
|
|
|
|
|
|
def test_home_renders_manual_gws_branch_when_unset(fresh_db, monkeypatch):
|
|
monkeypatch.delenv("AGNES_GWS_CLIENT_ID", raising=False)
|
|
monkeypatch.delenv("AGNES_GWS_CLIENT_SECRET", raising=False)
|
|
|
|
from src.db import get_system_db, close_system_db
|
|
|
|
conn = get_system_db()
|
|
try:
|
|
_, sess = _make_user_and_session(conn)
|
|
finally:
|
|
conn.close()
|
|
close_system_db()
|
|
|
|
c = _client()
|
|
resp = c.get("/home", cookies={"access_token": sess})
|
|
assert resp.status_code == 200
|
|
body = resp.text
|
|
# Manual setup walkthrough renders
|
|
assert "Run `gws auth setup` for me" in body
|
|
# No leaked client_id placeholder
|
|
assert "GOOGLE_WORKSPACE_CLI_CLIENT_ID=" not in body
|
|
|
|
|
|
def test_home_automode_default_show(fresh_db, monkeypatch):
|
|
monkeypatch.delenv("AGNES_HOME_SHOW_AUTOMODE", raising=False)
|
|
from app.instance_config import get_home_automode_visibility
|
|
assert get_home_automode_visibility() is True
|
|
|
|
|
|
def test_home_automode_env_can_hide(fresh_db, monkeypatch):
|
|
monkeypatch.setenv("AGNES_HOME_SHOW_AUTOMODE", "0")
|
|
from app.instance_config import get_home_automode_visibility
|
|
assert get_home_automode_visibility() is False
|
|
|
|
|
|
def test_home_renders_automode_block_by_default(fresh_db, monkeypatch):
|
|
"""Step 3 — turn on auto-accept mode renders by default for the
|
|
not-onboarded /home view."""
|
|
monkeypatch.delenv("AGNES_HOME_SHOW_AUTOMODE", raising=False)
|
|
|
|
from src.db import get_system_db, close_system_db
|
|
|
|
conn = get_system_db()
|
|
try:
|
|
_, sess = _make_user_and_session(conn)
|
|
finally:
|
|
conn.close()
|
|
close_system_db()
|
|
|
|
c = _client()
|
|
body = c.get("/home", cookies={"access_token": sess}).text
|
|
assert "Step 3 — turn on auto-accept mode" in body
|
|
assert '<div class="automode-card">' in body # rendered element, not CSS selector
|
|
assert "acceptEdits" in body # ~/.claude/settings.json snippet
|
|
|
|
|
|
def test_home_hides_automode_block_when_env_off(fresh_db, monkeypatch):
|
|
monkeypatch.setenv("AGNES_HOME_SHOW_AUTOMODE", "0")
|
|
|
|
from src.db import get_system_db, close_system_db
|
|
|
|
conn = get_system_db()
|
|
try:
|
|
_, sess = _make_user_and_session(conn)
|
|
finally:
|
|
conn.close()
|
|
close_system_db()
|
|
|
|
c = _client()
|
|
body = c.get("/home", cookies={"access_token": sess}).text
|
|
assert "Step 3 — turn on auto-accept mode" not in body
|
|
# HTML element absent (CSS selector with same name still in <style>, that's fine)
|
|
assert '<div class="automode-card">' not in body
|
|
|
|
|
|
def test_navbar_home_link_uses_home_route(fresh_db, monkeypatch):
|
|
"""The shared navbar's primary "Home" link respects
|
|
``AGNES_HOME_ROUTE`` so a single env flip routes it to /home or
|
|
/dashboard. Tested by rendering an authed page and grepping the
|
|
rendered HTML — keeps the assertion close to what users see."""
|
|
monkeypatch.setenv("AGNES_HOME_ROUTE", "/home")
|
|
|
|
from src.db import get_system_db, close_system_db
|
|
|
|
conn = get_system_db()
|
|
try:
|
|
_, sess = _make_user_and_session(conn)
|
|
finally:
|
|
conn.close()
|
|
close_system_db()
|
|
|
|
c = _client()
|
|
# /home page itself renders the shared header.
|
|
resp = c.get("/home", cookies={"access_token": sess})
|
|
assert resp.status_code == 200
|
|
# Navbar link href reflects the resolved home_route, not hard-coded /dashboard.
|
|
# Label is "Home" (was "Dashboard" before the nav reorg).
|
|
assert 'href="/home">Home' in resp.text
|