From 548ba3a66940241a1b2e9551af26cee17aca90e2 Mon Sep 17 00:00:00 2001
From: peter <peter@cygnus.systems>
Date: Mon, 7 Sep 2026 13:12:27 +0100
Subject: [PATCH 1/7] =?UTF-8?q?v0.6.0:=20per-artifact=20actions=20menu=20(?=
 =?UTF-8?q?=E2=8B=AF=20+=20right-click)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A ⋯ button on row hover and right-click on a feed row open the same floating
menu: Keep / Open / Copy link / Delete. Dismisses on click-away/Escape,
edge-flips to stay on-screen. Standalone one-click Delete icon stays; the
Trash view keeps its dedicated Undelete.

- Row markup: actions grouped in a .row-actions container (delete + ⋯ in the
  feed/keep views; undelete in trash). Reuses the existing keep endpoint.
- Menu only in the normal/keep views, not trash. Keep-toggle syncs the row's
  kept badge + the preview Keep button, and (in the Keep folder) drops the row
  when unkept.
- Frontend-only (no backend change); inline JS validated with node --check;
  152 tests pass; feed renders in all views.

Share + Add-label join the menu in later slices.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 CHANGELOG.md                            |  13 ++-
 daybook_project/__init__.py             |   2 +-
 static/agentfeed.css                    |  56 +++++++++++--
 templates/artifacts/_artifact_rows.html |  13 +--
 templates/artifacts/feed.html           | 100 +++++++++++++++++++++++-
 5 files changed, 166 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cac692a..46204aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,16 @@ former name, "Daybook".)
 
 _Nothing yet._
 
+## [0.6.0] — 2026-09-07
+
+### Added
+- **Per-artifact actions menu.** A **⋯** button appears on row hover, and
+  **right-clicking** a feed row opens the same floating menu — **Keep /
+  Open / Copy link / Delete**. Dismisses on click-away or Escape, edge-flips
+  to stay on-screen. The standalone one-click Delete icon stays; the Trash
+  view keeps its dedicated Undelete. (Share and Add-label will join the menu
+  in later slices.)
+
 ## [0.5.1] — 2026-09-07
 
 ### Added
@@ -195,7 +205,8 @@ First tagged release.
 - Dockerised (Gunicorn + whitenoise), SQLite, `git`-based deploy with a
   runbook (`deploy/cloud_agent_deploy.md`) and health check.
 
-[Unreleased]: https://git.cygnus.systems/peter/daybook/compare/v0.5.1...HEAD
+[Unreleased]: https://git.cygnus.systems/peter/daybook/compare/v0.6.0...HEAD
+[0.6.0]: https://git.cygnus.systems/peter/daybook/compare/v0.5.1...v0.6.0
 [0.5.1]: https://git.cygnus.systems/peter/daybook/compare/v0.5.0...v0.5.1
 [0.5.0]: https://git.cygnus.systems/peter/daybook/compare/v0.4.1...v0.5.0
 [0.4.1]: https://git.cygnus.systems/peter/daybook/compare/v0.4.0...v0.4.1
diff --git a/daybook_project/__init__.py b/daybook_project/__init__.py
index ee033ee..2d6a887 100644
--- a/daybook_project/__init__.py
+++ b/daybook_project/__init__.py
@@ -1,4 +1,4 @@
 # Single source of truth for the app version. Bump this, commit, then tag the
 # commit `vX.Y.Z` and deploy. Surfaced on Settings -> About and in
 # GET /api/capabilities ("version").
-__version__ = "0.5.1"
+__version__ = "0.6.0"
diff --git a/static/agentfeed.css b/static/agentfeed.css
index 667a968..aa0626e 100644
--- a/static/agentfeed.css
+++ b/static/agentfeed.css
@@ -1060,12 +1060,22 @@ kbd {
   position: relative;
 }
 
-.row-action {
+.row-actions {
   position: absolute;
-  right: 0.5rem;
+  right: 0.4rem;
   top: 50%;
   transform: translateY(-50%);
+  display: flex;
+  gap: 0.15rem;
   opacity: 0;
+}
+
+.artifact-row:hover .row-actions,
+.artifact-row:focus-within .row-actions {
+  opacity: 1;
+}
+
+.row-action {
   cursor: pointer;
   font-size: 0.95rem;
   line-height: 1;
@@ -1075,11 +1085,6 @@ kbd {
   color: var(--muted);
 }
 
-.artifact-row:hover .row-action,
-.artifact-row:focus-within .row-action {
-  opacity: 1;
-}
-
 .row-action:hover {
   background: var(--surface-alt);
   color: var(--text);
@@ -1089,6 +1094,43 @@ kbd {
   color: var(--danger-text-plain);
 }
 
+/* Per-row actions menu (opened by the ⋯ trigger or right-click) */
+.row-menu {
+  position: fixed;
+  z-index: 100;
+  min-width: 9rem;
+  background: var(--surface);
+  border: 1px solid var(--control-border);
+  border-radius: 8px;
+  box-shadow: 0 6px 18px rgba(0, 0, 0, 0.14);
+  padding: 0.25rem;
+  display: flex;
+  flex-direction: column;
+}
+
+.row-menu[hidden] {
+  display: none;
+}
+
+.row-menu button {
+  background: transparent;
+  border: 0;
+  border-radius: 5px;
+  color: var(--text);
+  cursor: pointer;
+  font-size: 0.85rem;
+  padding: 0.4rem 0.6rem;
+  text-align: left;
+}
+
+.row-menu button:hover {
+  background: var(--surface-alt);
+}
+
+.row-menu button.danger {
+  color: var(--danger-text-plain);
+}
+
 /* System folders (Keep / Deleted) at the bottom of the sidebar */
 .source-folders {
   border-top: 1px solid var(--grid-line);
diff --git a/templates/artifacts/_artifact_rows.html b/templates/artifacts/_artifact_rows.html
index 45c2f2f..37c9ed1 100644
--- a/templates/artifacts/_artifact_rows.html
+++ b/templates/artifacts/_artifact_rows.html
@@ -30,10 +30,13 @@
       {% endif %}
     </span>
     <span class="artifact-source">{{ artifact.source }}</span>
-    {% if in_trash %}
-      <span class="row-action row-undelete" role="button" tabindex="0" data-undelete="{{ artifact.id }}" title="Restore from Trash" aria-label="Restore {{ artifact.title }}">&#8617;</span>
-    {% else %}
-      <span class="row-action row-delete" role="button" tabindex="0" data-delete="{{ artifact.id }}" title="Delete" aria-label="Delete {{ artifact.title }}">&#128465;</span>
-    {% endif %}
+    <span class="row-actions">
+      {% if in_trash %}
+        <span class="row-action row-undelete" role="button" tabindex="0" data-undelete="{{ artifact.id }}" title="Restore from Trash" aria-label="Restore {{ artifact.title }}">&#8617;</span>
+      {% else %}
+        <span class="row-action row-delete" role="button" tabindex="0" data-delete="{{ artifact.id }}" title="Delete" aria-label="Delete {{ artifact.title }}">&#128465;</span>
+        <span class="row-action row-menu-trigger" role="button" tabindex="0" data-menu-trigger title="More actions" aria-label="More actions for {{ artifact.title }}">&#8943;</span>
+      {% endif %}
+    </span>
   </a>
 {% endfor %}
diff --git a/templates/artifacts/feed.html b/templates/artifacts/feed.html
index 90a26bb..95e8659 100644
--- a/templates/artifacts/feed.html
+++ b/templates/artifacts/feed.html
@@ -147,6 +147,13 @@
     </section>
   </main>
 
+  <div class="row-menu" hidden data-row-menu>
+    <button type="button" data-menu-action="keep">Keep</button>
+    <button type="button" data-menu-action="open">Open</button>
+    <button type="button" data-menu-action="copy">Copy link</button>
+    <button type="button" data-menu-action="delete" class="danger">Delete</button>
+  </div>
+
   <script>
     (() => {
       const feed = document.querySelector(".feed");
@@ -528,6 +535,85 @@
         });
       }
 
+      // --- Per-row actions menu (⋯ trigger + right-click) ---
+      const rowMenu = document.querySelector("[data-row-menu]");
+      let menuRowId = null;
+
+      const currentMenuRow = () =>
+        menuRowId ? artifactList.querySelector(`.artifact-row[data-artifact-id="${menuRowId}"]`) : null;
+
+      const closeRowMenu = () => {
+        if (rowMenu) rowMenu.hidden = true;
+        menuRowId = null;
+      };
+
+      const openRowMenu = (row, x, y) => {
+        if (!rowMenu || !row) return;
+        menuRowId = row.dataset.artifactId;
+        const keepBtn = rowMenu.querySelector('[data-menu-action="keep"]');
+        if (keepBtn) keepBtn.textContent = row.dataset.kept === "1" ? "Remove from Keep" : "Keep";
+        rowMenu.hidden = false;
+        const rect = rowMenu.getBoundingClientRect();
+        const left = Math.max(8, Math.min(x, window.innerWidth - rect.width - 8));
+        const top = Math.max(8, Math.min(y, window.innerHeight - rect.height - 8));
+        rowMenu.style.left = `${left}px`;
+        rowMenu.style.top = `${top}px`;
+      };
+
+      const copyText = async (text) => {
+        try { await navigator.clipboard.writeText(text); } catch (e) { /* clipboard unavailable */ }
+      };
+
+      const keepFromMenu = async (row, id) => {
+        try {
+          const response = await fetch(`/a/${id}/keep`, {method: "POST", headers: {"X-CSRFToken": csrfToken}});
+          if (!response.ok) return;
+          const data = await response.json();
+          row.dataset.kept = data.is_kept ? "1" : "0";
+          row.classList.toggle("kept", data.is_kept);
+          const badge = row.querySelector("[data-kept-badge]");
+          if (badge) badge.hidden = !data.is_kept;
+          bumpFolderCount("keep", data.is_kept ? 1 : -1);
+          if (feed.dataset.folder === "keep" && !data.is_kept) removeRowFromList(row);
+          const keepButton = document.querySelector("[data-keep-button]");
+          if (keepButton && keepButton.dataset.artifactId === id) {
+            keepButton.classList.toggle("kept", data.is_kept);
+            keepButton.textContent = data.is_kept ? "✓ Kept" : "Keep";
+          }
+        } catch (e) { /* leave as-is */ }
+      };
+
+      if (rowMenu) {
+        rowMenu.addEventListener("click", (event) => {
+          const btn = event.target.closest("[data-menu-action]");
+          if (!btn) return;
+          const row = currentMenuRow();
+          const id = menuRowId;
+          closeRowMenu();
+          if (!row || !id) return;
+          const action = btn.dataset.menuAction;
+          if (action === "delete") softDeleteRow(id);
+          else if (action === "keep") keepFromMenu(row, id);
+          else if (action === "open") window.open(row.dataset.renderedUrl, "_blank", "noopener");
+          else if (action === "copy") copyText(window.location.origin + row.dataset.renderedUrl);
+        });
+      }
+
+      document.addEventListener("click", (event) => {
+        if (rowMenu && !rowMenu.hidden && !rowMenu.contains(event.target)) closeRowMenu();
+      });
+      document.addEventListener("keydown", (event) => {
+        if (event.key === "Escape") closeRowMenu();
+      });
+
+      // Right-click a feed row opens the same menu at the cursor.
+      artifactList.addEventListener("contextmenu", (event) => {
+        const row = event.target.closest(".artifact-row");
+        if (!row || feed.dataset.folder) return;   // normal feed only
+        event.preventDefault();
+        openRowMenu(row, event.clientX, event.clientY);
+      });
+
       const renderPreview = (row, pushState = true) => {
         navigationMode = "artifacts";
         markRead(row);
@@ -563,13 +649,19 @@
 
       // Delegated so rows appended by infinite scroll work without rebinding.
       artifactList.addEventListener("click", (event) => {
-        // Row action icons (delete/undelete) intercept before selection.
-        const action = event.target.closest("[data-delete], [data-undelete]");
+        // Row action icons (delete/undelete/menu) intercept before selection.
+        const action = event.target.closest("[data-delete], [data-undelete], [data-menu-trigger]");
         if (action) {
           event.preventDefault();
           event.stopPropagation();
-          if (action.hasAttribute("data-delete")) softDeleteRow(action.getAttribute("data-delete"));
-          else undeleteRow(action.getAttribute("data-undelete"));
+          if (action.hasAttribute("data-menu-trigger")) {
+            const rect = action.getBoundingClientRect();
+            openRowMenu(action.closest(".artifact-row"), rect.right, rect.bottom);
+          } else if (action.hasAttribute("data-delete")) {
+            softDeleteRow(action.getAttribute("data-delete"));
+          } else {
+            undeleteRow(action.getAttribute("data-undelete"));
+          }
           return;
         }
         const row = event.target.closest(".artifact-row");

From ab3e92268af030e68f6ae8f493d92774a6e8d920 Mon Sep 17 00:00:00 2001
From: peter <peter@cygnus.systems>
Date: Mon, 7 Sep 2026 21:07:39 +0100
Subject: [PATCH 2/7] v0.6.1: pin Keep/Deleted folders to sidebar bottom;
 highlight All sources

- Move the Keep/Deleted system folders out of the scrolling source list into a
  pinned section at the bottom of the sidebar (only sources scroll now), so the
  folders stay reachable with many sources. Renamed .source-folders ->
  .system-folders; .source-list flexes to fill.
- "All sources" is visually distinct (bold + subtle blue tint) as the primary
  entry.

Template/CSS only. Feed/trash rendering tests pass; feed renders in all views.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 CHANGELOG.md                  | 12 +++++++++++-
 daybook_project/__init__.py   |  2 +-
 static/agentfeed.css          | 26 +++++++++++++++++++++----
 templates/artifacts/feed.html | 36 +++++++++++++++++------------------
 4 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46204aa..1d6c6c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,15 @@ former name, "Daybook".)
 
 _Nothing yet._
 
+## [0.6.1] — 2026-09-07
+
+### Changed
+- Sidebar: the **Keep / Deleted folders are pinned to the bottom** — only the
+  source list scrolls, so the folders stay reachable no matter how many sources
+  you have. **"All sources"** is now visually distinct (bold + subtle blue tint)
+  as the primary entry. (Internal: `.source-folders` class renamed to
+  `.system-folders`.)
+
 ## [0.6.0] — 2026-09-07
 
 ### Added
@@ -205,7 +214,8 @@ First tagged release.
 - Dockerised (Gunicorn + whitenoise), SQLite, `git`-based deploy with a
   runbook (`deploy/cloud_agent_deploy.md`) and health check.
 
-[Unreleased]: https://git.cygnus.systems/peter/daybook/compare/v0.6.0...HEAD
+[Unreleased]: https://git.cygnus.systems/peter/daybook/compare/v0.6.1...HEAD
+[0.6.1]: https://git.cygnus.systems/peter/daybook/compare/v0.6.0...v0.6.1
 [0.6.0]: https://git.cygnus.systems/peter/daybook/compare/v0.5.1...v0.6.0
 [0.5.1]: https://git.cygnus.systems/peter/daybook/compare/v0.5.0...v0.5.1
 [0.5.0]: https://git.cygnus.systems/peter/daybook/compare/v0.4.1...v0.5.0
diff --git a/daybook_project/__init__.py b/daybook_project/__init__.py
index 2d6a887..6227cb2 100644
--- a/daybook_project/__init__.py
+++ b/daybook_project/__init__.py
@@ -1,4 +1,4 @@
 # Single source of truth for the app version. Bump this, commit, then tag the
 # commit `vX.Y.Z` and deploy. Surfaced on Settings -> About and in
 # GET /api/capabilities ("version").
-__version__ = "0.6.0"
+__version__ = "0.6.1"
diff --git a/static/agentfeed.css b/static/agentfeed.css
index aa0626e..d282868 100644
--- a/static/agentfeed.css
+++ b/static/agentfeed.css
@@ -360,6 +360,7 @@ h1 {
 
 /* Source sidebar: scrollbar hidden until hover (short list, rarely scrolls). */
 .source-list {
+  flex: 1 1 auto;   /* fill available height so system folders pin to the bottom */
   scrollbar-color: transparent transparent;
   scrollbar-width: none;
 }
@@ -1131,11 +1132,28 @@ kbd {
   color: var(--danger-text-plain);
 }
 
-/* System folders (Keep / Deleted) at the bottom of the sidebar */
-.source-folders {
+/* System folders (Keep / Deleted): pinned at the bottom of the sidebar,
+   below the scrolling source list. */
+.system-folders {
   border-top: 1px solid var(--grid-line);
-  margin-top: 0.4rem;
-  padding-top: 0.4rem;
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  padding: 0.4rem 0.6rem 0.2rem;
+}
+
+/* "All sources" — the primary entry, visually distinct from individual sources:
+   bold, with a subtle blue tint (works over both light and dark surfaces). */
+.all-sources-link {
+  font-weight: 600;
+}
+
+.all-sources-link:not(.selected) {
+  background: rgba(74, 110, 168, 0.14);
+}
+
+.all-sources-link:not(.selected):hover {
+  background: rgba(74, 110, 168, 0.22);
 }
 
 .empty-trash-button {
diff --git a/templates/artifacts/feed.html b/templates/artifacts/feed.html
index 95e8659..54b3d20 100644
--- a/templates/artifacts/feed.html
+++ b/templates/artifacts/feed.html
@@ -35,7 +35,7 @@
         <h2>Sources</h2>
       </div>
       <nav class="source-list">
-        <a class="source-link {% if not selected_source and not selected_folder %}selected{% endif %}" href="?{% if selected_label %}label={{ selected_label|urlencode }}&amp;{% endif %}{% if selected_kind %}kind={{ selected_kind|urlencode }}&amp;{% endif %}{% if title_query %}q={{ title_query|urlencode }}&amp;{% endif %}view={{ selected_view }}&amp;preview=none">
+        <a class="source-link all-sources-link {% if not selected_source and not selected_folder %}selected{% endif %}" href="?{% if selected_label %}label={{ selected_label|urlencode }}&amp;{% endif %}{% if selected_kind %}kind={{ selected_kind|urlencode }}&amp;{% endif %}{% if title_query %}q={{ title_query|urlencode }}&amp;{% endif %}view={{ selected_view }}&amp;preview=none">
           <span class="source-name">All sources</span>
           {% if total_count %}<span class="source-count">{{ total_count }}</span>{% endif %}
         </a>
@@ -45,24 +45,24 @@
             {% if entry.count %}<span class="source-count">{{ entry.count }}</span>{% endif %}
           </a>
         {% endfor %}
-
-        {% if keep_count or trash_count %}
-          <div class="source-folders">
-            {% if keep_count %}
-              <a class="source-link folder-link {% if selected_folder == 'keep' %}selected{% endif %}" href="?folder=keep&amp;view={{ selected_view }}&amp;preview=none" data-folder-link="keep">
-                <span class="source-name">&#9733; Keep</span>
-                <span class="source-count">{{ keep_count }}</span>
-              </a>
-            {% endif %}
-            {% if trash_count %}
-              <a class="source-link folder-link {% if selected_folder == 'deleted' %}selected{% endif %}" href="?folder=deleted&amp;view={{ selected_view }}&amp;preview=none" data-folder-link="deleted">
-                <span class="source-name">&#128465; Deleted</span>
-                <span class="source-count">{{ trash_count }}</span>
-              </a>
-            {% endif %}
-          </div>
-        {% endif %}
       </nav>
+
+      {% if keep_count or trash_count %}
+        <nav class="system-folders" aria-label="Folders">
+          {% if keep_count %}
+            <a class="source-link folder-link {% if selected_folder == 'keep' %}selected{% endif %}" href="?folder=keep&amp;view={{ selected_view }}&amp;preview=none" data-folder-link="keep">
+              <span class="source-name">&#9733; Keep</span>
+              <span class="source-count">{{ keep_count }}</span>
+            </a>
+          {% endif %}
+          {% if trash_count %}
+            <a class="source-link folder-link {% if selected_folder == 'deleted' %}selected{% endif %}" href="?folder=deleted&amp;view={{ selected_view }}&amp;preview=none" data-folder-link="deleted">
+              <span class="source-name">&#128465; Deleted</span>
+              <span class="source-count">{{ trash_count }}</span>
+            </a>
+          {% endif %}
+        </nav>
+      {% endif %}
     </aside>
 
     <div class="splitter" data-splitter="days" role="separator" aria-label="Resize sources sidebar" aria-orientation="vertical"></div>

From c1be2face7174883b356d69e0a5e8285cca12bd1 Mon Sep 17 00:00:00 2001
From: peter <peter@cygnus.systems>
Date: Mon, 7 Sep 2026 21:18:49 +0100
Subject: [PATCH 3/7] v0.6.2: order sources by most recent message (recency)

- Sidebar sources ordered by Max(created_at) desc instead of alphabetically;
  "All sources" stays pinned at top (rendered separately).
- Live updates move a source to the top when it gets a new message, so the
  recency order holds without a reload.

152 tests pass; JS re-validated with node --check.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 CHANGELOG.md                  | 10 +++++++++-
 artifacts/views.py            |  8 +++++---
 daybook_project/__init__.py   |  2 +-
 templates/artifacts/feed.html | 26 ++++++++++++++++----------
 4 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d6c6c6..1366216 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,13 @@ former name, "Daybook".)
 
 _Nothing yet._
 
+## [0.6.2] — 2026-09-07
+
+### Changed
+- Source sidebar is now ordered by **most recent message** (Telegram-style)
+  instead of alphabetically; "All sources" stays pinned at the top. Live
+  updates move a source to the top when it receives a new message.
+
 ## [0.6.1] — 2026-09-07
 
 ### Changed
@@ -214,7 +221,8 @@ First tagged release.
 - Dockerised (Gunicorn + whitenoise), SQLite, `git`-based deploy with a
   runbook (`deploy/cloud_agent_deploy.md`) and health check.
 
-[Unreleased]: https://git.cygnus.systems/peter/daybook/compare/v0.6.1...HEAD
+[Unreleased]: https://git.cygnus.systems/peter/daybook/compare/v0.6.2...HEAD
+[0.6.2]: https://git.cygnus.systems/peter/daybook/compare/v0.6.1...v0.6.2
 [0.6.1]: https://git.cygnus.systems/peter/daybook/compare/v0.6.0...v0.6.1
 [0.6.0]: https://git.cygnus.systems/peter/daybook/compare/v0.5.1...v0.6.0
 [0.5.1]: https://git.cygnus.systems/peter/daybook/compare/v0.5.0...v0.5.1
diff --git a/artifacts/views.py b/artifacts/views.py
index 1d2aff0..055c861 100644
--- a/artifacts/views.py
+++ b/artifacts/views.py
@@ -19,7 +19,7 @@ from django.contrib.auth import views as auth_views
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
 from django.db import OperationalError, transaction
-from django.db.models import Count, Q, Sum
+from django.db.models import Count, Max, Q, Sum
 from django.http import FileResponse, Http404, HttpResponse, HttpResponseForbidden, JsonResponse
 from django.shortcuts import get_object_or_404, redirect, render
 from django.template.defaultfilters import date as date_filter, slugify
@@ -586,10 +586,12 @@ def feed(request):
     source_scoped = apply_feed_filters(
         live, "", selected_label, selected_kind, title_query
     )
+    # Sources ordered by most recent message first (Telegram-style); "All
+    # sources" is rendered separately and stays pinned at the top.
     source_counts = (
         source_scoped.values("source")
-        .annotate(count=Count("id", filter=Q(read_at__isnull=True)))
-        .order_by("source")
+        .annotate(count=Count("id", filter=Q(read_at__isnull=True)), latest=Max("created_at"))
+        .order_by("-latest")
     )
     keep_count = live.filter(is_kept=True).count()
     trash_count = Artifact.objects.filter(owner=request.user, deleted_at__isnull=False).count()
diff --git a/daybook_project/__init__.py b/daybook_project/__init__.py
index 6227cb2..28b8174 100644
--- a/daybook_project/__init__.py
+++ b/daybook_project/__init__.py
@@ -1,4 +1,4 @@
 # Single source of truth for the app version. Bump this, commit, then tag the
 # commit `vX.Y.Z` and deploy. Surfaced on Settings -> About and in
 # GET /api/capabilities ("version").
-__version__ = "0.6.1"
+__version__ = "0.6.2"
diff --git a/templates/artifacts/feed.html b/templates/artifacts/feed.html
index 54b3d20..a8e9cca 100644
--- a/templates/artifacts/feed.html
+++ b/templates/artifacts/feed.html
@@ -443,15 +443,17 @@
           `<span class="source-name">${escapeHtml(name)}</span>` +
           `<span class="source-count">${count}</span>`;
 
-        // Insert alphabetically among the per-source links (after "All sources").
+        // Newest activity goes to the top of the per-source list (just under
+        // the pinned "All sources"), matching the recency ordering.
         const list = document.querySelector(".source-list");
-        const others = sourceLinks().filter(
-          (l) => l.querySelector(".source-name")?.textContent.trim() !== "All sources",
-        );
-        const after = others.find(
-          (l) => (l.querySelector(".source-name")?.textContent.trim() || "") > name,
-        );
-        list.insertBefore(link, after || null);
+        const firstSource = list.querySelector(".source-link:not(.all-sources-link)");
+        list.insertBefore(link, firstSource);
+      };
+
+      const moveSourceToTop = (link) => {
+        const list = document.querySelector(".source-list");
+        const firstSource = list.querySelector(".source-link:not(.all-sources-link)");
+        if (firstSource !== link) list.insertBefore(link, firstSource);
       };
 
       // From the newly-arrived rows: bump each source's unread count (adding a
@@ -466,8 +468,12 @@
         Object.entries(counts).forEach(([source, n]) => {
           total += n;
           const existing = findSourceLink(source);
-          if (existing) bumpSourceBadge(existing, n);
-          else addSourceLink(source, n);
+          if (existing) {
+            bumpSourceBadge(existing, n);
+            moveSourceToTop(existing);   // most-recent activity -> top (recency order)
+          } else {
+            addSourceLink(source, n);
+          }
         });
         const allLink = findSourceLink("All sources");
         if (allLink && total) bumpSourceBadge(allLink, total);

From 7b161f12768dbf7627df2f23188a8ebb9ba9c1b7 Mon Sep 17 00:00:00 2001
From: peter <peter@cygnus.systems>
Date: Mon, 7 Sep 2026 21:37:08 +0100
Subject: [PATCH 4/7] v0.6.3: UI wording -> "messages"; folder spacing + tint
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- User-facing "artifact(s)" -> "messages" across the UI (feed count, empty
  states, preview, About, Storage). Model/API/skill keep "artifact" internally
  — no agent-contract change.
- Sidebar: Keep/Deleted folders get spacing between them and share the "All
  sources" bold + blue-tint styling (special folders).
- Fix: About page points to Settings -> API Keys (was stale "Settings ->
  Account / API token").

152 tests pass; inline JS re-validated with node --check.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 CHANGELOG.md                                | 17 ++++++++++++-
 daybook_project/__init__.py                 |  2 +-
 static/agentfeed.css                        | 17 ++++++++-----
 templates/artifacts/feed.html               | 28 ++++++++++-----------
 templates/artifacts/settings_about.html     |  8 +++---
 templates/artifacts/settings_demo_data.html |  2 +-
 templates/artifacts/settings_storage.html   | 10 ++++----
 7 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1366216..318a2a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,20 @@ former name, "Daybook".)
 
 _Nothing yet._
 
+## [0.6.3] — 2026-09-07
+
+### Changed
+- **User-facing wording: "artifact(s)" → "messages"** throughout the UI (feed
+  count, empty states, preview, About, Storage). The model, API
+  (`/api/artifacts`), and posting skill keep "artifact" as the internal term —
+  no contract change for agents.
+- Sidebar: the Keep/Deleted folders now have spacing between them and share the
+  "All sources" bold+blue-tint styling (they're special folders).
+
+### Fixed
+- About page now points to Settings → API Keys (was the stale "Settings →
+  Account / personal API token").
+
 ## [0.6.2] — 2026-09-07
 
 ### Changed
@@ -221,7 +235,8 @@ First tagged release.
 - Dockerised (Gunicorn + whitenoise), SQLite, `git`-based deploy with a
   runbook (`deploy/cloud_agent_deploy.md`) and health check.
 
-[Unreleased]: https://git.cygnus.systems/peter/daybook/compare/v0.6.2...HEAD
+[Unreleased]: https://git.cygnus.systems/peter/daybook/compare/v0.6.3...HEAD
+[0.6.3]: https://git.cygnus.systems/peter/daybook/compare/v0.6.2...v0.6.3
 [0.6.2]: https://git.cygnus.systems/peter/daybook/compare/v0.6.1...v0.6.2
 [0.6.1]: https://git.cygnus.systems/peter/daybook/compare/v0.6.0...v0.6.1
 [0.6.0]: https://git.cygnus.systems/peter/daybook/compare/v0.5.1...v0.6.0
diff --git a/daybook_project/__init__.py b/daybook_project/__init__.py
index 28b8174..b040cb3 100644
--- a/daybook_project/__init__.py
+++ b/daybook_project/__init__.py
@@ -1,4 +1,4 @@
 # Single source of truth for the app version. Bump this, commit, then tag the
 # commit `vX.Y.Z` and deploy. Surfaced on Settings -> About and in
 # GET /api/capabilities ("version").
-__version__ = "0.6.2"
+__version__ = "0.6.3"
diff --git a/static/agentfeed.css b/static/agentfeed.css
index d282868..ca19527 100644
--- a/static/agentfeed.css
+++ b/static/agentfeed.css
@@ -1139,20 +1139,25 @@ kbd {
   display: flex;
   flex-direction: column;
   flex-shrink: 0;
-  padding: 0.4rem 0.6rem 0.2rem;
+  gap: 0.25rem;   /* space Keep / Deleted apart */
+  padding: 0.4rem 0.6rem 0.3rem;
 }
 
-/* "All sources" — the primary entry, visually distinct from individual sources:
-   bold, with a subtle blue tint (works over both light and dark surfaces). */
-.all-sources-link {
+/* "Special" sidebar entries — "All sources" and the Keep/Deleted folders —
+   share a distinct look (bold + subtle blue tint) to set them apart from the
+   individual sources. */
+.all-sources-link,
+.folder-link {
   font-weight: 600;
 }
 
-.all-sources-link:not(.selected) {
+.all-sources-link:not(.selected),
+.folder-link:not(.selected) {
   background: rgba(74, 110, 168, 0.14);
 }
 
-.all-sources-link:not(.selected):hover {
+.all-sources-link:not(.selected):hover,
+.folder-link:not(.selected):hover {
   background: rgba(74, 110, 168, 0.22);
 }
 
diff --git a/templates/artifacts/feed.html b/templates/artifacts/feed.html
index a8e9cca..daa2182 100644
--- a/templates/artifacts/feed.html
+++ b/templates/artifacts/feed.html
@@ -73,7 +73,7 @@
         {% if selected_folder == 'deleted' %}
           <button type="button" class="empty-trash-button" data-empty-trash>Empty Trash</button>
         {% else %}
-          <span>{{ artifacts|length }} artifact{{ artifacts|length|pluralize }}</span>
+          <span>{{ artifacts|length }} message{{ artifacts|length|pluralize }}</span>
         {% endif %}
       </div>
 
@@ -82,7 +82,7 @@
           {% include "artifacts/_day_groups.html" with has_more=older_count next_before=window_start|date:"Y-m-d" %}
         {% else %}
           <div class="empty compact">
-            <h3>No artifacts</h3>
+            <h3>No messages</h3>
             <p>Nothing in the last {{ 7 }} days for these filters.</p>
           </div>
         {% endif %}
@@ -94,7 +94,7 @@
     <section class="preview-pane">
       <header class="pane-bar preview-actions" data-actions>
         <div class="preview-title" data-preview-title {% if selected_artifact %}title="{{ selected_artifact.title }}"{% endif %}>
-          {% if selected_artifact %}{{ selected_artifact.title }}{% else %}No artifact loaded{% endif %}
+          {% if selected_artifact %}{{ selected_artifact.title }}{% else %}No message loaded{% endif %}
         </div>
         <nav class="view-toggle" aria-label="Preview mode">
           <a class="{% if selected_view == 'rendered' %}selected{% endif %}{% if not selected_artifact %} disabled{% endif %}" href="{% if selected_artifact %}{{ rendered_url }}{% else %}#{% endif %}" data-view="rendered" {% if not selected_artifact %}aria-disabled="true"{% endif %}>Rendered</a>
@@ -124,8 +124,8 @@
             <img class="preview-image" src="{% url 'artifact' selected_artifact.id %}" alt="{{ selected_artifact.title }}">
           {% elif selected_artifact.kind == "binary" %}
             <div class="empty preview-empty">
-              <h2>Binary Artifact</h2>
-              <p>This artifact type cannot be previewed inline yet.</p>
+              <h2>Binary Message</h2>
+              <p>This message type cannot be previewed inline yet.</p>
               <p><a href="{% url 'artifact' selected_artifact.id %}">Open or download it</a>.</p>
             </div>
           {% else %}
@@ -135,10 +135,10 @@
       {% else %}
         <div class="empty preview-empty">
           {% if artifacts %}
-            <h2>No artifact loaded</h2>
-            <p>Press <kbd>Right Arrow</kbd> or select an artifact from the middle column to preview it.</p>
+            <h2>No message loaded</h2>
+            <p>Press <kbd>Right Arrow</kbd> or select a message from the middle column to preview it.</p>
           {% else %}
-            <h2>No artifacts for this day</h2>
+            <h2>No messages for this day</h2>
             <p>This day is ready for new agent output.</p>
           {% endif %}
         </div>
@@ -239,7 +239,7 @@
         try {
           await navigator.clipboard.writeText(absoluteUrl);
         } catch {
-          window.prompt("Copy artifact link", absoluteUrl);
+          window.prompt("Copy message link", absoluteUrl);
         }
         const original = button.textContent;
         button.textContent = "Copied";
@@ -348,7 +348,7 @@
         if (!actions) return;
         const previewTitle = actions.querySelector("[data-preview-title]");
         if (previewTitle) {
-          previewTitle.textContent = "No artifact loaded";
+          previewTitle.textContent = "No message loaded";
           previewTitle.removeAttribute("title");
         }
         actions.querySelectorAll("[data-view]").forEach((link) => {
@@ -484,7 +484,7 @@
         const header = document.querySelector(".artifact-sidebar .pane-heading span");
         if (!header) return;
         const total = Math.max(0, (parseInt(header.textContent, 10) || 0) + delta);
-        header.textContent = `${total} artifact${total === 1 ? "" : "s"}`;
+        header.textContent = `${total} message${total === 1 ? "" : "s"}`;
       };
 
       const bumpFolderCount = (folder, delta) => {
@@ -632,7 +632,7 @@
           : kind === "image"
             ? `<img class="preview-image" src="${source}" alt="${title}">`
             : kind === "binary"
-              ? `<div class="empty preview-empty"><h2>Binary Artifact</h2><p>This artifact type cannot be previewed inline yet.</p><p><a href="${source}">Open or download it</a>.</p></div>`
+              ? `<div class="empty preview-empty"><h2>Binary Message</h2><p>This message type cannot be previewed inline yet.</p><p><a href="${source}">Open or download it</a>.</p></div>`
               : `<iframe class="preview-frame" src="${source}" title="${title}"></iframe>`;
 
         previewBody.innerHTML = `<div class="preview-frame-wrap">${content}</div>`;
@@ -647,7 +647,7 @@
         }
         allRows().forEach((candidate) => candidate.classList.remove("selected"));
         disableActions();
-        previewBody.innerHTML = `<div class="empty preview-empty"><h2>No artifact loaded</h2><p>Press <kbd>Right Arrow</kbd> or select an artifact from the middle column to preview it.</p></div>`;
+        previewBody.innerHTML = `<div class="empty preview-empty"><h2>No message loaded</h2><p>Press <kbd>Right Arrow</kbd> or select a message from the middle column to preview it.</p></div>`;
         window.history.pushState({}, "", noPreviewUrl());
         const currentSource = document.querySelector(".source-link.selected");
         if (currentSource) currentSource.focus({preventScroll: true});
@@ -885,7 +885,7 @@
           const header = document.querySelector(".artifact-sidebar .pane-heading span");
           if (header) {
             const total = (parseInt(header.textContent, 10) || 0) + data.count;
-            header.textContent = `${total} artifact${total === 1 ? "" : "s"}`;
+            header.textContent = `${total} message${total === 1 ? "" : "s"}`;
           }
         } catch {
           // ignore; retry next tick
diff --git a/templates/artifacts/settings_about.html b/templates/artifacts/settings_about.html
index c2a49ef..d7b536d 100644
--- a/templates/artifacts/settings_about.html
+++ b/templates/artifacts/settings_about.html
@@ -10,11 +10,11 @@
   </div>
 
   <p>A self-hosted, multi-user journal where AI agents, scripts, or people
-  publish artifacts — reports, HTML, decks, images, PDFs, JSON, CSV — and each
+  publish messages — reports, HTML, decks, images, PDFs, JSON, CSV — and each
   logged-in user browses their own time-ordered, label-filterable feed. The
   server owns IDs, styling, and storage; agents publish content, not files.</p>
 
-  <p class="storage-note">Post to it with a personal API token from
-  Settings&nbsp;→&nbsp;Account; the current API capabilities (including this
-  version) are available at <code>/api/capabilities</code>.</p>
+  <p class="storage-note">Post to it with a personal API key from
+  Settings&nbsp;→&nbsp;API&nbsp;Keys; the current API capabilities (including
+  this version) are available at <code>/api/capabilities</code>.</p>
 {% endblock %}
diff --git a/templates/artifacts/settings_demo_data.html b/templates/artifacts/settings_demo_data.html
index 4726753..6375e2d 100644
--- a/templates/artifacts/settings_demo_data.html
+++ b/templates/artifacts/settings_demo_data.html
@@ -2,7 +2,7 @@
 
 {% block settings_content %}
   <h2>Demo Data</h2>
-  <p>Generate one sample artifact of every supported kind (markdown, HTML fragment, full HTML, deck, image, PDF, binary), tagged "demo" and dated today.</p>
+  <p>Generate one sample message of every supported kind (markdown, HTML fragment, full HTML, deck, image, PDF, binary), tagged "demo" and dated today.</p>
   <form method="post">
     {% csrf_token %}
     <button type="submit">Generate Demo Data</button>
diff --git a/templates/artifacts/settings_storage.html b/templates/artifacts/settings_storage.html
index b511fa0..84991bb 100644
--- a/templates/artifacts/settings_storage.html
+++ b/templates/artifacts/settings_storage.html
@@ -11,14 +11,14 @@
   </p>
 
   <ul class="storage-facts">
-    <li>{{ artifact_count }} artifact{{ artifact_count|pluralize }} total</li>
+    <li>{{ artifact_count }} message{{ artifact_count|pluralize }} total</li>
     <li>{{ kept_count }} kept ({{ kept_bytes|filesizeformat }}) &mdash; never auto-deleted</li>
   </ul>
 
   <p class="storage-note">
-    When your quota fills, the oldest <strong>unkept</strong> artifacts are deleted
-    automatically to make room for new ones. Click <strong>Keep</strong> on an artifact
-    to protect it. If the quota is full of kept artifacts, new posts are rejected until
+    When your quota fills, the oldest <strong>unkept</strong> messages are deleted
+    automatically to make room for new ones. Click <strong>Keep</strong> on a message
+    to protect it. If the quota is full of kept messages, new posts are rejected until
     you free space.
   </p>
 
@@ -26,7 +26,7 @@
     <h3>Admin</h3>
     <ul class="storage-facts">
       <li>Total quota allocated across all users: <strong>{{ total_allocated|filesizeformat }}</strong></li>
-      <li>Free space on the artifact disk: <strong>{{ disk_free|filesizeformat }}</strong></li>
+      <li>Free space on the storage disk: <strong>{{ disk_free|filesizeformat }}</strong></li>
     </ul>
     {% if total_allocated > disk_free %}
       <p class="storage-warning">

From 89936ebf5850f19705e21e36e2715ea47e0a78ae Mon Sep 17 00:00:00 2001
From: peter <peter@cygnus.systems>
Date: Mon, 7 Sep 2026 22:26:48 +0100
Subject: [PATCH 5/7] v0.7.0: mark all as read by clicking the unread badge

- Click a source's unread count in the sidebar to mark all of that source's
  messages read (clears the badge + reduces the All-sources total); click the
  All-sources total to mark everything read.
- POST /feed/mark-read (session, owner-scoped, excludes trashed). Visible feed
  rows drop their unread state too. Badge is keyboard-activatable (Enter/Space).

156 tests pass (4 new); inline JS re-validated with node --check.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 CHANGELOG.md                  | 11 ++++++-
 artifacts/urls.py             |  1 +
 artifacts/views.py            | 15 +++++++++
 daybook_project/__init__.py   |  2 +-
 static/agentfeed.css          | 12 +++++++
 templates/artifacts/feed.html | 59 +++++++++++++++++++++++++++++++++--
 tests/views/test_trash.py     | 28 +++++++++++++++++
 7 files changed, 123 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 318a2a1..6ff33af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,14 @@ former name, "Daybook".)
 
 _Nothing yet._
 
+## [0.7.0] — 2026-09-07
+
+### Added
+- **Mark all as read.** Click a source's unread badge in the sidebar to mark
+  all of that source's messages read (clears the badge); click the **All
+  sources** total to mark everything read. Owner-scoped, excludes trashed; any
+  visible feed rows update too. Backed by `POST /feed/mark-read`.
+
 ## [0.6.3] — 2026-09-07
 
 ### Changed
@@ -235,7 +243,8 @@ First tagged release.
 - Dockerised (Gunicorn + whitenoise), SQLite, `git`-based deploy with a
   runbook (`deploy/cloud_agent_deploy.md`) and health check.
 
-[Unreleased]: https://git.cygnus.systems/peter/daybook/compare/v0.6.3...HEAD
+[Unreleased]: https://git.cygnus.systems/peter/daybook/compare/v0.7.0...HEAD
+[0.7.0]: https://git.cygnus.systems/peter/daybook/compare/v0.6.3...v0.7.0
 [0.6.3]: https://git.cygnus.systems/peter/daybook/compare/v0.6.2...v0.6.3
 [0.6.2]: https://git.cygnus.systems/peter/daybook/compare/v0.6.1...v0.6.2
 [0.6.1]: https://git.cygnus.systems/peter/daybook/compare/v0.6.0...v0.6.1
diff --git a/artifacts/urls.py b/artifacts/urls.py
index 158b3d1..44bab7f 100644
--- a/artifacts/urls.py
+++ b/artifacts/urls.py
@@ -13,6 +13,7 @@ urlpatterns = [
     path("a/<str:artifact_id>/delete", views.delete_artifact, name="artifact-delete"),
     path("a/<str:artifact_id>/undelete", views.undelete_artifact, name="artifact-undelete"),
     path("feed/empty-trash", views.empty_trash, name="feed-empty-trash"),
+    path("feed/mark-read", views.mark_all_read, name="feed-mark-read"),
     path("a/<str:artifact_id>", views.artifact_view, name="artifact"),
     path("s/<str:share_token>", views.shared_artifact_view, name="artifact-shared"),
     path("assets/<str:asset_id>", views.asset_view, name="asset"),
diff --git a/artifacts/views.py b/artifacts/views.py
index 055c861..172b8c7 100644
--- a/artifacts/views.py
+++ b/artifacts/views.py
@@ -696,6 +696,21 @@ def empty_trash(request):
     return JsonResponse({"purged": count})
 
 
+@login_required
+@require_POST
+def mark_all_read(request):
+    """Mark all of the user's unread (non-trashed) messages as read, optionally
+    scoped to one source. Backs the sidebar 'Mark all as read' action."""
+    unread = Artifact.objects.filter(
+        owner=request.user, deleted_at__isnull=True, read_at__isnull=True
+    )
+    source = request.POST.get("source", "")
+    if source:
+        unread = unread.filter(source=source)
+    marked = unread.update(read_at=timezone.now())
+    return JsonResponse({"marked": marked, "source": source})
+
+
 @login_required
 def feed_older(request):
     """Return the next page of older day-groups as an HTML fragment for infinite scroll."""
diff --git a/daybook_project/__init__.py b/daybook_project/__init__.py
index b040cb3..f00cfaa 100644
--- a/daybook_project/__init__.py
+++ b/daybook_project/__init__.py
@@ -1,4 +1,4 @@
 # Single source of truth for the app version. Bump this, commit, then tag the
 # commit `vX.Y.Z` and deploy. Surfaced on Settings -> About and in
 # GET /api/capabilities ("version").
-__version__ = "0.6.3"
+__version__ = "0.7.0"
diff --git a/static/agentfeed.css b/static/agentfeed.css
index ca19527..7c8110d 100644
--- a/static/agentfeed.css
+++ b/static/agentfeed.css
@@ -514,6 +514,18 @@ h1 {
   font-size: 0.7rem;
 }
 
+/* The unread badge doubles as a "mark all as read" button. */
+.source-count[data-mark-read] {
+  cursor: pointer;
+  border-radius: 8px;
+  padding: 0 0.35rem;
+}
+
+.source-count[data-mark-read]:hover {
+  background: rgba(74, 110, 168, 0.28);
+  color: var(--text);
+}
+
 .pane-heading span,
 .artifact-time {
   color: var(--muted);
diff --git a/templates/artifacts/feed.html b/templates/artifacts/feed.html
index daa2182..4dfe047 100644
--- a/templates/artifacts/feed.html
+++ b/templates/artifacts/feed.html
@@ -37,12 +37,12 @@
       <nav class="source-list">
         <a class="source-link all-sources-link {% if not selected_source and not selected_folder %}selected{% endif %}" href="?{% if selected_label %}label={{ selected_label|urlencode }}&amp;{% endif %}{% if selected_kind %}kind={{ selected_kind|urlencode }}&amp;{% endif %}{% if title_query %}q={{ title_query|urlencode }}&amp;{% endif %}view={{ selected_view }}&amp;preview=none">
           <span class="source-name">All sources</span>
-          {% if total_count %}<span class="source-count">{{ total_count }}</span>{% endif %}
+          {% if total_count %}<span class="source-count" data-mark-read role="button" tabindex="0" title="Mark all as read">{{ total_count }}</span>{% endif %}
         </a>
         {% for entry in source_counts %}
-          <a class="source-link {% if entry.source == selected_source and not selected_folder %}selected{% endif %}" href="?source={{ entry.source|urlencode }}{% if selected_label %}&amp;label={{ selected_label|urlencode }}{% endif %}{% if selected_kind %}&amp;kind={{ selected_kind|urlencode }}{% endif %}{% if title_query %}&amp;q={{ title_query|urlencode }}{% endif %}&amp;view={{ selected_view }}&amp;preview=none">
+          <a class="source-link {% if entry.source == selected_source and not selected_folder %}selected{% endif %}" href="?source={{ entry.source|urlencode }}{% if selected_label %}&amp;label={{ selected_label|urlencode }}{% endif %}{% if selected_kind %}&amp;kind={{ selected_kind|urlencode }}{% endif %}{% if title_query %}&amp;q={{ title_query|urlencode }}{% endif %}&amp;view={{ selected_view }}&amp;preview=none" data-source="{{ entry.source }}">
             <span class="source-name">{{ entry.source }}</span>
-            {% if entry.count %}<span class="source-count">{{ entry.count }}</span>{% endif %}
+            {% if entry.count %}<span class="source-count" data-mark-read role="button" tabindex="0" title="Mark all as read">{{ entry.count }}</span>{% endif %}
           </a>
         {% endfor %}
       </nav>
@@ -620,6 +620,59 @@
         openRowMenu(row, event.clientX, event.clientY);
       });
 
+      // Click a source's unread badge to mark all of that source's messages read.
+      const markSourceRead = async (badge) => {
+        const link = badge.closest(".source-link");
+        if (!link) return;
+        const isAll = link.classList.contains("all-sources-link");
+        const source = link.dataset.source || "";
+        const body = new URLSearchParams();
+        if (!isAll && source) body.set("source", source);
+        try {
+          const response = await fetch("{% url 'feed-mark-read' %}", {
+            method: "POST",
+            headers: {"X-CSRFToken": csrfToken, "Content-Type": "application/x-www-form-urlencoded"},
+            body: body.toString(),
+          });
+          if (!response.ok) return;
+        } catch (e) { return; }
+        if (isAll) {
+          document.querySelectorAll(".source-list .source-count").forEach((b) => b.remove());
+          artifactList.querySelectorAll(".artifact-row.unread").forEach((r) => r.classList.remove("unread"));
+        } else {
+          const n = parseInt(badge.textContent, 10) || 0;
+          badge.remove();
+          const allBadge = document.querySelector(".all-sources-link .source-count");
+          if (allBadge) {
+            const t = (parseInt(allBadge.textContent, 10) || 0) - n;
+            if (t > 0) allBadge.textContent = String(t);
+            else allBadge.remove();
+          }
+          artifactList
+            .querySelectorAll(`.artifact-row.unread[data-source="${CSS.escape(source)}"]`)
+            .forEach((r) => r.classList.remove("unread"));
+        }
+      };
+
+      const sourceListEl = document.querySelector(".source-list");
+      if (sourceListEl) {
+        const badgeFromEvent = (event) => event.target.closest("[data-mark-read]");
+        sourceListEl.addEventListener("click", (event) => {
+          const badge = badgeFromEvent(event);
+          if (!badge) return;
+          event.preventDefault();
+          event.stopPropagation();
+          markSourceRead(badge);
+        });
+        sourceListEl.addEventListener("keydown", (event) => {
+          if (event.key !== "Enter" && event.key !== " ") return;
+          const badge = badgeFromEvent(event);
+          if (!badge) return;
+          event.preventDefault();
+          markSourceRead(badge);
+        });
+      }
+
       const renderPreview = (row, pushState = true) => {
         navigationMode = "artifacts";
         markRead(row);
diff --git a/tests/views/test_trash.py b/tests/views/test_trash.py
index e04601e..28faf70 100644
--- a/tests/views/test_trash.py
+++ b/tests/views/test_trash.py
@@ -128,3 +128,31 @@ class TrashKeepViewTestCase(TestCase):
         self.client.post(reverse("artifact-delete", args=[fresh.id]))
         self.assertFalse(Artifact.objects.filter(pk=old.id).exists())
         self.assertTrue(Artifact.objects.filter(pk=fresh.id, deleted_at__isnull=False).exists())
+
+    def test_mark_all_read_across_sources(self):
+        self.make(source="a")
+        self.make(source="b")
+        r = self.client.post(reverse("feed-mark-read"))
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.json()["marked"], 2)
+        self.assertFalse(Artifact.objects.filter(owner=self.user, read_at__isnull=True).exists())
+
+    def test_mark_all_read_scoped_to_source(self):
+        a = self.make(source="hermes")
+        b = self.make(source="janus")
+        self.assertEqual(self.client.post(reverse("feed-mark-read"), {"source": "hermes"}).json()["marked"], 1)
+        a.refresh_from_db()
+        b.refresh_from_db()
+        self.assertIsNotNone(a.read_at)
+        self.assertIsNone(b.read_at)
+
+    def test_mark_all_read_owner_scoped(self):
+        theirs = self.make(owner=self.other)
+        self.client.post(reverse("feed-mark-read"))
+        theirs.refresh_from_db()
+        self.assertIsNone(theirs.read_at)
+
+    def test_mark_all_read_excludes_trashed(self):
+        a = self.make()
+        Artifact.objects.filter(pk=a.id).update(deleted_at=timezone.now())
+        self.assertEqual(self.client.post(reverse("feed-mark-read")).json()["marked"], 0)

From fcd7da853ff9631e37dd570ee4079a6ecac9dde2 Mon Sep 17 00:00:00 2001
From: peter <peter@cygnus.systems>
Date: Mon, 7 Sep 2026 23:23:53 +0100
Subject: [PATCH 6/7] docs: say 'API key' instead of 'token' in agent-facing
 wording

Sweep human-facing 'personal API token' / '<your-personal-token>'
placeholders to 'API key' / '<your-personal-key>' across the API docs,
quickstart, deployment guide, LLM helper, and posting skill, matching the
in-app 'Settings -> API Keys' naming. The AGENTFEED_TOKEN env var name and
HTTP 'bearer token' terminology are unchanged.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 docs/agent_quickstart.md                       | 12 ++++++------
 docs/api.md                                    | 18 +++++++++---------
 docs/deployment.md                             |  4 ++--
 docs/llm_posting_helper.md                     |  2 +-
 .../scripts/agentfeed_post.py                  |  4 ++--
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/docs/agent_quickstart.md b/docs/agent_quickstart.md
index 942ccee..29339ac 100644
--- a/docs/agent_quickstart.md
+++ b/docs/agent_quickstart.md
@@ -15,7 +15,7 @@ Also confirms your token is valid:
 
 ```powershell
 Invoke-RestMethod "http://127.0.0.1:8001/api/capabilities" `
-  -Headers @{ Authorization = "Bearer <your-personal-token>" }
+  -Headers @{ Authorization = "Bearer <your-personal-key>" }
 ```
 
 ## 2. Publish Markdown
@@ -39,7 +39,7 @@ $body = @{
 $artifact = Invoke-RestMethod `
   -Uri "http://127.0.0.1:8001/api/artifacts" `
   -Method Post `
-  -Headers @{ Authorization = "Bearer <your-personal-token>" } `
+  -Headers @{ Authorization = "Bearer <your-personal-key>" } `
   -ContentType "application/json" `
   -Body $body
 
@@ -69,7 +69,7 @@ $body = @{
 Invoke-RestMethod `
   -Uri "http://127.0.0.1:8001/api/artifacts" `
   -Method Post `
-  -Headers @{ Authorization = "Bearer <your-personal-token>" } `
+  -Headers @{ Authorization = "Bearer <your-personal-key>" } `
   -ContentType "application/json" `
   -Body $body
 ```
@@ -78,7 +78,7 @@ Invoke-RestMethod `
 
 ```powershell
 curl.exe -X POST "http://127.0.0.1:8001/api/artifacts" `
-  -H "Authorization: Bearer <your-personal-token>" `
+  -H "Authorization: Bearer <your-personal-key>" `
   -F "source=orion" `
   -F "source_type=agent" `
   -F "source_name=Orion Agent" `
@@ -120,7 +120,7 @@ $body = @{
 Invoke-RestMethod `
   -Uri "http://127.0.0.1:8001/api/artifacts/$($artifact.id)" `
   -Method Patch `
-  -Headers @{ Authorization = "Bearer <your-personal-token>" } `
+  -Headers @{ Authorization = "Bearer <your-personal-key>" } `
   -ContentType "application/json" `
   -Body $body
 ```
@@ -131,7 +131,7 @@ Invoke-RestMethod `
 Invoke-RestMethod `
   -Uri "http://127.0.0.1:8001/api/artifacts/$($artifact.id)" `
   -Method Delete `
-  -Headers @{ Authorization = "Bearer <your-personal-token>" }
+  -Headers @{ Authorization = "Bearer <your-personal-key>" }
 ```
 
 Deletes the artifact's database row and its files. You can only delete artifacts your own token owns.
diff --git a/docs/api.md b/docs/api.md
index 5135f76..413a238 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -108,7 +108,7 @@ Endpoint:
 ```http
 POST /api/artifacts
 Content-Type: application/json
-Authorization: Bearer <your-personal-token>
+Authorization: Bearer <your-personal-key>
 ```
 
 Required fields:
@@ -188,7 +188,7 @@ $body = @{
 Invoke-RestMethod `
   -Uri "http://127.0.0.1:8001/api/artifacts" `
   -Method Post `
-  -Headers @{ Authorization = "Bearer <your-personal-token>" } `
+  -Headers @{ Authorization = "Bearer <your-personal-key>" } `
   -ContentType "application/json" `
   -Body $body
 ```
@@ -241,7 +241,7 @@ Endpoint:
 ```http
 POST /api/artifacts
 Content-Type: multipart/form-data
-Authorization: Bearer <your-personal-token>
+Authorization: Bearer <your-personal-key>
 ```
 
 Required fields:
@@ -288,7 +288,7 @@ PowerShell/curl example:
 
 ```powershell
 curl.exe -X POST "http://127.0.0.1:8001/api/artifacts" `
-  -H "Authorization: Bearer <your-personal-token>" `
+  -H "Authorization: Bearer <your-personal-key>" `
   -F "source=orion" `
   -F "source_type=agent" `
   -F "source_name=Orion Agent" `
@@ -305,7 +305,7 @@ artifact), upload it first and reference the returned URL in your content.
 ```http
 POST /api/assets
 Content-Type: multipart/form-data
-Authorization: Bearer <your-personal-token>
+Authorization: Bearer <your-personal-key>
 ```
 
 | Field | Notes |
@@ -392,7 +392,7 @@ Endpoint:
 ```http
 PATCH /api/artifacts/{id}
 Content-Type: application/json
-Authorization: Bearer <your-personal-token>
+Authorization: Bearer <your-personal-key>
 ```
 
 Editable fields:
@@ -438,7 +438,7 @@ $body = @{
 Invoke-RestMethod `
   -Uri "http://127.0.0.1:8001/api/artifacts/a1b2c3d4" `
   -Method Patch `
-  -Headers @{ Authorization = "Bearer <your-personal-token>" } `
+  -Headers @{ Authorization = "Bearer <your-personal-key>" } `
   -ContentType "application/json" `
   -Body $body
 ```
@@ -449,7 +449,7 @@ Endpoint:
 
 ```http
 DELETE /api/artifacts/{id}
-Authorization: Bearer <your-personal-token>
+Authorization: Bearer <your-personal-key>
 ```
 
 **Soft-delete:** moves the artifact to Trash rather than removing it — it's
@@ -464,7 +464,7 @@ There is no API endpoint to undelete or purge yet — that's app-UI-only.
 
 ```bash
 curl -X DELETE "http://127.0.0.1:8001/api/artifacts/a1b2c3d4" \
-  -H "Authorization: Bearer <your-personal-token>"
+  -H "Authorization: Bearer <your-personal-key>"
 ```
 
 ## Rendered And Raw Content
diff --git a/docs/deployment.md b/docs/deployment.md
index ad22fce..27d1fad 100644
--- a/docs/deployment.md
+++ b/docs/deployment.md
@@ -77,7 +77,7 @@ docker compose -f deploy/docker-compose.yml up -d --build
 ```
 
 Create your first login (superuser) so you have something to log in with and
-a personal API token to post through:
+a personal API key to post through:
 
 ```bash
 docker compose -f deploy/docker-compose.yml exec agentfeed python manage.py createsuperuser
@@ -100,7 +100,7 @@ smoke-test post:
 
 ```bash
 curl -fsS -X POST http://127.0.0.1:8000/api/artifacts \
-  -H "Authorization: Bearer <your-personal-token>" \
+  -H "Authorization: Bearer <your-personal-key>" \
   -H "Content-Type: application/json" \
   -d '{
     "source": "deploy-smoke",
diff --git a/docs/llm_posting_helper.md b/docs/llm_posting_helper.md
index 90897d9..75b4508 100644
--- a/docs/llm_posting_helper.md
+++ b/docs/llm_posting_helper.md
@@ -20,7 +20,7 @@ them, or set them in your agent harness's own env config.
 
 ```text
 AGENTFEED_URL=http://127.0.0.1:8001
-AGENTFEED_TOKEN=your-personal-api-token
+AGENTFEED_TOKEN=your-personal-api-key
 AGENTFEED_SOURCE=agent
 ```
 
diff --git a/skills/agentfeed-posting/scripts/agentfeed_post.py b/skills/agentfeed-posting/scripts/agentfeed_post.py
index 4d676de..049f78f 100644
--- a/skills/agentfeed-posting/scripts/agentfeed_post.py
+++ b/skills/agentfeed-posting/scripts/agentfeed_post.py
@@ -27,7 +27,7 @@ DEFAULT_SOURCE = "agent"
 def main():
     args = parse_args()
     base_url = os.environ.get("AGENTFEED_URL", DEFAULT_URL).rstrip("/")
-    # AGENTFEED_TOKEN is your personal per-user token (Settings -> API Keys in the app);
+    # AGENTFEED_TOKEN is your personal per-user API key (Settings -> API Keys in the app);
     # there is no shared fallback token, so posting without it cannot work.
     token = os.environ.get("AGENTFEED_TOKEN", "")
     source = args.source or os.environ.get("AGENTFEED_SOURCE", DEFAULT_SOURCE)
@@ -43,7 +43,7 @@ def main():
 
     if not token:
         print(
-            "error: AGENTFEED_TOKEN is not set. Get your personal API token from "
+            "error: AGENTFEED_TOKEN is not set. Get your personal API key from "
             f"{base_url}/settings/api-keys/ and set AGENTFEED_TOKEN.",
             file=sys.stderr,
         )

From c2a354809a13fbadb0ec0e846008b57776983b4a Mon Sep 17 00:00:00 2001
From: peter <peter@cygnus.systems>
Date: Tue, 8 Sep 2026 15:19:54 +0100
Subject: [PATCH 7/7] v0.7.1: in-app password change, custom labels, always-on
 folders

- Settings -> Account: change your own password (current + new), session
  preserved via update_session_auth_hash.
- Custom labels: per-user palette in Settings -> Labels; apply/remove from a
  message's ... menu (menu stays open, checkmark = applied). Labels are unified
  with tags; chip colours sync to the global TagColor. New Label model +
  migration 0017; POST /a/{id}/label (session, owner-scoped, palette-validated).
- Sidebar Keep/Deleted folders are now always shown; count badge only when
  non-empty. Updates the stale 'hide when empty' note in CLAUDE.md.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 CHANGELOG.md                              |  18 ++++
 CLAUDE.md                                 |   2 +-
 artifacts/migrations/0017_label.py        |  29 ++++++
 artifacts/models.py                       |  17 ++++
 artifacts/urls.py                         |   2 +
 artifacts/views.py                        |  91 ++++++++++++++++-
 daybook_project/__init__.py               |   2 +-
 static/agentfeed.css                      |  68 +++++++++++++
 templates/artifacts/feed.html             | 111 +++++++++++++++++----
 templates/artifacts/settings_account.html |  23 +++++
 templates/artifacts/settings_base.html    |   1 +
 templates/artifacts/settings_labels.html  |  54 +++++++++++
 tests/views/test_settings_account.py      |  54 +++++++++++
 tests/views/test_settings_labels.py       | 113 ++++++++++++++++++++++
 14 files changed, 562 insertions(+), 23 deletions(-)
 create mode 100644 artifacts/migrations/0017_label.py
 create mode 100644 templates/artifacts/settings_labels.html
 create mode 100644 tests/views/test_settings_account.py
 create mode 100644 tests/views/test_settings_labels.py

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ff33af..2cb6ed3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,24 @@ former name, "Daybook".)
 
 _Nothing yet._
 
+## [0.7.1] — 2026-09-08
+
+### Added
+- **Custom labels.** Curate a personal palette of coloured labels in
+  **Settings → Labels**, then apply them to any message from its ⋯ menu (or
+  right-click) — the menu stays open so you can apply several at once, with a
+  checkmark showing which are applied. Labels are unified with tags: applying
+  one adds it to the message's tags and renders as a chip. Backed by
+  `POST /a/{id}/label` (session-auth, owner-scoped, palette-validated); chip
+  colours sync to the global `TagColor`.
+- **Change your password in-app** from **Settings → Account**: enter the current
+  password, then a new one. Uses Django's `PasswordChangeForm` and keeps the
+  session logged in after the change.
+
+### Changed
+- Sidebar: the **Keep** and **Deleted** folders are now always shown (even when
+  empty); the count badge only appears when the folder is non-empty.
+
 ## [0.7.0] — 2026-09-07
 
 ### Added
diff --git a/CLAUDE.md b/CLAUDE.md
index f38dbbf..86baea8 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -15,7 +15,7 @@ The core product principle is: agents publish content, not files. The server own
 - Exception to the above: an artifact can be explicitly opted into public sharing (per-artifact, owner-toggled from the feed UI) via a high-entropy `share_token`, served unauthenticated at `GET /s/{share_token}`. Not exposed via the ingest API yet — UI-only. Turning sharing off immediately invalidates the old link. Images embedded in a shared artifact are also served unauthenticated while it's shared, so inline content doesn't break for a link recipient.
 - User accounts can be created from Settings → Users (superuser-only in-app page) or via Django admin. Regular users are not staff and cannot access `/admin/`. Creating a user via Settings → Users also issues their API token immediately, shown once.
 - `TagColor` (label color overrides) stays global/shared across all users.
-- Deleting an artifact is a **soft-delete to Trash** (`deleted_at`), not a hard removal — recoverable via the "Deleted" sidebar folder (undelete), off-quota and eviction-protected while trashed, and purged permanently via "Empty Trash". `DELETE /api/artifacts/{id}` is soft too (idempotent); trashed artifacts are hidden from all API reads. A **Keep** sidebar folder is a view over `is_kept`. Both folders hide when empty. Trash auto-purges after a ~3-day retention window via a cron-less background thread triggered by deletes (`AGENTFEED_ASYNC_PURGE`, on by default); "Empty Trash" purges immediately.
+- Deleting an artifact is a **soft-delete to Trash** (`deleted_at`), not a hard removal — recoverable via the "Deleted" sidebar folder (undelete), off-quota and eviction-protected while trashed, and purged permanently via "Empty Trash". `DELETE /api/artifacts/{id}` is soft too (idempotent); trashed artifacts are hidden from all API reads. A **Keep** sidebar folder is a view over `is_kept`. Both the Keep and Deleted folders are always shown in the sidebar (even when empty); the count badge only appears when the folder is non-empty. Trash auto-purges after a ~3-day retention window via a cron-less background thread triggered by deletes (`AGENTFEED_ASYNC_PURGE`, on by default); "Empty Trash" purges immediately.
 - Use random 8-character artifact IDs.
 - Start as a plain Django project; add Docker after core ingest and viewer work.
 - Preserve original markdown as `.md` alongside rendered `.html`.
diff --git a/artifacts/migrations/0017_label.py b/artifacts/migrations/0017_label.py
new file mode 100644
index 0000000..aedcc1a
--- /dev/null
+++ b/artifacts/migrations/0017_label.py
@@ -0,0 +1,29 @@
+# Generated by Django 5.2.15 on 2026-09-08 13:46
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('artifacts', '0016_artifact_deleted_at'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Label',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=40)),
+                ('color', models.CharField(max_length=20)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='labels', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'ordering': ['name'],
+                'unique_together': {('user', 'name')},
+            },
+        ),
+    ]
diff --git a/artifacts/models.py b/artifacts/models.py
index dd87793..dcba524 100644
--- a/artifacts/models.py
+++ b/artifacts/models.py
@@ -96,6 +96,23 @@ class TagColor(models.Model):
         return f"{self.name} ({self.color})"
 
 
+class Label(models.Model):
+    """A user's reusable label in their personal palette. Applying one from the
+    feed UI just adds its `name` to an artifact's `tags`; the chip colour lives
+    in the global TagColor table (kept in sync when the palette entry is saved)."""
+
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="labels")
+    name = models.CharField(max_length=40)
+    color = models.CharField(max_length=20)  # #RRGGBB
+
+    class Meta:
+        unique_together = ("user", "name")
+        ordering = ["name"]
+
+    def __str__(self):
+        return f"{self.name} ({self.color})"
+
+
 class UserProfile(models.Model):
     DEFAULT_QUOTA_BYTES = 1024 * 1024 * 1024  # 1 GB
 
diff --git a/artifacts/urls.py b/artifacts/urls.py
index 44bab7f..d7adc5d 100644
--- a/artifacts/urls.py
+++ b/artifacts/urls.py
@@ -10,6 +10,7 @@ urlpatterns = [
     path("a/<str:artifact_id>/read", views.mark_artifact_read, name="artifact-mark-read"),
     path("a/<str:artifact_id>/keep", views.toggle_artifact_keep, name="artifact-toggle-keep"),
     path("a/<str:artifact_id>/share", views.toggle_artifact_share, name="artifact-toggle-share"),
+    path("a/<str:artifact_id>/label", views.toggle_artifact_label, name="artifact-toggle-label"),
     path("a/<str:artifact_id>/delete", views.delete_artifact, name="artifact-delete"),
     path("a/<str:artifact_id>/undelete", views.undelete_artifact, name="artifact-undelete"),
     path("feed/empty-trash", views.empty_trash, name="feed-empty-trash"),
@@ -28,6 +29,7 @@ urlpatterns = [
     path("settings/", views.settings_home, name="settings-home"),
     path("settings/account/", views.settings_account, name="settings-account"),
     path("settings/api-keys/", views.settings_api_keys, name="settings-api-keys"),
+    path("settings/labels/", views.settings_labels, name="settings-labels"),
     path("settings/users/", views.settings_users, name="settings-users"),
     path("settings/demo-data/", views.settings_demo_data, name="settings-demo-data"),
     path("settings/storage/", views.settings_storage, name="settings-storage"),
diff --git a/artifacts/views.py b/artifacts/views.py
index 172b8c7..bd2fccc 100644
--- a/artifacts/views.py
+++ b/artifacts/views.py
@@ -15,8 +15,9 @@ import nh3
 import openpyxl
 from django.conf import settings
 from django.contrib import messages
-from django.contrib.auth import views as auth_views
+from django.contrib.auth import update_session_auth_hash, views as auth_views
 from django.contrib.auth.decorators import login_required
+from django.contrib.auth.forms import PasswordChangeForm
 from django.contrib.auth.models import User
 from django.db import OperationalError, transaction
 from django.db.models import Count, Max, Q, Sum
@@ -36,7 +37,7 @@ from rest_framework.views import APIView
 
 from .demo_data import create_demo_artifacts
 from .forms import AgentFeedLoginForm
-from .models import ApiKey, Artifact, Asset, TagColor
+from .models import ApiKey, Artifact, Asset, Label, TagColor
 from .storage import (
     QuotaExceeded,
     SIDECAR_SUFFIXES,
@@ -625,6 +626,7 @@ def feed(request):
             "today": today,
             "title_query": title_query,
             "kind_choices": Artifact.KIND_CHOICES,
+            "label_palette": request.user.labels.all(),
         },
     )
 
@@ -639,6 +641,31 @@ def mark_artifact_read(request, artifact_id):
     return JsonResponse({"id": artifact.id, "read_at": artifact.read_at.isoformat()})
 
 
+@login_required
+@require_POST
+def toggle_artifact_label(request, artifact_id):
+    """Toggle a palette label on/off for one of the user's own messages. The
+    label name is written into/removed from the artifact's `tags` list (labels
+    are unified with tags). Only names in the user's palette are accepted."""
+    artifact = get_object_or_404(Artifact, pk=artifact_id, owner=request.user, deleted_at__isnull=True)
+    name = (request.POST.get("name") or "").strip()
+    label = Label.objects.filter(user=request.user, name=name).first()
+    if label is None:
+        return JsonResponse({"error": "No such label in your palette."}, status=400)
+    tags = list(artifact.tags)
+    if name in tags:
+        tags.remove(name)
+        applied = False
+    else:
+        tags.append(name)
+        applied = True
+    artifact.tags = tags
+    artifact.save(update_fields=["tags"])
+    # Keep the chip colour in sync with the palette (TagColor is global).
+    TagColor.objects.update_or_create(name=name, defaults={"color": label.color})
+    return JsonResponse({"applied": applied, "name": name, "color": label.color, "tags": tags})
+
+
 @login_required
 @require_POST
 def toggle_artifact_keep(request, artifact_id):
@@ -1507,10 +1534,25 @@ def settings_home(request):
 
 @login_required
 def settings_account(request):
+    if request.method == "POST":
+        password_form = PasswordChangeForm(request.user, request.POST)
+        if password_form.is_valid():
+            user = password_form.save()
+            # Keep the current session valid — changing the password rotates the
+            # session auth hash, which would otherwise log the user out.
+            update_session_auth_hash(request, user)
+            messages.success(request, "Password changed.")
+            return redirect("settings-account")
+    else:
+        password_form = PasswordChangeForm(request.user)
     return render(
         request,
         "artifacts/settings_account.html",
-        {"active_section": "account", "key_count": request.user.api_keys.count()},
+        {
+            "active_section": "account",
+            "key_count": request.user.api_keys.count(),
+            "password_form": password_form,
+        },
     )
 
 
@@ -1540,6 +1582,49 @@ def settings_api_keys(request):
     )
 
 
+LABEL_HEX_RE = re.compile(r"^#[0-9a-fA-F]{6}$")
+
+
+@login_required
+def settings_labels(request):
+    if request.method == "POST":
+        action = request.POST.get("action")
+        if action == "create":
+            name = (request.POST.get("name") or "").strip()
+            color = (request.POST.get("color") or "").strip()
+            if not name:
+                messages.error(request, "Give the label a name.")
+            elif not LABEL_HEX_RE.match(color):
+                messages.error(request, "Pick a colour (#RRGGBB).")
+            elif Label.objects.filter(user=request.user, name=name).exists():
+                messages.error(request, f"You already have a label called '{name}'.")
+            else:
+                Label.objects.create(user=request.user, name=name, color=color)
+                TagColor.objects.update_or_create(name=name, defaults={"color": color})
+                messages.success(request, f"Created label '{name}'.")
+        elif action == "update":
+            color = (request.POST.get("color") or "").strip()
+            label = Label.objects.filter(pk=request.POST.get("label_id") or "", user=request.user).first()
+            if label is None:
+                messages.error(request, "No such label.")
+            elif not LABEL_HEX_RE.match(color):
+                messages.error(request, "Pick a colour (#RRGGBB).")
+            else:
+                label.color = color
+                label.save(update_fields=["color"])
+                TagColor.objects.update_or_create(name=label.name, defaults={"color": color})
+                messages.success(request, f"Updated '{label.name}'.")
+        elif action == "delete":
+            deleted, _ = Label.objects.filter(pk=request.POST.get("label_id") or "", user=request.user).delete()
+            messages.success(request, "Label removed from your palette.") if deleted else messages.error(request, "No such label.")
+        return redirect("settings-labels")
+    return render(
+        request,
+        "artifacts/settings_labels.html",
+        {"active_section": "labels", "labels": request.user.labels.all()},
+    )
+
+
 @login_required
 def settings_users(request):
     if not request.user.is_superuser:
diff --git a/daybook_project/__init__.py b/daybook_project/__init__.py
index f00cfaa..a5bfd5e 100644
--- a/daybook_project/__init__.py
+++ b/daybook_project/__init__.py
@@ -1,4 +1,4 @@
 # Single source of truth for the app version. Bump this, commit, then tag the
 # commit `vX.Y.Z` and deploy. Surfaced on Settings -> About and in
 # GET /api/capabilities ("version").
-__version__ = "0.7.0"
+__version__ = "0.7.1"
diff --git a/static/agentfeed.css b/static/agentfeed.css
index 7c8110d..788b473 100644
--- a/static/agentfeed.css
+++ b/static/agentfeed.css
@@ -1144,6 +1144,48 @@ kbd {
   color: var(--danger-text-plain);
 }
 
+.row-menu-divider {
+  border-top: 1px solid var(--grid-line);
+  margin: 0.25rem 0;
+}
+
+.row-menu-labels {
+  display: flex;
+  flex-direction: column;
+  max-height: 13rem;
+  overflow-y: auto;
+}
+
+.row-menu-label {
+  align-items: center;
+  display: flex;
+  gap: 0.45rem;
+}
+
+.row-menu-dot {
+  border-radius: 50%;
+  flex: 0 0 auto;
+  height: 0.7rem;
+  width: 0.7rem;
+}
+
+.row-menu-label-name {
+  flex: 1 1 auto;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+/* Checkmark only visible once the label is applied to the row. */
+.row-menu-check {
+  flex: 0 0 auto;
+  opacity: 0;
+}
+
+.row-menu-label.applied .row-menu-check {
+  opacity: 1;
+}
+
 /* System folders (Keep / Deleted): pinned at the bottom of the sidebar,
    below the scrolling source list. */
 .system-folders {
@@ -1198,6 +1240,32 @@ kbd {
   gap: 0.3rem;
 }
 
+.password-change {
+  display: flex;
+  flex-direction: column;
+  gap: 0.85rem;
+  max-width: 22rem;
+}
+
+.password-change .form-field {
+  display: flex;
+  flex-direction: column;
+  font-weight: 600;
+  gap: 0.3rem;
+}
+
+.password-change button {
+  align-self: start;
+}
+
+.form-errors {
+  color: var(--danger, #d1453b);
+  font-weight: 400;
+  list-style: none;
+  margin: 0.15rem 0 0;
+  padding: 0;
+}
+
 .api-key-table {
   border-collapse: collapse;
   width: 100%;
diff --git a/templates/artifacts/feed.html b/templates/artifacts/feed.html
index 4dfe047..eedd25d 100644
--- a/templates/artifacts/feed.html
+++ b/templates/artifacts/feed.html
@@ -47,22 +47,16 @@
         {% endfor %}
       </nav>
 
-      {% if keep_count or trash_count %}
-        <nav class="system-folders" aria-label="Folders">
-          {% if keep_count %}
-            <a class="source-link folder-link {% if selected_folder == 'keep' %}selected{% endif %}" href="?folder=keep&amp;view={{ selected_view }}&amp;preview=none" data-folder-link="keep">
-              <span class="source-name">&#9733; Keep</span>
-              <span class="source-count">{{ keep_count }}</span>
-            </a>
-          {% endif %}
-          {% if trash_count %}
-            <a class="source-link folder-link {% if selected_folder == 'deleted' %}selected{% endif %}" href="?folder=deleted&amp;view={{ selected_view }}&amp;preview=none" data-folder-link="deleted">
-              <span class="source-name">&#128465; Deleted</span>
-              <span class="source-count">{{ trash_count }}</span>
-            </a>
-          {% endif %}
-        </nav>
-      {% endif %}
+      <nav class="system-folders" aria-label="Folders">
+        <a class="source-link folder-link {% if selected_folder == 'keep' %}selected{% endif %}" href="?folder=keep&amp;view={{ selected_view }}&amp;preview=none" data-folder-link="keep">
+          <span class="source-name">&#9733; Keep</span>
+          {% if keep_count %}<span class="source-count">{{ keep_count }}</span>{% endif %}
+        </a>
+        <a class="source-link folder-link {% if selected_folder == 'deleted' %}selected{% endif %}" href="?folder=deleted&amp;view={{ selected_view }}&amp;preview=none" data-folder-link="deleted">
+          <span class="source-name">&#128465; Deleted</span>
+          {% if trash_count %}<span class="source-count">{{ trash_count }}</span>{% endif %}
+        </a>
+      </nav>
     </aside>
 
     <div class="splitter" data-splitter="days" role="separator" aria-label="Resize sources sidebar" aria-orientation="vertical"></div>
@@ -152,6 +146,18 @@
     <button type="button" data-menu-action="open">Open</button>
     <button type="button" data-menu-action="copy">Copy link</button>
     <button type="button" data-menu-action="delete" class="danger">Delete</button>
+    {% if label_palette %}
+      <div class="row-menu-divider" role="separator"></div>
+      <div class="row-menu-labels">
+        {% for label in label_palette %}
+          <button type="button" class="row-menu-label" data-label-name="{{ label.name }}" data-label-color="{{ label.color }}">
+            <span class="row-menu-dot" style="background:{{ label.color }}"></span>
+            <span class="row-menu-label-name">{{ label.name }}</span>
+            <span class="row-menu-check" aria-hidden="true">&#10003;</span>
+          </button>
+        {% endfor %}
+      </div>
+    {% endif %}
   </div>
 
   <script>
@@ -418,13 +424,17 @@
 
       const bumpSourceBadge = (link, delta) => {
         let badge = link.querySelector(".source-count");
+        const next = (badge ? Number(badge.textContent) || 0 : 0) + delta;
+        if (next <= 0) {
+          if (badge) badge.remove();   // empty folder/source shows no count badge
+          return;
+        }
         if (!badge) {
           badge = document.createElement("span");
           badge.className = "source-count";
-          badge.textContent = "0";
           link.appendChild(badge);
         }
-        badge.textContent = String((Number(badge.textContent) || 0) + delta);
+        badge.textContent = String(next);
       };
 
       const addSourceLink = (name, count) => {
@@ -553,11 +563,22 @@
         menuRowId = null;
       };
 
+      const parseRowTags = (row) =>
+        (row.dataset.tags || "").split(",").map((t) => t.trim()).filter(Boolean);
+
+      const refreshMenuLabelState = (row) => {
+        const applied = new Set(parseRowTags(row));
+        rowMenu.querySelectorAll(".row-menu-label").forEach((btn) => {
+          btn.classList.toggle("applied", applied.has(btn.dataset.labelName));
+        });
+      };
+
       const openRowMenu = (row, x, y) => {
         if (!rowMenu || !row) return;
         menuRowId = row.dataset.artifactId;
         const keepBtn = rowMenu.querySelector('[data-menu-action="keep"]');
         if (keepBtn) keepBtn.textContent = row.dataset.kept === "1" ? "Remove from Keep" : "Keep";
+        refreshMenuLabelState(row);
         rowMenu.hidden = false;
         const rect = rowMenu.getBoundingClientRect();
         const left = Math.max(8, Math.min(x, window.innerWidth - rect.width - 8));
@@ -589,8 +610,62 @@
         } catch (e) { /* leave as-is */ }
       };
 
+      const addRowChip = (row, name, color) => {
+        const main = row.querySelector(".artifact-row-main");
+        if (!main) return;
+        let chips = main.querySelector(".tag-chips");
+        if (!chips) {
+          chips = document.createElement("span");
+          chips.className = "tag-chips";
+          main.appendChild(chips);
+        }
+        if ([...chips.querySelectorAll(".tag-chip")].some((c) => c.textContent === name)) return;
+        const chip = document.createElement("span");
+        chip.className = "tag-chip";
+        chip.style.background = color;
+        chip.textContent = name;
+        chips.appendChild(chip);
+      };
+
+      const removeRowChip = (row, name) => {
+        const chips = row.querySelector(".tag-chips");
+        if (!chips) return;
+        chips.querySelectorAll(".tag-chip").forEach((c) => { if (c.textContent === name) c.remove(); });
+        if (!chips.querySelector(".tag-chip")) chips.remove();
+      };
+
+      // Toggle a palette label on the current menu row. Leaves the menu open so
+      // several labels can be applied in one go.
+      const toggleLabelFromMenu = async (btn) => {
+        const row = currentMenuRow();
+        const id = menuRowId;
+        if (!row || !id) return;
+        const name = btn.dataset.labelName;
+        const body = new URLSearchParams();
+        body.set("name", name);
+        let data;
+        try {
+          const response = await fetch(`/a/${id}/label`, {
+            method: "POST",
+            headers: {"X-CSRFToken": csrfToken, "Content-Type": "application/x-www-form-urlencoded"},
+            body: body.toString(),
+          });
+          if (!response.ok) return;
+          data = await response.json();
+        } catch (e) { return; }
+        row.dataset.tags = data.tags.join(", ");
+        btn.classList.toggle("applied", data.applied);
+        if (data.applied) addRowChip(row, data.name, data.color);
+        else removeRowChip(row, data.name);
+      };
+
       if (rowMenu) {
         rowMenu.addEventListener("click", (event) => {
+          const labelBtn = event.target.closest(".row-menu-label");
+          if (labelBtn) {
+            toggleLabelFromMenu(labelBtn);
+            return;   // keep the menu open for applying multiple labels
+          }
           const btn = event.target.closest("[data-menu-action]");
           if (!btn) return;
           const row = currentMenuRow();
diff --git a/templates/artifacts/settings_account.html b/templates/artifacts/settings_account.html
index 5d1548d..e6191d7 100644
--- a/templates/artifacts/settings_account.html
+++ b/templates/artifacts/settings_account.html
@@ -10,4 +10,27 @@
     revocable on its own. You have {{ key_count }} key{{ key_count|pluralize }}.
   </p>
   <p><a href="{% url 'settings-api-keys' %}">Manage API keys &rarr;</a></p>
+
+  <h3>Change password</h3>
+  <p>Enter your current password, then choose a new one.</p>
+  <form method="post" class="password-change">
+    {% csrf_token %}
+    {% if password_form.non_field_errors %}
+      <ul class="form-errors">
+        {% for error in password_form.non_field_errors %}<li>{{ error }}</li>{% endfor %}
+      </ul>
+    {% endif %}
+    {% for field in password_form %}
+      <label class="form-field">
+        <span>{{ field.label }}</span>
+        {{ field }}
+        {% if field.errors %}
+          <ul class="form-errors">
+            {% for error in field.errors %}<li>{{ error }}</li>{% endfor %}
+          </ul>
+        {% endif %}
+      </label>
+    {% endfor %}
+    <button type="submit">Change password</button>
+  </form>
 {% endblock %}
diff --git a/templates/artifacts/settings_base.html b/templates/artifacts/settings_base.html
index 872696c..0af4daf 100644
--- a/templates/artifacts/settings_base.html
+++ b/templates/artifacts/settings_base.html
@@ -29,6 +29,7 @@
         <span class="settings-nav-heading">You</span>
         <a class="{% if active_section == 'account' %}selected{% endif %}" href="{% url 'settings-account' %}">Account</a>
         <a class="{% if active_section == 'api-keys' %}selected{% endif %}" href="{% url 'settings-api-keys' %}">API Keys</a>
+        <a class="{% if active_section == 'labels' %}selected{% endif %}" href="{% url 'settings-labels' %}">Labels</a>
         <a class="{% if active_section == 'storage' %}selected{% endif %}" href="{% url 'settings-storage' %}">Storage</a>
         <a class="{% if active_section == 'demo-data' %}selected{% endif %}" href="{% url 'settings-demo-data' %}">Demo Data</a>
       </div>
diff --git a/templates/artifacts/settings_labels.html b/templates/artifacts/settings_labels.html
new file mode 100644
index 0000000..45421c6
--- /dev/null
+++ b/templates/artifacts/settings_labels.html
@@ -0,0 +1,54 @@
+{% extends "artifacts/settings_base.html" %}
+
+{% block settings_content %}
+  <h2>Labels</h2>
+  <p>
+    Build a palette of labels you can apply to any message from its &#8943; menu
+    in the feed. A label is just a coloured tag — applying one adds it to the
+    message and it shows as a chip next to the title. Deleting a label here only
+    removes it from this palette; messages that already carry it keep the chip.
+  </p>
+
+  <h3>Add a label</h3>
+  <form method="post" class="label-create">
+    {% csrf_token %}
+    <input type="hidden" name="action" value="create">
+    <label>Name <input type="text" name="name" placeholder="e.g. follow-up" required autocomplete="off" maxlength="40"></label>
+    <label>Colour <input type="color" name="color" value="#4a6ea8"></label>
+    <button type="submit">Add label</button>
+  </form>
+
+  <h3>Your labels</h3>
+  {% if labels %}
+    <table class="label-table">
+      <thead>
+        <tr><th>Label</th><th>Colour</th><th></th></tr>
+      </thead>
+      <tbody>
+        {% for label in labels %}
+          <tr>
+            <td><span class="tag-chip" style="background:{{ label.color }}">{{ label.name }}</span></td>
+            <td>
+              <form method="post" class="label-recolor">
+                {% csrf_token %}
+                <input type="hidden" name="action" value="update">
+                <input type="hidden" name="label_id" value="{{ label.pk }}">
+                <input type="color" name="color" value="{{ label.color }}" onchange="this.form.submit()" title="Change colour">
+              </form>
+            </td>
+            <td>
+              <form method="post" onsubmit="return confirm('Remove &quot;{{ label.name|escapejs }}&quot; from your palette? Messages already labelled keep the chip.');">
+                {% csrf_token %}
+                <input type="hidden" name="action" value="delete">
+                <input type="hidden" name="label_id" value="{{ label.pk }}">
+                <button type="submit" class="label-delete">Delete</button>
+              </form>
+            </td>
+          </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+  {% else %}
+    <p class="muted">No labels yet. Add one above, then pick it from a message's &#8943; menu.</p>
+  {% endif %}
+{% endblock %}
diff --git a/tests/views/test_settings_account.py b/tests/views/test_settings_account.py
new file mode 100644
index 0000000..e732a09
--- /dev/null
+++ b/tests/views/test_settings_account.py
@@ -0,0 +1,54 @@
+from django.contrib.auth import get_user_model
+from django.test import TestCase
+from django.urls import reverse
+
+User = get_user_model()
+
+
+class ChangePasswordViewTestCase(TestCase):
+    def setUp(self):
+        self.user = User.objects.create_user(username="alice", password="oldpassword")
+        self.client.force_login(self.user)
+
+    def _post(self, old, new1, new2):
+        return self.client.post(
+            reverse("settings-account"),
+            {"old_password": old, "new_password1": new1, "new_password2": new2},
+        )
+
+    def test_get_renders_form(self):
+        response = self.client.get(reverse("settings-account"))
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Change password")
+        self.assertContains(response, "old_password")
+
+    def test_requires_login(self):
+        self.client.logout()
+        response = self.client.get(reverse("settings-account"))
+        self.assertEqual(response.status_code, 302)
+
+    def test_valid_change_updates_password(self):
+        response = self._post("oldpassword", "brandnewpass", "brandnewpass")
+        self.assertRedirects(response, reverse("settings-account"))
+        self.user.refresh_from_db()
+        self.assertTrue(self.user.check_password("brandnewpass"))
+        self.assertFalse(self.user.check_password("oldpassword"))
+
+    def test_valid_change_keeps_session(self):
+        self._post("oldpassword", "brandnewpass", "brandnewpass")
+        # Session must survive the password change (update_session_auth_hash),
+        # so a follow-up authenticated request still succeeds.
+        response = self.client.get(reverse("settings-account"))
+        self.assertEqual(response.status_code, 200)
+
+    def test_wrong_current_password_rejected(self):
+        response = self._post("WRONG", "brandnewpass", "brandnewpass")
+        self.assertEqual(response.status_code, 200)  # re-render with errors, no redirect
+        self.user.refresh_from_db()
+        self.assertTrue(self.user.check_password("oldpassword"))
+
+    def test_mismatched_new_password_rejected(self):
+        response = self._post("oldpassword", "brandnewpass", "different")
+        self.assertEqual(response.status_code, 200)
+        self.user.refresh_from_db()
+        self.assertTrue(self.user.check_password("oldpassword"))
diff --git a/tests/views/test_settings_labels.py b/tests/views/test_settings_labels.py
new file mode 100644
index 0000000..b534220
--- /dev/null
+++ b/tests/views/test_settings_labels.py
@@ -0,0 +1,113 @@
+from django.contrib.auth import get_user_model
+from django.test import TestCase
+from django.urls import reverse
+from django.utils import timezone
+
+from artifacts.models import Artifact, Label, TagColor
+
+User = get_user_model()
+
+
+class LabelPaletteTestCase(TestCase):
+    def setUp(self):
+        self.user = User.objects.create_user(username="alice", password="pw")
+        self.client.force_login(self.user)
+
+    def url(self):
+        return reverse("settings-labels")
+
+    def test_requires_login(self):
+        self.client.logout()
+        self.assertEqual(self.client.get(self.url()).status_code, 302)
+
+    def test_create_label_sets_palette_and_tagcolor(self):
+        self.client.post(self.url(), {"action": "create", "name": "follow-up", "color": "#112233"})
+        label = Label.objects.get(user=self.user, name="follow-up")
+        self.assertEqual(label.color, "#112233")
+        self.assertEqual(TagColor.objects.get(name="follow-up").color, "#112233")
+
+    def test_create_rejects_bad_color(self):
+        self.client.post(self.url(), {"action": "create", "name": "x", "color": "red"})
+        self.assertFalse(Label.objects.filter(user=self.user).exists())
+
+    def test_create_requires_name(self):
+        self.client.post(self.url(), {"action": "create", "name": "  ", "color": "#112233"})
+        self.assertFalse(Label.objects.filter(user=self.user).exists())
+
+    def test_duplicate_name_same_user_rejected(self):
+        Label.objects.create(user=self.user, name="dup", color="#111111")
+        self.client.post(self.url(), {"action": "create", "name": "dup", "color": "#222222"})
+        self.assertEqual(Label.objects.filter(user=self.user, name="dup").count(), 1)
+
+    def test_same_name_different_user_allowed(self):
+        other = User.objects.create_user(username="bob", password="pw")
+        Label.objects.create(user=other, name="shared", color="#111111")
+        self.client.post(self.url(), {"action": "create", "name": "shared", "color": "#222222"})
+        self.assertTrue(Label.objects.filter(user=self.user, name="shared").exists())
+
+    def test_recolor_updates_tagcolor(self):
+        label = Label.objects.create(user=self.user, name="urgent", color="#111111")
+        self.client.post(self.url(), {"action": "update", "label_id": label.pk, "color": "#ff0000"})
+        label.refresh_from_db()
+        self.assertEqual(label.color, "#ff0000")
+        self.assertEqual(TagColor.objects.get(name="urgent").color, "#ff0000")
+
+    def test_delete_removes_from_palette_only(self):
+        label = Label.objects.create(user=self.user, name="temp", color="#111111")
+        art = Artifact.objects.create(
+            id="lbl00001", owner=self.user, source="agent", title="T", kind=Artifact.MARKDOWN,
+            day=timezone.localdate(), path="agent/lbl00001.html", original_kind=Artifact.MARKDOWN,
+            tags=["temp"],
+        )
+        self.client.post(self.url(), {"action": "delete", "label_id": label.pk})
+        self.assertFalse(Label.objects.filter(pk=label.pk).exists())
+        art.refresh_from_db()
+        self.assertEqual(art.tags, ["temp"])  # chip stays on the message
+
+
+class ToggleLabelTestCase(TestCase):
+    def setUp(self):
+        self.user = User.objects.create_user(username="alice", password="pw")
+        self.other = User.objects.create_user(username="bob", password="pw")
+        self.client.force_login(self.user)
+        self.label = Label.objects.create(user=self.user, name="star", color="#abcdef")
+        self.art = Artifact.objects.create(
+            id="tog00001", owner=self.user, source="agent", title="T", kind=Artifact.MARKDOWN,
+            day=timezone.localdate(), path="agent/tog00001.html", original_kind=Artifact.MARKDOWN,
+        )
+
+    def toggle(self, art_id, name):
+        return self.client.post(reverse("artifact-toggle-label", args=[art_id]), {"name": name})
+
+    def test_toggle_on_then_off(self):
+        r = self.toggle(self.art.id, "star")
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue(r.json()["applied"])
+        self.art.refresh_from_db()
+        self.assertIn("star", self.art.tags)
+
+        r = self.toggle(self.art.id, "star")
+        self.assertFalse(r.json()["applied"])
+        self.art.refresh_from_db()
+        self.assertNotIn("star", self.art.tags)
+
+    def test_toggle_syncs_tagcolor(self):
+        self.toggle(self.art.id, "star")
+        self.assertEqual(TagColor.objects.get(name="star").color, "#abcdef")
+
+    def test_name_not_in_palette_rejected(self):
+        r = self.toggle(self.art.id, "nope")
+        self.assertEqual(r.status_code, 400)
+        self.art.refresh_from_db()
+        self.assertEqual(self.art.tags, [])
+
+    def test_owner_scoped(self):
+        theirs = Artifact.objects.create(
+            id="tog00002", owner=self.other, source="agent", title="T", kind=Artifact.MARKDOWN,
+            day=timezone.localdate(), path="agent/tog00002.html", original_kind=Artifact.MARKDOWN,
+        )
+        self.assertEqual(self.toggle(theirs.id, "star").status_code, 404)
+
+    def test_requires_login(self):
+        self.client.logout()
+        self.assertEqual(self.toggle(self.art.id, "star").status_code, 302)