Bound a Supply run toggle's session load and CSRF refresh by its deadline (Feature 17)

- loadMe takes an optional abort signal; AuthBootstrap calls it with none.
- Each toggle try loads GET /api/v1/me itself under its deadline when the
  session is not loaded, instead of joining a /me query already in flight
  that may never answer.
- The /me refresh a csrf 403 makes is bounded by the request's signal: a
  request whose signal aborts stops waiting at once and the refresh is no
  longer shared, so the next csrf 403 starts a fresh /me. Requests without
  a signal still share it, and it is aborted only once no request waits.
- Tests: a hung /me and a hung csrf refresh during a toggle exchange, both
  recovered on the next try in order; the client's refresh sharing and abort.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

README.md

@@ -11,14 +11,61 @@ single Go service with the React PWA embedded in the binary.
 > `/health`, embedded PWA skeleton, Makefile, Dockerfile, CI). The planned
 > application is described in [docs/ARCHITECTURE.md](docs/ARCHITECTURE.md).
 
-## Running it locally
+## Quick start
 
-The developer setup (prerequisites, Authentik and Google clients, the
-`MEALQUEST_*` environment, `make dev` and the optional SearXNG sidecar) is
-runbook information and lives in CTXD: project `mealquest`, file
-`RUNBOOKS.MD`, section "Local development". Configuration is read only from
-the environment, and the service refuses to start, naming every missing or
-invalid variable.
+Requirements: Go 1.25 and Node.js `^22.22.2 || ^24.15.0 || >=26.0.0` — that
+is, 22.22.2 or later on the 22 line, 24.15.0 or later on the 24 line, or 26.0.0
+or later. Node.js 23, 24.0–24.14 and 25 are not supported: this is the
+`engines` range of jsdom in the committed lockfile, the strictest of all the
+web dependencies.
+
+```sh
+(cd web && npm ci)
+mkdir -p ~/.mealquest-dev   # outside the repository: it holds a secret
+chmod 700 ~/.mealquest-dev
+head -c 32 /dev/urandom | base64 > ~/.mealquest-dev/secret_key
+chmod 600 ~/.mealquest-dev/secret_key
+export MEALQUEST_HTTP_ADDR=:8080
+export MEALQUEST_PUBLIC_URL=http://localhost:5173
+export MEALQUEST_DATA_DIR="$HOME/.mealquest-dev"
+export MEALQUEST_SHUTDOWN_TIMEOUT=10s
+export MEALQUEST_SECRET_KEY_FILE="$HOME/.mealquest-dev/secret_key"
+# Authentik OAuth2/OpenID provider for MealQuest (redirect URI:
+# $MEALQUEST_PUBLIC_URL/auth/callback). Save its client secret to the file.
+export MEALQUEST_OIDC_ISSUER=https://auth.example.com/application/o/mealquest/
+export MEALQUEST_OIDC_CLIENT_ID=mealquest
+export MEALQUEST_OIDC_CLIENT_SECRET_FILE="$HOME/.mealquest-dev/oidc_client_secret"
+export MEALQUEST_OIDC_ALLOWED_GROUPS=mealquest-admin
+# Optional: sessions end after MEALQUEST_SESSION_IDLE unused (default 720h)
+# and always MEALQUEST_SESSION_MAX after sign-in (default 4320h).
+# export MEALQUEST_SESSION_IDLE=720h
+# export MEALQUEST_SESSION_MAX=4320h
+# Optional: comma-separated IPs/CIDRs of reverse proxies whose
+# X-Forwarded-For/-Proto headers are honoured (production: Traefik). Unset
+# trusts no peer, which is right for local development.
+# export MEALQUEST_TRUSTED_PROXY=10.60.1.33
+# Optional: a SearXNG instance the Settings screen suggests as the recipe
+# search URL until one is saved.
+# export MEALQUEST_SEARXNG_URL=http://localhost:8888
+export MEALQUEST_DEFAULT_TZ=America/New_York
+make dev
+```
+
+`make dev` runs the Go server on `:8080` and the Vite dev server on `:5173`
+(which proxies `/api`, `/auth` and `/media` to `:8080`). Open
+http://localhost:5173. Configuration is environment-only and fails fast:
+every variable above is required except the commented-out session
+lifetimes (when set they must be positive, with MAX at least IDLE),
+trusted proxy list (every entry must be an IP or CIDR), the SearXNG URL
+(an absolute `http://` or `https://` URL without credentials, a query or a
+fragment) and `MEALQUEST_DEFAULT_TZ`, and
+secrets are read only from files named by `*_FILE` variables. `MEALQUEST_PUBLIC_URL`, `MEALQUEST_OIDC_ISSUER` and the
+endpoints the issuer advertises must be `https://`; plain `http://` is
+accepted only for `localhost`, `127.0.0.1` and `[::1]`.
+`MEALQUEST_DEFAULT_TZ` is the IANA zone the household settings are created
+with on first boot: until those settings exist, boot fails unless it is a
+valid IANA zone. Later boots ignore it, set or not (change the zone in
+household settings instead).
 
 ## Common commands
 
@@ -31,8 +78,7 @@ invalid variable.
 
 ## Where to read next
 
-- [AGENTS.md](AGENTS.md) — house rules, approved dependencies, the quality
-  floor every change must pass, repository layout, conventions.
+- [AGENTS.md](AGENTS.md) — house rules, approved dependencies, conventions.
 - [docs/ARCHITECTURE.md](docs/ARCHITECTURE.md) — architecture of record.
 - [design/MealQuest Requirements.md](design/MealQuest%20Requirements.md) — product requirements.
 - [design/MealQuest UI Designs/design_handoff_mealquest/README.md](design/MealQuest%20UI%20Designs/design_handoff_mealquest/README.md) — UI handoff.

deploy/.env.example

@@ -1,15 +1,20 @@
-# MealQuest production environment: the template for deploy/.env (never
-# committed). The service fails fast: a missing or invalid required variable
-# stops it at boot with the variable named. Creating deploy/.env: CTXD
-# project mealquest, RUNBOOKS.MD "Stack and first deploy" > "3. Environment
-# file".
+# MealQuest production environment. Copy to deploy/.env (never committed)
+# and replace the placeholders. The service fails fast: a missing or invalid
+# required variable stops it at boot with the variable named.
 #
 # Secrets are never set here. They live in deploy/secrets/ (never committed),
-# one value per file, owned by the container user 10001:10001 with mode
-# 0600: secret_key, oidc_client_secret and google_client_secret. SearXNG's
-# searxng.env is the exception: compose reads it itself, so it is owned by
-# the host account that runs compose, mode 0600. Creating them: CTXD project
-# mealquest, RUNBOOKS.MD "Stack and first deploy" > "4. Secrets".
+# one value per file, owned by the container user and readable only by it:
+#
+#   mkdir -p deploy/secrets && chmod 700 deploy/secrets
+#   head -c 32 /dev/urandom | base64 > deploy/secrets/secret_key
+#   printf '%s\n' '<Authentik client secret>' > deploy/secrets/oidc_client_secret
+#   printf '%s\n' '<Google OAuth client secret>' > deploy/secrets/google_client_secret
+#   sudo chown 10001:10001 deploy/secrets/* && sudo chmod 600 deploy/secrets/*
+#
+# SearXNG's secret key is the exception: compose reads it itself, so it
+# stays owned by you (mode 0600). Create it after the chown above:
+#
+#   (umask 077; printf 'SEARXNG_SECRET=%s\n' "$(openssl rand -hex 32)" > deploy/secrets/searxng.env)
 #
 # deploy/compose.yaml mounts them at /run/secrets/<name> and points the
 # *_FILE variables at them.
@@ -37,7 +42,8 @@ MEALQUEST_TRUSTED_PROXY=10.60.1.33
 
 # IANA zone the household settings are created with on first boot. Required
 # until those settings exist; ignored afterwards (change the zone in
-# household settings instead).
+# household settings instead). Confirm the household's zone before the first
+# deploy.
 MEALQUEST_DEFAULT_TZ=America/New_York
 
 # --- Authentik OIDC ----------------------------------------------------------
@@ -51,10 +57,10 @@ MEALQUEST_OIDC_ALLOWED_GROUPS=mealquest-admin
 
 # --- Google Calendar (Push to Calendar) ------------------------------------
 
-# Client ID of the Google OAuth web client (CTXD project mealquest,
-# RUNBOOKS.MD "Google Calendar OAuth client"). Required: the service will
-# not start without it and the client secret file. Its authorized redirect
-# URI is <MEALQUEST_PUBLIC_URL origin>/api/v1/integrations/google/callback.
+# Client ID of the Google OAuth web client (deploy/RUNBOOK.md "Google
+# Calendar OAuth client"). Required: the service will not start without it
+# and the client secret file. Its authorized redirect URI is
+# <MEALQUEST_PUBLIC_URL origin>/api/v1/integrations/google/callback.
 MEALQUEST_GOOGLE_CLIENT_ID=<client id>.apps.googleusercontent.com
 
 # Optional session lifetimes. A session ends after IDLE unused and always MAX
@@ -76,14 +82,13 @@ MEALQUEST_SESSION_MAX=4320h
 #   The SearXNG recipe-search sidecar on the compose network. The Settings
 #   screen pre-fills it as the SearXNG URL until one is saved; the saved
 #   provider and base URL come from PATCH /api/v1/settings/recipe-search.
-#   See CTXD project mealquest, RUNBOOKS.MD "Recipe search (SearXNG)".
+#   See deploy/RUNBOOK.md "Recipe search (SearXNG)".
 
 # --- Planned; not read by the service yet -------------------------------------
 #
 # Added to deploy/compose.yaml and this file by the features that use them.
 #
-# Web Push (Feature 19). Key pair: CTXD project mealquest, RUNBOOKS.MD
-# "VAPID keys (Web Push)".
+# Web Push (Feature 19). Generate the key pair with cmd/vapidgen.
 # MEALQUEST_VAPID_PUBLIC_KEY=<base64url VAPID public key>
 # MEALQUEST_VAPID_PRIVATE_KEY_FILE=/run/secrets/vapid_private_key
 # MEALQUEST_VAPID_SUBJECT=mailto:<owner address>

deploy/compose.dev.yaml

@@ -1,7 +1,8 @@
-# Development override layered on deploy/compose.yaml: publishes SearXNG
-# on the dev machine's loopback (127.0.0.1:8888) so it can be queried
-# directly. Using it: CTXD project mealquest, RUNBOOKS.MD "Local
-# development".
+# Development override: publishes SearXNG on the dev machine's loopback so
+# it can be queried directly, e.g.
+#
+#   docker compose -f deploy/compose.yaml -f deploy/compose.dev.yaml up -d searxng
+#   curl 'http://127.0.0.1:8888/search?q=chicken+tikka+masala+recipe&format=json'
 #
 # Loopback only, never a LAN address. Never used in production: the
 # systemd unit starts deploy/compose.yaml alone.

deploy/compose.yaml

@@ -1,16 +1,18 @@
-# Production stack for MealQuest on 10.60.1.14 (D-018). Building, deploying
-# and operating it: CTXD project mealquest, RUNBOOKS.MD "Stack unit" and
-# "Routine deploy and rollback".
+# Production stack for MealQuest on 10.60.1.14 (D-018). Build on the host,
+# then start through systemd:
+#
+#   docker compose -f deploy/compose.yaml build
+#   sudo systemctl restart mealquest
 #
 # The services use restart: "no" on purpose: Docker must not start them
 # before the DOCKER-USER firewall is applied. deploy/systemd/mealquest.service
 # owns start and stop and requires mealquest-firewall.service first.
 #
-# Configuration comes from deploy/.env (template: deploy/.env.example) and
-# secrets from deploy/secrets/; neither is committed. Compose bind-mounts
-# file secrets with their host owner and mode, so each file in
-# deploy/secrets/ must be owned by the container user 10001:10001 with mode
-# 0600 (except searxng.env, read by compose itself; see the searxng service).
+# Configuration comes from deploy/.env (copy deploy/.env.example) and secrets
+# from deploy/secrets/; neither is committed. Compose bind-mounts file secrets
+# with their host owner and mode, so each file in deploy/secrets/ must be
+# owned by the container user 10001:10001 with mode 0600 (except
+# searxng.env, read by compose itself; see the searxng service).
 name: mealquest
 
 services:
@@ -63,8 +65,8 @@ services:
   # the app's own user (owner of the volume) with a read-only root
   # filesystem, no privilege escalation and no Linux capabilities.
   #
-  # Restoring the database: CTXD project mealquest, RUNBOOKS.MD "Restore
-  # the database".
+  # Restore: follow "Restore the database" in deploy/RUNBOOK.md (stop the
+  # stack, move the database with its -wal and -shm aside, restore, check).
   litestream:
     image: litestream/litestream:0.5.17
     user: "10001:10001"

deploy/systemd/mealquest-firewall.service

@@ -5,9 +5,8 @@
 # are one-way: a failure here fails this unit visibly and never fails
 # docker.service.
 #
-# mealquest.service requires this unit and starts the stack only after it
-# has succeeded. Installing and operating both: CTXD project mealquest,
-# RUNBOOKS.MD "Host firewall" and "Stack unit".
+# Start MealQuest only after this unit has succeeded:
+#   systemctl start mealquest-firewall && docker compose up -d
 [Unit]
 Description=Restrict MealQuest port 8090 to Traefik (DOCKER-USER)
 After=docker.service

deploy/systemd/mealquest-media-backup.service

@@ -1,7 +1,8 @@
 # Runs the nightly MealQuest media backup (/usr/local/sbin/mealquest-media-backup).
-# Triggered by mealquest-media-backup.timer; output goes to the journal.
-# Installing it and running it by hand: CTXD project mealquest,
-# RUNBOOKS.MD "Media — nightly rsync".
+# Triggered by mealquest-media-backup.timer; run by hand with
+#   systemctl start mealquest-media-backup
+# and read the result with
+#   journalctl -u mealquest-media-backup
 #
 # The script runs as the app's user (10001, host user "mealquest") with no
 # capabilities. systemd, as root, only bind-mounts the data volume's root

deploy/systemd/mealquest-media-backup.sh

@@ -15,9 +15,8 @@
 # swapping the path afterwards cannot redirect it. Symlinks inside the
 # directory are copied as links (-a), never followed.
 #
-# The media directory is created at deploy time (CTXD project mealquest,
-# RUNBOOKS.MD "Media — nightly rsync"). If it is missing the job fails; it
-# is never treated as "nothing to back up".
+# The media directory is created at deploy time (deploy/RUNBOOK.md). If it
+# is missing the job fails; it is never treated as "nothing to back up".
 #
 # rsync mirrors into .../mealquest-backups/media/ only: the target ends in
 # a slash, so --delete removes files from that directory and nothing

web/src/App.test.tsx

@@ -33,7 +33,6 @@ const SCREENS = {
   '/onboarding': true,
   '/plan': true,
   '/plan/shopping': true,
-  '/plan/shopping/archive': true,
   '/discover': true,
   '/settings': true,
   '/settings/ai': true,
@@ -131,18 +130,6 @@ describe('App routes', () => {
     expect(await screen.findByRole('checkbox', { name: 'Ground beef' })).toBeChecked()
   })
 
-  it('/plan/shopping/archive renders the Supply archive inside the shell', async () => {
-    mockViewport(390)
-    stubFetchByPath({
-      ...SIGNED_IN,
-      '/api/v1/shopping/archive?by=week': () => jsonResponse(200, { by: 'week', periods: [] }),
-    })
-    renderAt('/plan/shopping/archive')
-    const heading = await screen.findByRole('heading', { level: 1, name: 'Supply archive' })
-    expect(screen.getByRole('main')).toContainElement(heading)
-    expect(await screen.findByText('Nothing archived yet')).toBeInTheDocument()
-  })
-
   it('/discover renders the Side quests deck inside the shell', async () => {
     mockViewport(390)
     stubFetchByPath({

web/src/App.tsx

@@ -17,7 +17,6 @@ import { RegularsSettingsPage } from './settings/RegularsSettingsPage.tsx'
 import { SettingsPage } from './settings/SettingsPage.tsx'
 import { AppShell } from './shell/AppShell.tsx'
 import { SupplyRunSync } from './shopping/api.ts'
-import { SupplyArchivePage } from './shopping/SupplyArchivePage.tsx'
 import { SupplyRunPage } from './shopping/SupplyRunPage.tsx'
 
 // Every route the app serves, with the heading its placeholder page shows.
@@ -43,7 +42,6 @@ export const routes = [
 const screens: Partial<Record<(typeof routes)[number]['path'], ReactNode>> = {
   '/plan': <PlanPage />,
   '/plan/shopping': <SupplyRunPage />,
-  '/plan/shopping/archive': <SupplyArchivePage />,
   '/discover': <DiscoverPage />,
   '/settings': <SettingsPage />,
   '/settings/ai': <AISettingsPage />,

web/src/shopping/SupplyArchivePage.module.css

@@ -1,144 +0,0 @@
-/* Supply archive · weekly posts (mock 1m, and the right panel of 2f). */
-.archive {
-  box-sizing: border-box;
-  display: flex;
-  flex-direction: column;
-  gap: 14px;
-  max-width: 560px;
-  padding-top: 8px;
-}
-
-.header {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-}
-
-.title {
-  margin: 0;
-  font-family: var(--font-heading);
-  font-size: 24px;
-  font-weight: 400;
-  line-height: 1.1;
-}
-
-.periods {
-  align-self: flex-start;
-}
-
-.period {
-  display: flex;
-  flex-direction: column;
-  gap: 10px;
-  margin-top: 6px;
-}
-
-.heading {
-  margin: 0;
-  font-family: var(--font-heading);
-  font-size: 18px;
-  font-weight: 400;
-  line-height: 1.2;
-}
-
-.posts {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-  margin: 0;
-  padding: 0;
-  list-style: none;
-}
-
-.post {
-  display: flex;
-  flex-direction: column;
-  gap: 6px;
-  padding: 16px;
-  border-radius: 24px;
-  background: var(--color-surface);
-  color: var(--color-text);
-  text-decoration: none;
-}
-
-.post:focus-visible {
-  outline: 3px solid var(--color-accent);
-  outline-offset: 2px;
-}
-
-/* The current week's post: grape-100 with a grape-300 ring. */
-.current {
-  background: var(--color-accent-100);
-  box-shadow: inset 0 0 0 2px var(--color-accent-300);
-}
-
-/* The week label as the API writes it, capitalised here. */
-.kicker {
-  font-family: var(--font-body);
-  font-size: 11px;
-  font-weight: 700;
-  letter-spacing: 0.08em;
-  text-transform: uppercase;
-  color: var(--color-neutral-700);
-}
-
-.current .kicker {
-  color: var(--color-accent-700);
-}
-
-.postTitle {
-  font-family: var(--font-heading);
-  font-size: 18px;
-  line-height: 1.15;
-}
-
-.meta {
-  font-family: var(--font-body);
-  font-size: 13px;
-  color: var(--color-neutral-800);
-}
-
-.chips {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 6px;
-}
-
-.chip {
-  padding: 3px 10px;
-  border-radius: var(--radius-pill);
-  background: var(--color-bg);
-  font-family: var(--font-body);
-  font-size: 11px;
-  font-weight: 700;
-}
-
-.older {
-  align-self: center;
-}
-
-.skeletonPost {
-  height: 112px;
-  border-radius: 24px;
-}
-
-/* Desktop (mock 2f): the week's list at the left, the archive in a 340 px
-   panel at the right. */
-.split {
-  display: flex;
-  gap: 24px;
-  align-items: flex-start;
-}
-
-.list {
-  flex: 1;
-  min-width: 0;
-}
-
-.panel {
-  flex: none;
-  box-sizing: border-box;
-  width: 340px;
-  padding-left: 24px;
-  border-left: 1px solid var(--color-divider);
-}

web/src/shopping/SupplyArchivePage.test.tsx

@@ -1,422 +0,0 @@
-import { QueryClientProvider } from '@tanstack/react-query'
-import { fireEvent, render, screen, waitFor, within } from '@testing-library/react'
-import { MemoryRouter, Route, Routes } from 'react-router'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { ApiProvider, createApiClient, createQueryClient, createVerifiedSession } from '../api/index.ts'
-import { createNetworkStatus } from '../pwa/networkStatus.ts'
-import { HOUSEHOLD_SETTINGS } from '../test/ApiProviders.tsx'
-import { errorResponse, fakeLocation, jsonResponse, ME } from '../test/fetchStub.ts'
-import { mockViewport } from '../test/matchMedia.ts'
-import type { ArchivePost } from './api.ts'
-import { PAGE, SupplyArchivePage } from './SupplyArchivePage.tsx'
-import styles from './SupplyArchivePage.module.css'
-
-const ARCHIVE = (by: string) => `/api/v1/shopping/archive?by=${by}`
-
-// post is one Supply archive post as GET /api/v1/shopping/archive sends it.
-function post(weekStart: string, label: string, overrides: Partial<ArchivePost> = {}): ArchivePost {
-  return {
-    weekStart,
-    label,
-    title: null,
-    dinnerCount: 7,
-    itemCount: 23,
-    onHandCount: 4,
-    dinners: ['Beef tacos', 'Tikka masala', 'Pizza', 'Pot roast', 'Orzo', 'Chili', 'Salmon'],
-    current: false,
-    ...overrides,
-  }
-}
-
-// The posts of mock 1m: this week's titled post, then the weeks across the
-// September–October boundary and the 2025–2026 one, the last untitled.
-const WEEK_41 = post('2026-10-05', 'Week 41 · Oct 5 – 11', { title: 'Tacos, tikka & a salmon finale', current: true })
-const WEEK_40 = post('2026-09-28', 'Week 40 · Sep 28 – Oct 4', { title: 'Pizza, pot roast & the great orzo trial', itemCount: 26 })
-const WEEK_39 = post('2026-09-21', 'Week 39 · Sep 21 – 27', { title: 'Chili season opens', dinnerCount: 1, itemCount: 1, onHandCount: 0, dinners: ['Chili'] })
-const WEEK_1 = post('2025-12-29', 'Week 1 · Dec 29 – Jan 4')
-
-// The archive as the server groups it: by week each period is one ISO week
-// headed by its label; by month and year a week belongs to the period of its
-// Monday, so week 40 is September's and week 1 is 2025's.
-const BY = {
-  week: (
-    [
-      ['2026-W41', WEEK_41],
-      ['2026-W40', WEEK_40],
-      ['2026-W39', WEEK_39],
-      ['2026-W01', WEEK_1],
-    ] as const
-  ).map(([key, p]) => ({ key, heading: p.label, posts: [p] })),
-  month: [
-    { key: '2026-10', heading: 'October 2026', posts: [WEEK_41] },
-    { key: '2026-09', heading: 'September 2026', posts: [WEEK_40, WEEK_39] },
-    { key: '2025-12', heading: 'December 2025', posts: [WEEK_1] },
-  ],
-  year: [
-    { key: '2026', heading: '2026', posts: [WEEK_41, WEEK_40, WEEK_39] },
-    { key: '2025', heading: '2025', posts: [WEEK_1] },
-  ],
-}
-
-function archive(by: keyof typeof BY) {
-  return () => jsonResponse(200, { by, periods: BY[by] })
-}
-
-type Responder = (init: RequestInit | undefined) => Response | Promise<Response>
-
-// stubServer answers "METHOD path" requests from responders, with /me and
-// the household settings; any other request fails the test.
-function stubServer(responders: Record<string, Responder>) {
-  const all: Record<string, Responder> = {
-    'GET /api/v1/me': () => jsonResponse(200, ME),
-    'GET /api/v1/settings/household': () => jsonResponse(200, HOUSEHOLD_SETTINGS),
-    ...responders,
-  }
-  const fetchMock = vi.fn<typeof fetch>((input, init) => {
-    const key = `${init?.method ?? 'GET'} ${String(input)}`
-    const respond = Object.hasOwn(all, key) ? all[key] : undefined
-    if (respond === undefined) throw new Error(`unexpected fetch: ${key}`)
-    return Promise.resolve(respond(init))
-  })
-  vi.stubGlobal('fetch', fetchMock)
-  return fetchMock
-}
-
-// renderPage loads /me (for the CSRF token any write would need, so a
-// missing PATCH is not for want of it) and renders the Supply archive at path.
-async function renderPage(path = '/plan/shopping/archive') {
-  const api = createApiClient(fakeLocation(path), createNetworkStatus(window), createVerifiedSession(localStorage))
-  await api.loadMe()
-  return render(
-    <ApiProvider client={api}>
-      <QueryClientProvider client={createQueryClient()}>
-        <MemoryRouter initialEntries={[path]}>
-          <Routes>
-            <Route path="/plan/shopping/archive" element={<SupplyArchivePage />} />
-            <Route path="/plan/shopping" element={<p>Supply run screen</p>} />
-          </Routes>
-        </MemoryRouter>
-      </QueryClientProvider>
-    </ApiProvider>,
-  )
-}
-
-// postCard is the post titled title, a link.
-function postCard(title: string) {
-  return screen.getByText(title).closest('a')!
-}
-
-beforeEach(() => {
-  mockViewport(390)
-  vi.useFakeTimers({ toFake: ['Date'] })
-  vi.setSystemTime(new Date('2026-10-07T16:00:00Z'))
-})
-
-afterEach(() => {
-  vi.useRealTimers()
-  vi.unstubAllGlobals()
-  Reflect.deleteProperty(window, 'matchMedia')
-})
-
-describe('SupplyArchivePage', () => {
-  it('renders mock 1m by week: one post per week with its kicker, title, counts and dinner chips', async () => {
-    stubServer({ [`GET ${ARCHIVE('week')}`]: archive('week') })
-    await renderPage()
-
-    expect(screen.getByRole('heading', { level: 1, name: 'Supply archive' })).toBeInTheDocument()
-    expect(screen.getByRole('radio', { name: 'Week' })).toBeChecked()
-    const card = await screen.findByText('Pizza, pot roast & the great orzo trial')
-    const post40 = card.closest('a')!
-    expect(within(post40).getByText('Week 40 · Sep 28 – Oct 4')).toHaveClass(styles.kicker!)
-    expect(post40).toHaveTextContent('7 dinners · 26 items · 4 already on hand')
-    expect(within(post40).getByText('Beef tacos')).toHaveClass(styles.chip!)
-    expect(within(post40).getByText('Tikka masala')).toHaveClass(styles.chip!)
-    expect(within(post40).getByText('+5')).toHaveClass(styles.chip!)
-    expect(within(post40).queryByText('Pizza')).not.toBeInTheDocument()
-    expect(postCard('Chili season opens')).toHaveTextContent('1 dinner · 1 item · 0 already on hand')
-    expect(within(postCard('Chili season opens')).queryByText(/^\+/)).not.toBeInTheDocument()
-
-    expect(screen.getAllByRole('link').map((link) => link.getAttribute('href'))).toEqual([
-      '/plan/shopping/archive?week=2026-10-05',
-      '/plan/shopping/archive?week=2026-09-28',
-      '/plan/shopping/archive?week=2026-09-21',
-      '/plan/shopping/archive?week=2025-12-29',
-    ])
-  })
-
-  it('renders by week the periods and headings the server sends, as sent', async () => {
-    stubServer({ [`GET ${ARCHIVE('week')}`]: archive('week') })
-    await renderPage()
-    await screen.findByText('Chili season opens')
-
-    expect(screen.getAllByRole('heading', { level: 2 }).map((h) => h.textContent)).toEqual(BY.week.map((period) => period.heading))
-    expect(screen.getByRole('heading', { level: 2, name: WEEK_40.label })).toHaveClass(styles.heading!)
-    for (const period of BY.week) {
-      const section = screen.getByRole('region', { name: period.heading })
-      expect(within(section).getAllByRole('link').map((link) => link.getAttribute('href'))).toEqual(
-        period.posts.map((p) => `/plan/shopping/archive?week=${p.weekStart}`),
-      )
-    }
-  })
-
-  it('capitalises the week label kicker in CSS from the label as the API writes it', async () => {
-    stubServer({ [`GET ${ARCHIVE('week')}`]: archive('week') })
-    await renderPage()
-    await screen.findByText('Chili season opens')
-    expect(within(postCard('Chili season opens')).getByText('Week 39 · Sep 21 – 27')).toHaveClass(styles.kicker!)
-  })
-
-  it.each([
-    ['Month', 'month', ['October 2026', 'September 2026', 'December 2025']],
-    ['Year', 'year', ['2026', '2025']],
-  ] as const)('groups by %s under the headings the server sends, across the month and year boundaries', async (label, by, headings) => {
-    const fetchMock = stubServer({ [`GET ${ARCHIVE('week')}`]: archive('week'), [`GET ${ARCHIVE(by)}`]: archive(by) })
-    await renderPage()
-    await screen.findByText('Chili season opens')
-
-    fireEvent.click(screen.getByRole('radio', { name: label }))
-
-    await waitFor(() => expect(screen.getAllByRole('heading', { level: 2 }).map((h) => h.textContent)).toEqual(headings))
-    expect(screen.getByRole('heading', { level: 2, name: headings[0] })).toHaveClass(styles.heading!)
-    expect(fetchMock.mock.calls.map(([input]) => String(input))).toContain(ARCHIVE(by))
-    for (const period of BY[by]) {
-      const section = screen.getByRole('region', { name: period.heading })
-      expect(within(section).getAllByRole('link').map((link) => link.getAttribute('href'))).toEqual(
-        period.posts.map((p) => `/plan/shopping/archive?week=${p.weekStart}`),
-      )
-    }
-  })
-
-  it('highlights the current week’s post, by the API’s current, and no other', async () => {
-    stubServer({ [`GET ${ARCHIVE('week')}`]: archive('week') })
-    await renderPage()
-
-    const current = (await screen.findByText('Tacos, tikka & a salmon finale')).closest('a')!
-    expect(current).toHaveClass(styles.current!)
-    expect(within(current).getByText('Week 41 · Oct 5 – 11 · Current')).toBeInTheDocument()
-    for (const title of ['Pizza, pot roast & the great orzo trial', 'Chili season opens']) {
-      expect(postCard(title)).not.toHaveClass(styles.current!)
-      expect(postCard(title)).not.toHaveTextContent('Current')
-    }
-  })
-
-  it('follows current from the API, not today’s date', async () => {
-    const past = { ...WEEK_40, current: true }
-    stubServer({ [`GET ${ARCHIVE('week')}`]: () => jsonResponse(200, { by: 'week', periods: [{ key: 'w', heading: past.label, posts: [{ ...WEEK_41, current: false }, past] }] }) })
-    await renderPage()
-
-    expect(await screen.findByText('Week 40 · Sep 28 – Oct 4 · Current')).toBeInTheDocument()
-    expect(postCard('Tacos, tikka & a salmon finale')).not.toHaveClass(styles.current!)
-  })
-
-  it('titles an untitled post with its week label', async () => {
-    stubServer({ [`GET ${ARCHIVE('week')}`]: archive('week') })
-    await renderPage()
-
-    await screen.findByText('Chili season opens')
-    const untitled = screen.getByRole('link', { name: /Week 1 · Dec 29 – Jan 4/ })
-    const label = within(untitled).getAllByText('Week 1 · Dec 29 – Jan 4')
-    expect(label.map((el) => el.className)).toEqual([styles.kicker, styles.postTitle])
-  })
-
-  it(`shows ${PAGE} posts and "Load older" shows the next ${PAGE}, none twice and none skipped`, async () => {
-    const weeks = Array.from({ length: 2 * PAGE + 3 }, (_, i) => {
-      const monday = new Date(Date.UTC(2026, 9, 5 - 7 * i)).toISOString().slice(0, 10)
-      return post(monday, `Week of ${monday}`, { title: `Post ${i}` })
-    })
-    // By month, so the cut falls inside a period and its heading is shown once.
-    const periods = [
-      { key: 'a', heading: 'Newer', posts: weeks.slice(0, PAGE + 2) },
-      { key: 'b', heading: 'Older', posts: weeks.slice(PAGE + 2) },
-    ]
-    stubServer({
-      [`GET ${ARCHIVE('week')}`]: archive('week'),
-      [`GET ${ARCHIVE('month')}`]: () => jsonResponse(200, { by: 'month', periods }),
-    })
-    await renderPage()
-    await screen.findByText('Chili season opens')
-    fireEvent.click(screen.getByRole('radio', { name: 'Month' }))
-
-    const titles = () => screen.getAllByRole('link').map((link) => within(link).getByText(/^Post /).textContent)
-    await screen.findByText('Post 0')
-    expect(titles()).toEqual(weeks.slice(0, PAGE).map((p) => p.title))
-    expect(screen.getAllByRole('heading', { level: 2 }).map((h) => h.textContent)).toEqual(['Newer'])
-
-    fireEvent.click(screen.getByRole('button', { name: 'Load older' }))
-    expect(titles()).toEqual(weeks.slice(0, 2 * PAGE).map((p) => p.title))
-    expect(screen.getAllByRole('heading', { level: 2 }).map((h) => h.textContent)).toEqual(['Newer', 'Older'])
-
-    fireEvent.click(screen.getByRole('button', { name: 'Load older' }))
-    expect(titles()).toEqual(weeks.map((p) => p.title))
-    expect(screen.queryByRole('button', { name: 'Load older' })).not.toBeInTheDocument()
-  })
-
-  it('offers no "Load older" when every post is shown', async () => {
-    stubServer({ [`GET ${ARCHIVE('week')}`]: archive('week') })
-    await renderPage()
-    await screen.findByText('Chili season opens')
-    expect(screen.queryByRole('button', { name: 'Load older' })).not.toBeInTheDocument()
-  })
-
-  it('shows skeleton posts while the archive loads', async () => {
-    stubServer({ [`GET ${ARCHIVE('week')}`]: () => new Promise<Response>(() => {}) })
-    await renderPage()
-    expect(screen.getByLabelText('Supply archive loading')).toHaveAttribute('aria-busy', 'true')
-    expect(screen.getAllByTestId('skeleton-post')).toHaveLength(3)
-  })
-
-  it('says so when nothing is archived yet', async () => {
-    stubServer({ [`GET ${ARCHIVE('week')}`]: () => jsonResponse(200, { by: 'week', periods: [] }) })
-    await renderPage()
-    expect(await screen.findByText('Nothing archived yet')).toBeInTheDocument()
-    expect(screen.queryByRole('button', { name: 'Load older' })).not.toBeInTheDocument()
-  })
-
-  it('reports a failed load and retries it', async () => {
-    let reads = 0
-    stubServer({
-      [`GET ${ARCHIVE('week')}`]: () => (++reads === 1 ? errorResponse(500, 'internal') : archive('week')()),
-    })
-    await renderPage()
-
-    const alert = await screen.findByRole('alert')
-    expect(alert).toHaveTextContent("Couldn't load the Supply archive.")
-    fireEvent.click(within(alert).getByRole('button', { name: 'Retry' }))
-    expect(await screen.findByText('Chili season opens')).toBeInTheDocument()
-    expect(reads).toBe(2)
-  })
-
-  it('reports a response that is not the archive by the period asked for', async () => {
-    stubServer({ [`GET ${ARCHIVE('week')}`]: () => jsonResponse(200, { by: 'month', periods: [] }) })
-    await renderPage()
-    expect(await screen.findByRole('alert')).toHaveTextContent(`GET ${ARCHIVE('week')}: response is not the Supply archive by week`)
-  })
-
-  it('goes back to the Supply run', async () => {
-    stubServer({ [`GET ${ARCHIVE('week')}`]: archive('week') })
-    await renderPage()
-    fireEvent.click(screen.getByRole('button', { name: 'Back to the Supply run' }))
-    expect(await screen.findByText('Supply run screen')).toBeInTheDocument()
-  })
-})
-
-// The frozen Supply run of week 40, as GET /api/v1/shopping/{weekStart}
-// sends it.
-const FROZEN = {
-  weekStart: '2026-09-28',
-  label: 'Week 40 · Sep 28 – Oct 4',
-  title: 'Pizza, pot roast & the great orzo trial',
-  status: 'archived',
-  sent_to_chat_at: null,
-  needed_count: 1,
-  total_count: 2,
-  groups: [
-    {
-      dinner: { id: 'd1', name: 'Friday pizza' },
-      date: '2026-10-02',
-      items: [
-        { id: 'i1', name: 'Pizza dough', qty: '2 balls', needed: true },
-        { id: 'i2', name: 'Mozzarella', qty: '1 lb', needed: false },
-      ],
-    },
-  ],
-}
-
-// The current week's Supply run, week 41, still current: the API's archive
-// includes it, highlighted.
-const CURRENT = {
-  ...FROZEN,
-  weekStart: '2026-10-05',
-  label: 'Week 41 · Oct 5 – 11',
-  title: 'Tacos, tikka & a salmon finale',
-  status: 'current',
-  groups: [
-    {
-      dinner: { id: 'd2', name: 'Beef tacos' },
-      date: '2026-10-05',
-      items: [
-        { id: 'i3', name: 'Corn tortillas', qty: '12', needed: true },
-        { id: 'i4', name: 'Limes', qty: '3', needed: false },
-      ],
-    },
-  ],
-}
-
-describe('SupplyArchivePage frozen post', () => {
-  it('opens a tapped post’s frozen list read-only, tagged Archived, sending no PATCH', async () => {
-    const fetchMock = stubServer({
-      [`GET ${ARCHIVE('week')}`]: archive('week'),
-      'GET /api/v1/shopping/2026-09-28': () => jsonResponse(200, FROZEN),
-    })
-    await renderPage()
-
-    fireEvent.click(await screen.findByText('Pizza, pot roast & the great orzo trial'))
-
-    expect(await screen.findByText('Archived')).toBeInTheDocument()
-    expect(screen.getByRole('heading', { level: 1, name: /Shopping list/ })).toBeInTheDocument()
-    expect(screen.getByText('Pizza dough')).toBeInTheDocument()
-    expect(screen.queryAllByRole('checkbox')).toEqual([])
-    fireEvent.click(screen.getByText('Pizza dough'))
-    fireEvent.click(screen.getByText('Mozzarella'))
-    expect(fetchMock.mock.calls.filter(([, init]) => init?.method !== undefined && init.method !== 'GET')).toEqual([])
-
-    // The list links back to the archive.
-    fireEvent.click(screen.getByRole('link', { name: 'Supply archive' }))
-    expect(await screen.findByRole('heading', { level: 1, name: 'Supply archive' })).toBeInTheDocument()
-  })
-
-  it('opens the current week’s post read-only too, tagged Archived, with no checkbox, nothing to send and no PATCH', async () => {
-    const fetchMock = stubServer({
-      [`GET ${ARCHIVE('week')}`]: archive('week'),
-      'GET /api/v1/shopping/2026-10-05': () => jsonResponse(200, CURRENT),
-    })
-    await renderPage()
-
-    fireEvent.click(await screen.findByText('Tacos, tikka & a salmon finale'))
-
-    expect(await screen.findByText('Archived')).toBeInTheDocument()
-    expect(screen.getByText("This week's list as it stands, read-only in the Supply archive.")).toBeInTheDocument()
-    expect(screen.getByText('Corn tortillas')).toBeInTheDocument()
-    expect(screen.queryAllByRole('checkbox')).toEqual([])
-    fireEvent.click(screen.getByText('Corn tortillas'))
-    fireEvent.click(screen.getByText('Limes'))
-    expect(fetchMock.mock.calls.filter(([, init]) => init?.method !== undefined && init.method !== 'GET')).toEqual([])
-  })
-
-  it('on desktop opens the current week’s post read-only, and with no post open shows this week’s Supply run to change', async () => {
-    mockViewport(1440)
-    const fetchMock = stubServer({
-      [`GET ${ARCHIVE('week')}`]: archive('week'),
-      'GET /api/v1/shopping/2026-10-05': () => jsonResponse(200, CURRENT),
-    })
-    const view = await renderPage('/plan/shopping/archive?week=2026-10-05')
-
-    expect(await screen.findByText('Archived')).toBeInTheDocument()
-    expect(screen.getByText('Corn tortillas')).toBeInTheDocument()
-    expect(screen.queryAllByRole('checkbox')).toEqual([])
-    expect(screen.queryByText('Send to Google Chat')).not.toBeInTheDocument()
-    fireEvent.click(screen.getByText('Corn tortillas'))
-    expect(fetchMock.mock.calls.filter(([, init]) => init?.method !== undefined && init.method !== 'GET')).toEqual([])
-    view.unmount()
-
-    await renderPage()
-    expect(await screen.findByRole('checkbox', { name: 'Corn tortillas' })).toBeInTheDocument()
-    expect(screen.queryByText('Archived')).not.toBeInTheDocument()
-  })
-
-  it('on desktop (mock 2f) shows the archive as a panel beside the open post’s list', async () => {
-    mockViewport(1440)
-    stubServer({
-      [`GET ${ARCHIVE('week')}`]: archive('week'),
-      'GET /api/v1/shopping/2026-09-28': () => jsonResponse(200, FROZEN),
-    })
-    await renderPage('/plan/shopping/archive?week=2026-09-28')
-
-    const panel = screen.getByRole('complementary', { name: 'Supply archive' })
-    expect(await within(panel).findByText('Chili season opens')).toBeInTheDocument()
-    expect(within(panel).queryByRole('button', { name: 'Back to the Supply run' })).not.toBeInTheDocument()
-    expect(await screen.findByText('Archived')).toBeInTheDocument()
-    expect(panel).not.toContainElement(screen.getByText('Pizza dough'))
-    expect(screen.queryAllByRole('checkbox')).toEqual([])
-  })
-})

web/src/shopping/SupplyArchivePage.tsx

@@ -1,183 +0,0 @@
-import { ChevronLeft } from 'lucide-react'
-import { useState } from 'react'
-import { Link, useNavigate, useSearchParams } from 'react-router'
-import { useBreakpoint } from '../shell/useBreakpoint.ts'
-import { Button } from '../ui/Button.tsx'
-import { EmptyState } from '../ui/EmptyState.tsx'
-import { ErrorBanner } from '../ui/ErrorBanner.tsx'
-import { Icon } from '../ui/Icon.tsx'
-import { IconButton } from '../ui/IconButton.tsx'
-import { Segmented } from '../ui/Segmented.tsx'
-import { Skeleton } from '../ui/Skeleton.tsx'
-import { useSupplyArchive, WEEK_PARAM, type ArchiveGroup, type ArchivePeriod, type ArchivePost } from './api.ts'
-import styles from './SupplyArchivePage.module.css'
-import { SUPPLY_ARCHIVE, SupplyRunPage } from './SupplyRunPage.tsx'
-
-// PAGE is how many posts the Supply archive shows at first, and how many
-// more each "Load older" shows.
-export const PAGE = 8
-
-// CHIPS is how many of a post's dinners it names; a "+N" chip counts the rest.
-const CHIPS = 2
-
-const PERIODS = [
-  { value: 'week', label: 'Week' },
-  { value: 'month', label: 'Month' },
-  { value: 'year', label: 'Year' },
-] as const satisfies readonly { value: ArchivePeriod; label: string }[]
-
-// archivePost is the Supply archive screen opened on the post of the week
-// starting on Monday weekStart.
-export function archivePost(weekStart: string): string {
-  return `${SUPPLY_ARCHIVE}?${new URLSearchParams({ [WEEK_PARAM]: weekStart })}`
-}
-
-function plural(n: number, one: string, many: string): string {
-  return `${n} ${n === 1 ? one : many}`
-}
-
-// PostCard is one week's Supply run (mock 1m): the week label as its kicker,
-// the AI's title — the week label while it has none — the counts and its
-// first dinners as chips. The current week's post is ringed in grape. It
-// opens the week's list, read-only.
-function PostCard({ post }: { post: ArchivePost }) {
-  const rest = post.dinners.length - CHIPS
-  return (
-    <Link to={archivePost(post.weekStart)} className={[styles.post, post.current && styles.current].filter(Boolean).join(' ')}>
-      <span className={styles.kicker}>
-        {post.label}
-        {post.current && ' · Current'}
-      </span>
-      <span className={styles.postTitle}>{post.title ?? post.label}</span>
-      <span className={styles.meta}>
-        {plural(post.dinnerCount, 'dinner', 'dinners')} · {plural(post.itemCount, 'item', 'items')} · {post.onHandCount} already on
-        hand
-      </span>
-      {post.dinners.length > 0 && (
-        <span className={styles.chips}>
-          {post.dinners.slice(0, CHIPS).map((name, i) => (
-            <span key={i} className={styles.chip}>
-              {name}
-            </span>
-          ))}
-          {rest > 0 && <span className={styles.chip}>+{rest}</span>}
-        </span>
-      )}
-    </Link>
-  )
-}
-
-function Posts({ posts }: { posts: ArchivePost[] }) {
-  return (
-    <ul className={styles.posts}>
-      {posts.map((post) => (
-        <li key={post.weekStart}>
-          <PostCard post={post} />
-        </li>
-      ))}
-    </ul>
-  )
-}
-
-// shownGroups is groups cut to their first shown posts, newest first, without
-// the periods left with none.
-function shownGroups(groups: ArchiveGroup[], shown: number): ArchiveGroup[] {
-  const out: ArchiveGroup[] = []
-  let left = shown
-  for (const group of groups) {
-    if (left === 0) break
-    const posts = group.posts.slice(0, left)
-    out.push({ ...group, posts })
-    left -= posts.length
-  }
-  return out
-}
-
-// ArchivePosts is the Supply archive as the server groups it by by: one post
-// per week, under the Bagel heading of each period the server sends — by
-// week, the week's label. It shows PAGE posts and "Load older" shows PAGE
-// more.
-function ArchivePosts({ by }: { by: ArchivePeriod }) {
-  const archive = useSupplyArchive(by)
-  const [shown, setShown] = useState(PAGE)
-
-  if (archive.isError) {
-    return <ErrorBanner onRetry={() => void archive.refetch()}>Couldn't load the Supply archive. {archive.error.message}</ErrorBanner>
-  }
-  if (archive.isPending) {
-    return (
-      <div aria-busy="true" aria-label="Supply archive loading" className={styles.posts}>
-        {Array.from({ length: 3 }, (_, i) => (
-          <Skeleton key={i} data-testid="skeleton-post" className={styles.skeletonPost} />
-        ))}
-      </div>
-    )
-  }
-  const total = archive.data.reduce((n, group) => n + group.posts.length, 0)
-  if (total === 0) {
-    return <EmptyState title="Nothing archived yet">Each week's Supply run becomes a post here once it's made.</EmptyState>
-  }
-  const groups = shownGroups(archive.data, shown)
-  return (
-    <>
-      {groups.map((group) => (
-        <section key={group.key} aria-label={group.heading} className={styles.period}>
-          <h2 className={styles.heading}>{group.heading}</h2>
-          <Posts posts={group.posts} />
-        </section>
-      ))}
-      {shown < total && (
-        <Button variant="outline" className={styles.older} onClick={() => setShown(shown + PAGE)}>
-          Load older
-        </Button>
-      )}
-    </>
-  )
-}
-
-// SupplyArchive is the Supply archive (mock 1m, and the right panel of 2f):
-// the Week | Month | Year control over the posts. On mobile and tablet a
-// back button returns to the Supply run.
-function SupplyArchive({ panel }: { panel: boolean }) {
-  const navigate = useNavigate()
-  const [by, setBy] = useState<ArchivePeriod>('week')
-  return (
-    <div className={styles.archive}>
-      <header className={styles.header}>
-        {!panel && (
-          <IconButton label="Back to the Supply run" onClick={() => void navigate('/plan/shopping')}>
-            <Icon icon={ChevronLeft} size="nav" />
-          </IconButton>
-        )}
-        <h1 className={styles.title}>Supply archive</h1>
-      </header>
-      <Segmented label="Group the Supply archive by" options={PERIODS} value={by} onValueChange={setBy} className={styles.periods} />
-      <ArchivePosts key={by} by={by} />
-    </div>
-  )
-}
-
-// SupplyArchivePage is /plan/shopping/archive. A post opens it on its week
-// (?week=), whose list the Supply run screen shows read-only and tagged
-// Archived, whatever its status: even the current week's post is only
-// viewed here, never changed. On desktop (mock 2f) the archive is a panel at
-// the right of that list, this week's editable Supply run when no post is
-// open; on mobile and tablet it is the archive or, with a post open, the
-// post's list.
-export function SupplyArchivePage() {
-  const layout = useBreakpoint()
-  const [params] = useSearchParams()
-  if (layout === 'desktop') {
-    return (
-      <div className={styles.split}>
-        <div className={styles.list}>
-          <SupplyRunPage readOnly={params.has(WEEK_PARAM)} />
-        </div>
-        <aside className={styles.panel} aria-label="Supply archive">
-          <SupplyArchive panel />
-        </aside>
-      </div>
-    )
-  }
-  return params.has(WEEK_PARAM) ? <SupplyRunPage readOnly /> : <SupplyArchive panel={false} />
-}

web/src/shopping/SupplyRunPage.tsx

@@ -40,8 +40,8 @@ export function sentAt(at: Date, timezone: string): string {
 
 // ItemRow is one ingredient: on a current Supply run a checkbox, checked
 // (grape) while it is to buy; unchecked, the name is struck through and
-// "have it" stands in for the quantity. A read-only Supply run shows the
-// same marks. An item toggled while the server cannot be reached
+// "have it" stands in for the quantity. An archived Supply run shows the
+// same marks, read-only. An item toggled while the server cannot be reached
 // says it will sync.
 function ItemRow({ item, toggles }: { item: SupplyRunItem; toggles: Toggles | null }) {
   const name = (
@@ -121,13 +121,12 @@ function ArchiveLink({ layout }: { layout: Breakpoint }) {
 // one card per dinner, stacked on mobile and in three masonry columns from
 // tablet up, where Archive and Send to Google Chat are actions in the
 // header. On a current Supply run each item toggles at once (useToggles); a
-// toggle refused puts the item back and says why. An archived one, or any
-// opened from the Supply archive (readOnly), is read-only and tagged
-// Archived, and a toggle it refused is not offered again.
-function SupplyRunList({ weekStart, timezone, layout, readOnly }: WeekProps) {
+// toggle refused puts the item back and says why. An archived one is
+// read-only, and a toggle it refused is not offered again.
+function SupplyRunList({ weekStart, timezone, layout }: { weekStart: string; timezone: string; layout: Breakpoint }) {
   const toggles = useToggles(weekStart)
   const run = toggles.shown
-  const viewOnly = readOnly || run.status === 'archived'
+  const archived = run.status === 'archived'
   const wide = layout !== 'mobile'
   const failed = toggles.failed
   const failedItem = failed && run.groups.flatMap((group) => group.items).find((item) => item.id === failed.toggle.id)
@@ -139,23 +138,21 @@ function SupplyRunList({ weekStart, timezone, layout, readOnly }: WeekProps) {
           <p className={styles.kicker}>Supply run · {weekLabel(weekStart).dates}</p>
           <div className={styles.titleRow}>
             <h1 className={styles.title}>Shopping list</h1>
-            {viewOnly && <Tag tone="grape">Archived</Tag>}
+            {archived && <Tag tone="grape">Archived</Tag>}
             <p className={styles.count}>
               {run.needed_count} / {run.total_count}
             </p>
           </div>
           <p className={styles.helper}>
-            {run.status === 'archived'
+            {archived
               ? 'This list is in the Supply archive, as it was when the week ended.'
-              : viewOnly
-                ? "This week's list as it stands, read-only in the Supply archive."
-                : "Uncheck anything you already have — it won't be counted."}
+              : "Uncheck anything you already have — it won't be counted."}
           </p>
         </div>
         {wide && (
           <div className={styles.actions}>
             <ArchiveLink layout={layout} />
-            {!viewOnly && (
+            {!archived && (
               <Unavailable hint={CHAT_HINT} below className={styles.action}>
                 <Icon icon={MessageSquare} size="inline" />
                 Send to Google Chat
@@ -165,7 +162,7 @@ function SupplyRunList({ weekStart, timezone, layout, readOnly }: WeekProps) {
         )}
       </header>
       {failed !== null && (
-        <ErrorBanner onRetry={viewOnly ? undefined : () => toggles.toggle(failed.toggle)}>
+        <ErrorBanner onRetry={archived ? undefined : () => toggles.toggle(failed.toggle)}>
           Couldn't mark {failedItem ? failedItem.name : 'an item'} {failed.toggle.needed ? 'to buy' : '“have it”'}.{' '}
           {failed.error.message}
         </ErrorBanner>
@@ -176,7 +173,7 @@ function SupplyRunList({ weekStart, timezone, layout, readOnly }: WeekProps) {
       ) : (
         <div className={styles.groups} data-testid="supply-run-groups">
           {run.groups.map((group) => (
-            <GroupCard key={`${group.date} ${group.dinner.id}`} group={group} toggles={viewOnly ? null : toggles} />
+            <GroupCard key={`${group.date} ${group.dinner.id}`} group={group} toggles={archived ? null : toggles} />
           ))}
         </div>
       )}
@@ -204,12 +201,9 @@ function SkeletonGroups({ layout }: { layout: Breakpoint }) {
   )
 }
 
-type WeekProps = { weekStart: string; timezone: string; layout: Breakpoint; readOnly: boolean }
-
 // WeekSupplyRun is the Supply run of the week starting on weekStart, or,
-// when the week has none yet, the offer to make it from the week's plan —
-// not offered read-only.
-function WeekSupplyRun({ weekStart, timezone, layout, readOnly }: WeekProps) {
+// when the week has none yet, the offer to make it from the week's plan.
+function WeekSupplyRun({ weekStart, timezone, layout }: { weekStart: string; timezone: string; layout: Breakpoint }) {
   const run = useSupplyRun(weekStart)
   const generate = useGenerateSupplyRun(weekStart)
 
@@ -222,42 +216,36 @@ function WeekSupplyRun({ weekStart, timezone, layout, readOnly }: WeekProps) {
   if (run.data === null) {
     return (
       <div className={`${styles.page} ${styles[layout]}`}>
-        {readOnly ? (
-          <EmptyState title="No shopping list">This week has no Supply run in the Supply archive.</EmptyState>
-        ) : (
-          <EmptyState title="No shopping list yet" action={{ label: 'Make the shopping list', onClick: () => generate.mutate() }}>
-            I'll gather the ingredients of this week's planned dinners into a Supply run.
-          </EmptyState>
-        )}
+        <EmptyState title="No shopping list yet" action={{ label: 'Make the shopping list', onClick: () => generate.mutate() }}>
+          I'll gather the ingredients of this week's planned dinners into a Supply run.
+        </EmptyState>
         {generate.isError && (
           <ErrorBanner onRetry={() => generate.mutate()}>Couldn't make the shopping list. {generate.error.message}</ErrorBanner>
         )}
       </div>
     )
   }
-  return <SupplyRunList weekStart={weekStart} timezone={timezone} layout={layout} readOnly={readOnly} />
+  return <SupplyRunList weekStart={weekStart} timezone={timezone} layout={layout} />
 }
 
 // SupplyRunPage is the Supply run (mock 1l on mobile, 2b on tablet, 2f on
 // desktop) of the week the Plan opens on — next week once this week's
 // plan_draft time has come, otherwise this week — or of the week chosen by
-// ?week=. Opened from the Supply archive it is readOnly: tagged Archived,
-// with no checkbox and nothing to make or send, whatever the week. Offline,
-// where the settings cannot be read, it chooses the week by the schedule
-// saved on this device.
-export function SupplyRunPage({ readOnly = false }: { readOnly?: boolean }) {
+// ?week=, such as a week in the Supply archive. Offline, where the settings
+// cannot be read, it chooses the week by the schedule saved on this device.
+export function SupplyRunPage() {
   const problem = useSavedProblem()
   return (
     <>
       {problem !== null && (
         <ErrorBanner>Changes to the shopping list can't be kept on this device while offline. {problem.message}</ErrorBanner>
       )}
-      <ChosenSupplyRun readOnly={readOnly} />
+      <ChosenSupplyRun />
     </>
   )
 }
 
-function ChosenSupplyRun({ readOnly }: { readOnly: boolean }) {
+function ChosenSupplyRun() {
   const layout = useBreakpoint()
   const settings = useHouseholdSettings()
   const [params] = useSearchParams()
@@ -276,7 +264,7 @@ function ChosenSupplyRun({ readOnly }: { readOnly: boolean }) {
   }
   if (!schedule) return <SkeletonGroups layout={layout} />
   const week = chosen ?? defaultWeek(schedule, new Date())
-  return <WeekSupplyRun key={week} weekStart={week} timezone={schedule.timezone} layout={layout} readOnly={readOnly} />
+  return <WeekSupplyRun key={week} weekStart={week} timezone={schedule.timezone} layout={layout} />
 }
 
 // isMonday says whether date is a real YYYY-MM-DD Monday.

web/src/shopping/api.ts

@@ -497,77 +497,3 @@ function shown(run: SupplyRun, pending: Toggle[]): SupplyRun {
   }))
   return { ...run, needed_count: needed, groups }
 }
-
-export const ARCHIVE_PERIODS = ['week', 'month', 'year'] as const
-
-// ArchivePeriod is what the Supply archive is grouped by.
-export type ArchivePeriod = (typeof ARCHIVE_PERIODS)[number]
-
-// ArchivePost is one week's Supply run in the Supply archive: label is the
-// week label, "Week 41 · Oct 5 – 11", which stands in for title while it is
-// null; onHandCount counts the items marked "have it", and dinners names the
-// dinners in day order. current is true for the household's current week.
-export type ArchivePost = {
-  weekStart: string
-  label: string
-  title: string | null
-  dinnerCount: number
-  itemCount: number
-  onHandCount: number
-  dinners: string[]
-  current: boolean
-}
-
-// ArchiveGroup is one period of the Supply archive — a week, a month
-// ("October 2026") or a year ("2026") — and its posts, newest first.
-export type ArchiveGroup = { key: string; heading: string; posts: ArchivePost[] }
-
-function parsePost(where: string, body: unknown): ArchivePost {
-  if (
-    !isRecord(body) ||
-    typeof body.weekStart !== 'string' ||
-    typeof body.label !== 'string' ||
-    (body.title !== null && typeof body.title !== 'string') ||
-    !Array.isArray(body.dinners) ||
-    !body.dinners.every((name) => typeof name === 'string') ||
-    typeof body.current !== 'boolean'
-  ) {
-    throw new Error(`${where}: response has a post that is not a Supply archive post`)
-  }
-  return {
-    weekStart: body.weekStart,
-    label: body.label,
-    title: body.title,
-    dinnerCount: count(where, 'dinnerCount', body.dinnerCount),
-    itemCount: count(where, 'itemCount', body.itemCount),
-    onHandCount: count(where, 'onHandCount', body.onHandCount),
-    dinners: body.dinners as string[],
-    current: body.current,
-  }
-}
-
-function parseArchiveGroup(where: string, body: unknown): ArchiveGroup {
-  if (!isRecord(body) || typeof body.key !== 'string' || typeof body.heading !== 'string' || !Array.isArray(body.posts)) {
-    throw new Error(`${where}: response has a period that is not a Supply archive period`)
-  }
-  return { key: body.key, heading: body.heading, posts: body.posts.map((post) => parsePost(where, post)) }
-}
-
-// useSupplyArchive is the Supply archive grouped by by, newest first (GET
-// /api/v1/shopping/archive?by=week|month|year): the server groups it in the
-// household's zone, so it is shown as answered, never grouped again here.
-export function useSupplyArchive(by: ArchivePeriod) {
-  const { apiRead } = useApi()
-  return useQuery({
-    queryKey: ['supply archive', by] as const,
-    queryFn: async (): Promise<ArchiveGroup[]> => {
-      const path = `${SHOPPING_PATH}/archive?${new URLSearchParams({ by })}`
-      const where = `GET ${path}`
-      const { body } = await apiRead<unknown>(path)
-      if (!isRecord(body) || body.by !== by || !Array.isArray(body.periods)) {
-        throw new Error(`${where}: response is not the Supply archive by ${by}`)
-      }
-      return body.periods.map((period) => parseArchiveGroup(where, period))
-    },
-  })
-}

web/src/shopping/offlineQueue.test.tsx

@@ -1,7 +1,7 @@
 import { QueryClientProvider } from '@tanstack/react-query'
 import { act, fireEvent, render, screen, waitFor, within } from '@testing-library/react'
 import { MemoryRouter } from 'react-router'
-import { afterEach, beforeEach, describe, expect, it, vi, type Mock, type MockInstance } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest'
 import { ApiProvider, createApiClient, createQueryClient, createVerifiedSession } from '../api/index.ts'
 import { createNetworkStatus, type NetworkWindow } from '../pwa/networkStatus.ts'
 import { HOUSEHOLD_SETTINGS } from '../test/ApiProviders.tsx'
@@ -211,17 +211,6 @@ async function advance(ms: number) {
   await act(() => vi.advanceTimersByTimeAsync(ms))
 }
 
-// The page's setTimeout, watched: retrySecondTry waits for a timer to be set.
-let timers: MockInstance<typeof setTimeout>
-
-// retrySecondTry jumps past the wait before a toggle's second try — RETRY_FIRST
-// doubled by its failed first try — once that wait's timer is set, so the jump
-// never lands before the timer it is meant to fire.
-async function retrySecondTry() {
-  await waitFor(() => expect(timers).toHaveBeenCalledWith(expect.any(Function), 2 * RETRY_FIRST))
-  await advance(2 * RETRY_FIRST)
-}
-
 function checkbox(name: string) {
   return screen.getByRole('checkbox', { name: new RegExp(`^${name}`) })
 }
@@ -238,7 +227,6 @@ beforeEach(() => {
   // a wait (advance).
   vi.useFakeTimers({ toFake: ['Date', 'setTimeout', 'clearTimeout'], shouldAdvanceTime: true })
   vi.setSystemTime(new Date('2026-10-07T16:00:00Z'))
-  timers = vi.spyOn(globalThis, 'setTimeout')
 })
 
 afterEach(() => {
@@ -471,7 +459,7 @@ describe('offline toggle queue, replay', () => {
     expect(patches(server.fetchMock)).toHaveLength(1)
     expect(queue()).toEqual(['i3 true', 'i1 false'])
 
-    await retrySecondTry()
+    await advance(RETRY_FIRST)
     await waitFor(() => expect(queue()).toEqual([]))
     expect(patches(server.fetchMock)).toEqual([
       `${ITEM('i3')} {"needed":true}`,
@@ -504,7 +492,7 @@ describe('offline toggle queue, replay', () => {
     expect(patches(server.fetchMock)).toEqual([])
 
     // The next try sends a fresh /me, which the server answers.
-    await retrySecondTry()
+    await advance(RETRY_FIRST)
     await waitFor(() => expect(queue()).toEqual([]))
     expect(mes(server.fetchMock)).toBe(3)
     expect(patches(server.fetchMock)).toEqual([`${ITEM('i3')} {"needed":true}`, `${ITEM('i1')} {"needed":false}`])
@@ -544,7 +532,7 @@ describe('offline toggle queue, replay', () => {
     expect(queue()).toEqual(['i3 true', 'i1 false'])
 
     // The next try is refused again and sends a fresh refresh, which answers.
-    await retrySecondTry()
+    await advance(RETRY_FIRST)
     await waitFor(() => expect(queue()).toEqual([]))
     expect(patches(server.fetchMock)).toEqual([
       `${ITEM('i3')} {"needed":true}`,
@@ -567,10 +555,8 @@ describe('offline toggle queue, replay', () => {
     fireEvent.click(checkbox('Corn tortillas'))
     expect(await within(row('Corn tortillas')).findByText('will sync')).toBeInTheDocument()
     reachable = true
-    expect(patches(fetchMock)).toEqual([])
 
-    // Nothing says the server is back: only the wait's timer tries it again.
-    await retrySecondTry()
+    await advance(RETRY_FIRST)
     await waitFor(() => expect(queue()).toEqual([]))
     // The first try failed at GET /api/v1/me, before its PATCH.
     expect(patches(fetchMock)).toEqual([`${ITEM('i2')} {"needed":false}`])