diff --git a/CHANGELOG.md b/CHANGELOG.md index cf4ed70..2cb6ed3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,112 @@ 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 +- **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 +- **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 +- 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 +- 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 +- **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 +- **Automatic Trash purge.** Trashed artifacts older than a ~3-day retention + window are now permanently removed automatically. It's cron-less: a delete + triggers a sweep that runs on a **background thread** (off the request, so + the click never blocks), tolerant of concurrent runs. Manual "Empty Trash" + still works for immediate reclaim. Controlled by `AGENTFEED_ASYNC_PURGE` + (on by default; tests run it inline). + +## [0.5.0] — 2026-09-07 + +### Added +- **Trash (soft-delete).** Deleting an artifact now moves it to a recoverable + **Trash** instead of removing it. Feed rows get a hover **Delete** icon; a + **"Deleted"** folder at the bottom of the sidebar lists trashed items with a + hover **Undelete**, plus an **Empty Trash** button to purge permanently. + Trashed items are **off-quota** (deleting frees quota immediately) and + eviction-protected. `DELETE /api/artifacts/{id}` is now a soft-delete too + (idempotent); trashed items are hidden from all API reads. +- **Keep folder.** A sidebar folder listing kept artifacts (a view over the + existing `is_kept` flag), mirroring Trash. Both hide when empty. +- Session endpoints `POST /a/{id}/delete`, `/a/{id}/undelete`, + `/feed/empty-trash`; feed `?folder=deleted` / `?folder=keep` views. + +### Changed +- `DELETE /api/artifacts/{id}` no longer hard-deletes — see above. + +### Note +- Permanent purge is manual (**Empty Trash**) in this release; automatic + purge-on-delete (background, ~3-day retention) is the planned fast-follow. + +### Changed +- Live feed updates now also keep the **source sidebar** current: as new posts + arrive, per-source and total unread counts bump, and a source posting for the + first time is added to the list (alphabetically) — all derived client-side + from the polled rows, no extra request. Sources added live stay + keyboard-navigable. Caveat: while filtered to a single source, *other* new + sources still only appear on reload (the poll is scoped to the selected view). + ## [0.4.0] — 2026-09-04 ### Added @@ -155,7 +261,15 @@ 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.4.0...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 +[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 [0.4.0]: https://git.cygnus.systems/peter/daybook/compare/v0.3.2...v0.4.0 [0.3.2]: https://git.cygnus.systems/peter/daybook/compare/v0.3.1...v0.3.2 [0.3.1]: https://git.cygnus.systems/peter/daybook/compare/v0.3.0...v0.3.1 diff --git a/CLAUDE.md b/CLAUDE.md index 5db5bbd..86baea8 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -15,6 +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 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/0016_artifact_deleted_at.py b/artifacts/migrations/0016_artifact_deleted_at.py new file mode 100644 index 0000000..0454f2f --- /dev/null +++ b/artifacts/migrations/0016_artifact_deleted_at.py @@ -0,0 +1,18 @@ +# Generated by Django 5.2.15 on 2026-09-07 11:32 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('artifacts', '0015_migrate_tokens_to_apikeys'), + ] + + operations = [ + migrations.AddField( + model_name='artifact', + name='deleted_at', + field=models.DateTimeField(blank=True, db_index=True, null=True), + ), + ] 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 bbd14a8..dcba524 100644 --- a/artifacts/models.py +++ b/artifacts/models.py @@ -60,6 +60,9 @@ class Artifact(models.Model): metadata = models.JSONField(default=dict, blank=True) read_at = models.DateTimeField(null=True, blank=True) is_kept = models.BooleanField(default=False) + # Soft-delete: non-null = in Trash (hidden from feed/sources, off-quota, + # recoverable via undelete, purged by Empty Trash). NULL = live. + deleted_at = models.DateTimeField(null=True, blank=True, db_index=True) size_bytes = models.BigIntegerField(default=0) # NULL = not shared. Many rows share NULL (SQL treats each NULL as # distinct, so `unique=True` still holds); a real value must be unique @@ -74,6 +77,10 @@ class Artifact(models.Model): def is_shared(self): return bool(self.share_token) + @property + def is_deleted(self): + return self.deleted_at is not None + class Meta: ordering = ["-created_at"] @@ -89,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/storage.py b/artifacts/storage.py index 1ac53cd..df53526 100644 --- a/artifacts/storage.py +++ b/artifacts/storage.py @@ -7,9 +7,11 @@ SUM rather than a stat of every file. """ import shutil +import threading from datetime import timedelta from django.conf import settings +from django.db import connection from django.db.models import F, Sum from django.utils import timezone @@ -70,8 +72,13 @@ def artifact_total_bytes(artifact): def user_usage_bytes(user): + # Trashed artifacts are off-quota (deleting relieves quota immediately); + # their files linger on disk until Empty Trash / purge, but don't count. artifact_bytes = ( - Artifact.objects.filter(owner=user).aggregate(total=Sum("size_bytes")).get("total") or 0 + Artifact.objects.filter(owner=user, deleted_at__isnull=True) + .aggregate(total=Sum("size_bytes")) + .get("total") + or 0 ) asset_bytes = ( Asset.objects.filter(owner=user).aggregate(total=Sum("size_bytes")).get("total") or 0 @@ -113,8 +120,10 @@ def make_room_for(user, incoming_bytes): if used + incoming_bytes <= quota: return [] + # Trashed artifacts are eviction-protected (recovery window is guaranteed) + # and already off-quota, so they're never eviction candidates. unkept = list( - Artifact.objects.filter(owner=user, is_kept=False).order_by("created_at") + Artifact.objects.filter(owner=user, is_kept=False, deleted_at__isnull=True).order_by("created_at") ) # Check whether eviction can possibly succeed before deleting anything - # otherwise a doomed request would still destroy every unkept artifact on @@ -137,6 +146,55 @@ def make_room_for(user, incoming_bytes): return evicted +def purge_trashed(user): + """Permanently remove all of a user's trashed artifacts (files + rows). + Backs the "Empty Trash" action.""" + trashed = list(Artifact.objects.filter(owner=user, deleted_at__isnull=False)) + for artifact in trashed: + delete_artifact_files(artifact) + artifact.delete() + return len(trashed) + + +TRASH_RETENTION = timedelta(days=3) + + +def purge_expired_trash(now=None): + """Permanently remove trashed artifacts older than the retention window + (all users). Tolerant of already-gone rows so concurrent purges are safe. + Returns the number purged.""" + now = now or timezone.now() + cutoff = now - TRASH_RETENTION + expired = list(Artifact.objects.filter(deleted_at__isnull=False, deleted_at__lt=cutoff)) + purged = 0 + for artifact in expired: + try: + delete_artifact_files(artifact) + artifact.delete() + purged += 1 + except Exception: + # Another concurrent purge got there first, or a file's already + # gone — a purge error must never surface to anyone. + pass + return purged + + +def spawn_trash_purge(): + """Run purge_expired_trash off the request thread (cron-less: triggered by + deletes). Falls back to inline when async is disabled (tests).""" + if not getattr(settings, "AGENTFEED_ASYNC_PURGE", True): + purge_expired_trash() + return + + def _run(): + try: + purge_expired_trash() + finally: + connection.close() # threads get their own connection; don't leak it + + threading.Thread(target=_run, daemon=True).start() + + ASSET_ORPHAN_GRACE = timedelta(hours=24) diff --git a/artifacts/urls.py b/artifacts/urls.py index cc1f03c..d7adc5d 100644 --- a/artifacts/urls.py +++ b/artifacts/urls.py @@ -10,6 +10,11 @@ urlpatterns = [ path("a//read", views.mark_artifact_read, name="artifact-mark-read"), path("a//keep", views.toggle_artifact_keep, name="artifact-toggle-keep"), path("a//share", views.toggle_artifact_share, name="artifact-toggle-share"), + path("a//label", views.toggle_artifact_label, name="artifact-toggle-label"), + path("a//delete", views.delete_artifact, name="artifact-delete"), + path("a//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/", views.artifact_view, name="artifact"), path("s/", views.shared_artifact_view, name="artifact-shared"), path("assets/", views.asset_view, name="asset"), @@ -24,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 1a6afc3..bd2fccc 100644 --- a/artifacts/views.py +++ b/artifacts/views.py @@ -15,11 +15,12 @@ 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, 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 @@ -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, @@ -44,6 +45,8 @@ from .storage import ( delete_artifact_files, disk_free_bytes, make_room_for, + purge_trashed, + spawn_trash_purge, sweep_orphan_assets, total_allocated_bytes, user_quota_bytes, @@ -90,7 +93,7 @@ class ArtifactListCreateView(APIView): user = resolve_request_user(request) if user is None: return Response({"detail": "Authentication required (session or bearer token)."}, status=403) - artifacts = Artifact.objects.filter(owner=user) + artifacts = Artifact.objects.filter(owner=user, deleted_at__isnull=True) if source := request.query_params.get("source"): artifacts = artifacts.filter(source=source) if label := request.query_params.get("label"): @@ -231,7 +234,7 @@ class ArtifactDetailView(APIView): user = resolve_request_user(request) if user is None: return Response({"detail": "Authentication required (session or bearer token)."}, status=403) - artifact = get_object_or_404(Artifact, pk=artifact_id, owner=user) + artifact = get_object_or_404(Artifact, pk=artifact_id, owner=user, deleted_at__isnull=True) return Response(serialize_artifact(artifact, request)) def patch(self, request, artifact_id): @@ -239,7 +242,7 @@ class ArtifactDetailView(APIView): if user is None: return HttpResponseForbidden("Invalid or missing API token") - artifact = get_object_or_404(Artifact, pk=artifact_id, owner=user) + artifact = get_object_or_404(Artifact, pk=artifact_id, owner=user, deleted_at__isnull=True) data = request.data not_editable = IMMUTABLE_PATCH_FIELDS & set(data.keys()) if not_editable: @@ -298,9 +301,13 @@ class ArtifactDetailView(APIView): if user is None: return HttpResponseForbidden("Invalid or missing API token") + # Soft-delete: move to Trash (recoverable, off-quota) rather than + # permanently removing. Purged later via Empty Trash. Idempotent. artifact = get_object_or_404(Artifact, pk=artifact_id, owner=user) - delete_artifact_files(artifact) - artifact.delete() + if artifact.deleted_at is None: + artifact.deleted_at = timezone.now() + artifact.save(update_fields=["deleted_at"]) + spawn_trash_purge() # sweep expired trash off the request thread return Response(status=204) @@ -318,7 +325,7 @@ class ArtifactRawView(APIView): user = resolve_request_user(request) if user is None: return Response({"detail": "Authentication required (session or bearer token)."}, status=403) - artifact = get_object_or_404(Artifact, pk=artifact_id, owner=user) + artifact = get_object_or_404(Artifact, pk=artifact_id, owner=user, deleted_at__isnull=True) raw_path = raw_artifact_path(artifact) if raw_path and raw_path.exists(): @@ -516,21 +523,40 @@ def feed(request): selected_artifact_id = request.GET.get("artifact", "") preview_none = request.GET.get("preview") == "none" selected_view = "raw" if request.GET.get("view") == "raw" else "rendered" + selected_folder = request.GET.get("folder", "") + if selected_folder not in ("deleted", "keep"): + selected_folder = "" - all_artifacts = Artifact.objects.filter(owner=request.user) + # Live (non-trashed) artifacts drive the normal feed and the source sidebar. + live = Artifact.objects.filter(owner=request.user, deleted_at__isnull=True) + if selected_folder == "deleted": + # System folder: all trashed items, not source-scoped. + selected_source = "" + base = Artifact.objects.filter(owner=request.user, deleted_at__isnull=False) + elif selected_folder == "keep": + selected_source = "" + base = live.filter(is_kept=True) + else: + base = live artifacts = apply_feed_filters( - all_artifacts, selected_source, selected_label, selected_kind, title_query + base, selected_source, selected_label, selected_kind, title_query ) - window_start = today - timedelta(days=FEED_WINDOW_DAYS - 1) - if not artifacts.filter(day__gte=window_start).exists(): - # Nothing recent for these filters: fall back to the most recent days that - # do match, so selecting a source is never met with a blank list. - recent_days = list(artifacts.dates("day", "day", order="DESC")[:FEED_WINDOW_DAYS]) - if recent_days: - window_start = recent_days[-1] - window_artifacts = list(artifacts.filter(day__gte=window_start).order_by("-created_at")) - older_count = artifacts.filter(day__lt=window_start).count() + if selected_folder: + # System folders show everything (no 7-day window / infinite scroll). + window_start = today + window_artifacts = list(artifacts.order_by("-created_at")) + older_count = 0 + else: + window_start = today - timedelta(days=FEED_WINDOW_DAYS - 1) + if not artifacts.filter(day__gte=window_start).exists(): + # Nothing recent for these filters: fall back to the most recent days + # that do match, so selecting a source is never met with a blank list. + recent_days = list(artifacts.dates("day", "day", order="DESC")[:FEED_WINDOW_DAYS]) + if recent_days: + window_start = recent_days[-1] + window_artifacts = list(artifacts.filter(day__gte=window_start).order_by("-created_at")) + older_count = artifacts.filter(day__lt=window_start).count() overrides = tag_color_overrides() day_groups = group_artifacts_by_day(window_artifacts, overrides) @@ -540,6 +566,8 @@ def feed(request): selected_artifact = next((a for a in window_artifacts if a.id == selected_artifact_id), None) toggle_query = {"view": "rendered"} + if selected_folder: + toggle_query["folder"] = selected_folder if selected_source: toggle_query["source"] = selected_source if selected_label: @@ -554,18 +582,22 @@ def feed(request): toggle_query["view"] = "raw" raw_url = f"?{urlencode(toggle_query)}" - # Source counts come from the other filters only, so the sidebar still shows - # every source available under the current label/type/name filters. + # Source counts + labels always come from live artifacts, so the sidebar is + # the same whichever folder you're viewing. source_scoped = apply_feed_filters( - all_artifacts, "", selected_label, selected_kind, title_query + 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() - all_labels = sorted({tag for tags in all_artifacts.values_list("tags", flat=True) for tag in tags}) + all_labels = sorted({tag for tags in live.values_list("tags", flat=True) for tag in tags}) return render( request, "artifacts/feed.html", @@ -578,6 +610,10 @@ def feed(request): "feed_since": (window_artifacts[0].created_at if window_artifacts else timezone.now()).isoformat(), "source_counts": source_counts, "total_count": source_scoped.filter(read_at__isnull=True).count(), + "keep_count": keep_count, + "trash_count": trash_count, + "selected_folder": selected_folder, + "in_trash": selected_folder == "deleted", "all_labels": labels_with_colors_list(all_labels, overrides), "raw_url": raw_url, "rendered_url": rendered_url, @@ -590,6 +626,7 @@ def feed(request): "today": today, "title_query": title_query, "kind_choices": Artifact.KIND_CHOICES, + "label_palette": request.user.labels.all(), }, ) @@ -604,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): @@ -630,12 +692,58 @@ def toggle_artifact_share(request, artifact_id): return JsonResponse({"id": artifact.id, "is_shared": artifact.is_shared, "share_url": share_url}) +@login_required +@require_POST +def delete_artifact(request, artifact_id): + """Soft-delete: move to Trash (recoverable, off-quota). Idempotent.""" + artifact = get_object_or_404(Artifact, pk=artifact_id, owner=request.user) + if artifact.deleted_at is None: + artifact.deleted_at = timezone.now() + artifact.save(update_fields=["deleted_at"]) + spawn_trash_purge() # sweep expired trash off the request thread + return JsonResponse({"id": artifact.id, "deleted": True}) + + +@login_required +@require_POST +def undelete_artifact(request, artifact_id): + """Restore a trashed artifact back to the live feed.""" + artifact = get_object_or_404(Artifact, pk=artifact_id, owner=request.user) + if artifact.deleted_at is not None: + artifact.deleted_at = None + artifact.save(update_fields=["deleted_at"]) + return JsonResponse({"id": artifact.id, "deleted": False}) + + +@login_required +@require_POST +def empty_trash(request): + """Permanently purge all of the user's trashed artifacts.""" + count = purge_trashed(request.user) + 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.""" before = parse_date(request.GET.get("before", "")) or timezone.localdate() artifacts = apply_feed_filters( - Artifact.objects.filter(owner=request.user), + Artifact.objects.filter(owner=request.user, deleted_at__isnull=True), request.GET.get("source", ""), request.GET.get("label", ""), request.GET.get("kind", ""), @@ -683,7 +791,7 @@ def feed_updates(request): selected_kind = request.GET.get("kind", "") title_query = request.GET.get("q", "") artifacts = apply_feed_filters( - Artifact.objects.filter(owner=request.user), + Artifact.objects.filter(owner=request.user, deleted_at__isnull=True), selected_source, selected_label, selected_kind, @@ -1426,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, + }, ) @@ -1459,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 bc935aa..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.4.0" +__version__ = "0.7.1" diff --git a/daybook_project/settings.py b/daybook_project/settings.py index ab989ea..a041730 100644 --- a/daybook_project/settings.py +++ b/daybook_project/settings.py @@ -19,6 +19,10 @@ AGENTFEED_KEY_PROVISIONING_API = os.environ.get( "AGENTFEED_KEY_PROVISIONING_API", "" ).lower() in {"1", "true", "yes", "on"} +# Purge expired Trash off the request thread (triggered by deletes, no cron). +# Tests override this to run inline so purge behavior is deterministic. +AGENTFEED_ASYNC_PURGE = True + # Needed when running behind a TLS-terminating reverse proxy (Apache/Nginx/etc.): # Django otherwise thinks every request is plain HTTP, which breaks CSRF checks # on login/POST. The proxy must forward X-Forwarded-Proto: https. 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 " } + -Headers @{ Authorization = "Bearer " } ``` ## 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 " } ` + -Headers @{ Authorization = "Bearer " } ` -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 " } ` + -Headers @{ Authorization = "Bearer " } ` -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 " ` + -H "Authorization: Bearer " ` -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 " } ` + -Headers @{ Authorization = "Bearer " } ` -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 " } + -Headers @{ Authorization = "Bearer " } ``` 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 187270c..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 +Authorization: Bearer ``` Required fields: @@ -188,7 +188,7 @@ $body = @{ Invoke-RestMethod ` -Uri "http://127.0.0.1:8001/api/artifacts" ` -Method Post ` - -Headers @{ Authorization = "Bearer " } ` + -Headers @{ Authorization = "Bearer " } ` -ContentType "application/json" ` -Body $body ``` @@ -241,7 +241,7 @@ Endpoint: ```http POST /api/artifacts Content-Type: multipart/form-data -Authorization: Bearer +Authorization: Bearer ``` 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 " ` + -H "Authorization: Bearer " ` -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 +Authorization: Bearer ``` | Field | Notes | @@ -392,7 +392,7 @@ Endpoint: ```http PATCH /api/artifacts/{id} Content-Type: application/json -Authorization: Bearer +Authorization: Bearer ``` Editable fields: @@ -438,7 +438,7 @@ $body = @{ Invoke-RestMethod ` -Uri "http://127.0.0.1:8001/api/artifacts/a1b2c3d4" ` -Method Patch ` - -Headers @{ Authorization = "Bearer " } ` + -Headers @{ Authorization = "Bearer " } ` -ContentType "application/json" ` -Body $body ``` @@ -449,18 +449,22 @@ Endpoint: ```http DELETE /api/artifacts/{id} -Authorization: Bearer +Authorization: Bearer ``` -Removes the artifact's database row and its files (primary file, markdown -sidecar, and any attached assets). Returns `204` with no body on success. +**Soft-delete:** moves the artifact to Trash rather than removing it — it's +recoverable (from the app's "Deleted" folder), becomes off-quota, and is hidden +from all API reads (`GET /api/artifacts`, the detail, and `…/raw` all treat it +as gone). Files stay on disk until the trash is purged (Empty Trash in the app). +Returns `204` with no body. -You can only delete artifacts your own token owns; others return `404`, as -does a second delete of the same id. +**Idempotent:** deleting an already-trashed id returns `204` again (not `404`). +You can only delete artifacts your own token owns; another user's returns `404`. +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 " + -H "Authorization: Bearer " ``` ## 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 " \ + -H "Authorization: Bearer " \ -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, ) diff --git a/static/agentfeed.css b/static/agentfeed.css index 865c1a0..788b473 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; } @@ -513,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); @@ -1055,6 +1068,163 @@ kbd { animation: agentfeed-row-arrive 1.5s ease-out; } +/* Hover/focus row actions (delete in the feed, undelete in Trash) */ +.artifact-row { + position: relative; +} + +.row-actions { + position: absolute; + 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; + padding: 0.15rem 0.3rem; + border-radius: 4px; + background: var(--surface); + color: var(--muted); +} + +.row-action:hover { + background: var(--surface-alt); + color: var(--text); +} + +.row-delete:hover { + 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); +} + +.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 { + border-top: 1px solid var(--grid-line); + display: flex; + flex-direction: column; + flex-shrink: 0; + gap: 0.25rem; /* space Keep / Deleted apart */ + padding: 0.4rem 0.6rem 0.3rem; +} + +/* "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), +.folder-link:not(.selected) { + background: rgba(74, 110, 168, 0.14); +} + +.all-sources-link:not(.selected):hover, +.folder-link:not(.selected):hover { + background: rgba(74, 110, 168, 0.22); +} + +.empty-trash-button { + background: var(--danger-bg); + border: 1px solid var(--danger-text); + border-radius: 6px; + color: var(--danger-text); + cursor: pointer; + font-size: 0.78rem; + padding: 0.2rem 0.55rem; +} + .api-key-create { align-items: end; display: flex; @@ -1070,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/_artifact_rows.html b/templates/artifacts/_artifact_rows.html index 1125e01..37c9ed1 100644 --- a/templates/artifacts/_artifact_rows.html +++ b/templates/artifacts/_artifact_rows.html @@ -30,5 +30,13 @@ {% endif %} {{ artifact.source }} + + {% if in_trash %} + ↩ + {% else %} + 🗑 + ⋯ + {% endif %} + {% endfor %} diff --git a/templates/artifacts/feed.html b/templates/artifacts/feed.html index a240ebc..eedd25d 100644 --- a/templates/artifacts/feed.html +++ b/templates/artifacts/feed.html @@ -27,6 +27,7 @@ data-selected-kind="{{ selected_kind }}" data-title-query="{{ title_query }}" data-selected-view="{{ selected_view }}" + data-folder="{{ selected_folder }}" data-window-start="{{ window_start|date:'Y-m-d' }}" data-older-count="{{ older_count }}">