* 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).
320 lines
12 KiB
HTML
320 lines
12 KiB
HTML
{% extends "base.html" %}
|
||
|
||
{% block title %}Admin · News — {{ instance_name or "AI Data Analyst" }}{% endblock %}
|
||
|
||
{% block head_extra %}
|
||
<style>
|
||
body.news-admin .container { max-width: 1280px; padding: 0 32px 48px; }
|
||
body.news-admin h1 { font-size: 22px; margin: 24px 0 10px; }
|
||
body.news-admin h2 { font-size: 16px; margin: 18px 0 8px; color: #374151; }
|
||
|
||
body.news-admin .panel {
|
||
background: white;
|
||
border: 1px solid #E5E7EB;
|
||
border-radius: 12px;
|
||
padding: 22px 26px;
|
||
margin-bottom: 18px;
|
||
}
|
||
body.news-admin .meta {
|
||
font-size: 12px;
|
||
color: #6B7280;
|
||
margin-bottom: 10px;
|
||
text-transform: uppercase;
|
||
letter-spacing: 0.6px;
|
||
}
|
||
body.news-admin .empty { color: #6B7280; font-style: italic; }
|
||
|
||
body.news-admin .editor-row {
|
||
display: grid;
|
||
grid-template-columns: 1fr 1fr;
|
||
gap: 18px;
|
||
}
|
||
body.news-admin .editor-col label {
|
||
display: block;
|
||
font-size: 12px;
|
||
font-weight: 600;
|
||
color: #374151;
|
||
margin-bottom: 6px;
|
||
text-transform: uppercase;
|
||
letter-spacing: 0.4px;
|
||
}
|
||
body.news-admin textarea {
|
||
width: 100%;
|
||
min-height: 220px;
|
||
font-family: ui-monospace, "SF Mono", Consolas, monospace;
|
||
font-size: 13px;
|
||
padding: 10px 12px;
|
||
border: 1px solid #D1D5DB;
|
||
border-radius: 6px;
|
||
resize: vertical;
|
||
box-sizing: border-box;
|
||
}
|
||
body.news-admin textarea#content { min-height: 360px; }
|
||
body.news-admin .preview-frame {
|
||
width: 100%;
|
||
min-height: 360px;
|
||
border: 1px solid #E5E7EB;
|
||
border-radius: 6px;
|
||
background: white;
|
||
}
|
||
|
||
body.news-admin .row-actions {
|
||
display: flex;
|
||
gap: 10px;
|
||
align-items: center;
|
||
margin-top: 14px;
|
||
}
|
||
body.news-admin button.primary {
|
||
background: #0073D1;
|
||
color: white;
|
||
border: 1px solid #0073D1;
|
||
padding: 8px 16px;
|
||
border-radius: 6px;
|
||
font-size: 13px;
|
||
font-weight: 500;
|
||
cursor: pointer;
|
||
}
|
||
body.news-admin button.primary:hover { background: #0056A3; }
|
||
body.news-admin button.primary:disabled { opacity: 0.5; cursor: not-allowed; }
|
||
body.news-admin button.ghost {
|
||
background: white;
|
||
color: #374151;
|
||
border: 1px solid #D1D5DB;
|
||
padding: 8px 14px;
|
||
border-radius: 6px;
|
||
font-size: 13px;
|
||
cursor: pointer;
|
||
}
|
||
body.news-admin button.ghost:hover { border-color: #0073D1; color: #0073D1; }
|
||
body.news-admin .status { font-size: 13px; color: #6B7280; margin-left: 6px; }
|
||
|
||
body.news-admin table.versions {
|
||
width: 100%;
|
||
border-collapse: collapse;
|
||
font-size: 13px;
|
||
}
|
||
body.news-admin table.versions th,
|
||
body.news-admin table.versions td {
|
||
text-align: left;
|
||
padding: 8px 10px;
|
||
border-bottom: 1px solid #F3F4F6;
|
||
}
|
||
body.news-admin .badge {
|
||
display: inline-block;
|
||
padding: 2px 8px;
|
||
border-radius: 999px;
|
||
font-size: 11px;
|
||
font-weight: 600;
|
||
text-transform: uppercase;
|
||
}
|
||
body.news-admin .badge-draft { background: #FEF3C7; color: #92400E; }
|
||
body.news-admin .badge-published { background: #D1FAE5; color: #047857; }
|
||
|
||
body.news-admin details.format-help {
|
||
margin-top: 14px;
|
||
background: #F9FAFB;
|
||
border: 1px solid #E5E7EB;
|
||
border-radius: 6px;
|
||
padding: 10px 14px;
|
||
}
|
||
body.news-admin details.format-help summary {
|
||
cursor: pointer;
|
||
font-weight: 600;
|
||
color: #374151;
|
||
font-size: 13px;
|
||
}
|
||
body.news-admin details.format-help pre {
|
||
background: #0F172A;
|
||
color: #FBBF24;
|
||
padding: 10px 12px;
|
||
border-radius: 6px;
|
||
overflow-x: auto;
|
||
font-size: 12px;
|
||
margin: 8px 0;
|
||
}
|
||
</style>
|
||
<script>
|
||
document.addEventListener('DOMContentLoaded', function () {
|
||
document.body.classList.add('news-admin');
|
||
|
||
var introEl = document.getElementById('intro');
|
||
var contentEl = document.getElementById('content');
|
||
var previewFrame = document.getElementById('preview');
|
||
var saveBtn = document.getElementById('save-btn');
|
||
var publishBtn = document.getElementById('publish-btn');
|
||
var saveStatus = document.getElementById('save-status');
|
||
|
||
function refreshPreview() {
|
||
fetch('/api/admin/news/preview', {
|
||
method: 'POST',
|
||
credentials: 'same-origin',
|
||
headers: { 'Content-Type': 'application/json' },
|
||
body: JSON.stringify({ intro: introEl.value, content: contentEl.value }),
|
||
}).then(function (r) { return r.json(); }).then(function (data) {
|
||
// Use srcdoc + sandbox="" so the preview iframe can't access the
|
||
// parent origin even if the sanitizer ever lets something
|
||
// through. Empty sandbox = strictest possible posture.
|
||
var html = '<style>body{font-family:Inter,system-ui,sans-serif;font-size:14px;color:#111827;margin:0;padding:18px;}</style>'
|
||
+ '<div>' + (data.intro || '') + '</div>'
|
||
+ '<hr style="border:0;border-top:1px solid #E5E7EB;margin:14px 0">'
|
||
+ '<div>' + (data.content || '') + '</div>';
|
||
previewFrame.setAttribute('srcdoc', html);
|
||
}).catch(function () { /* ignore preview failures silently */ });
|
||
}
|
||
introEl.addEventListener('blur', refreshPreview);
|
||
contentEl.addEventListener('blur', refreshPreview);
|
||
refreshPreview();
|
||
|
||
saveBtn.addEventListener('click', function () {
|
||
saveBtn.disabled = true;
|
||
saveStatus.textContent = 'Saving…';
|
||
fetch('/api/admin/news/draft', {
|
||
method: 'PUT',
|
||
credentials: 'same-origin',
|
||
headers: { 'Content-Type': 'application/json' },
|
||
body: JSON.stringify({ intro: introEl.value, content: contentEl.value }),
|
||
}).then(function (r) {
|
||
if (!r.ok) throw new Error(r.status);
|
||
return r.json();
|
||
}).then(function () {
|
||
saveStatus.textContent = 'Saved.';
|
||
window.location.reload();
|
||
}).catch(function (e) {
|
||
saveStatus.textContent = 'Save failed (' + e.message + ').';
|
||
saveBtn.disabled = false;
|
||
});
|
||
});
|
||
|
||
publishBtn && publishBtn.addEventListener('click', function () {
|
||
if (!confirm('Publish the active draft? This makes it the version everyone sees on /home and /news.')) return;
|
||
publishBtn.disabled = true;
|
||
saveStatus.textContent = 'Publishing…';
|
||
fetch('/api/admin/news/publish', { method: 'POST', credentials: 'same-origin' })
|
||
.then(function (r) {
|
||
if (!r.ok) throw new Error(r.status);
|
||
return r.json();
|
||
}).then(function () { window.location.reload(); })
|
||
.catch(function (e) {
|
||
saveStatus.textContent = 'Publish failed (' + e.message + ').';
|
||
publishBtn.disabled = false;
|
||
});
|
||
});
|
||
|
||
document.querySelectorAll('button.unpublish-btn').forEach(function (btn) {
|
||
btn.addEventListener('click', function () {
|
||
var v = btn.getAttribute('data-version');
|
||
if (!confirm('Unpublish version ' + v + '? /home and /news will fall back to the next-highest published version.')) return;
|
||
btn.disabled = true;
|
||
fetch('/api/admin/news/unpublish/' + v, { method: 'POST', credentials: 'same-origin' })
|
||
.then(function (r) {
|
||
if (!r.ok) throw new Error(r.status);
|
||
window.location.reload();
|
||
}).catch(function (e) {
|
||
alert('Unpublish failed: ' + e.message);
|
||
btn.disabled = false;
|
||
});
|
||
});
|
||
});
|
||
});
|
||
</script>
|
||
{% endblock %}
|
||
|
||
{% block content %}
|
||
<h1>News editor</h1>
|
||
|
||
<div class="panel">
|
||
<h2>Currently published</h2>
|
||
{% if news_current %}
|
||
<div class="meta">
|
||
Version {{ news_current.version }} ·
|
||
published {{ news_current.published_at.strftime('%Y-%m-%d %H:%M UTC') if news_current.published_at else '' }}
|
||
{% if news_current.published_by %} by {{ news_current.published_by }}{% endif %}
|
||
</div>
|
||
<p style="margin:0">View live at <a href="/news">/news</a>.</p>
|
||
{% else %}
|
||
<p class="empty">No version published yet — write a draft below and click Publish.</p>
|
||
{% endif %}
|
||
</div>
|
||
|
||
<div class="panel">
|
||
<h2>{% if news_draft %}Draft (v{{ news_draft.version }}){% else %}New draft{% endif %}</h2>
|
||
<div class="editor-row">
|
||
<div class="editor-col">
|
||
<label for="intro">Intro / perex (shown on /home)</label>
|
||
<textarea id="intro" placeholder="<p>Short HTML perex shown at the bottom of /home. Keep it tight.</p>">{{ news_draft.intro if news_draft else '' }}</textarea>
|
||
|
||
<label for="content" style="margin-top:14px">Full content (shown on /news)</label>
|
||
<textarea id="content" placeholder="<h1>Full body</h1> <p>Use the documented classes — see Format help below.</p>">{{ news_draft.content if news_draft else '' }}</textarea>
|
||
|
||
<div class="row-actions">
|
||
<button type="button" class="primary" id="save-btn">Save draft</button>
|
||
<button type="button" class="primary" id="publish-btn"
|
||
{% if not news_draft %}disabled title="Save a draft first"{% endif %}>
|
||
Publish this draft
|
||
</button>
|
||
<span class="status" id="save-status"></span>
|
||
</div>
|
||
|
||
<details class="format-help">
|
||
<summary>Format help — what HTML and classes are allowed</summary>
|
||
<p>Tags allowed: <code>p, h1–h6, ul, ol, li, strong, em, code, pre, blockquote, a, img, span, div, section, table, thead, tbody, tr, th, td, details, summary, figure, figcaption, iframe</code>. Anything else is stripped.</p>
|
||
<p>Use these documented classes for consistent styling:</p>
|
||
<pre><div class="callout callout-warn"><strong>Heads up:</strong> rolling restart 14:00 UTC.</div>
|
||
|
||
<div class="video-embed">
|
||
<iframe src="https://www.youtube.com/embed/abc123"></iframe>
|
||
</div>
|
||
|
||
<section class="news-section">
|
||
<h2>Big news</h2>
|
||
<div class="news-grid-2">
|
||
<div>Column 1</div>
|
||
<div>Column 2</div>
|
||
</div>
|
||
</section>
|
||
|
||
<a class="news-cta" href="/setup-advanced">Open advanced setup</a></pre>
|
||
<p>Iframe <code>src</code> must be on YouTube, Vimeo, or Loom — anything else has the iframe stripped on save.</p>
|
||
</details>
|
||
</div>
|
||
|
||
<div class="editor-col">
|
||
<label>Preview (sanitized)</label>
|
||
<iframe id="preview" class="preview-frame" sandbox=""></iframe>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
|
||
<div class="panel">
|
||
<h2>Versions</h2>
|
||
{% if news_versions %}
|
||
<table class="versions">
|
||
<thead>
|
||
<tr>
|
||
<th>v</th><th>Status</th><th>Created</th><th>By</th>
|
||
<th>Published</th><th>Intro preview</th><th></th>
|
||
</tr>
|
||
</thead>
|
||
<tbody>
|
||
{% for v in news_versions %}
|
||
<tr>
|
||
<td><strong>{{ v.version }}</strong></td>
|
||
<td><span class="badge badge-{{ v.status }}">{{ v.status }}</span></td>
|
||
<td>{{ v.created_at.strftime('%Y-%m-%d %H:%M') if v.created_at else '' }}</td>
|
||
<td>{{ v.created_by or '' }}</td>
|
||
<td>{{ v.published_at.strftime('%Y-%m-%d %H:%M') if v.published_at else '' }}</td>
|
||
<td>{{ v.intro_preview }}</td>
|
||
<td>
|
||
{% if v.published %}
|
||
<button type="button" class="ghost unpublish-btn" data-version="{{ v.version }}">Unpublish</button>
|
||
{% endif %}
|
||
</td>
|
||
</tr>
|
||
{% endfor %}
|
||
</tbody>
|
||
</table>
|
||
{% else %}
|
||
<p class="empty">No versions yet.</p>
|
||
{% endif %}
|
||
</div>
|
||
{% endblock %}
|