Keep the stored-key removal path open and verify after sheet dismissal

- The API key row stays visible whenever a key is stored, Ollama included,
  and Replace (with Remove key) stays enabled after a provider or base URL
  change, so "remove the key first" can be followed without undoing it.
- One lock hint and one save-error guidance cover provider and base URL.
- Closing the key sheet no longer resets the store mutation, so the PUT's
  verify still runs; a store error after dismissal shows under the key.
- Reset and Save changes sit at the bottom of the screen (mock 1o).
- Tests: base URL lock guidance, recover by removing the key with Ollama
  chosen, and dismissing the sheet while the PUT is pending.

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

README.md

@@ -44,9 +44,6 @@ export MEALQUEST_OIDC_ALLOWED_GROUPS=mealquest-admin
 # 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
 ```
@@ -56,9 +53,8 @@ make dev
 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
+trusted proxy list (every entry must be an IP or CIDR) 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]`.

cmd/server/main.go

@@ -16,7 +16,6 @@ import (
 	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/ai/aisettings"
 	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/auth"
 	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/config"
-	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/dinners"
 	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/forwarded"
 	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/frontend"
 	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/household"
@@ -80,9 +79,9 @@ func run(cfg config.Config, logger *slog.Logger) error {
 	if err != nil {
 		return err
 	}
-	search, err := recipes.NewSearchSettingsService(db, box, cfg.SearXNGURL)
+	search, err := recipes.NewSearchSettingsService(db, box)
 	if err != nil {
-		return fmt.Errorf("%s: %w", config.EnvSearXNGURL, err)
+		return err
 	}
 
 	ai, err := aisettings.New(db, box, cfg.PublicURL.String())
@@ -106,7 +105,7 @@ func run(cfg config.Config, logger *slog.Logger) error {
 		return err
 	}
 
-	router, err := server.NewRouter(logger, version, cfg.TrustedProxy, authFlow, sessions, settings, search, ai, dinners.NewService(db), runner, photos, frontend.Assets())
+	router, err := server.NewRouter(logger, version, cfg.TrustedProxy, authFlow, sessions, settings, search, ai, runner, photos, frontend.Assets())
 	if err != nil {
 		return err
 	}

deploy/.env.example

@@ -68,10 +68,10 @@ MEALQUEST_SESSION_MAX=4320h
 # MEALQUEST_OIDC_CLIENT_SECRET_FILE=/run/secrets/oidc_client_secret
 #   The Authentik provider's client secret.
 # MEALQUEST_SEARXNG_URL=http://searxng:8080
-#   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 deploy/RUNBOOK.md "Recipe search (SearXNG)".
+#   The SearXNG recipe-search sidecar on the compose network. Planned; not
+#   read by the service yet. The app takes its recipe-search provider and
+#   base URL from PATCH /api/v1/settings/recipe-search; see
+#   deploy/RUNBOOK.md "Recipe search (SearXNG)".
 
 # --- Planned; not read by the service yet -------------------------------------
 #

deploy/RUNBOOK.md

@@ -417,23 +417,15 @@ The `searxng` service in `deploy/compose.yaml` is a private SearXNG
 instance for recipe search. On the compose network it is reachable at
 `http://searxng:8080`; that is the address to configure in the app.
 
-Starting the sidecar does not connect the app to it. The recipe-search
-provider and base URL live in the `recipe_search_settings` row and are set
-through `GET`/`PATCH /api/v1/settings/recipe-search` (the API behind the
-recipe search card on Settings → AI assistant). Until that row exists,
-recipe search answers 409 `not_configured`.
+Starting the sidecar does not connect the app to it. The service does not
+read `MEALQUEST_SEARXNG_URL`: `deploy/compose.yaml` sets it for a future
+wiring, and today it does nothing. The recipe-search provider and base URL
+live in the `recipe_search_settings` row and are set through
+`GET`/`PATCH /api/v1/settings/recipe-search` (the API behind the Settings
+screen's recipe search; the screen itself is not built yet). Until that row
+exists, recipe search answers 409 `not_configured`.
 
-`deploy/compose.yaml` sets `MEALQUEST_SEARXNG_URL=http://searxng:8080`.
-The service only suggests it: `GET` returns it as `default_base_url`, and
-the recipe search card pre-fills the SearXNG URL with it while no URL is
-saved. Nothing is stored until the card is saved, and a saved `base_url`
-always wins. A set value must be an absolute `http://` or `https://` URL
-without credentials, a query or a fragment, or the service refuses to
-start; unset, `default_base_url` is `null`.
-
-To set it up, open Settings → AI assistant, check that the recipe search
-card shows SearXNG with `http://searxng:8080`, select **Save recipe search**
-and then **Test**. Or, from a signed-in session (every non-`GET` request
+After the first deploy, from a signed-in session (every non-`GET` request
 needs the `X-MealQuest-CSRF` header set to `csrfToken` from
 `GET /api/v1/me`):
 

docs/ARCHITECTURE.md

@@ -96,7 +96,7 @@ Columns ending in `_ct` hold AES-256-GCM ciphertext (via `secretbox`).
 | `recipe_ingredients` | recipe_id, position, raw_text, name, qty, unit, note. |
 | `recipe_steps` | recipe_id, position, text. |
 | `photos` | source_url, local_path, width, height, sha256, fetched_at. |
-| `dinners` | The meal record and its lifecycle: name, normalized_name, status (`suggested` / `quest_log` / `tried` / `regular` / `archived`), origin, method, minutes_total, difficulty, cuisine, is_favorite, recipe_id, recipe_url (a pasted recipe link awaiting grounding), photo_id, grounding_status, updated_by. |
+| `dinners` | The meal record and its lifecycle: name, normalized_name, status (`suggested` / `quest_log` / `tried` / `regular` / `archived`), origin, method, minutes_total, difficulty, cuisine, is_favorite, recipe_id, photo_id, grounding_status, updated_by. |
 | `suggestion_batches` | trigger, status, ai_run_id. |
 | `suggestions` | dinner_id, batch_id, reason, cited_regular_ids (JSON), status, decided_at. |
 | `week_plans` | week_start (unique), status (`draft` / `synced` / `changed`), ai_note, ai_run_id, calendar_synced_at. |
@@ -149,9 +149,6 @@ automatic** (D-021).
   the Brave key (`api_key`, write-only: responses carry only
   `api_key_set` and `api_key_last4`; an empty string removes it). The
   result must be usable: SearXNG needs a base_url, Brave a key.
-  Responses also carry the read-only `default_base_url`, the deployment's
-  `MEALQUEST_SEARXNG_URL` (or null), which the client pre-fills while no
-  base_url is saved; only a PATCH of base_url stores a URL.
   `POST /api/v1/settings/recipe-search/test` searches "chicken tikka
   masala" and returns `{query, count}`, 409 `not_configured`, or 502
   `search_failed` with the provider's error.
@@ -178,28 +175,6 @@ automatic** (D-021).
   restores `household.DefaultPersonaPrompt` (CTXD PROMPTS.MD §4). No
   response holds the key. `Service.HarnessConfig` reads the settings for
   each skill run, so a saved change applies to the next run.
-- Dinners (`dinners.Service`). `POST /api/v1/dinners` adds a Regular from
-  exactly one of `{name}` or `{recipe_url}` (an https:// link, kept in
-  `recipe_url` for grounding) with status and origin `regular` and
-  grounding_status `pending`, answering 201 with the dinner. A link's
-  dinner is named from its last path segment (separators become spaces,
-  an extension and all-digit words are dropped: `…/12345/beef-stew/` is
-  "Beef stew"); a link that names nothing is 400 — add it by name. A name
-  is trimmed, at most 120 characters and must keep a word after
-  `harness.Normalize`, which sets `normalized_name`. A name
-  `harness.Similar` to an unarchived dinner's, or a link one already has,
-  is 409 `duplicate_dinner`; archived names may be added again.
-  `GET /api/v1/dinners?status=regular|quest_log` returns
-  `{dinners: [...]}` ordered by normalized name, each with `photo_url`
-  (`/media/photos/{photo_id}-400.jpg`, or null) and `grounding_status`;
-  any other status is 400. `PATCH /api/v1/dinners/{id}` edits `name`
-  (deduplicated against the other unarchived dinners), `method`
-  (`stovetop` / `oven` / `crockpot` / `grill` / `other`), `minutes_total`
-  (1–1440) and `difficulty` (`easy` / `medium` / `hard`); invalid values
-  are 400 `invalid_dinner` and change nothing. `DELETE /api/v1/dinners/{id}`
-  sets status `archived` and keeps the row; `POST
-  /api/v1/dinners/{id}/favorite` toggles `is_favorite`. Every write records
-  the session's subject as `updated_by`; an unknown id is 404.
 - `/health` — liveness.
 - Everything else serves the embedded PWA with SPA fallback.
 

internal/config/config.go

@@ -35,8 +35,6 @@ const (
 	EnvTrustedProxy = "MEALQUEST_TRUSTED_PROXY"
 
 	EnvDefaultTZ = "MEALQUEST_DEFAULT_TZ"
-
-	EnvSearXNGURL = "MEALQUEST_SEARXNG_URL"
 )
 
 // Session lifetime defaults (D-004): long enough that the kitchen tablet
@@ -75,13 +73,6 @@ type Config struct {
 	// validates it only while the settings do not exist yet, and ignores it
 	// once they do. Empty when unset.
 	DefaultTZ string
-
-	// SearXNGURL is the deployment's SearXNG instance, which the Settings
-	// screen suggests while no recipe-search URL is saved. It is optional
-	// and validated by recipes.NewSearchSettingsService: the compose
-	// network's http://searxng:8080 is neither https nor loopback, so the
-	// secure-URL rule does not apply. Empty when unset.
-	SearXNGURL string
 }
 
 // PublicOrigin returns the scheme and host of PublicURL, the only parts of it
@@ -116,8 +107,6 @@ func load(lookup func(string) (string, bool)) (Config, error) {
 		TrustedProxy: r.trustedProxy(EnvTrustedProxy),
 
 		DefaultTZ: r.optional(EnvDefaultTZ),
-
-		SearXNGURL: r.optional(EnvSearXNGURL),
 	}
 	if cfg.SessionIdle > 0 && cfg.SessionMax > 0 && cfg.SessionMax < cfg.SessionIdle {
 		r.fail(EnvSessionMax, "must be at least %s (%s)", EnvSessionIdle, cfg.SessionIdle)

internal/config/config_test.go

@@ -422,8 +422,6 @@ func TestLoadValues(t *testing.T) {
 		EnvOIDCAllowedGroups:    " mealquest-admin ,family",
 
 		EnvDefaultTZ: "Europe/London",
-
-		EnvSearXNGURL: "http://searxng:8080",
 	}
 	cfg, err := load(func(k string) (string, bool) { v, ok := env[k]; return v, ok })
 	if err != nil {
@@ -482,9 +480,6 @@ func TestLoadValues(t *testing.T) {
 	if cfg.DefaultTZ != "Europe/London" {
 		t.Errorf("DefaultTZ = %q, want Europe/London", cfg.DefaultTZ)
 	}
-	if cfg.SearXNGURL != "http://searxng:8080" {
-		t.Errorf("SearXNGURL = %q, want http://searxng:8080", cfg.SearXNGURL)
-	}
 }
 
 func TestSecretRedacted(t *testing.T) {

internal/db/db_test.go

@@ -106,22 +106,13 @@ func TestDinners(t *testing.T) {
 		Cuisine:         str("Mexican"),
 		IsFavorite:      0,
 		RecipeID:        str(recipe.ID),
-		RecipeUrl:       str("https://example.com/tacos"),
 		PhotoID:         str(photo.ID),
 		GroundingStatus: "grounded",
 		UpdatedBy:       str("alex@example.com"),
 		CreatedAt:       created,
 		UpdatedAt:       created,
 	}
-	want := db.Dinner{
-		ID: create.ID, Name: create.Name, NormalizedName: create.NormalizedName,
-		Status: create.Status, Origin: create.Origin, Method: create.Method,
-		MinutesTotal: create.MinutesTotal, Difficulty: create.Difficulty,
-		Cuisine: create.Cuisine, IsFavorite: create.IsFavorite, RecipeID: create.RecipeID,
-		PhotoID: create.PhotoID, GroundingStatus: create.GroundingStatus,
-		UpdatedBy: create.UpdatedBy, CreatedAt: created, UpdatedAt: created,
-		RecipeUrl: create.RecipeUrl,
-	}
+	want := db.Dinner(create)
 	got, err := q.CreateDinner(ctx, create)
 	if err != nil {
 		t.Fatalf("CreateDinner: %v", err)
@@ -206,7 +197,6 @@ func TestDinners(t *testing.T) {
 		Cuisine: update.Cuisine, IsFavorite: 0, RecipeID: update.RecipeID,
 		PhotoID: update.PhotoID, GroundingStatus: update.GroundingStatus,
 		UpdatedBy: update.UpdatedBy, CreatedAt: created, UpdatedAt: updated,
-		RecipeUrl: create.RecipeUrl, // UpdateDinner leaves the recipe link
 	}
 	if got != want {
 		t.Fatalf("UpdateDinner returned %+v, want %+v", got, want)
@@ -237,17 +227,6 @@ func TestDinners(t *testing.T) {
 	_, err = q.SetDinnerFavorite(ctx, db.SetDinnerFavoriteParams{ID: "missing", IsFavorite: 1, UpdatedAt: updated})
 	mustNoRows(t, "SetDinnerFavorite missing", err)
 
-	for _, wantFav := range []int64{1, 0} {
-		got, err = q.ToggleDinnerFavorite(ctx, db.ToggleDinnerFavoriteParams{
-			ID: create.ID, UpdatedBy: str("alex@example.com"), UpdatedAt: updated,
-		})
-		if err != nil || got.IsFavorite != wantFav || got.UpdatedBy != str("alex@example.com") {
-			t.Fatalf("ToggleDinnerFavorite = %+v, %v; want is_favorite %d", got, err, wantFav)
-		}
-	}
-	_, err = q.ToggleDinnerFavorite(ctx, db.ToggleDinnerFavoriteParams{ID: "missing", UpdatedAt: updated})
-	mustNoRows(t, "ToggleDinnerFavorite missing", err)
-
 	const archivedAt = "2026-10-05T12:00:00.000Z"
 	got, err = q.ArchiveDinner(ctx, db.ArchiveDinnerParams{
 		ID: create.ID, UpdatedBy: str("alex@example.com"), UpdatedAt: archivedAt,
@@ -261,15 +240,6 @@ func TestDinners(t *testing.T) {
 	}
 	assertIDs(t, "archived", listIDs("archived"), create.ID)
 	assertIDs(t, "tried after archive", listIDs("tried"))
-	unarchived, err := q.ListUnarchivedDinners(ctx)
-	if err != nil {
-		t.Fatalf("ListUnarchivedDinners: %v", err)
-	}
-	var unarchivedIDs []string
-	for _, d := range unarchived {
-		unarchivedIDs = append(unarchivedIDs, d.ID)
-	}
-	assertIDs(t, "unarchived", unarchivedIDs, other.ID, third.ID)
 	_, err = q.ArchiveDinner(ctx, db.ArchiveDinnerParams{ID: "missing", UpdatedAt: archivedAt})
 	mustNoRows(t, "ArchiveDinner missing", err)
 }

internal/db/dinners.sql.go

@@ -16,7 +16,7 @@ SET status = 'archived',
 	updated_by = ?,
 	updated_at = ?
 WHERE id = ?
-RETURNING id, name, normalized_name, status, origin, method, minutes_total, difficulty, cuisine, is_favorite, recipe_id, photo_id, grounding_status, updated_by, created_at, updated_at, recipe_url
+RETURNING id, name, normalized_name, status, origin, method, minutes_total, difficulty, cuisine, is_favorite, recipe_id, photo_id, grounding_status, updated_by, created_at, updated_at
 `
 
 type ArchiveDinnerParams struct {
@@ -46,7 +46,6 @@ func (q *Queries) ArchiveDinner(ctx context.Context, arg ArchiveDinnerParams) (D
 		&i.UpdatedBy,
 		&i.CreatedAt,
 		&i.UpdatedAt,
-		&i.RecipeUrl,
 	)
 	return i, err
 }
@@ -54,14 +53,14 @@ func (q *Queries) ArchiveDinner(ctx context.Context, arg ArchiveDinnerParams) (D
 const createDinner = `-- name: CreateDinner :one
 INSERT INTO dinners (
 	id, name, normalized_name, status, origin, method, minutes_total,
-	difficulty, cuisine, is_favorite, recipe_id, recipe_url, photo_id,
-	grounding_status, updated_by, created_at, updated_at
+	difficulty, cuisine, is_favorite, recipe_id, photo_id, grounding_status,
+	updated_by, created_at, updated_at
 ) VALUES (
 	?, ?, ?, ?, ?, ?, ?,
 	?, ?, ?, ?, ?, ?,
-	?, ?, ?, ?
+	?, ?, ?
 )
-RETURNING id, name, normalized_name, status, origin, method, minutes_total, difficulty, cuisine, is_favorite, recipe_id, photo_id, grounding_status, updated_by, created_at, updated_at, recipe_url
+RETURNING id, name, normalized_name, status, origin, method, minutes_total, difficulty, cuisine, is_favorite, recipe_id, photo_id, grounding_status, updated_by, created_at, updated_at
 `
 
 type CreateDinnerParams struct {
@@ -76,7 +75,6 @@ type CreateDinnerParams struct {
 	Cuisine         sql.NullString
 	IsFavorite      int64
 	RecipeID        sql.NullString
-	RecipeUrl       sql.NullString
 	PhotoID         sql.NullString
 	GroundingStatus string
 	UpdatedBy       sql.NullString
@@ -97,7 +95,6 @@ func (q *Queries) CreateDinner(ctx context.Context, arg CreateDinnerParams) (Din
 		arg.Cuisine,
 		arg.IsFavorite,
 		arg.RecipeID,
-		arg.RecipeUrl,
 		arg.PhotoID,
 		arg.GroundingStatus,
 		arg.UpdatedBy,
@@ -122,13 +119,12 @@ func (q *Queries) CreateDinner(ctx context.Context, arg CreateDinnerParams) (Din
 		&i.UpdatedBy,
 		&i.CreatedAt,
 		&i.UpdatedAt,
-		&i.RecipeUrl,
 	)
 	return i, err
 }
 
 const getDinner = `-- name: GetDinner :one
-SELECT id, name, normalized_name, status, origin, method, minutes_total, difficulty, cuisine, is_favorite, recipe_id, photo_id, grounding_status, updated_by, created_at, updated_at, recipe_url FROM dinners
+SELECT id, name, normalized_name, status, origin, method, minutes_total, difficulty, cuisine, is_favorite, recipe_id, photo_id, grounding_status, updated_by, created_at, updated_at FROM dinners
 WHERE id = ?
 `
 
@@ -152,13 +148,12 @@ func (q *Queries) GetDinner(ctx context.Context, id string) (Dinner, error) {
 		&i.UpdatedBy,
 		&i.CreatedAt,
 		&i.UpdatedAt,
-		&i.RecipeUrl,
 	)
 	return i, err
 }
 
 const listDinnersByStatus = `-- name: ListDinnersByStatus :many
-SELECT id, name, normalized_name, status, origin, method, minutes_total, difficulty, cuisine, is_favorite, recipe_id, photo_id, grounding_status, updated_by, created_at, updated_at, recipe_url FROM dinners
+SELECT id, name, normalized_name, status, origin, method, minutes_total, difficulty, cuisine, is_favorite, recipe_id, photo_id, grounding_status, updated_by, created_at, updated_at FROM dinners
 WHERE status = ?
 ORDER BY normalized_name, id
 `
@@ -189,55 +184,6 @@ func (q *Queries) ListDinnersByStatus(ctx context.Context, status string) ([]Din
 			&i.UpdatedBy,
 			&i.CreatedAt,
 			&i.UpdatedAt,
-			&i.RecipeUrl,
-		); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const listUnarchivedDinners = `-- name: ListUnarchivedDinners :many
-SELECT id, name, normalized_name, status, origin, method, minutes_total, difficulty, cuisine, is_favorite, recipe_id, photo_id, grounding_status, updated_by, created_at, updated_at, recipe_url FROM dinners
-WHERE status <> 'archived'
-ORDER BY id
-`
-
-// Every dinner a new or renamed dinner must not repeat.
-func (q *Queries) ListUnarchivedDinners(ctx context.Context) ([]Dinner, error) {
-	rows, err := q.db.QueryContext(ctx, listUnarchivedDinners)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var items []Dinner
-	for rows.Next() {
-		var i Dinner
-		if err := rows.Scan(
-			&i.ID,
-			&i.Name,
-			&i.NormalizedName,
-			&i.Status,
-			&i.Origin,
-			&i.Method,
-			&i.MinutesTotal,
-			&i.Difficulty,
-			&i.Cuisine,
-			&i.IsFavorite,
-			&i.RecipeID,
-			&i.PhotoID,
-			&i.GroundingStatus,
-			&i.UpdatedBy,
-			&i.CreatedAt,
-			&i.UpdatedAt,
-			&i.RecipeUrl,
 		); err != nil {
 			return nil, err
 		}
@@ -258,7 +204,7 @@ SET is_favorite = ?,
 	updated_by = ?,
 	updated_at = ?
 WHERE id = ?
-RETURNING id, name, normalized_name, status, origin, method, minutes_total, difficulty, cuisine, is_favorite, recipe_id, photo_id, grounding_status, updated_by, created_at, updated_at, recipe_url
+RETURNING id, name, normalized_name, status, origin, method, minutes_total, difficulty, cuisine, is_favorite, recipe_id, photo_id, grounding_status, updated_by, created_at, updated_at
 `
 
 type SetDinnerFavoriteParams struct {
@@ -294,48 +240,6 @@ func (q *Queries) SetDinnerFavorite(ctx context.Context, arg SetDinnerFavoritePa
 		&i.UpdatedBy,
 		&i.CreatedAt,
 		&i.UpdatedAt,
-		&i.RecipeUrl,
-	)
-	return i, err
-}
-
-const toggleDinnerFavorite = `-- name: ToggleDinnerFavorite :one
-UPDATE dinners
-SET is_favorite = 1 - is_favorite,
-	updated_by = ?,
-	updated_at = ?
-WHERE id = ?
-RETURNING id, name, normalized_name, status, origin, method, minutes_total, difficulty, cuisine, is_favorite, recipe_id, photo_id, grounding_status, updated_by, created_at, updated_at, recipe_url
-`
-
-type ToggleDinnerFavoriteParams struct {
-	UpdatedBy sql.NullString
-	UpdatedAt string
-	ID        string
-}
-
-// An unknown id returns sql.ErrNoRows.
-func (q *Queries) ToggleDinnerFavorite(ctx context.Context, arg ToggleDinnerFavoriteParams) (Dinner, error) {
-	row := q.db.QueryRowContext(ctx, toggleDinnerFavorite, arg.UpdatedBy, arg.UpdatedAt, arg.ID)
-	var i Dinner
-	err := row.Scan(
-		&i.ID,
-		&i.Name,
-		&i.NormalizedName,
-		&i.Status,
-		&i.Origin,
-		&i.Method,
-		&i.MinutesTotal,
-		&i.Difficulty,
-		&i.Cuisine,
-		&i.IsFavorite,
-		&i.RecipeID,
-		&i.PhotoID,
-		&i.GroundingStatus,
-		&i.UpdatedBy,
-		&i.CreatedAt,
-		&i.UpdatedAt,
-		&i.RecipeUrl,
 	)
 	return i, err
 }
@@ -356,7 +260,7 @@ SET name = ?,
 	updated_by = ?,
 	updated_at = ?
 WHERE id = ?
-RETURNING id, name, normalized_name, status, origin, method, minutes_total, difficulty, cuisine, is_favorite, recipe_id, photo_id, grounding_status, updated_by, created_at, updated_at, recipe_url
+RETURNING id, name, normalized_name, status, origin, method, minutes_total, difficulty, cuisine, is_favorite, recipe_id, photo_id, grounding_status, updated_by, created_at, updated_at
 `
 
 type UpdateDinnerParams struct {
@@ -412,7 +316,6 @@ func (q *Queries) UpdateDinner(ctx context.Context, arg UpdateDinnerParams) (Din
 		&i.UpdatedBy,
 		&i.CreatedAt,
 		&i.UpdatedAt,
-		&i.RecipeUrl,
 	)
 	return i, err
 }

internal/db/models.go

@@ -67,7 +67,6 @@ type Dinner struct {
 	UpdatedBy       sql.NullString
 	CreatedAt       string
 	UpdatedAt       string
-	RecipeUrl       sql.NullString
 }
 
 type HouseholdSetting struct {

internal/db/querier.go

@@ -60,16 +60,12 @@ type Querier interface {
 	ListRecentDeclinedNames(ctx context.Context, limit int64) ([]string, error)
 	ListRecipeIngredients(ctx context.Context, recipeID string) ([]RecipeIngredient, error)
 	ListRecipeSteps(ctx context.Context, recipeID string) ([]RecipeStep, error)
-	// Every dinner a new or renamed dinner must not repeat.
-	ListUnarchivedDinners(ctx context.Context) ([]Dinner, error)
 	// Stores a partial result of a running job.
 	PublishJobResult(ctx context.Context, arg PublishJobResultParams) (int64, error)
 	// An unknown id returns sql.ErrNoRows.
 	SetDinnerFavorite(ctx context.Context, arg SetDinnerFavoriteParams) (Dinner, error)
 	SucceedJob(ctx context.Context, arg SucceedJobParams) (int64, error)
 	// An unknown id returns sql.ErrNoRows.
-	ToggleDinnerFavorite(ctx context.Context, arg ToggleDinnerFavoriteParams) (Dinner, error)
-	// An unknown id returns sql.ErrNoRows.
 	UpdateDinner(ctx context.Context, arg UpdateDinnerParams) (Dinner, error)
 	// Creates the single row (id 1) or replaces every column except id and
 	// created_at.

internal/dinners/dinners.go

@@ -1,467 +0,0 @@
-// Package dinners keeps the household's dinners: adding Regulars by name or
-// recipe link, listing Regulars and the Quest log, editing, archiving and
-// favoriting. Names are deduplicated with the harness's dinner-name rules,
-// so the Regulars the household types and the Side quests the AI suggests
-// are compared the same way.
-package dinners
-
-import (
-	"context"
-	"database/sql"
-	"errors"
-	"fmt"
-	"net/url"
-	"slices"
-	"strings"
-	"unicode"
-	"unicode/utf8"
-
-	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/ai/harness"
-	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/db"
-	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/store"
-)
-
-// Dinner statuses (the dinners.status column).
-const (
-	StatusSuggested = "suggested"
-	StatusQuestLog  = "quest_log"
-	StatusTried     = "tried"
-	StatusRegular   = "regular"
-	StatusArchived  = "archived"
-)
-
-// Limits on what a member may enter.
-const (
-	MaxNameChars   = 120
-	MaxRecipeURL   = 2048
-	MaxMinutes     = 1440 // a day; a crock-pot dinner fits
-	photoListWidth = 400  // the stored photo size lists show
-)
-
-// Methods and Difficulties are the values the dinners table allows.
-var (
-	Methods      = []string{"stovetop", "oven", "crockpot", "grill", "other"}
-	Difficulties = []string{"easy", "medium", "hard"}
-)
-
-// listable are the statuses List answers for.
-var listable = []string{StatusRegular, StatusQuestLog}
-
-// ErrNotFound is returned for an unknown dinner id.
-var ErrNotFound = errors.New("dinner not found")
-
-// Dinner is a dinner as the API shows it.
-type Dinner struct {
-	ID              string  `json:"id"`
-	Name            string  `json:"name"`
-	Status          string  `json:"status"`
-	Origin          string  `json:"origin"`
-	Method          *string `json:"method"`
-	MinutesTotal    *int64  `json:"minutes_total"`
-	Difficulty      *string `json:"difficulty"`
-	Cuisine         *string `json:"cuisine"`
-	IsFavorite      bool    `json:"is_favorite"`
-	RecipeID        *string `json:"recipe_id"`
-	RecipeURL       *string `json:"recipe_url"`
-	PhotoURL        *string `json:"photo_url"`
-	GroundingStatus string  `json:"grounding_status"`
-	UpdatedBy       *string `json:"updated_by"`
-	CreatedAt       string  `json:"created_at"`
-	UpdatedAt       string  `json:"updated_at"`
-}
-
-// NewRegular is a Regular to add: exactly one of Name and RecipeURL.
-type NewRegular struct {
-	Name      *string
-	RecipeURL *string
-}
-
-// Patch edits a dinner. Nil fields are left as they are.
-type Patch struct {
-	Name         *string
-	Method       *string
-	MinutesTotal *int
-	Difficulty   *string
-}
-
-// Problem is one invalid field, named by its JSON key.
-type Problem struct {
-	Field  string
-	Reason string
-}
-
-// ValidationError lists every invalid field of a request.
-type ValidationError struct {
-	Problems []Problem
-}
-
-func (e *ValidationError) Error() string {
-	parts := make([]string, len(e.Problems))
-	for i, p := range e.Problems {
-		parts[i] = p.Field + ": " + p.Reason
-	}
-	return "invalid dinner: " + strings.Join(parts, "; ")
-}
-
-func invalid(field, reason string) *ValidationError {
-	return &ValidationError{Problems: []Problem{{Field: field, Reason: reason}}}
-}
-
-// DuplicateError is returned when a new or renamed dinner repeats an
-// unarchived one: its name is harness.Similar, or it has the same recipe
-// link.
-type DuplicateError struct {
-	Existing Dinner
-}
-
-func (e *DuplicateError) Error() string {
-	return fmt.Sprintf("%q is already a dinner (%s)", e.Existing.Name, e.Existing.Status)
-}
-
-// Service reads and changes dinners.
-type Service struct {
-	st *store.Store
-}
-
-// NewService returns a service over st.
-func NewService(st *store.Store) *Service {
-	return &Service{st: st}
-}
-
-// CreateRegular adds a Regular named by r.Name, or by the last path segment
-// of r.RecipeURL (whose recipe grounding later replaces), with status and
-// origin regular and grounding_status pending, recording updatedBy. A name
-// repeating an unarchived dinner is a *DuplicateError.
-func (s *Service) CreateRegular(ctx context.Context, r NewRegular, updatedBy string) (Dinner, error) {
-	if updatedBy == "" {
-		return Dinner{}, errors.New("dinners: create: no member to record as updated_by")
-	}
-	var name string
-	var recipeURL sql.NullString
-	switch {
-	case r.Name != nil && r.RecipeURL != nil:
-		return Dinner{}, invalid("name", "give a name or a recipe_url, not both")
-	case r.Name != nil:
-		n, err := checkName(*r.Name)
-		if err != nil {
-			return Dinner{}, err
-		}
-		name = n
-	case r.RecipeURL != nil:
-		u, err := checkRecipeURL(*r.RecipeURL)
-		if err != nil {
-			return Dinner{}, err
-		}
-		n, ok := nameFromURL(u)
-		if !ok {
-			return Dinner{}, invalid("recipe_url", "the link does not name a dinner; add it by name instead")
-		}
-		name = n
-		recipeURL = sql.NullString{String: u.String(), Valid: true}
-	default:
-		return Dinner{}, invalid("name", "give a name or a recipe_url")
-	}
-
-	var row db.Dinner
-	err := s.st.WithTx(ctx, func(tx *sql.Tx) error {
-		q := db.New(tx)
-		if err := checkUnique(ctx, q, "", name, recipeURL); err != nil {
-			return err
-		}
-		now := store.Now().String()
-		var err error
-		row, err = q.CreateDinner(ctx, db.CreateDinnerParams{
-			ID:              store.NewID(),
-			Name:            name,
-			NormalizedName:  harness.Normalize(name),
-			Status:          StatusRegular,
-			Origin:          "regular",
-			RecipeUrl:       recipeURL,
-			GroundingStatus: "pending",
-			UpdatedBy:       sql.NullString{String: updatedBy, Valid: true},
-			CreatedAt:       now,
-			UpdatedAt:       now,
-		})
-		if err != nil {
-			return fmt.Errorf("dinners: create: %w", err)
-		}
-		return nil
-	})
-	if err != nil {
-		return Dinner{}, err
-	}
-	return fromRow(row), nil
-}
-
-// List returns the dinners with status, which must be regular or
-// quest_log, ordered by normalized name.
-func (s *Service) List(ctx context.Context, status string) ([]Dinner, error) {
-	if !slices.Contains(listable, status) {
-		return nil, invalid("status", "must be one of "+strings.Join(listable, ", "))
-	}
-	rows, err := db.New(s.st.Reader).ListDinnersByStatus(ctx, status)
-	if err != nil {
-		return nil, fmt.Errorf("dinners: list %s: %w", status, err)
-	}
-	out := make([]Dinner, len(rows))
-	for i, row := range rows {
-		out[i] = fromRow(row)
-	}
-	return out, nil
-}
-
-// Update applies p to dinner id, recording updatedBy. An invalid patch is a
-// *ValidationError and a new name repeating another unarchived dinner a
-// *DuplicateError; either changes nothing.
-func (s *Service) Update(ctx context.Context, id string, p Patch, updatedBy string) (Dinner, error) {
-	if updatedBy == "" {
-		return Dinner{}, errors.New("dinners: update: no member to record as updated_by")
-	}
-	name, err := p.validate()
-	if err != nil {
-		return Dinner{}, err
-	}
-
-	var row db.Dinner
-	err = s.st.WithTx(ctx, func(tx *sql.Tx) error {
-		q := db.New(tx)
-		cur, err := q.GetDinner(ctx, id)
-		if errors.Is(err, sql.ErrNoRows) {
-			return ErrNotFound
-		}
-		if err != nil {
-			return fmt.Errorf("dinners: read %s: %w", id, err)
-		}
-		params := db.UpdateDinnerParams{
-			ID:              cur.ID,
-			Name:            cur.Name,
-			NormalizedName:  cur.NormalizedName,
-			Status:          cur.Status,
-			Origin:          cur.Origin,
-			Method:          cur.Method,
-			MinutesTotal:    cur.MinutesTotal,
-			Difficulty:      cur.Difficulty,
-			Cuisine:         cur.Cuisine,
-			RecipeID:        cur.RecipeID,
-			PhotoID:         cur.PhotoID,
-			GroundingStatus: cur.GroundingStatus,
-			UpdatedBy:       sql.NullString{String: updatedBy, Valid: true},
-			UpdatedAt:       store.Now().String(),
-		}
-		if p.Name != nil {
-			if err := checkUnique(ctx, q, cur.ID, name, sql.NullString{}); err != nil {
-				return err
-			}
-			params.Name = name
-			params.NormalizedName = harness.Normalize(name)
-		}
-		if p.Method != nil {
-			params.Method = sql.NullString{String: *p.Method, Valid: true}
-		}
-		if p.MinutesTotal != nil {
-			params.MinutesTotal = sql.NullInt64{Int64: int64(*p.MinutesTotal), Valid: true}
-		}
-		if p.Difficulty != nil {
-			params.Difficulty = sql.NullString{String: *p.Difficulty, Valid: true}
-		}
-		row, err = q.UpdateDinner(ctx, params)
-		if err != nil {
-			return fmt.Errorf("dinners: update %s: %w", id, err)
-		}
-		return nil
-	})
-	if err != nil {
-		return Dinner{}, err
-	}
-	return fromRow(row), nil
-}
-
-// Archive sets dinner id's status to archived, recording updatedBy. The row
-// is kept, so its name still counts for Side quest dedupe.
-func (s *Service) Archive(ctx context.Context, id, updatedBy string) (Dinner, error) {
-	if updatedBy == "" {
-		return Dinner{}, errors.New("dinners: archive: no member to record as updated_by")
-	}
-	row, err := db.New(s.st.Writer).ArchiveDinner(ctx, db.ArchiveDinnerParams{
-		ID:        id,
-		UpdatedBy: sql.NullString{String: updatedBy, Valid: true},
-		UpdatedAt: store.Now().String(),
-	})
-	if errors.Is(err, sql.ErrNoRows) {
-		return Dinner{}, ErrNotFound
-	}
-	if err != nil {
-		return Dinner{}, fmt.Errorf("dinners: archive %s: %w", id, err)
-	}
-	return fromRow(row), nil
-}
-
-// ToggleFavorite flips dinner id's is_favorite, recording updatedBy.
-func (s *Service) ToggleFavorite(ctx context.Context, id, updatedBy string) (Dinner, error) {
-	if updatedBy == "" {
-		return Dinner{}, errors.New("dinners: favorite: no member to record as updated_by")
-	}
-	row, err := db.New(s.st.Writer).ToggleDinnerFavorite(ctx, db.ToggleDinnerFavoriteParams{
-		ID:        id,
-		UpdatedBy: sql.NullString{String: updatedBy, Valid: true},
-		UpdatedAt: store.Now().String(),
-	})
-	if errors.Is(err, sql.ErrNoRows) {
-		return Dinner{}, ErrNotFound
-	}
-	if err != nil {
-		return Dinner{}, fmt.Errorf("dinners: favorite %s: %w", id, err)
-	}
-	return fromRow(row), nil
-}
-
-// validate checks every field of p and returns its trimmed name.
-func (p Patch) validate() (string, error) {
-	var problems []Problem
-	var name string
-	if p.Name == nil && p.Method == nil && p.MinutesTotal == nil && p.Difficulty == nil {
-		return "", invalid("patch", "no fields to change")
-	}
-	if p.Name != nil {
-		n, err := checkName(*p.Name)
-		var verr *ValidationError
-		if errors.As(err, &verr) {
-			problems = append(problems, verr.Problems...)
-		}
-		name = n
-	}
-	if p.Method != nil && !slices.Contains(Methods, *p.Method) {
-		problems = append(problems, Problem{"method", "must be one of " + strings.Join(Methods, ", ")})
-	}
-	if p.MinutesTotal != nil && (*p.MinutesTotal < 1 || *p.MinutesTotal > MaxMinutes) {
-		problems = append(problems, Problem{"minutes_total", fmt.Sprintf("must be 1 to %d", MaxMinutes)})
-	}
-	if p.Difficulty != nil && !slices.Contains(Difficulties, *p.Difficulty) {
-		problems = append(problems, Problem{"difficulty", "must be one of " + strings.Join(Difficulties, ", ")})
-	}
-	if problems != nil {
-		return "", &ValidationError{Problems: problems}
-	}
-	return name, nil
-}
-
-// checkName returns raw trimmed, refusing a name that is empty, too long or
-// has no words left once normalized (so it could not be deduplicated).
-func checkName(raw string) (string, error) {
-	name := strings.TrimSpace(raw)
-	switch {
-	case name == "":
-		return "", invalid("name", "must not be empty")
-	case utf8.RuneCountInString(name) > MaxNameChars:
-		return "", invalid("name", fmt.Sprintf("must be at most %d characters", MaxNameChars))
-	case harness.Normalize(name) == "":
-		return "", invalid("name", "must name a dish, not only filler words")
-	}
-	return name, nil
-}
-
-// checkRecipeURL parses raw as an absolute https:// link to a recipe page,
-// the only kind recipe grounding fetches.
-func checkRecipeURL(raw string) (*url.URL, error) {
-	raw = strings.TrimSpace(raw)
-	if len(raw) > MaxRecipeURL {
-		return nil, invalid("recipe_url", fmt.Sprintf("must be at most %d bytes", MaxRecipeURL))
-	}
-	u, err := url.Parse(raw)
-	switch {
-	case err != nil:
-		return nil, invalid("recipe_url", "is not a URL")
-	case u.Scheme != "https" || u.Hostname() == "":
-		return nil, invalid("recipe_url", "must be an https:// link")
-	case u.User != nil:
-		return nil, invalid("recipe_url", "must not carry a user name or password")
-	}
-	return u, nil
-}
-
-// nameFromURL names a dinner from the last path segment of u: separators
-// become spaces, a file extension and words of only digits are dropped and
-// the first letter is capitalized, so
-// https://example.com/recipes/12345/chicken-tikka-masala/ is
-// "Chicken tikka masala". ok is false when no usable name is left.
-func nameFromURL(u *url.URL) (name string, ok bool) {
-	segments := strings.FieldsFunc(u.Path, func(r rune) bool { return r == '/' })
-	if len(segments) == 0 {
-		return "", false
-	}
-	slug := segments[len(segments)-1]
-	if i := strings.LastIndexByte(slug, '.'); i > 0 {
-		slug = slug[:i]
-	}
-	var words []string
-	for _, w := range strings.FieldsFunc(slug, func(r rune) bool { return r == '-' || r == '_' || r == '+' || unicode.IsSpace(r) }) {
-		if strings.IndexFunc(w, func(r rune) bool { return !unicode.IsDigit(r) }) >= 0 {
-			words = append(words, strings.ToLower(w))
-		}
-	}
-	name = strings.Join(words, " ")
-	if r, size := utf8.DecodeRuneInString(name); r != utf8.RuneError {
-		name = string(unicode.ToUpper(r)) + name[size:]
-	}
-	if _, err := checkName(name); err != nil {
-		return "", false
-	}
-	return name, true
-}
-
-// checkUnique returns a *DuplicateError when name is harness.Similar to an
-// unarchived dinner other than self, or recipeURL is one's recipe link.
-func checkUnique(ctx context.Context, q *db.Queries, self, name string, recipeURL sql.NullString) error {
-	rows, err := q.ListUnarchivedDinners(ctx)
-	if err != nil {
-		return fmt.Errorf("dinners: list for dedupe: %w", err)
-	}
-	for _, row := range rows {
-		if row.ID == self {
-			continue
-		}
-		if harness.Similar(name, row.Name) || (recipeURL.Valid && row.RecipeUrl == recipeURL) {
-			return &DuplicateError{Existing: fromRow(row)}
-		}
-	}
-	return nil
-}
-
-// PhotoURL is where the API serves a list-sized copy of photo id.
-func PhotoURL(id string) string {
-	return fmt.Sprintf("/media/photos/%s-%d.jpg", id, photoListWidth)
-}
-
-func fromRow(r db.Dinner) Dinner {
-	d := Dinner{
-		ID:              r.ID,
-		Name:            r.Name,
-		Status:          r.Status,
-		Origin:          r.Origin,
-		Method:          nullString(r.Method),
-		Difficulty:      nullString(r.Difficulty),
-		Cuisine:         nullString(r.Cuisine),
-		IsFavorite:      r.IsFavorite == 1,
-		RecipeID:        nullString(r.RecipeID),
-		RecipeURL:       nullString(r.RecipeUrl),
-		GroundingStatus: r.GroundingStatus,
-		UpdatedBy:       nullString(r.UpdatedBy),
-		CreatedAt:       r.CreatedAt,
-		UpdatedAt:       r.UpdatedAt,
-	}
-	if r.MinutesTotal.Valid {
-		d.MinutesTotal = &r.MinutesTotal.Int64
-	}
-	if r.PhotoID.Valid {
-		u := PhotoURL(r.PhotoID.String)
-		d.PhotoURL = &u
-	}
-	return d
-}
-
-func nullString(s sql.NullString) *string {
-	if !s.Valid {
-		return nil
-	}
-	return &s.String
-}

internal/dinners/dinners_test.go

@@ -1,33 +0,0 @@
-package dinners
-
-import (
-	"net/url"
-	"testing"
-)
-
-func TestNameFromURL(t *testing.T) {
-	t.Parallel()
-	tests := []struct {
-		link string
-		want string // "" means no usable name
-	}{
-		{"https://example.com/recipes/12345/chicken-tikka-masala/", "Chicken tikka masala"},
-		{"https://example.com/recipe/beef_stew.html", "Beef stew"},
-		{"https://example.com/2024/05/best-ever-chili-123", "Best ever chili"},
-		{"https://example.com/crème-brûlée", "Crème brûlée"},
-		{"https://example.com/recipes/chili?utm=1#notes", "Chili"},
-		{"https://example.com/", ""},
-		{"https://example.com/recipe/98765", ""},
-		{"https://example.com/the-best-easy-recipe", ""},
-	}
-	for _, tt := range tests {
-		u, err := url.Parse(tt.link)
-		if err != nil {
-			t.Fatal(err)
-		}
-		got, ok := nameFromURL(u)
-		if got != tt.want || ok != (tt.want != "") {
-			t.Errorf("nameFromURL(%s) = %q, %v; want %q", tt.link, got, ok, tt.want)
-		}
-	}
-}

internal/recipes/fetcher_test.go

@@ -564,11 +564,9 @@ func TestFetchCacheIsNotSharedWithCallers(t *testing.T) {
 	}
 }
 
-// TestFetchCanceledWaitHoldsNoSlot covers a burst of requests whose
+// TestFetchCanceledWaitHoldsNoSlot covers a burst of fetches whose
 // rate-limit waits end with their context: they must not push back the
-// next request that is allowed through. The burst calls waitTurn, the wait
-// turnConn's first Write makes, directly: through Fetch, net/http races the
-// failed write against its read loop, so the error it returns varies.
+// next request that is allowed through.
 func TestFetchCanceledWaitHoldsNoSlot(t *testing.T) {
 	t.Parallel()
 	env := newTestEnv(t, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -579,24 +577,14 @@ func TestFetchCanceledWaitHoldsNoSlot(t *testing.T) {
 	if _, err := env.f.Fetch(t.Context(), "https://example.com/first"); err != nil {
 		t.Fatalf("first Fetch: %v", err)
 	}
-	firstSent := clock.now()
 	env.f.sleep = func(context.Context, time.Duration) error { return context.DeadlineExceeded }
 	for i := range 5 {
-		// Each request comes later in the interval, so a slot it took
-		// would delay the request after the burst.
-		clock.advance(HostInterval / 10)
-		if _, err := env.f.waitTurn(t.Context(), "example.com"); !errors.Is(err, context.DeadlineExceeded) {
-			t.Fatalf("burst waitTurn %d error = %v, want context.DeadlineExceeded", i, err)
+		if _, err := env.f.Fetch(t.Context(), fmt.Sprintf("https://example.com/burst/%d", i)); !errors.Is(err, context.DeadlineExceeded) {
+			t.Fatalf("burst Fetch %d error = %v, want context.DeadlineExceeded", i, err)
 		}
 	}
-	env.f.mu.Lock()
-	last := env.f.lastSent["example.com"]
-	env.f.mu.Unlock()
-	if !last.Equal(firstSent) {
-		t.Errorf("host slot taken at %s after the burst, want the first send at %s", last, firstSent)
-	}
 	env.f.sleep = clock.sleep
-	clock.advance(firstSent.Add(HostInterval).Sub(clock.now()))
+	clock.advance(HostInterval)
 	if _, err := env.f.Fetch(t.Context(), "https://example.com/after"); err != nil {
 		t.Fatalf("Fetch after the burst: %v", err)
 	}

internal/recipes/searchsettings.go

@@ -30,15 +30,10 @@ var ErrSearchNotConfigured = errors.New("recipes: recipe search is not configure
 type SearchSettings struct {
 	// Provider is "searxng" or "brave", nil until first chosen.
 	Provider *string `json:"provider"`
-	// BaseURL is the saved SearXNG instance's URL, nil when not set.
-	BaseURL *string `json:"base_url"`
-	// DefaultBaseURL is the deployment's SearXNG URL
-	// (MEALQUEST_SEARXNG_URL), for the client to suggest while BaseURL is
-	// not set. It is never saved by itself: only a PATCH of base_url saves
-	// a URL. Nil when the deployment names none.
-	DefaultBaseURL *string `json:"default_base_url"`
-	APIKeySet      bool    `json:"api_key_set"`
-	APIKeyLast4    *string `json:"api_key_last4"`
+	// BaseURL is the SearXNG instance's URL, nil when not set.
+	BaseURL     *string `json:"base_url"`
+	APIKeySet   bool    `json:"api_key_set"`
+	APIKeyLast4 *string `json:"api_key_last4"`
 	// UpdatedAt is nil until the settings are first saved.
 	UpdatedAt *string `json:"updated_at"`
 }
@@ -80,49 +75,32 @@ func (e *SearchSettingsError) Error() string {
 type SearchSettingsService struct {
 	st  *store.Store
 	box *secretbox.Box
-	// defaultBaseURL is SearchSettings.DefaultBaseURL, "" for none.
-	defaultBaseURL string
 	// newProvider is NewSearchProvider; tests point Brave elsewhere.
 	newProvider func(db.RecipeSearchSetting, *secretbox.Box) (SearchProvider, error)
 }
 
 // NewSearchSettingsService returns the service over st, sealing keys with
-// box. defaultBaseURL is the deployment's SearXNG URL, "" for none; a set
-// one must be a valid SearXNG URL.
-func NewSearchSettingsService(st *store.Store, box *secretbox.Box, defaultBaseURL string) (*SearchSettingsService, error) {
+// box.
+func NewSearchSettingsService(st *store.Store, box *secretbox.Box) (*SearchSettingsService, error) {
 	if st == nil {
 		return nil, errors.New("recipes: nil store")
 	}
 	if box == nil {
 		return nil, errors.New("recipes: nil secret box")
 	}
-	if defaultBaseURL != "" {
-		if _, err := NewSearXNG(defaultBaseURL); err != nil {
-			return nil, fmt.Errorf("recipes: default SearXNG URL: %s", strings.TrimPrefix(err.Error(), "recipes: "))
-		}
-	}
-	return &SearchSettingsService{st: st, box: box, defaultBaseURL: defaultBaseURL, newProvider: NewSearchProvider}, nil
+	return &SearchSettingsService{st: st, box: box, newProvider: NewSearchProvider}, nil
 }
 
-// Get returns the settings; before any are saved every field but
-// DefaultBaseURL is unset.
+// Get returns the settings; before any are saved every field is unset.
 func (s *SearchSettingsService) Get(ctx context.Context) (SearchSettings, error) {
 	row, err := db.New(s.st.Reader).GetRecipeSearchSettings(ctx)
 	if errors.Is(err, sql.ErrNoRows) {
-		return SearchSettings{DefaultBaseURL: s.defaultBase()}, nil
+		return SearchSettings{}, nil
 	}
 	if err != nil {
 		return SearchSettings{}, fmt.Errorf("recipes: read recipe search settings: %w", err)
 	}
-	return s.settingsFrom(row), nil
-}
-
-func (s *SearchSettingsService) defaultBase() *string {
-	if s.defaultBaseURL == "" {
-		return nil
-	}
-	u := s.defaultBaseURL
-	return &u
+	return searchSettingsFrom(row), nil
 }
 
 // Update applies patch and returns the settings it leaves. The first update
@@ -163,7 +141,7 @@ func (s *SearchSettingsService) Update(ctx context.Context, patch SearchSettings
 	if err != nil {
 		return SearchSettings{}, err
 	}
-	return s.settingsFrom(saved), nil
+	return searchSettingsFrom(saved), nil
 }
 
 // apply returns row with patch applied, validated.
@@ -248,15 +226,14 @@ func (s *SearchSettingsService) TestSearch(ctx context.Context) (int, error) {
 	return len(cands), nil
 }
 
-func (s *SearchSettingsService) settingsFrom(row db.RecipeSearchSetting) SearchSettings {
+func searchSettingsFrom(row db.RecipeSearchSetting) SearchSettings {
 	provider, updated := row.Provider, row.UpdatedAt
 	return SearchSettings{
-		Provider:       &provider,
-		BaseURL:        nullString(row.BaseUrl),
-		DefaultBaseURL: s.defaultBase(),
-		APIKeySet:      len(row.ApiKeyCt) > 0,
-		APIKeyLast4:    nullString(row.ApiKeyLast4),
-		UpdatedAt:      &updated,
+		Provider:    &provider,
+		BaseURL:     nullString(row.BaseUrl),
+		APIKeySet:   len(row.ApiKeyCt) > 0,
+		APIKeyLast4: nullString(row.ApiKeyLast4),
+		UpdatedAt:   &updated,
 	}
 }
 

internal/recipes/searchsettings_test.go

@@ -19,13 +19,6 @@ import (
 const testBraveKey = "BSA-secret-brave-key-9f3c"
 
 func newTestSearchSettings(t *testing.T) *SearchSettingsService {
-	t.Helper()
-	return newTestSearchSettingsWithDefault(t, "")
-}
-
-// newTestSearchSettingsWithDefault is newTestSearchSettings with
-// defaultBaseURL as the deployment's SearXNG URL.
-func newTestSearchSettingsWithDefault(t *testing.T, defaultBaseURL string) *SearchSettingsService {
 	t.Helper()
 	st, err := store.Open(t.Context(), t.TempDir())
 	if err != nil {
@@ -45,7 +38,7 @@ func newTestSearchSettingsWithDefault(t *testing.T, defaultBaseURL string) *Sear
 	if err != nil {
 		t.Fatal(err)
 	}
-	svc, err := NewSearchSettingsService(st, box, defaultBaseURL)
+	svc, err := NewSearchSettingsService(st, box)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -131,74 +124,6 @@ func TestSearchSettingsUpdate(t *testing.T) {
 	}
 }
 
-func TestSearchSettingsDefaultBaseURL(t *testing.T) {
-	t.Parallel()
-	svc := newTestSearchSettingsWithDefault(t, "http://searxng:8080")
-	got, err := svc.Get(t.Context())
-	if err != nil {
-		t.Fatal(err)
-	}
-	if got.DefaultBaseURL == nil || *got.DefaultBaseURL != "http://searxng:8080" || got.BaseURL != nil || got.Provider != nil {
-		t.Errorf("Get before any update = %+v, want only default_base_url set", got)
-	}
-	if _, err := svc.Provider(t.Context()); !errors.Is(err, ErrSearchNotConfigured) {
-		t.Errorf("Provider with only a default error = %v, want ErrSearchNotConfigured", err)
-	}
-
-	// The default is a suggestion: SearXNG still needs a saved URL.
-	if _, err := svc.Update(t.Context(), SearchSettingsPatch{Provider: ptr("searxng")}); err == nil {
-		t.Error("choosing SearXNG without a URL succeeded with a default set")
-	}
-
-	got, err = svc.Update(t.Context(), SearchSettingsPatch{Provider: ptr("searxng"), BaseURL: ptr("https://search.example")})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if *got.BaseURL != "https://search.example" || got.DefaultBaseURL == nil || *got.DefaultBaseURL != "http://searxng:8080" {
-		t.Errorf("Update result = %+v, want the saved URL beside the default", got)
-	}
-	got, err = svc.Get(t.Context())
-	if err != nil {
-		t.Fatal(err)
-	}
-	if *got.BaseURL != "https://search.example" {
-		t.Errorf("Get base_url = %q, want the saved URL, not the default", *got.BaseURL)
-	}
-	row, err := db.New(svc.st.Reader).GetRecipeSearchSettings(t.Context())
-	if err != nil {
-		t.Fatal(err)
-	}
-	if row.BaseUrl.String != "https://search.example" {
-		t.Errorf("stored base_url = %q", row.BaseUrl.String)
-	}
-}
-
-func TestNewSearchSettingsServiceRejectsBadDefault(t *testing.T) {
-	t.Parallel()
-	st, err := store.Open(t.Context(), t.TempDir())
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() {
-		if err := st.Close(); err != nil {
-			t.Error(err)
-		}
-	})
-	key := make([]byte, secretbox.KeySize)
-	rand.Read(key)
-	box, err := secretbox.New(base64.StdEncoding.EncodeToString(key))
-	if err != nil {
-		t.Fatal(err)
-	}
-	for _, u := range []string{"searxng:8080", "ftp://searxng", "http://user:pw@searxng:8080"} {
-		if _, err := NewSearchSettingsService(st, box, u); err == nil {
-			t.Errorf("NewSearchSettingsService(%q) succeeded", u)
-		} else if strings.Contains(err.Error(), "pw") {
-			t.Errorf("error for %q echoes the URL: %v", u, err)
-		}
-	}
-}
-
 func TestSearchSettingsTestSearch(t *testing.T) {
 	t.Parallel()
 	searx := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

internal/server/aisettings_test.go

@@ -28,7 +28,7 @@ const (
 func newAIRouter(t *testing.T) http.Handler {
 	t.Helper()
 	logger := slog.New(slog.NewTextHandler(io.Discard, nil))
-	r, err := NewRouter(logger, "dev", nil, stubAuth{}, stubSessions{}, newTestSettings(t), newTestSearch(t), newTestAI(t), newTestDinners(t),
+	r, err := NewRouter(logger, "dev", nil, stubAuth{}, stubSessions{}, newTestSettings(t), newTestSearch(t), newTestAI(t),
 		newTestRunner(t), newTestPhotos(t), fstest.MapFS{"index.html": {Data: []byte(fixtureIndex)}})
 	if err != nil {
 		t.Fatal(err)

internal/server/dinners.go

@@ -1,148 +0,0 @@
-package server
-
-import (
-	"errors"
-	"log/slog"
-	"net/http"
-
-	"github.com/go-chi/chi/v5"
-
-	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/auth"
-	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/dinners"
-)
-
-// maxDinnerBody bounds a POST or PATCH /dinners request body.
-const maxDinnerBody = 16 << 10
-
-// dinnerCreate is the POST /dinners body: a name or a recipe_url.
-type dinnerCreate struct {
-	Name      *string `json:"name"`
-	RecipeURL *string `json:"recipe_url"`
-}
-
-// dinnerPatch is the PATCH /dinners/{id} body. Every field is optional;
-// unknown fields and null values are refused.
-type dinnerPatch struct {
-	Name         *string `json:"name"`
-	Method       *string `json:"method"`
-	MinutesTotal *int    `json:"minutes_total"`
-	Difficulty   *string `json:"difficulty"`
-}
-
-type dinnerList struct {
-	Dinners []dinners.Dinner `json:"dinners"`
-}
-
-// getDinners answers GET /dinners?status=regular|quest_log.
-func getDinners(logger *slog.Logger, svc *dinners.Service) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		list, err := svc.List(r.Context(), r.URL.Query().Get("status"))
-		if err != nil {
-			writeDinnerError(w, r, logger, "list dinners", err)
-			return
-		}
-		writeJSON(w, r, logger, http.StatusOK, dinnerList{Dinners: list})
-	}
-}
-
-// postDinner adds a Regular, recording the session's actor as updated_by.
-func postDinner(logger *slog.Logger, svc *dinners.Service) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		actor, ok := actorOrFail(w, r, logger)
-		if !ok {
-			return
-		}
-		body, err := decodePatch[dinnerCreate](http.MaxBytesReader(w, r.Body, maxDinnerBody))
-		if err != nil {
-			writeError(w, r, logger, http.StatusBadRequest, "invalid_request", err.Error())
-			return
-		}
-		d, err := svc.CreateRegular(r.Context(), dinners.NewRegular(body), actor.Subject)
-		if err != nil {
-			writeDinnerError(w, r, logger, "create dinner", err)
-			return
-		}
-		writeJSON(w, r, logger, http.StatusCreated, d)
-	}
-}
-
-// patchDinner edits a dinner, recording the session's actor as updated_by.
-func patchDinner(logger *slog.Logger, svc *dinners.Service) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		actor, ok := actorOrFail(w, r, logger)
-		if !ok {
-			return
-		}
-		patch, err := decodePatch[dinnerPatch](http.MaxBytesReader(w, r.Body, maxDinnerBody))
-		if err != nil {
-			writeError(w, r, logger, http.StatusBadRequest, "invalid_request", err.Error())
-			return
-		}
-		d, err := svc.Update(r.Context(), chi.URLParam(r, "id"), dinners.Patch(patch), actor.Subject)
-		if err != nil {
-			writeDinnerError(w, r, logger, "update dinner", err)
-			return
-		}
-		writeJSON(w, r, logger, http.StatusOK, d)
-	}
-}
-
-// deleteDinner archives a dinner; the row is never deleted.
-func deleteDinner(logger *slog.Logger, svc *dinners.Service) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		actor, ok := actorOrFail(w, r, logger)
-		if !ok {
-			return
-		}
-		d, err := svc.Archive(r.Context(), chi.URLParam(r, "id"), actor.Subject)
-		if err != nil {
-			writeDinnerError(w, r, logger, "archive dinner", err)
-			return
-		}
-		writeJSON(w, r, logger, http.StatusOK, d)
-	}
-}
-
-// postDinnerFavorite toggles a dinner's is_favorite.
-func postDinnerFavorite(logger *slog.Logger, svc *dinners.Service) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		actor, ok := actorOrFail(w, r, logger)
-		if !ok {
-			return
-		}
-		d, err := svc.ToggleFavorite(r.Context(), chi.URLParam(r, "id"), actor.Subject)
-		if err != nil {
-			writeDinnerError(w, r, logger, "toggle dinner favorite", err)
-			return
-		}
-		writeJSON(w, r, logger, http.StatusOK, d)
-	}
-}
-
-// actorOrFail returns the session's actor, or answers 500 when the request
-// has none, which behind requireSession is a wiring bug.
-func actorOrFail(w http.ResponseWriter, r *http.Request, logger *slog.Logger) (auth.Actor, bool) {
-	actor, ok := auth.ActorFrom(r.Context())
-	if !ok {
-		logger.ErrorContext(r.Context(), r.Method+" "+r.URL.Path+" without a session")
-		writeError(w, r, logger, http.StatusInternalServerError, "internal", "internal error")
-	}
-	return actor, ok
-}
-
-// writeDinnerError maps a dinners.Service error to its API error.
-func writeDinnerError(w http.ResponseWriter, r *http.Request, logger *slog.Logger, action string, err error) {
-	var invalid *dinners.ValidationError
-	var dup *dinners.DuplicateError
-	switch {
-	case errors.As(err, &invalid):
-		writeError(w, r, logger, http.StatusBadRequest, "invalid_dinner", invalid.Error())
-	case errors.As(err, &dup):
-		writeError(w, r, logger, http.StatusConflict, "duplicate_dinner", dup.Error())
-	case errors.Is(err, dinners.ErrNotFound):
-		writeError(w, r, logger, http.StatusNotFound, "not_found", "dinner not found")
-	default:
-		logger.ErrorContext(r.Context(), action, "error", err)
-		writeError(w, r, logger, http.StatusInternalServerError, "internal", "internal error")
-	}
-}

internal/server/dinners_test.go

@@ -1,464 +0,0 @@
-package server
-
-import (
-	"context"
-	"io"
-	"log/slog"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-	"testing/fstest"
-
-	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/dinners"
-	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/store"
-)
-
-const dinnersPath = "/api/v1/dinners"
-
-// newDinnersRouter returns a router whose dinners service runs over the
-// returned store.
-func newDinnersRouter(t *testing.T) (http.Handler, *store.Store) {
-	t.Helper()
-	st := newTestStore(t)
-	logger := slog.New(slog.NewTextHandler(io.Discard, nil))
-	r, err := NewRouter(logger, "dev", nil, stubAuth{}, stubSessions{}, newTestSettings(t), newTestSearch(t), newTestAI(t),
-		dinners.NewService(st), newTestRunner(t), newTestPhotos(t), fstest.MapFS{"index.html": {Data: []byte(fixtureIndex)}})
-	if err != nil {
-		t.Fatal(err)
-	}
-	return r, st
-}
-
-// callDinners sends a signed-in request with body (none when empty).
-func callDinners(t *testing.T, h http.Handler, method, target, body string) (*httptest.ResponseRecorder, map[string]any) {
-	t.Helper()
-	var r io.Reader
-	if body != "" {
-		r = strings.NewReader(body)
-	}
-	return serve(t, h, signedIn(method, target, r))
-}
-
-// createDinner adds a Regular and returns its id.
-func createDinner(t *testing.T, h http.Handler, body string) string {
-	t.Helper()
-	rec, got := callDinners(t, h, http.MethodPost, dinnersPath, body)
-	if rec.Code != http.StatusCreated {
-		t.Fatalf("POST %s = %d: %s", body, rec.Code, rec.Body)
-	}
-	return got["id"].(string)
-}
-
-// listNames returns the names GET /dinners?status=status lists, in order.
-func listNames(t *testing.T, h http.Handler, status string) []string {
-	t.Helper()
-	rec, body := callDinners(t, h, http.MethodGet, dinnersPath+"?status="+status, "")
-	if rec.Code != http.StatusOK {
-		t.Fatalf("GET status=%s = %d: %s", status, rec.Code, rec.Body)
-	}
-	list, ok := body["dinners"].([]any)
-	if !ok {
-		t.Fatalf("GET status=%s has no dinners list: %v", status, body)
-	}
-	names := make([]string, len(list))
-	for i, d := range list {
-		names[i] = d.(map[string]any)["name"].(string)
-	}
-	return names
-}
-
-func TestCreateDinnerByName(t *testing.T) {
-	t.Parallel()
-	router, st := newDinnersRouter(t)
-
-	rec, body := callDinners(t, router, http.MethodPost, dinnersPath, `{"name":"  Chicken Tikka Masala "}`)
-	if rec.Code != http.StatusCreated {
-		t.Fatalf("status = %d, want 201: %s", rec.Code, rec.Body)
-	}
-	for k, v := range map[string]any{
-		"name":             "Chicken Tikka Masala",
-		"status":           "regular",
-		"origin":           "regular",
-		"grounding_status": "pending",
-		"is_favorite":      false,
-		"recipe_url":       nil,
-		"photo_url":        nil,
-		"method":           nil,
-		"minutes_total":    nil,
-		"difficulty":       nil,
-		"updated_by":       testSession.Subject,
-	} {
-		if got, ok := body[k]; !ok || got != v {
-			t.Errorf("%s = %#v (present %v), want %#v", k, got, ok, v)
-		}
-	}
-	var normalized, updatedBy string
-	if err := st.Reader.QueryRow(`SELECT normalized_name, updated_by FROM dinners WHERE id = ?`, body["id"]).Scan(&normalized, &updatedBy); err != nil {
-		t.Fatal(err)
-	}
-	if normalized != "chicken tikka masala" || updatedBy != testSession.Subject {
-		t.Errorf("stored normalized_name, updated_by = %q, %q", normalized, updatedBy)
-	}
-}
-
-func TestCreateDinnerByURL(t *testing.T) {
-	t.Parallel()
-	router, _ := newDinnersRouter(t)
-
-	link := "https://www.example.com/recipes/12345/beef-and-broccoli-stir-fry/"
-	rec, body := callDinners(t, router, http.MethodPost, dinnersPath, `{"recipe_url":"`+link+`"}`)
-	if rec.Code != http.StatusCreated {
-		t.Fatalf("status = %d, want 201: %s", rec.Code, rec.Body)
-	}
-	for k, v := range map[string]any{
-		"name":             "Beef and broccoli stir fry",
-		"recipe_url":       link,
-		"status":           "regular",
-		"origin":           "regular",
-		"grounding_status": "pending",
-		"updated_by":       testSession.Subject,
-	} {
-		if body[k] != v {
-			t.Errorf("%s = %#v, want %#v", k, body[k], v)
-		}
-	}
-
-	// The same link again is a duplicate even though its name would differ.
-	rec, body = callDinners(t, router, http.MethodPost, dinnersPath, `{"name":"Something else entirely"}`)
-	if rec.Code != http.StatusCreated {
-		t.Fatalf("unrelated name = %d: %s", rec.Code, rec.Body)
-	}
-	rec, body = callDinners(t, router, http.MethodPost, dinnersPath, `{"recipe_url":"`+link+`"}`)
-	if rec.Code != http.StatusConflict || errorCode(body) != "duplicate_dinner" {
-		t.Errorf("same link again = %d %v, want 409 duplicate_dinner", rec.Code, body)
-	}
-
-	for _, tc := range []struct{ name, body string }{
-		{"plain http", `{"recipe_url":"http://example.com/recipes/chili"}`},
-		{"not a URL", `{"recipe_url":"chili"}`},
-		{"credentials", `{"recipe_url":"https://me:pw@example.com/recipes/chili"}`},
-		{"no name in path", `{"recipe_url":"https://example.com/"}`},
-		{"numeric slug", `{"recipe_url":"https://example.com/recipe/98765"}`},
-		{"both fields", `{"name":"Chili","recipe_url":"https://example.com/recipes/chili"}`},
-		{"neither field", `{}`},
-	} {
-		rec, body := callDinners(t, router, http.MethodPost, dinnersPath, tc.body)
-		if rec.Code != http.StatusBadRequest || errorCode(body) != "invalid_dinner" {
-			t.Errorf("%s: %d %v, want 400 invalid_dinner", tc.name, rec.Code, body)
-		}
-	}
-}
-
-func TestCreateDinnerDuplicate(t *testing.T) {
-	t.Parallel()
-	router, st := newDinnersRouter(t)
-	createDinner(t, router, `{"name":"Chicken Tikka Masala"}`)
-
-	for _, name := range []string{
-		"chicken tikka masala",
-		"Easy Chicken Tikka-Masala!",
-		"The Best Homemade Chicken Tikka Masala Recipe",
-	} {
-		rec, body := callDinners(t, router, http.MethodPost, dinnersPath, `{"name":"`+name+`"}`)
-		if rec.Code != http.StatusConflict || errorCode(body) != "duplicate_dinner" {
-			t.Errorf("%q: %d %v, want 409 duplicate_dinner", name, rec.Code, body)
-		}
-	}
-	// A slug naming the same dish is a duplicate too.
-	rec, body := callDinners(t, router, http.MethodPost, dinnersPath, `{"recipe_url":"https://example.com/easy-chicken-tikka-masala.html"}`)
-	if rec.Code != http.StatusConflict {
-		t.Errorf("URL slug duplicate = %d %v, want 409", rec.Code, body)
-	}
-
-	var n int
-	if err := st.Reader.QueryRow(`SELECT count(*) FROM dinners`).Scan(&n); err != nil {
-		t.Fatal(err)
-	}
-	if n != 1 {
-		t.Errorf("dinners rows = %d, want 1", n)
-	}
-
-	// A different dish sharing words is not a duplicate.
-	createDinner(t, router, `{"name":"Chicken Tikka Wraps"}`)
-}
-
-func TestCreateDinnerRejected(t *testing.T) {
-	t.Parallel()
-	router, _ := newDinnersRouter(t)
-	for _, tc := range []struct{ name, body, code string }{
-		{"empty name", `{"name":"   "}`, "invalid_dinner"},
-		{"filler only", `{"name":"The Best Easy Recipe"}`, "invalid_dinner"},
-		{"too long", `{"name":"` + strings.Repeat("x", dinners.MaxNameChars+1) + `"}`, "invalid_dinner"},
-		{"null name", `{"name":null}`, "invalid_request"},
-		{"unknown field", `{"name":"Chili","status":"quest_log"}`, "invalid_request"},
-		{"not an object", `"Chili"`, "invalid_request"},
-	} {
-		rec, body := callDinners(t, router, http.MethodPost, dinnersPath, tc.body)
-		if rec.Code != http.StatusBadRequest || errorCode(body) != tc.code {
-			t.Errorf("%s: %d %v, want 400 %s", tc.name, rec.Code, body, tc.code)
-		}
-	}
-}
-
-func TestListDinnersFiltersByStatus(t *testing.T) {
-	t.Parallel()
-	router, st := newDinnersRouter(t)
-	tacos := createDinner(t, router, `{"name":"Tacos"}`)
-	createDinner(t, router, `{"name":"Lasagna"}`)
-	pho := createDinner(t, router, `{"name":"Pho"}`)
-	gone := createDinner(t, router, `{"name":"Meatloaf"}`)
-
-	ctx := context.Background()
-	if _, err := st.Writer.ExecContext(ctx, `UPDATE dinners SET status = 'quest_log', origin = 'side_quest' WHERE id = ?`, pho); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := st.Writer.ExecContext(ctx,
-		`INSERT INTO photos (id, source_url, local_path, width, height, sha256, fetched_at, created_at, updated_at)
-		 VALUES ('photo1', 'https://example.com/tacos.jpg', 'media/photos/photo1', 1200, 800, 'abc', 't', 't', 't')`); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := st.Writer.ExecContext(ctx, `UPDATE dinners SET photo_id = 'photo1', grounding_status = 'grounded' WHERE id = ?`, tacos); err != nil {
-		t.Fatal(err)
-	}
-	if rec, _ := callDinners(t, router, http.MethodDelete, dinnersPath+"/"+gone, ""); rec.Code != http.StatusOK {
-		t.Fatalf("DELETE = %d", rec.Code)
-	}
-
-	if got := strings.Join(listNames(t, router, "regular"), ","); got != "Lasagna,Tacos" {
-		t.Errorf("regular = %s, want Lasagna,Tacos", got)
-	}
-	if got := strings.Join(listNames(t, router, "quest_log"), ","); got != "Pho" {
-		t.Errorf("quest_log = %s, want Pho", got)
-	}
-
-	_, body := callDinners(t, router, http.MethodGet, dinnersPath+"?status=regular", "")
-	for _, d := range body["dinners"].([]any) {
-		d := d.(map[string]any)
-		switch d["name"] {
-		case "Tacos":
-			if d["photo_url"] != "/media/photos/photo1-400.jpg" || d["grounding_status"] != "grounded" {
-				t.Errorf("Tacos photo_url, grounding_status = %v, %v", d["photo_url"], d["grounding_status"])
-			}
-		case "Lasagna":
-			if d["photo_url"] != nil || d["grounding_status"] != "pending" {
-				t.Errorf("Lasagna photo_url, grounding_status = %v, %v", d["photo_url"], d["grounding_status"])
-			}
-		}
-	}
-
-	// An empty list is [] rather than null.
-	empty, _ := newDinnersRouter(t)
-	rec, _ := callDinners(t, empty, http.MethodGet, dinnersPath+"?status=regular", "")
-	if got := rec.Body.String(); got != `{"dinners":[]}` {
-		t.Errorf("empty list = %s", got)
-	}
-
-	for _, q := range []string{"", "?status=archived", "?status=suggested", "?status=bogus"} {
-		rec, body := callDinners(t, router, http.MethodGet, dinnersPath+q, "")
-		if rec.Code != http.StatusBadRequest || errorCode(body) != "invalid_dinner" {
-			t.Errorf("GET %q = %d %v, want 400 invalid_dinner", q, rec.Code, body)
-		}
-	}
-}
-
-func TestPatchDinner(t *testing.T) {
-	t.Parallel()
-	router, st := newDinnersRouter(t)
-	id := createDinner(t, router, `{"name":"Chili"}`)
-	createDinner(t, router, `{"name":"Pot Roast"}`)
-	if _, err := st.Writer.Exec(`UPDATE dinners SET updated_by = 'someone-else' WHERE id = ?`, id); err != nil {
-		t.Fatal(err)
-	}
-
-	rec, body := callDinners(t, router, http.MethodPatch, dinnersPath+"/"+id,
-		`{"name":"White Chicken Chili","method":"crockpot","minutes_total":480,"difficulty":"easy"}`)
-	if rec.Code != http.StatusOK {
-		t.Fatalf("status = %d: %s", rec.Code, rec.Body)
-	}
-	for k, v := range map[string]any{
-		"name":          "White Chicken Chili",
-		"method":        "crockpot",
-		"minutes_total": float64(480),
-		"difficulty":    "easy",
-		"status":        "regular",
-		"updated_by":    testSession.Subject,
-	} {
-		if body[k] != v {
-			t.Errorf("%s = %#v, want %#v", k, body[k], v)
-		}
-	}
-	var normalized string
-	if err := st.Reader.QueryRow(`SELECT normalized_name FROM dinners WHERE id = ?`, id).Scan(&normalized); err != nil {
-		t.Fatal(err)
-	}
-	if normalized != "white chicken chili" {
-		t.Errorf("normalized_name = %q", normalized)
-	}
-
-	// A partial patch leaves the other fields.
-	rec, body = callDinners(t, router, http.MethodPatch, dinnersPath+"/"+id, `{"difficulty":"medium"}`)
-	if rec.Code != http.StatusOK || body["method"] != "crockpot" || body["difficulty"] != "medium" || body["name"] != "White Chicken Chili" {
-		t.Errorf("partial patch = %d %v", rec.Code, body)
-	}
-	// Renaming to its own name, respelled, is not a duplicate of itself.
-	if rec, body := callDinners(t, router, http.MethodPatch, dinnersPath+"/"+id, `{"name":"Easy white chicken chili"}`); rec.Code != http.StatusOK {
-		t.Errorf("self rename = %d %v", rec.Code, body)
-	}
-	// Renaming onto another dinner is.
-	rec, body = callDinners(t, router, http.MethodPatch, dinnersPath+"/"+id, `{"name":"The Best Pot Roast"}`)
-	if rec.Code != http.StatusConflict || errorCode(body) != "duplicate_dinner" {
-		t.Errorf("rename onto Pot Roast = %d %v, want 409", rec.Code, body)
-	}
-}
-
-func TestPatchDinnerValidation(t *testing.T) {
-	t.Parallel()
-	router, _ := newDinnersRouter(t)
-	id := createDinner(t, router, `{"name":"Chili"}`)
-
-	for _, tc := range []struct {
-		name, body, code, in string
-	}{
-		{"bad method", `{"method":"microwave"}`, "invalid_dinner", "method"},
-		{"crock pot spelling", `{"method":"crock pot"}`, "invalid_dinner", "method"},
-		{"bad difficulty", `{"difficulty":"expert"}`, "invalid_dinner", "difficulty"},
-		{"zero minutes", `{"minutes_total":0}`, "invalid_dinner", "minutes_total"},
-		{"negative minutes", `{"minutes_total":-5}`, "invalid_dinner", "minutes_total"},
-		{"too many minutes", `{"minutes_total":1441}`, "invalid_dinner", "minutes_total"},
-		{"empty name", `{"name":""}`, "invalid_dinner", "name"},
-		{"every problem", `{"method":"x","difficulty":"y","minutes_total":0}`, "invalid_dinner", "method: must be one of stovetop, oven, crockpot, grill, other; minutes_total"},
-		{"empty patch", `{}`, "invalid_dinner", "no fields"},
-		{"fractional minutes", `{"minutes_total":30.5}`, "invalid_request", "minutes_total"},
-		{"string minutes", `{"minutes_total":"30"}`, "invalid_request", "minutes_total"},
-		{"null method", `{"method":null}`, "invalid_request", "method"},
-		{"read-only field", `{"status":"archived"}`, "invalid_request", "status"},
-		{"favorite field", `{"is_favorite":true}`, "invalid_request", "is_favorite"},
-	} {
-		rec, body := callDinners(t, router, http.MethodPatch, dinnersPath+"/"+id, tc.body)
-		msg, _ := body["error"].(map[string]any)["message"].(string)
-		if rec.Code != http.StatusBadRequest || errorCode(body) != tc.code || !strings.Contains(msg, tc.in) {
-			t.Errorf("%s: %d %v, want 400 %s containing %q", tc.name, rec.Code, body, tc.code, tc.in)
-		}
-	}
-
-	_, body := callDinners(t, router, http.MethodGet, dinnersPath+"?status=regular", "")
-	d := body["dinners"].([]any)[0].(map[string]any)
-	if d["method"] != nil || d["difficulty"] != nil || d["minutes_total"] != nil || d["name"] != "Chili" {
-		t.Errorf("a rejected patch changed the dinner: %v", d)
-	}
-
-	rec, body := callDinners(t, router, http.MethodPatch, dinnersPath+"/nope", `{"method":"oven"}`)
-	if rec.Code != http.StatusNotFound || errorCode(body) != "not_found" {
-		t.Errorf("unknown id = %d %v, want 404", rec.Code, body)
-	}
-}
-
-func TestDeleteDinnerArchives(t *testing.T) {
-	t.Parallel()
-	router, st := newDinnersRouter(t)
-	id := createDinner(t, router, `{"name":"Shepherd's Pie"}`)
-	if _, err := st.Writer.Exec(`UPDATE dinners SET updated_by = 'someone-else' WHERE id = ?`, id); err != nil {
-		t.Fatal(err)
-	}
-
-	rec, body := callDinners(t, router, http.MethodDelete, dinnersPath+"/"+id, "")
-	if rec.Code != http.StatusOK || body["status"] != "archived" || body["updated_by"] != testSession.Subject {
-		t.Fatalf("DELETE = %d %v", rec.Code, body)
-	}
-	var status, name, updatedBy string
-	if err := st.Reader.QueryRow(`SELECT status, name, updated_by FROM dinners WHERE id = ?`, id).Scan(&status, &name, &updatedBy); err != nil {
-		t.Fatalf("archived row is gone: %v", err)
-	}
-	if status != "archived" || name != "Shepherd's Pie" || updatedBy != testSession.Subject {
-		t.Errorf("row = %s %q %s", status, name, updatedBy)
-	}
-	if got := listNames(t, router, "regular"); len(got) != 0 {
-		t.Errorf("regular after archive = %v", got)
-	}
-	// An archived name may be added again.
-	createDinner(t, router, `{"name":"Shepherds Pie"}`)
-
-	rec, body = callDinners(t, router, http.MethodDelete, dinnersPath+"/nope", "")
-	if rec.Code != http.StatusNotFound || errorCode(body) != "not_found" {
-		t.Errorf("unknown id = %d %v, want 404", rec.Code, body)
-	}
-}
-
-func TestFavoriteDinnerToggles(t *testing.T) {
-	t.Parallel()
-	router, st := newDinnersRouter(t)
-	id := createDinner(t, router, `{"name":"Fish Tacos"}`)
-	if _, err := st.Writer.Exec(`UPDATE dinners SET updated_by = 'someone-else' WHERE id = ?`, id); err != nil {
-		t.Fatal(err)
-	}
-
-	for _, want := range []bool{true, false, true} {
-		rec, body := callDinners(t, router, http.MethodPost, dinnersPath+"/"+id+"/favorite", "")
-		if rec.Code != http.StatusOK || body["is_favorite"] != want || body["updated_by"] != testSession.Subject {
-			t.Fatalf("favorite = %d %v, want is_favorite %v", rec.Code, body, want)
-		}
-	}
-	var fav int
-	if err := st.Reader.QueryRow(`SELECT is_favorite FROM dinners WHERE id = ?`, id).Scan(&fav); err != nil {
-		t.Fatal(err)
-	}
-	if fav != 1 {
-		t.Errorf("stored is_favorite = %d, want 1", fav)
-	}
-
-	rec, body := callDinners(t, router, http.MethodPost, dinnersPath+"/nope/favorite", "")
-	if rec.Code != http.StatusNotFound || errorCode(body) != "not_found" {
-		t.Errorf("unknown id = %d %v, want 404", rec.Code, body)
-	}
-}
-
-// TestDinnerWritesRequireCSRF sends every dinners write without the CSRF
-// header and with a wrong one; each is refused and changes nothing.
-func TestDinnerWritesRequireCSRF(t *testing.T) {
-	t.Parallel()
-	router, st := newDinnersRouter(t)
-	id := createDinner(t, router, `{"name":"Chili"}`)
-
-	var before string
-	snapshot := `SELECT group_concat(id || name || status || is_favorite || coalesce(method, '') || updated_at, '|') FROM dinners`
-	if err := st.Reader.QueryRow(snapshot).Scan(&before); err != nil {
-		t.Fatal(err)
-	}
-
-	writes := []struct{ method, target, body string }{
-		{http.MethodPost, dinnersPath, `{"name":"Lasagna"}`},
-		{http.MethodPatch, dinnersPath + "/" + id, `{"method":"oven"}`},
-		{http.MethodDelete, dinnersPath + "/" + id, ""},
-		{http.MethodPost, dinnersPath + "/" + id + "/favorite", ""},
-	}
-	for _, w := range writes {
-		for _, header := range []*string{nil, ptr("wrong-token")} {
-			req := httptest.NewRequest(w.method, w.target, strings.NewReader(w.body))
-			req.AddCookie(validSessionCookie)
-			if header != nil {
-				req.Header.Set(CSRFHeader, *header)
-			}
-			rec, body := serve(t, router, req)
-			if rec.Code != http.StatusForbidden || errorCode(body) != "csrf" {
-				t.Errorf("%s %s (header %v) = %d %v, want 403 csrf", w.method, w.target, header != nil, rec.Code, body)
-			}
-		}
-	}
-
-	var after string
-	if err := st.Reader.QueryRow(snapshot).Scan(&after); err != nil {
-		t.Fatal(err)
-	}
-	if after != before {
-		t.Errorf("refused writes changed dinners:\n before %s\n after  %s", before, after)
-	}
-
-	// Without a session, the list is 401 too.
-	req := httptest.NewRequest(http.MethodGet, dinnersPath+"?status=regular", nil)
-	if rec, body := serve(t, router, req); rec.Code != http.StatusUnauthorized || errorCode(body) != "unauthenticated" {
-		t.Errorf("GET without a session = %d %v, want 401", rec.Code, body)
-	}
-}
-
-func ptr[T any](v T) *T { return &v }

internal/server/login_test.go

@@ -83,7 +83,7 @@ func newLoginRouter(t *testing.T, issuer string) http.Handler {
 		t.Fatal(err)
 	}
 	r, err := NewRouter(logger, "dev", trusted, flow, sessions, newTestSettings(t),
-		newTestSearch(t), newTestAI(t), newTestDinners(t), newTestRunner(t), newTestPhotos(t), fstest.MapFS{"index.html": {Data: []byte(fixtureIndex)}})
+		newTestSearch(t), newTestAI(t), newTestRunner(t), newTestPhotos(t), fstest.MapFS{"index.html": {Data: []byte(fixtureIndex)}})
 	if err != nil {
 		t.Fatal(err)
 	}

internal/server/media_test.go

@@ -51,7 +51,7 @@ func newMediaRouter(t *testing.T) (r http.Handler, id, orphan string) {
 		t.Fatal(err)
 	}
 	logger := slog.New(slog.NewTextHandler(io.Discard, nil))
-	r, err = NewRouter(logger, "dev", nil, stubAuth{}, stubSessions{}, newTestSettings(t), newTestSearch(t), newTestAI(t), newTestDinners(t), newTestRunner(t),
+	r, err = NewRouter(logger, "dev", nil, stubAuth{}, stubSessions{}, newTestSettings(t), newTestSearch(t), newTestAI(t), newTestRunner(t),
 		photos, fstest.MapFS{"index.html": {Data: []byte(fixtureIndex)}})
 	if err != nil {
 		t.Fatal(err)

internal/server/origin_test.go

@@ -45,7 +45,7 @@ func newOriginRouter(t *testing.T, logs io.Writer) http.Handler {
 	}
 	logger := slog.New(forwarded.LogHandler(slog.NewJSONHandler(logs, nil)))
 	r, err := NewRouter(logger, "dev", trusted, probeAuth{}, stubSessions{}, newTestSettings(t),
-		newTestSearch(t), newTestAI(t), newTestDinners(t), newTestRunner(t), newTestPhotos(t), fstest.MapFS{"index.html": {Data: []byte(fixtureIndex)}})
+		newTestSearch(t), newTestAI(t), newTestRunner(t), newTestPhotos(t), fstest.MapFS{"index.html": {Data: []byte(fixtureIndex)}})
 	if err != nil {
 		t.Fatal(err)
 	}

internal/server/recipesearch_test.go

@@ -22,7 +22,7 @@ const (
 func newRecipeSearchRouter(t *testing.T, search *recipes.SearchSettingsService) http.Handler {
 	t.Helper()
 	logger := slog.New(slog.NewTextHandler(io.Discard, nil))
-	r, err := NewRouter(logger, "dev", nil, stubAuth{}, stubSessions{}, newTestSettings(t), search, newTestAI(t), newTestDinners(t), newTestRunner(t),
+	r, err := NewRouter(logger, "dev", nil, stubAuth{}, stubSessions{}, newTestSettings(t), search, newTestAI(t), newTestRunner(t),
 		newTestPhotos(t), fstest.MapFS{"index.html": {Data: []byte(fixtureIndex)}})
 	if err != nil {
 		t.Fatal(err)
@@ -46,7 +46,7 @@ func TestRecipeSearchSettingsAPI(t *testing.T) {
 	}
 
 	rec, body := call(http.MethodGet, recipeSearchPath, "")
-	if def, ok := body["default_base_url"]; rec.Code != http.StatusOK || body["provider"] != nil || body["api_key_set"] != false || !ok || def != nil {
+	if rec.Code != http.StatusOK || body["provider"] != nil || body["api_key_set"] != false {
 		t.Errorf("GET unconfigured = %d %v", rec.Code, body)
 	}
 	rec, body = call(http.MethodPost, recipeSearchTestPath, "")

internal/server/server.go

@@ -11,7 +11,6 @@ import (
 	"github.com/go-chi/chi/v5"
 
 	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/ai/aisettings"
-	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/dinners"
 	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/forwarded"
 	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/frontend"
 	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/household"
@@ -35,13 +34,12 @@ type RouteMounter interface {
 // /media; settings serves /api/v1/settings/household; search serves
 // /api/v1/settings/recipe-search and its /test; ai serves
 // /api/v1/settings/ai, its /api-key, /verify, /models and /reset-prompt;
-// dinnerSvc serves GET and POST /api/v1/dinners, PATCH and DELETE
-// /api/v1/dinners/{id} and POST /api/v1/dinners/{id}/favorite; runner serves
+// runner serves
 // POST /api/v1/jobs and GET /api/v1/jobs/{id}; photos serves
 // GET /media/photos/{id}-{size}.jpg; assets is the web build
 // served for every other GET. /health, /auth and the web build are public.
 // Requests to /api/v1 other than GET also need the session's CSRF token in CSRFHeader.
-func NewRouter(logger *slog.Logger, version string, trusted forwarded.Trusted, auth RouteMounter, sessions SessionLookup, settings *household.SettingsService, search *recipes.SearchSettingsService, ai *aisettings.Service, dinnerSvc *dinners.Service, runner *jobs.Runner, photos PhotoFiles, assets fs.FS) (http.Handler, error) {
+func NewRouter(logger *slog.Logger, version string, trusted forwarded.Trusted, auth RouteMounter, sessions SessionLookup, settings *household.SettingsService, search *recipes.SearchSettingsService, ai *aisettings.Service, runner *jobs.Runner, photos PhotoFiles, assets fs.FS) (http.Handler, error) {
 	if settings == nil {
 		return nil, errors.New("server: nil household settings service")
 	}
@@ -51,9 +49,6 @@ func NewRouter(logger *slog.Logger, version string, trusted forwarded.Trusted, a
 	if ai == nil {
 		return nil, errors.New("server: nil AI settings service")
 	}
-	if dinnerSvc == nil {
-		return nil, errors.New("server: nil dinners service")
-	}
 	if runner == nil {
 		return nil, errors.New("server: nil job runner")
 	}
@@ -97,11 +92,6 @@ func NewRouter(logger *slog.Logger, version string, trusted forwarded.Trusted, a
 	apiV1.Post("/settings/ai/verify", postAIVerify(logger, ai))
 	apiV1.Get("/settings/ai/models", getAIModels(logger, ai))
 	apiV1.Post("/settings/ai/reset-prompt", postAIResetPrompt(logger, ai))
-	apiV1.Get("/dinners", getDinners(logger, dinnerSvc))
-	apiV1.Post("/dinners", postDinner(logger, dinnerSvc))
-	apiV1.Patch("/dinners/{id}", patchDinner(logger, dinnerSvc))
-	apiV1.Delete("/dinners/{id}", deleteDinner(logger, dinnerSvc))
-	apiV1.Post("/dinners/{id}/favorite", postDinnerFavorite(logger, dinnerSvc))
 	apiV1.Post("/jobs", postJob(logger, runner))
 	apiV1.Get("/jobs/{id}", getJob(logger, runner))
 	media.Get("/photos/{name}", getPhoto(logger, photos))

internal/server/server_test.go

@@ -17,7 +17,6 @@ import (
 	"github.com/go-chi/chi/v5"
 
 	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/ai/aisettings"
-	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/dinners"
 	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/household"
 	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/jobs"
 	"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/recipes"
@@ -44,7 +43,7 @@ func newTestRouterWith(t *testing.T, version string, settings *household.Setting
 		"index.html":             {Data: []byte(fixtureIndex)},
 		"assets/index-AbC123.js": {Data: []byte(fixtureAsset)},
 	}
-	r, err := NewRouter(logger, version, nil, stubAuth{}, stubSessions{}, settings, newTestSearch(t), newTestAI(t), newTestDinners(t), runner, newTestPhotos(t), assets)
+	r, err := NewRouter(logger, version, nil, stubAuth{}, stubSessions{}, settings, newTestSearch(t), newTestAI(t), runner, newTestPhotos(t), assets)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -133,19 +132,13 @@ func newTestPhotos(t *testing.T) *recipes.PhotoCache {
 // configured, over a migrated temp database and a random secret box.
 func newTestSearch(t *testing.T) *recipes.SearchSettingsService {
 	t.Helper()
-	search, err := recipes.NewSearchSettingsService(newTestStore(t), newTestBox(t), "")
+	search, err := recipes.NewSearchSettingsService(newTestStore(t), newTestBox(t))
 	if err != nil {
 		t.Fatal(err)
 	}
 	return search
 }
 
-// newTestDinners returns a dinners service over a migrated temp database.
-func newTestDinners(t *testing.T) *dinners.Service {
-	t.Helper()
-	return dinners.NewService(newTestStore(t))
-}
-
 // newTestBox returns a secret box under a random key.
 func newTestBox(t *testing.T) *secretbox.Box {
 	t.Helper()
@@ -177,7 +170,7 @@ func TestNewRouterRequiresAISettings(t *testing.T) {
 	t.Parallel()
 
 	logger := slog.New(slog.NewTextHandler(io.Discard, nil))
-	if _, err := NewRouter(logger, "dev", nil, stubAuth{}, stubSessions{}, newTestSettings(t), newTestSearch(t), nil, newTestDinners(t), newTestRunner(t), newTestPhotos(t), fstest.MapFS{"index.html": {}}); err == nil {
+	if _, err := NewRouter(logger, "dev", nil, stubAuth{}, stubSessions{}, newTestSettings(t), newTestSearch(t), nil, newTestRunner(t), newTestPhotos(t), fstest.MapFS{"index.html": {}}); err == nil {
 		t.Fatal("NewRouter accepted a nil AI settings service")
 	}
 }
@@ -186,7 +179,7 @@ func TestNewRouterRequiresSearchSettings(t *testing.T) {
 	t.Parallel()
 
 	logger := slog.New(slog.NewTextHandler(io.Discard, nil))
-	if _, err := NewRouter(logger, "dev", nil, stubAuth{}, stubSessions{}, newTestSettings(t), nil, newTestAI(t), newTestDinners(t), newTestRunner(t), newTestPhotos(t), fstest.MapFS{"index.html": {}}); err == nil {
+	if _, err := NewRouter(logger, "dev", nil, stubAuth{}, stubSessions{}, newTestSettings(t), nil, newTestAI(t), newTestRunner(t), newTestPhotos(t), fstest.MapFS{"index.html": {}}); err == nil {
 		t.Fatal("NewRouter accepted a nil recipe search settings service")
 	}
 }
@@ -195,7 +188,7 @@ func TestNewRouterRequiresPhotoFiles(t *testing.T) {
 	t.Parallel()
 
 	logger := slog.New(slog.NewTextHandler(io.Discard, nil))
-	if _, err := NewRouter(logger, "dev", nil, stubAuth{}, stubSessions{}, newTestSettings(t), newTestSearch(t), newTestAI(t), newTestDinners(t), newTestRunner(t), nil, fstest.MapFS{"index.html": {}}); err == nil {
+	if _, err := NewRouter(logger, "dev", nil, stubAuth{}, stubSessions{}, newTestSettings(t), newTestSearch(t), newTestAI(t), newTestRunner(t), nil, fstest.MapFS{"index.html": {}}); err == nil {
 		t.Fatal("NewRouter accepted nil photo files")
 	}
 }
@@ -204,25 +197,16 @@ func TestNewRouterRequiresSettings(t *testing.T) {
 	t.Parallel()
 
 	logger := slog.New(slog.NewTextHandler(io.Discard, nil))
-	if _, err := NewRouter(logger, "dev", nil, stubAuth{}, stubSessions{}, nil, newTestSearch(t), newTestAI(t), newTestDinners(t), newTestRunner(t), newTestPhotos(t), fstest.MapFS{"index.html": {}}); err == nil {
+	if _, err := NewRouter(logger, "dev", nil, stubAuth{}, stubSessions{}, nil, newTestSearch(t), newTestAI(t), newTestRunner(t), newTestPhotos(t), fstest.MapFS{"index.html": {}}); err == nil {
 		t.Fatal("NewRouter accepted a nil settings service")
 	}
 }
 
-func TestNewRouterRequiresDinners(t *testing.T) {
-	t.Parallel()
-
-	logger := slog.New(slog.NewTextHandler(io.Discard, nil))
-	if _, err := NewRouter(logger, "dev", nil, stubAuth{}, stubSessions{}, newTestSettings(t), newTestSearch(t), newTestAI(t), nil, newTestRunner(t), newTestPhotos(t), fstest.MapFS{"index.html": {}}); err == nil {
-		t.Fatal("NewRouter accepted a nil dinners service")
-	}
-}
-
 func TestNewRouterRequiresJobRunner(t *testing.T) {
 	t.Parallel()
 
 	logger := slog.New(slog.NewTextHandler(io.Discard, nil))
-	if _, err := NewRouter(logger, "dev", nil, stubAuth{}, stubSessions{}, newTestSettings(t), newTestSearch(t), newTestAI(t), newTestDinners(t), nil, newTestPhotos(t), fstest.MapFS{"index.html": {}}); err == nil {
+	if _, err := NewRouter(logger, "dev", nil, stubAuth{}, stubSessions{}, newTestSettings(t), newTestSearch(t), newTestAI(t), nil, newTestPhotos(t), fstest.MapFS{"index.html": {}}); err == nil {
 		t.Fatal("NewRouter accepted a nil job runner")
 	}
 }

internal/server/settings.go

@@ -110,7 +110,7 @@ func decodePatch[T any](body io.Reader) (T, error) {
 		if errors.As(err, &typeErr) {
 			return patch, fmt.Errorf("%s: want a JSON %s", typeErr.Field, typeErr.Type)
 		}
-		return patch, fmt.Errorf("invalid request body: %v", err)
+		return patch, fmt.Errorf("invalid settings: %v", err)
 	}
 	return patch, nil
 }

internal/server/settings_test.go

@@ -216,7 +216,7 @@ func TestHouseholdSettingsWithRealSession(t *testing.T) {
 	}
 	logger := slog.New(slog.NewTextHandler(io.Discard, nil))
 	router, err := NewRouter(logger, "dev", nil, stubAuth{}, sessions, household.NewSettingsService(st),
-		newTestSearch(t), newTestAI(t), newTestDinners(t), newTestRunner(t), newTestPhotos(t), fstest.MapFS{"index.html": {Data: []byte(fixtureIndex)}})
+		newTestSearch(t), newTestAI(t), newTestRunner(t), newTestPhotos(t), fstest.MapFS{"index.html": {Data: []byte(fixtureIndex)}})
 	if err != nil {
 		t.Fatal(err)
 	}

internal/store/migrate_test.go

@@ -175,8 +175,8 @@ func TestMigrateEmbeddedMigrations(t *testing.T) {
 	if err := Migrate(context.Background(), s.Writer, migrations.FS); err != nil {
 		t.Fatal(err)
 	}
-	if got := versions(migrationRows(t, s)); got != "0000_bootstrap,0001_init,0002_household_settings_updated_by,0003_jobs_status,0004_ai_provider_presets,0005_ai_provider_xai,0006_ai_runs_status,0007_recipe_grounding,0008_dinner_recipe_url" {
-		t.Errorf("versions = %q, want 0000_bootstrap,0001_init,0002_household_settings_updated_by,0003_jobs_status,0004_ai_provider_presets,0005_ai_provider_xai,0006_ai_runs_status,0007_recipe_grounding,0008_dinner_recipe_url", got)
+	if got := versions(migrationRows(t, s)); got != "0000_bootstrap,0001_init,0002_household_settings_updated_by,0003_jobs_status,0004_ai_provider_presets,0005_ai_provider_xai,0006_ai_runs_status,0007_recipe_grounding" {
+		t.Errorf("versions = %q, want 0000_bootstrap,0001_init,0002_household_settings_updated_by,0003_jobs_status,0004_ai_provider_presets,0005_ai_provider_xai,0006_ai_runs_status,0007_recipe_grounding", got)
 	}
 }
 
@@ -196,8 +196,8 @@ func TestMigrateBootstrapThenEmbeddedInitApplies(t *testing.T) {
 	if err := Migrate(ctx, s.Writer, migrations.FS); err != nil {
 		t.Fatal(err)
 	}
-	if got := versions(migrationRows(t, s)); got != "0000_bootstrap,0001_init,0002_household_settings_updated_by,0003_jobs_status,0004_ai_provider_presets,0005_ai_provider_xai,0006_ai_runs_status,0007_recipe_grounding,0008_dinner_recipe_url" {
-		t.Errorf("versions = %q, want 0000_bootstrap,0001_init,0002_household_settings_updated_by,0003_jobs_status,0004_ai_provider_presets,0005_ai_provider_xai,0006_ai_runs_status,0007_recipe_grounding,0008_dinner_recipe_url", got)
+	if got := versions(migrationRows(t, s)); got != "0000_bootstrap,0001_init,0002_household_settings_updated_by,0003_jobs_status,0004_ai_provider_presets,0005_ai_provider_xai,0006_ai_runs_status,0007_recipe_grounding" {
+		t.Errorf("versions = %q, want 0000_bootstrap,0001_init,0002_household_settings_updated_by,0003_jobs_status,0004_ai_provider_presets,0005_ai_provider_xai,0006_ai_runs_status,0007_recipe_grounding", got)
 	}
 	if !tableExists(t, s, "dinners") {
 		t.Error("table from 0001_init was not created")

migrations/0008_dinner_recipe_url.sql

@@ -1,5 +0,0 @@
--- 0008_dinner_recipe_url: a Regular added from a pasted recipe link keeps
--- that link until grounding resolves it to a recipe (recipe_id). Nothing
--- else records the link: recipes rows exist only for fetched pages.
-
-ALTER TABLE dinners ADD COLUMN recipe_url TEXT;

migrations/queries/dinners.sql

@@ -1,12 +1,12 @@
 -- name: CreateDinner :one
 INSERT INTO dinners (
 	id, name, normalized_name, status, origin, method, minutes_total,
-	difficulty, cuisine, is_favorite, recipe_id, recipe_url, photo_id,
-	grounding_status, updated_by, created_at, updated_at
+	difficulty, cuisine, is_favorite, recipe_id, photo_id, grounding_status,
+	updated_by, created_at, updated_at
 ) VALUES (
 	?, ?, ?, ?, ?, ?, ?,
 	?, ?, ?, ?, ?, ?,
-	?, ?, ?, ?
+	?, ?, ?
 )
 RETURNING *;
 
@@ -19,12 +19,6 @@ SELECT * FROM dinners
 WHERE status = ?
 ORDER BY normalized_name, id;
 
--- name: ListUnarchivedDinners :many
--- Every dinner a new or renamed dinner must not repeat.
-SELECT * FROM dinners
-WHERE status <> 'archived'
-ORDER BY id;
-
 -- name: UpdateDinner :one
 -- An unknown id returns sql.ErrNoRows.
 UPDATE dinners
@@ -61,12 +55,3 @@ SET is_favorite = ?,
 	updated_at = ?
 WHERE id = ?
 RETURNING *;
-
--- name: ToggleDinnerFavorite :one
--- An unknown id returns sql.ErrNoRows.
-UPDATE dinners
-SET is_favorite = 1 - is_favorite,
-	updated_by = ?,
-	updated_at = ?
-WHERE id = ?
-RETURNING *;

web/src/App.test.tsx

@@ -5,7 +5,7 @@ import { createNetworkStatus } from './pwa/networkStatus.ts'
 import { mockViewport } from './test/matchMedia.ts'
 import { errorResponse, fakeLocation, jsonResponse, ME, request, stubFetch, stubFetchByPath } from './test/fetchStub.ts'
 import App, { routes } from './App.tsx'
-import { AI_SETTINGS, HOUSEHOLD_SETTINGS, RECIPE_SEARCH_SETTINGS, SETTINGS_API } from './test/ApiProviders.tsx'
+import { AI_SETTINGS, SETTINGS_API } from './test/ApiProviders.tsx'
 import { InDataRouter } from './test/dataRouter.tsx'
 
 afterEach(() => {
@@ -27,7 +27,7 @@ function renderAppAt(path: string, location = fakeLocation(path)) {
 }
 
 // The routes that render a built screen rather than a placeholder page.
-const SCREENS = { '/settings': true, '/settings/ai': true, '/settings/household': true }
+const SCREENS = { '/settings': true, '/settings/ai': true }
 
 describe('App routes', () => {
   it('registers every handoff route plus the extra settings pages', () => {
@@ -80,25 +80,12 @@ describe('App routes', () => {
       '/api/v1/me': () => jsonResponse(200, ME),
       '/api/v1/settings/ai': () => jsonResponse(200, AI_SETTINGS),
       '/api/v1/settings/ai/models': () => jsonResponse(200, { models: [] }),
-      '/api/v1/settings/recipe-search': () => jsonResponse(200, RECIPE_SEARCH_SETTINGS),
     })
     renderAt('/settings/ai')
     const heading = await screen.findByRole('heading', { level: 1, name: 'AI assistant' })
     expect(screen.getByRole('main')).toContainElement(heading)
     expect(await screen.findByText('••••••••3f9a')).toBeInTheDocument()
   })
-
-  it('/settings/household renders the household settings screen inside the shell', async () => {
-    mockViewport(390)
-    stubFetchByPath({
-      '/api/v1/me': () => jsonResponse(200, ME),
-      '/api/v1/settings/household': () => jsonResponse(200, HOUSEHOLD_SETTINGS),
-    })
-    renderAt('/settings/household')
-    const heading = await screen.findByRole('heading', { level: 1, name: 'Household' })
-    expect(screen.getByRole('main')).toContainElement(heading)
-    expect(await screen.findByLabelText('Dinner time')).toHaveValue('17:30')
-  })
 })
 
 describe('App bootstrap', () => {

web/src/App.tsx

@@ -7,7 +7,6 @@ import { PlaceholderPage } from './pages/PlaceholderPage.tsx'
 import { OfflinePill } from './pwa/OfflinePill.tsx'
 import { UpdatePrompt, type UpdateContainer } from './pwa/UpdatePrompt.tsx'
 import { AISettingsPage } from './settings/AISettingsPage.tsx'
-import { HouseholdSettingsPage } from './settings/HouseholdSettingsPage.tsx'
 import { SettingsPage } from './settings/SettingsPage.tsx'
 import { AppShell } from './shell/AppShell.tsx'
 
@@ -34,7 +33,6 @@ export const routes = [
 const screens: Partial<Record<(typeof routes)[number]['path'], ReactNode>> = {
   '/settings': <SettingsPage />,
   '/settings/ai': <AISettingsPage />,
-  '/settings/household': <HouseholdSettingsPage />,
 }
 
 // AppRoutes is the shell and its pages, shown once /api/v1/me has loaded.

web/src/settings/AISettingsPage.module.css

@@ -251,63 +251,3 @@
   justify-content: flex-end;
   gap: 10px;
 }
-
-/* Recipe search card, below the AI assistant's actions. */
-.card {
-  display: flex;
-  flex-direction: column;
-  gap: 14px;
-  border: 1px solid var(--color-neutral-300);
-}
-
-.cardTitle {
-  margin: 0;
-  font-family: var(--font-heading);
-  font-size: 22px;
-  font-weight: 400;
-}
-
-.cardLoading {
-  height: 160px;
-  border-radius: var(--radius-lg);
-}
-
-.cardActions {
-  display: grid;
-  grid-template-columns: minmax(0, 1fr) minmax(0, 2fr);
-  gap: 10px;
-}
-
-.cardActions > button {
-  min-height: 52px;
-}
-
-.cardHeader {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 10px;
-}
-
-/* AI assistant card on the desktop settings (mock 2e): the card grows to
-   fill its column and the system prompt grows to fill the card. */
-.fill {
-  flex: 1;
-  gap: 18px;
-}
-
-.fill .prompt,
-.fill .textarea {
-  flex: 1;
-}
-
-.fill .textarea {
-  resize: none;
-}
-
-/* A form locked while its save or prompt reset is pending, so no edit is
-   made that the response would then replace. It lays out as if it were not
-   there. */
-.lock {
-  display: contents;
-}

web/src/settings/AISettingsPage.test.tsx

@@ -4,12 +4,11 @@ import { Route, Routes, useLocation } from 'react-router'
 import { afterEach, describe, expect, it, vi, type Mock } from 'vitest'
 import { ApiProvider, createApiClient, createQueryClient, createVerifiedSession } from '../api/index.ts'
 import { createNetworkStatus } from '../pwa/networkStatus.ts'
-import { AI_SETTINGS, RECIPE_SEARCH_SETTINGS } from '../test/ApiProviders.tsx'
+import { AI_SETTINGS } from '../test/ApiProviders.tsx'
 import { InDataRouter } from '../test/dataRouter.tsx'
 import { errorResponse, fakeLocation, jsonResponse, ME } from '../test/fetchStub.ts'
 import { expectMinHitArea } from '../test/hitArea.ts'
-import { AISettingsPage, formatVerifiedDate } from './AISettingsPage.tsx'
-import { maskedKey } from './api.ts'
+import { AISettingsPage, formatVerifiedDate, maskedKey } from './AISettingsPage.tsx'
 
 const MODELS = {
   models: [
@@ -31,7 +30,6 @@ function stubAPI(responders: Record<string, Responder> = {}): Mock<typeof fetch>
     'GET /api/v1/me': () => jsonResponse(200, ME),
     'GET /api/v1/settings/ai': () => jsonResponse(200, AI_SETTINGS),
     'GET /api/v1/settings/ai/models': () => jsonResponse(200, MODELS),
-    'GET /api/v1/settings/recipe-search': () => jsonResponse(200, RECIPE_SEARCH_SETTINGS),
     ...responders,
   }
   const fetchMock = vi.fn<typeof fetch>((input, init) => {
@@ -407,63 +405,6 @@ describe('AISettingsPage', () => {
     expect(unload()).toBe(true)
   })
 
-  it('locks the form while a save is pending, and guards leaving until the save lands', async () => {
-    let answer: (response: Response) => void = () => {}
-    stubAPI({ 'PATCH /api/v1/settings/ai': () => new Promise<Response>((resolve) => (answer = resolve)) })
-    await renderPage()
-    const unload = () => {
-      const event = new Event('beforeunload', { cancelable: true })
-      act(() => void window.dispatchEvent(event))
-      return event.defaultPrevented
-    }
-    fireEvent.change(prompt(), { target: { value: 'Keep it cozy.' } })
-    fireEvent.click(save())
-
-    expect(await screen.findByRole('button', { name: 'Saving…' })).toBeDisabled()
-    for (const field of [provider(), model(), slider(), prompt()]) expect(field).toBeDisabled()
-    expect(screen.getByRole('button', { name: 'Reset' })).toBeDisabled()
-    expect(unload()).toBe(true)
-
-    answer(jsonResponse(200, { ...AI_SETTINGS, system_prompt: 'Keep it cozy.' }))
-    expect(await screen.findByText('Changes saved.')).toBeInTheDocument()
-    expect(prompt()).toBeEnabled()
-    expect(prompt()).toHaveValue('Keep it cozy.')
-    await waitFor(() => expect(unload()).toBe(false))
-  })
-
-  it('locks the form while a prompt reset is pending, even with the sheet closed', async () => {
-    let answer: (response: Response) => void = () => {}
-    stubAPI({
-      'POST /api/v1/settings/ai/reset-prompt': () => new Promise<Response>((resolve) => (answer = resolve)),
-    })
-    await renderPage()
-    const unload = () => {
-      const event = new Event('beforeunload', { cancelable: true })
-      act(() => void window.dispatchEvent(event))
-      return event.defaultPrevented
-    }
-    fireEvent.change(slider(), { target: { value: '0.2' } })
-    fireEvent.click(screen.getByRole('button', { name: 'Reset' }))
-    const confirm = screen.getByRole('dialog', { name: 'Reset the system prompt?' })
-    fireEvent.click(within(confirm).getByRole('button', { name: 'Reset prompt' }))
-    expect(await within(confirm).findByRole('button', { name: 'Resetting…' })).toBeDisabled()
-    fireEvent.click(within(confirm).getByRole('button', { name: 'Cancel' }))
-    await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())
-
-    for (const field of [provider(), model(), slider(), prompt()]) expect(field).toBeDisabled()
-    expect(screen.getByRole('button', { name: 'Reset' })).toBeDisabled()
-    expect(save()).toBeDisabled()
-    expect(unload()).toBe(true)
-
-    answer(jsonResponse(200, { ...AI_SETTINGS, system_prompt: DEFAULT_PROMPT }))
-    await waitFor(() => expect(prompt()).toBeEnabled())
-    expect(prompt()).toHaveValue(DEFAULT_PROMPT)
-    expect(slider()).toHaveValue('0.2')
-    expect(unload()).toBe(true)
-    fireEvent.change(prompt(), { target: { value: 'After the reset.' } })
-    expect(prompt()).toHaveValue('After the reset.')
-  })
-
   it('keeps 44 px tap targets', async () => {
     stubAPI()
     await renderPage()
@@ -481,300 +422,6 @@ describe('AISettingsPage', () => {
   })
 })
 
-// apiError is an API error response carrying message.
-function apiError(status: number, code: string, message: string): Response {
-  return jsonResponse(status, { error: { code, message, retryable: false } })
-}
-
-const BRAVE_SETTINGS = { ...RECIPE_SEARCH_SETTINGS, provider: 'brave', api_key_set: true, api_key_last4: 'b7c2' }
-
-describe('Recipe search card', () => {
-  const card = () => screen.getByRole('region', { name: 'Recipe search' })
-  const searxng = () => within(card()).getByRole('radio', { name: 'SearXNG' })
-  const brave = () => within(card()).getByRole('radio', { name: 'Brave' })
-  const url = () => within(card()).getByRole('textbox', { name: 'SearXNG URL' })
-  const saveSearch = () => within(card()).getByRole('button', { name: 'Save recipe search' })
-  const testSearch = () => within(card()).getByRole('button', { name: 'Test' })
-
-  async function renderCard() {
-    await renderPage()
-    await within(card()).findByRole('radiogroup', { name: 'Recipe search provider' })
-  }
-
-  // addKey enters key in the Brave key sheet.
-  function addKey(button: string, key: string) {
-    fireEvent.click(within(card()).getByRole('button', { name: button }))
-    const sheet = screen.getByRole('dialog')
-    fireEvent.change(within(sheet).getByLabelText('Brave API key'), { target: { value: key } })
-    fireEvent.click(within(sheet).getByRole('button', { name: 'Use this key' }))
-  }
-
-  it('shows the saved SearXNG URL', async () => {
-    stubAPI()
-    await renderCard()
-    expect(searxng()).toHaveAttribute('aria-checked', 'true')
-    expect(url()).toHaveValue('http://searxng:8080')
-    expect(within(card()).queryByText('Brave API key')).not.toBeInTheDocument()
-    expect(saveSearch()).toBeDisabled()
-    expect(testSearch()).toBeEnabled()
-  })
-
-  const UNCONFIGURED = {
-    provider: null,
-    base_url: null,
-    default_base_url: 'http://searxng:8080',
-    api_key_set: false,
-    api_key_last4: null,
-    updated_at: null,
-  }
-
-  it('starts on SearXNG with the deployment\'s URL before recipe search is set up, and saves it', async () => {
-    const fetchMock = stubAPI({
-      'GET /api/v1/settings/recipe-search': () => jsonResponse(200, UNCONFIGURED),
-      'PATCH /api/v1/settings/recipe-search': (body) =>
-        jsonResponse(200, { ...RECIPE_SEARCH_SETTINGS, ...(body as object) }),
-    })
-    await renderCard()
-    expect(searxng()).toHaveAttribute('aria-checked', 'true')
-    expect(url()).toHaveValue('http://searxng:8080')
-    expect(testSearch()).toBeDisabled()
-    expect(saveSearch()).toBeEnabled()
-    fireEvent.click(saveSearch())
-    expect(await within(card()).findByText('Recipe search saved.')).toBeInTheDocument()
-    expect(sent(fetchMock)).toEqual([
-      {
-        request: 'PATCH /api/v1/settings/recipe-search',
-        body: { provider: 'searxng', base_url: 'http://searxng:8080' },
-      },
-    ])
-  })
-
-  it('starts with an empty URL when the deployment names no SearXNG', async () => {
-    stubAPI({
-      'GET /api/v1/settings/recipe-search': () => jsonResponse(200, { ...UNCONFIGURED, default_base_url: null }),
-    })
-    await renderCard()
-    expect(url()).toHaveValue('')
-  })
-
-  it('shows the saved URL, not the deployment\'s', async () => {
-    stubAPI({
-      'GET /api/v1/settings/recipe-search': () =>
-        jsonResponse(200, { ...RECIPE_SEARCH_SETTINGS, base_url: 'https://search.example' }),
-    })
-    await renderCard()
-    expect(url()).toHaveValue('https://search.example')
-    expect(saveSearch()).toBeDisabled()
-  })
-
-  it('switches providers, keeping each provider\'s field', async () => {
-    stubAPI()
-    await renderCard()
-    fireEvent.change(url(), { target: { value: 'https://search.example' } })
-    fireEvent.click(brave())
-    expect(brave()).toHaveAttribute('aria-checked', 'true')
-    expect(within(card()).queryByRole('textbox', { name: 'SearXNG URL' })).not.toBeInTheDocument()
-    expect(within(card()).getByText('No key stored')).toBeInTheDocument()
-    expect(within(card()).getByRole('button', { name: 'Add key' })).toBeInTheDocument()
-
-    fireEvent.click(searxng())
-    expect(url()).toHaveValue('https://search.example')
-  })
-
-  it('saves a new SearXNG URL', async () => {
-    const fetchMock = stubAPI({
-      'PATCH /api/v1/settings/recipe-search': (body) =>
-        jsonResponse(200, { ...RECIPE_SEARCH_SETTINGS, ...(body as object) }),
-    })
-    await renderCard()
-    fireEvent.change(url(), { target: { value: 'https://search.example' } })
-    expect(testSearch()).toBeDisabled()
-    expect(within(card()).getByText('Save your changes to test them.')).toBeInTheDocument()
-    fireEvent.click(saveSearch())
-    expect(await within(card()).findByText('Recipe search saved.')).toBeInTheDocument()
-    expect(sent(fetchMock)).toEqual([
-      { request: 'PATCH /api/v1/settings/recipe-search', body: { base_url: 'https://search.example' } },
-    ])
-    expect(saveSearch()).toBeDisabled()
-    expect(testSearch()).toBeEnabled()
-  })
-
-  it('saves a switch to Brave with its key, then shows only the key\'s last four characters', async () => {
-    const fetchMock = stubAPI({ 'PATCH /api/v1/settings/recipe-search': () => jsonResponse(200, BRAVE_SETTINGS) })
-    await renderCard()
-    fireEvent.click(brave())
-    addKey('Add key', 'BSA-secret-key-b7c2')
-    expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
-    expect(within(card()).getByText('••••••••b7c2')).toBeInTheDocument()
-    expect(within(card()).getByText('New key not saved yet')).toBeInTheDocument()
-    expect(document.body).not.toHaveTextContent('BSA-secret-key-b7c2')
-
-    fireEvent.click(saveSearch())
-    expect(await within(card()).findByText('Recipe search saved.')).toBeInTheDocument()
-    expect(sent(fetchMock)).toEqual([
-      { request: 'PATCH /api/v1/settings/recipe-search', body: { provider: 'brave', api_key: 'BSA-secret-key-b7c2' } },
-    ])
-    expect(within(card()).getByText('••••••••b7c2')).toBeInTheDocument()
-    expect(within(card()).queryByText('New key not saved yet')).not.toBeInTheDocument()
-    expect(within(card()).getByRole('button', { name: 'Replace' })).toBeInTheDocument()
-    expect(document.body).not.toHaveTextContent('BSA-secret-key-b7c2')
-  })
-
-  it('masks a stored Brave key and replaces it', async () => {
-    const fetchMock = stubAPI({
-      'GET /api/v1/settings/recipe-search': () => jsonResponse(200, BRAVE_SETTINGS),
-      'PATCH /api/v1/settings/recipe-search': () => jsonResponse(200, { ...BRAVE_SETTINGS, api_key_last4: '9d0e' }),
-    })
-    await renderCard()
-    expect(brave()).toHaveAttribute('aria-checked', 'true')
-    expect(within(card()).getByText('••••••••b7c2')).toBeInTheDocument()
-    expect(saveSearch()).toBeDisabled()
-
-    addKey('Replace', 'BSA-other-key-9d0e')
-    fireEvent.click(within(card()).getByRole('button', { name: 'Discard' }))
-    expect(within(card()).getByText('••••••••b7c2')).toBeInTheDocument()
-    expect(saveSearch()).toBeDisabled()
-
-    addKey('Replace', 'BSA-other-key-9d0e')
-    fireEvent.click(saveSearch())
-    expect(await within(card()).findByText('••••••••9d0e')).toBeInTheDocument()
-    expect(sent(fetchMock)).toEqual([
-      { request: 'PATCH /api/v1/settings/recipe-search', body: { api_key: 'BSA-other-key-9d0e' } },
-    ])
-  })
-
-  it('reports a save the server refuses', async () => {
-    stubAPI({
-      'PATCH /api/v1/settings/recipe-search': () =>
-        apiError(400, 'invalid_settings', 'invalid recipe search settings: api_key: must be at least 8 characters'),
-    })
-    await renderCard()
-    fireEvent.click(brave())
-    addKey('Add key', 'short')
-    fireEvent.click(saveSearch())
-    expect(await within(card()).findByRole('alert')).toHaveTextContent(
-      'Not saved: invalid recipe search settings: api_key: must be at least 8 characters.',
-    )
-  })
-
-  it('shows how many recipes the test found', async () => {
-    const fetchMock = stubAPI({
-      'POST /api/v1/settings/recipe-search/test': () =>
-        jsonResponse(200, { query: 'chicken tikka masala', count: 12 }),
-    })
-    await renderCard()
-    fireEvent.click(testSearch())
-    expect(await within(card()).findByText("Found 12 recipes for 'chicken tikka masala'")).toBeInTheDocument()
-    expect(sent(fetchMock)).toEqual([{ request: 'POST /api/v1/settings/recipe-search/test', body: undefined }])
-  })
-
-  it('shows the error when the test fails', async () => {
-    stubAPI({
-      'POST /api/v1/settings/recipe-search/test': () =>
-        apiError(502, 'search_failed', 'recipes: SearXNG answered 403 Forbidden'),
-    })
-    await renderCard()
-    fireEvent.click(testSearch())
-    expect(await within(card()).findByRole('alert')).toHaveTextContent(
-      'Test failed: recipes: SearXNG answered 403 Forbidden',
-    )
-  })
-
-  it('clears a test result when the settings are edited', async () => {
-    stubAPI({
-      'POST /api/v1/settings/recipe-search/test': () =>
-        jsonResponse(200, { query: 'chicken tikka masala', count: 12 }),
-    })
-    await renderCard()
-    fireEvent.click(testSearch())
-    expect(await within(card()).findByText("Found 12 recipes for 'chicken tikka masala'")).toBeInTheDocument()
-    fireEvent.change(url(), { target: { value: 'https://search.example' } })
-    expect(within(card()).getByText('Save your changes to test them.')).toBeInTheDocument()
-    expect(within(card()).queryByText(/Found 12 recipes/)).not.toBeInTheDocument()
-  })
-
-  it('clears a test error when the settings are edited', async () => {
-    stubAPI({
-      'POST /api/v1/settings/recipe-search/test': () =>
-        apiError(502, 'search_failed', 'recipes: SearXNG answered 403 Forbidden'),
-    })
-    await renderCard()
-    fireEvent.click(testSearch())
-    expect(await within(card()).findByRole('alert')).toHaveTextContent('Test failed')
-    fireEvent.click(brave())
-    expect(within(card()).getByText('Save your changes to test them.')).toBeInTheDocument()
-    expect(within(card()).queryByRole('alert')).not.toBeInTheDocument()
-  })
-
-  it('asks before leaving with an unsaved recipe search change', async () => {
-    stubAPI()
-    await renderCard()
-    fireEvent.change(url(), { target: { value: 'https://search.example' } })
-    fireEvent.click(screen.getByRole('button', { name: 'Back to Settings' }))
-    expect(await screen.findByRole('dialog', { name: 'Leave without saving?' })).toBeInTheDocument()
-  })
-
-  it('does not count the suggested SearXNG URL as an unsaved change until it is edited', async () => {
-    stubAPI({ 'GET /api/v1/settings/recipe-search': () => jsonResponse(200, UNCONFIGURED) })
-    await renderCard()
-    const unload = () => {
-      const event = new Event('beforeunload', { cancelable: true })
-      act(() => void window.dispatchEvent(event))
-      return event.defaultPrevented
-    }
-    expect(saveSearch()).toBeEnabled()
-    expect(unload()).toBe(false)
-    fireEvent.change(url(), { target: { value: 'https://search.example' } })
-    expect(unload()).toBe(true)
-    fireEvent.change(url(), { target: { value: 'http://searxng:8080' } })
-    expect(unload()).toBe(false)
-  })
-
-  it('leaves the untouched first-use card without asking', async () => {
-    stubAPI({ 'GET /api/v1/settings/recipe-search': () => jsonResponse(200, UNCONFIGURED) })
-    await renderCard()
-    fireEvent.click(screen.getByRole('button', { name: 'Back to Settings' }))
-    expect(await screen.findByTestId('path')).toHaveTextContent('/settings')
-  })
-
-  it('locks the card while a save is pending, and guards leaving until the save lands', async () => {
-    let answer: (response: Response) => void = () => {}
-    stubAPI({ 'PATCH /api/v1/settings/recipe-search': () => new Promise<Response>((resolve) => (answer = resolve)) })
-    await renderCard()
-    const unload = () => {
-      const event = new Event('beforeunload', { cancelable: true })
-      act(() => void window.dispatchEvent(event))
-      return event.defaultPrevented
-    }
-    fireEvent.change(url(), { target: { value: 'https://search.example' } })
-    fireEvent.click(saveSearch())
-
-    expect(await within(card()).findByRole('button', { name: 'Saving…' })).toBeDisabled()
-    for (const field of [url(), searxng(), brave()]) expect(field).toBeDisabled()
-    expect(unload()).toBe(true)
-
-    answer(jsonResponse(200, { ...RECIPE_SEARCH_SETTINGS, base_url: 'https://search.example' }))
-    expect(await within(card()).findByText('Recipe search saved.')).toBeInTheDocument()
-    expect(url()).toBeEnabled()
-    expect(url()).toHaveValue('https://search.example')
-    await waitFor(() => expect(unload()).toBe(false))
-  })
-
-  it('keeps 44 px tap targets', async () => {
-    stubAPI({ 'GET /api/v1/settings/recipe-search': () => jsonResponse(200, BRAVE_SETTINGS) })
-    await renderCard()
-    for (const control of [
-      searxng(),
-      brave(),
-      within(card()).getByRole('button', { name: 'Replace' }),
-      testSearch(),
-      saveSearch(),
-    ]) {
-      expectMinHitArea(control)
-    }
-  })
-})
-
 describe('maskedKey', () => {
   it('shows only the last four characters', () => {
     expect(maskedKey('3f9a')).toBe('••••••••3f9a')

web/src/settings/AISettingsPage.tsx

@@ -1,9 +1,8 @@
 import { ChevronLeft } from 'lucide-react'
 import { useEffect, useId, useState, type ReactNode } from 'react'
-import { useNavigate } from 'react-router'
+import { useBlocker, useNavigate } from 'react-router'
 import { ApiError } from '../api/index.ts'
 import { Button } from '../ui/Button.tsx'
-import { Card } from '../ui/Card.tsx'
 import { ErrorBanner } from '../ui/ErrorBanner.tsx'
 import { Icon } from '../ui/Icon.tsx'
 import { IconButton } from '../ui/IconButton.tsx'
@@ -11,12 +10,10 @@ import { Select } from '../ui/Select.tsx'
 import { Sheet } from '../ui/Sheet.tsx'
 import { Skeleton } from '../ui/Skeleton.tsx'
 import { Slider } from '../ui/Slider.tsx'
-import { Tag } from '../ui/Tag.tsx'
 import { TextInput } from '../ui/TextInput.tsx'
 import {
   aiKeyPolicy,
   aiProviderLabels,
-  maskedKey,
   providersWithBaseURL,
   useAIModels,
   useAISettings,
@@ -29,8 +26,6 @@ import {
   type AISettingsPatch,
 } from './api.ts'
 import styles from './AISettingsPage.module.css'
-import { Confirm, LeaveGuard } from './LeaveGuard.tsx'
-import { RecipeSearchCard } from './RecipeSearchCard.tsx'
 
 // TYPE_MODEL is the Model dropdown's "Type a model id" option.
 const TYPE_MODEL = '\u0000type'
@@ -38,56 +33,20 @@ const TYPE_MODEL = '\u0000type'
 // Admin · AI assistant (handoff mock 1o). Provider, model, temperature and
 // system prompt are edited as a draft and saved together; the API key is
 // stored (and verified) on its own, straight away. The client only ever
-// sees the key's last four characters. Recipe search is its own card, saved
-// on its own.
+// sees the key's last four characters.
 export function AISettingsPage() {
-  const [aiDirty, setAIDirty] = useState(false)
-  const [recipeSearchDirty, setRecipeSearchDirty] = useState(false)
+  const settings = useAISettings()
   return (
     <div className={styles.page}>
       <Header />
-      <AIAssistantSettings onDirtyChange={setAIDirty} />
-      <RecipeSearchCard onDirtyChange={setRecipeSearchDirty} />
-      <LeaveGuard dirty={aiDirty || recipeSearchDirty} />
-    </div>
-  )
-}
-
-type AISettingsProps = {
-  // Called with whether the form holds unsaved changes.
-  onDirtyChange: (dirty: boolean) => void
-}
-
-// AIAssistantCard is the AI assistant's fields as a card, for the desktop
-// settings (handoff mock 2e): the system prompt grows to fill the card.
-export function AIAssistantCard({ onDirtyChange }: AISettingsProps) {
-  const titleId = useId()
-  return (
-    <Card className={`${styles.card} ${styles.fill}`} aria-labelledby={titleId} role="region">
-      <div className={styles.cardHeader}>
-        <h2 id={titleId} className={styles.cardTitle}>
-          AI assistant
-        </h2>
-        <Tag>Admin</Tag>
-      </div>
-      <AIAssistantSettings onDirtyChange={onDirtyChange} />
-    </Card>
-  )
-}
-
-// AIAssistantSettings is the AI assistant's form once its settings load.
-function AIAssistantSettings({ onDirtyChange }: AISettingsProps) {
-  const settings = useAISettings()
-  return (
-    <>
       {settings.isPending && <Skeleton className={styles.loading} />}
       {settings.isError && (
         <ErrorBanner onRetry={() => void settings.refetch()}>
           AI settings could not load: {settings.error.message}
         </ErrorBanner>
       )}
-      {settings.isSuccess && <AISettingsForm saved={settings.data} onDirtyChange={onDirtyChange} />}
-    </>
+      {settings.isSuccess && <AISettingsForm saved={settings.data} />}
+    </div>
   )
 }
 
@@ -136,11 +95,7 @@ function patchOf(saved: AISettings, draft: Draft): AISettingsPatch {
   return patch
 }
 
-type AISettingsFormProps = AISettingsProps & {
-  saved: AISettings
-}
-
-function AISettingsForm({ saved, onDirtyChange }: AISettingsFormProps) {
+function AISettingsForm({ saved }: { saved: AISettings }) {
   const [draft, setDraft] = useState(() => draftOf(saved))
   const [typingModel, setTypingModel] = useState(false)
   const [confirmingReset, setConfirmingReset] = useState(false)
@@ -161,10 +116,15 @@ function AISettingsForm({ saved, onDirtyChange }: AISettingsFormProps) {
   const listed = canList && models.isSuccess ? models.data : []
   const typedModel = typingModel || !(draft.model === '' || listed.some((m) => m.id === draft.model))
 
+  const blocker = useBlocker(
+    ({ currentLocation, nextLocation }) => dirty && currentLocation.pathname !== nextLocation.pathname,
+  )
   useEffect(() => {
-    onDirtyChange(dirty)
-  }, [dirty, onDirtyChange])
-  useEffect(() => () => onDirtyChange(false), [onDirtyChange])
+    if (!dirty) return
+    const onBeforeUnload = (event: BeforeUnloadEvent) => event.preventDefault()
+    window.addEventListener('beforeunload', onBeforeUnload)
+    return () => window.removeEventListener('beforeunload', onBeforeUnload)
+  }, [dirty])
 
   function edit(change: Partial<Draft>) {
     save.reset()
@@ -201,7 +161,7 @@ function AISettingsForm({ saved, onDirtyChange }: AISettingsFormProps) {
   }
 
   return (
-    <fieldset className={styles.lock} disabled={save.isPending || resetPrompt.isPending}>
+    <>
       <div className={styles.columns}>
         <Select
           label="Provider"
@@ -325,10 +285,26 @@ function AISettingsForm({ saved, onDirtyChange }: AISettingsFormProps) {
       >
         This restores MealQuest's default system prompt for everyone in the household.
       </Confirm>
-    </fieldset>
+      <Confirm
+        open={blocker.state === 'blocked'}
+        title="Leave without saving?"
+        confirmLabel="Leave"
+        cancelLabel="Keep editing"
+        onCancel={() => blocker.reset?.()}
+        onConfirm={() => blocker.proceed?.()}
+      >
+        Your changes to the AI assistant have not been saved.
+      </Confirm>
+    </>
   )
 }
 
+// maskedKey shows the stored key as dots and its last four characters, all
+// the client ever knows of it.
+export function maskedKey(last4: string): string {
+  return `••••••••${last4}`
+}
+
 // formatVerifiedDate turns key_verified_at into the handoff's "Oct 1".
 export function formatVerifiedDate(timestamp: string): string {
   const date = new Date(timestamp)
@@ -544,3 +520,52 @@ function PromptField({ value, onChange }: { value: string; onChange: (value: str
     </div>
   )
 }
+
+type ConfirmProps = {
+  open: boolean
+  title: string
+  children: ReactNode
+  confirmLabel: string
+  cancelLabel?: string
+  busy?: boolean
+  error?: string | null
+  onCancel: () => void
+  onConfirm: () => void
+}
+
+function Confirm({
+  open,
+  title,
+  children,
+  confirmLabel,
+  cancelLabel = 'Cancel',
+  busy = false,
+  error = null,
+  onCancel,
+  onConfirm,
+}: ConfirmProps) {
+  const titleId = useId()
+  return (
+    <Sheet open={open} onClose={onCancel} aria-labelledby={titleId}>
+      <div className={styles.sheet}>
+        <h2 id={titleId} className={styles.sheetTitle}>
+          {title}
+        </h2>
+        <p className={styles.sheetText}>{children}</p>
+        {error !== null && (
+          <p className={styles.error} role="alert">
+            {error}
+          </p>
+        )}
+        <div className={styles.sheetActions}>
+          <Button variant="outline" onClick={onCancel}>
+            {cancelLabel}
+          </Button>
+          <Button disabled={busy} onClick={onConfirm}>
+            {confirmLabel}
+          </Button>
+        </div>
+      </div>
+    </Sheet>
+  )
+}

web/src/settings/HouseholdSettingsPage.module.css

@@ -1,237 +0,0 @@
-/* Settings · Household. */
-.page {
-  box-sizing: border-box;
-  min-height: 100%;
-  max-width: 560px;
-  display: flex;
-  flex-direction: column;
-  gap: 18px;
-  padding-top: 6px;
-}
-
-.header {
-  display: flex;
-  align-items: center;
-  gap: 16px;
-}
-
-.kicker {
-  margin: 0;
-  font-family: var(--font-body);
-  font-size: 12px;
-  font-weight: 700;
-  letter-spacing: 0.1em;
-  text-transform: uppercase;
-  color: var(--color-accent-700);
-}
-
-.title {
-  margin: 0;
-  font-family: var(--font-heading);
-  font-size: 28px;
-  font-weight: 400;
-}
-
-.shared {
-  margin: 0;
-  padding: 14px 16px;
-  border-radius: 26px;
-  background: var(--color-accent-2-100);
-  color: var(--color-accent-2-900);
-  font-family: var(--font-body);
-  font-size: 14px;
-  font-weight: 700;
-}
-
-.loading {
-  height: 420px;
-  border-radius: 26px;
-}
-
-.card {
-  display: flex;
-  flex-direction: column;
-  gap: 18px;
-  border: 1px solid var(--color-neutral-300);
-}
-
-.cardTitle {
-  margin: 0;
-  font-family: var(--font-heading);
-  font-size: 22px;
-  font-weight: 400;
-}
-
-.field {
-  display: flex;
-  flex-direction: column;
-  gap: 6px;
-  min-width: 0;
-}
-
-.groupLabel {
-  font-family: var(--font-body);
-  font-size: 14px;
-  font-weight: 700;
-  color: var(--color-neutral-700);
-}
-
-.columns {
-  display: grid;
-  grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
-  gap: 10px;
-  align-items: end;
-}
-
-.time {
-  width: 100%;
-}
-
-/* Beside a day dropdown, a time matches its height. */
-.pairedTime {
-  height: 56px;
-}
-
-.hint,
-.error,
-.status {
-  margin: 0;
-  font-family: var(--font-body);
-  font-size: 13px;
-  line-height: 1.4;
-}
-
-.hint {
-  color: var(--color-neutral-700);
-}
-
-.error {
-  font-weight: 700;
-  color: var(--color-accent-700);
-}
-
-.errors {
-  display: flex;
-  flex-direction: column;
-  gap: 4px;
-}
-
-.status {
-  color: var(--color-accent-2-800);
-}
-
-.status:empty {
-  display: none;
-}
-
-.zoneRow {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-  min-height: 56px;
-  padding: 0 6px 0 20px;
-  border: 1px solid var(--color-neutral-300);
-  border-radius: var(--radius-pill);
-  background: var(--color-surface);
-}
-
-.zoneValue {
-  flex: 1;
-  min-width: 0;
-  display: flex;
-  flex-wrap: wrap;
-  align-items: baseline;
-  gap: 0 8px;
-}
-
-.zoneName {
-  min-width: 0;
-  overflow: hidden;
-  font-family: var(--font-body);
-  font-size: 15px;
-  font-weight: 700;
-  text-overflow: ellipsis;
-}
-
-.offset {
-  font-family: var(--font-mono);
-  font-size: 13px;
-  color: var(--color-neutral-700);
-}
-
-.change {
-  flex: none;
-  min-width: 44px;
-  min-height: 44px;
-  padding: 0 18px;
-  border: 0;
-  border-radius: var(--radius-pill);
-  background: var(--color-bg);
-  color: var(--color-text);
-  font-family: var(--font-body);
-  font-size: 14px;
-  font-weight: 700;
-  cursor: pointer;
-}
-
-.actions {
-  margin-top: auto;
-  display: grid;
-  padding-top: 6px;
-}
-
-.save {
-  min-height: 52px;
-}
-
-.sheet {
-  display: flex;
-  flex-direction: column;
-  gap: 14px;
-  max-width: 560px;
-  margin: 0 auto;
-}
-
-.zoneList {
-  max-height: 50vh;
-  margin: 0;
-  padding: 0;
-  overflow-y: auto;
-  list-style: none;
-}
-
-.zoneOption {
-  box-sizing: border-box;
-  display: flex;
-  align-items: center;
-  gap: 10px;
-  width: 100%;
-  min-width: 44px;
-  min-height: 48px;
-  padding: 0 16px;
-  border: 0;
-  border-radius: var(--radius-pill);
-  background: transparent;
-  color: var(--color-text);
-  text-align: start;
-  cursor: pointer;
-}
-
-.zoneOption .zoneName {
-  flex: 1;
-}
-
-.zoneOption[aria-pressed='true'] {
-  background: var(--color-accent-2-100);
-  color: var(--color-accent-2-900);
-}
-
-.check {
-  flex: none;
-}
-
-/* A form locked while its save is pending, so no edit is made that the
-   saved settings would then replace. It lays out as if it were not there. */
-.lock {
-  display: contents;
-}

web/src/settings/HouseholdSettingsPage.test.tsx

@@ -1,394 +0,0 @@
-import { QueryClientProvider } from '@tanstack/react-query'
-import { act, fireEvent, render, screen, waitFor, within } from '@testing-library/react'
-import { Route, Routes, useLocation } from 'react-router'
-import { afterEach, describe, expect, it, vi, type Mock } from 'vitest'
-import { ApiProvider, ApiError, createApiClient, createQueryClient, createVerifiedSession } from '../api/index.ts'
-import { createNetworkStatus } from '../pwa/networkStatus.ts'
-import { HOUSEHOLD_SETTINGS } from '../test/ApiProviders.tsx'
-import { InDataRouter } from '../test/dataRouter.tsx'
-import { errorResponse, fakeLocation, jsonResponse, ME } from '../test/fetchStub.ts'
-import { expectMinHitArea } from '../test/hitArea.ts'
-import { householdSettingsProblems } from './api.ts'
-import { HouseholdSettingsPage } from './HouseholdSettingsPage.tsx'
-import { matchesZone, utcOffset, zoneLabel } from './timezones.ts'
-
-type Responder = (body: unknown) => Response | Promise<Response>
-
-// stubAPI answers "METHOD path" from responders, each called with the
-// request's decoded JSON body; GET /settings/household answers
-// HOUSEHOLD_SETTINGS unless overridden. Any other request fails the test.
-function stubAPI(responders: Record<string, Responder> = {}): Mock<typeof fetch> {
-  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}`)
-    const body = typeof init?.body === 'string' ? (JSON.parse(init.body) as unknown) : undefined
-    return Promise.resolve(respond(body))
-  })
-  vi.stubGlobal('fetch', fetchMock)
-  return fetchMock
-}
-
-// sent lists the requests other than GETs, as "METHOD path" and body.
-function sent(fetchMock: Mock<typeof fetch>) {
-  return fetchMock.mock.calls
-    .filter(([, init]) => (init?.method ?? 'GET') !== 'GET')
-    .map(([input, init]) => ({
-      request: `${init?.method} ${String(input)}`,
-      body: typeof init?.body === 'string' ? (JSON.parse(init.body) as unknown) : undefined,
-    }))
-}
-
-afterEach(() => {
-  vi.unstubAllGlobals()
-})
-
-function CurrentPath() {
-  return <p data-testid="path">{useLocation().pathname}</p>
-}
-
-// renderPage loads /me (for the CSRF token every write needs) and renders
-// the page at /settings/household in a data router, so its leave guard works.
-async function renderPage() {
-  const api = createApiClient(
-    fakeLocation('/settings/household'),
-    createNetworkStatus(window),
-    createVerifiedSession(localStorage),
-  )
-  await api.loadMe()
-  render(
-    <ApiProvider client={api}>
-      <QueryClientProvider client={createQueryClient()}>
-        <InDataRouter path="/settings/household">
-          <Routes>
-            <Route path="/settings/household" element={<HouseholdSettingsPage />} />
-            <Route path="*" element={<CurrentPath />} />
-          </Routes>
-        </InDataRouter>
-      </QueryClientProvider>
-    </ApiProvider>,
-  )
-  await screen.findByLabelText('Dinner time')
-}
-
-const save = () => screen.getByRole('button', { name: 'Save changes' })
-const input = (name: string) => screen.getByLabelText(name)
-const zoneGroup = () => screen.getByRole('group', { name: 'Time zone' })
-
-describe('HouseholdSettingsPage', () => {
-  it('loads every household setting with plain-word copy', async () => {
-    stubAPI()
-    await renderPage()
-    expect(screen.getByRole('button', { name: 'Back to Settings' })).toBeInTheDocument()
-    expect(screen.getByRole('heading', { level: 1, name: 'Household' })).toBeInTheDocument()
-    expect(screen.getByText('Changes apply to everyone in the household.')).toBeInTheDocument()
-
-    expect(zoneGroup()).toHaveTextContent('America / New York')
-    expect(zoneGroup()).toHaveTextContent(utcOffset('America/New_York', new Date()))
-    expect(input('Dinner time')).toHaveValue('17:30')
-    expect(input('Dinner time')).toHaveAccessibleDescription(/crock-pot dinners count back from it/)
-    expect(input('Day-of reminder')).toHaveValue('16:30')
-    expect(input('Rotation check')).toHaveValue('09:00')
-    expect(input('Rotation check')).toHaveAccessibleDescription(/When we ask whether to keep a new dinner/)
-    expect(input('Plan draft day')).toHaveValue('5')
-    expect(within(input('Plan draft day')).getByRole('option', { selected: true })).toHaveTextContent('Friday')
-    expect(input('Plan draft time')).toHaveValue('09:00')
-    expect(input('New suggestions day')).toHaveValue('0')
-    expect(input('New suggestions time')).toHaveValue('08:00')
-    expect(input('Google Chat Supply run day')).toHaveValue('6')
-    expect(input('Google Chat Supply run time')).toHaveValue('08:00')
-    expect(input('Google Chat Supply run time')).toHaveAccessibleDescription(/Supply run is sent to your Google Chat/)
-    expect(save()).toBeDisabled()
-  })
-
-  it('reports a load failure with a retry', async () => {
-    stubAPI({ 'GET /api/v1/settings/household': () => errorResponse(500, 'internal') })
-    const api = createApiClient(
-      fakeLocation('/settings/household'),
-      createNetworkStatus(window),
-      createVerifiedSession(localStorage),
-    )
-    render(
-      <ApiProvider client={api}>
-        <QueryClientProvider client={createQueryClient()}>
-          <InDataRouter path="/settings/household">
-            <HouseholdSettingsPage />
-          </InDataRouter>
-        </QueryClientProvider>
-      </ApiProvider>,
-    )
-    expect(await screen.findByRole('alert')).toHaveTextContent('Household settings could not load: internal message')
-    expect(screen.getByRole('button', { name: 'Retry' })).toBeInTheDocument()
-  })
-
-  it('saves only the edited fields', async () => {
-    const fetchMock = stubAPI({
-      'PATCH /api/v1/settings/household': (body) => jsonResponse(200, { ...HOUSEHOLD_SETTINGS, ...(body as object) }),
-    })
-    await renderPage()
-    fireEvent.change(input('Dinner time'), { target: { value: '18:15' } })
-    fireEvent.change(input('Rotation check'), { target: { value: '10:00' } })
-    fireEvent.change(input('Plan draft day'), { target: { value: '4' } })
-    fireEvent.change(input('Google Chat Supply run time'), { target: { value: '07:30' } })
-    // Changed and changed back: not sent.
-    fireEvent.change(input('Day-of reminder'), { target: { value: '16:00' } })
-    fireEvent.change(input('Day-of reminder'), { target: { value: '16:30' } })
-    fireEvent.click(save())
-
-    expect(await screen.findByText('Changes saved.')).toBeInTheDocument()
-    expect(sent(fetchMock)).toEqual([
-      {
-        request: 'PATCH /api/v1/settings/household',
-        body: { dinner_time: '18:15', review_time: '10:00', plan_draft_dow: 4, chat_autosend_time: '07:30' },
-      },
-    ])
-    expect(input('Dinner time')).toHaveValue('18:15')
-    expect(save()).toBeDisabled()
-  })
-
-  it('chooses a time zone from the searchable list', async () => {
-    const fetchMock = stubAPI({
-      'PATCH /api/v1/settings/household': (body) => jsonResponse(200, { ...HOUSEHOLD_SETTINGS, ...(body as object) }),
-    })
-    await renderPage()
-    fireEvent.click(within(zoneGroup()).getByRole('button', { name: 'Change' }))
-    const sheet = screen.getByRole('dialog', { name: 'Choose a time zone' })
-    const list = within(sheet).getByRole('list', { name: 'Time zones' })
-    expect(within(list).getByRole('button', { pressed: true })).toHaveAccessibleName(
-      `America / New York, ${utcOffset('America/New_York', new Date())}`,
-    )
-
-    fireEvent.change(within(sheet).getByRole('searchbox', { name: 'Search time zones' }), {
-      target: { value: 'los angeles' },
-    })
-    const options = within(list).getAllByRole('button')
-    expect(options).toHaveLength(1)
-    expect(within(sheet).getByText('1 time zone')).toBeInTheDocument()
-    expect(options[0]).toHaveAccessibleName(`America / Los Angeles, ${utcOffset('America/Los_Angeles', new Date())}`)
-    fireEvent.click(options[0]!)
-
-    expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
-    expect(zoneGroup()).toHaveTextContent('America / Los Angeles')
-    fireEvent.click(save())
-    await screen.findByText('Changes saved.')
-    expect(sent(fetchMock)).toEqual([
-      { request: 'PATCH /api/v1/settings/household', body: { timezone: 'America/Los_Angeles' } },
-    ])
-  })
-
-  it('offers the UTC zones the browser list leaves out', async () => {
-    expect(Intl.supportedValuesOf('timeZone')).not.toContain('Etc/UTC')
-    const fetchMock = stubAPI({
-      'PATCH /api/v1/settings/household': (body) => jsonResponse(200, { ...HOUSEHOLD_SETTINGS, ...(body as object) }),
-    })
-    await renderPage()
-    expect(zoneGroup()).toHaveTextContent('America / New York')
-    fireEvent.click(within(zoneGroup()).getByRole('button', { name: 'Change' }))
-    const sheet = screen.getByRole('dialog', { name: 'Choose a time zone' })
-    const list = within(sheet).getByRole('list', { name: 'Time zones' })
-    fireEvent.change(within(sheet).getByRole('searchbox', { name: 'Search time zones' }), {
-      target: { value: 'utc' },
-    })
-    expect(within(list).getByRole('button', { name: 'UTC, UTC+00:00' })).toBeInTheDocument()
-    fireEvent.click(within(list).getByRole('button', { name: 'Etc / UTC, UTC+00:00' }))
-
-    expect(zoneGroup()).toHaveTextContent('Etc / UTC')
-    fireEvent.click(save())
-    await screen.findByText('Changes saved.')
-    expect(sent(fetchMock)).toEqual([
-      { request: 'PATCH /api/v1/settings/household', body: { timezone: 'Etc/UTC' } },
-    ])
-  })
-
-  it('keeps offering a saved zone the browser list leaves out after another is chosen', async () => {
-    expect(Intl.supportedValuesOf('timeZone')).not.toContain('US/Eastern')
-    stubAPI({
-      'GET /api/v1/settings/household': () => jsonResponse(200, { ...HOUSEHOLD_SETTINGS, timezone: 'US/Eastern' }),
-    })
-    await renderPage()
-    const search = (value: string) =>
-      fireEvent.change(screen.getByRole('searchbox', { name: 'Search time zones' }), { target: { value } })
-    const option = (name: RegExp) =>
-      within(screen.getByRole('list', { name: 'Time zones' })).getByRole('button', { name })
-
-    fireEvent.click(within(zoneGroup()).getByRole('button', { name: 'Change' }))
-    search('los angeles')
-    fireEvent.click(option(/^America \/ Los Angeles,/))
-    expect(zoneGroup()).toHaveTextContent('America / Los Angeles')
-
-    fireEvent.click(within(zoneGroup()).getByRole('button', { name: 'Change' }))
-    search('us eastern')
-    fireEvent.click(option(/^US \/ Eastern,/))
-    expect(zoneGroup()).toHaveTextContent('US / Eastern')
-    expect(save()).toBeDisabled()
-  })
-
-  it('says when no time zone matches the search', async () => {
-    stubAPI()
-    await renderPage()
-    fireEvent.click(within(zoneGroup()).getByRole('button', { name: 'Change' }))
-    const sheet = screen.getByRole('dialog', { name: 'Choose a time zone' })
-    fireEvent.change(within(sheet).getByRole('searchbox'), { target: { value: 'Atlantis' } })
-    expect(within(sheet).getByText('No time zone matches.')).toBeInTheDocument()
-    expect(within(sheet).queryAllByRole('listitem')).toHaveLength(0)
-  })
-
-  it('shows the API validation errors beside their fields', async () => {
-    stubAPI({
-      'PATCH /api/v1/settings/household': () =>
-        jsonResponse(400, {
-          error: {
-            code: 'invalid_settings',
-            message:
-              'invalid household settings: timezone: unknown time zone "Mars/Olympus" (want an IANA zone such as America/New_York); dinner_time: invalid time "" (want 24-hour HH:MM, 00:00-23:59)',
-            retryable: false,
-          },
-        }),
-    })
-    await renderPage()
-    fireEvent.change(input('Dinner time'), { target: { value: '' } })
-    fireEvent.click(save())
-
-    expect(await screen.findByRole('alert')).toHaveTextContent('Not saved: fix the settings marked below their fields.')
-    expect(input('Dinner time')).toHaveAttribute('aria-invalid', 'true')
-    expect(input('Dinner time')).toHaveAccessibleDescription(/^invalid time "" \(want 24-hour HH:MM, 00:00-23:59\)/)
-    expect(zoneGroup()).toHaveAccessibleDescription(
-      'unknown time zone "Mars/Olympus" (want an IANA zone such as America/New_York)',
-    )
-    expect(input('Day-of reminder')).toHaveAttribute('aria-invalid', 'false')
-
-    // Editing again clears the refused save's errors.
-    fireEvent.change(input('Dinner time'), { target: { value: '18:00' } })
-    expect(screen.queryByRole('alert')).not.toBeInTheDocument()
-    expect(input('Dinner time')).toHaveAttribute('aria-invalid', 'false')
-  })
-
-  it('shows an error that names no field as a whole-form error', async () => {
-    stubAPI({ 'PATCH /api/v1/settings/household': () => errorResponse(500, 'internal') })
-    await renderPage()
-    fireEvent.change(input('Dinner time'), { target: { value: '18:00' } })
-    fireEvent.click(save())
-    expect(await screen.findByRole('alert')).toHaveTextContent('Not saved: internal message')
-    expect(input('Dinner time')).toHaveValue('18:00')
-    expect(save()).toBeEnabled()
-  })
-
-  it('asks before leaving with unsaved changes', async () => {
-    stubAPI()
-    await renderPage()
-    fireEvent.change(input('New suggestions time'), { target: { value: '07:00' } })
-    fireEvent.click(screen.getByRole('button', { name: 'Back to Settings' }))
-    const confirm = await screen.findByRole('dialog', { name: 'Leave without saving?' })
-    fireEvent.click(within(confirm).getByRole('button', { name: 'Keep editing' }))
-    await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())
-    expect(input('New suggestions time')).toHaveValue('07:00')
-
-    fireEvent.click(screen.getByRole('button', { name: 'Back to Settings' }))
-    fireEvent.click(within(await screen.findByRole('dialog')).getByRole('button', { name: 'Leave' }))
-    expect(await screen.findByTestId('path')).toHaveTextContent('/settings')
-  })
-
-  it('locks the form while a save is pending, and guards leaving until the save lands', async () => {
-    let answer: (response: Response) => void = () => {}
-    stubAPI({
-      'PATCH /api/v1/settings/household': () => new Promise<Response>((resolve) => (answer = resolve)),
-    })
-    await renderPage()
-    const unload = () => {
-      const event = new Event('beforeunload', { cancelable: true })
-      act(() => void window.dispatchEvent(event))
-      return event.defaultPrevented
-    }
-    fireEvent.change(input('Dinner time'), { target: { value: '18:15' } })
-    fireEvent.click(save())
-
-    expect(await screen.findByRole('button', { name: 'Saving…' })).toBeDisabled()
-    for (const field of ['Dinner time', 'Day-of reminder', 'Plan draft day', 'Google Chat Supply run time']) {
-      expect(input(field)).toBeDisabled()
-    }
-    expect(screen.getByRole('button', { name: 'Change' })).toBeDisabled()
-    expect(unload()).toBe(true)
-
-    answer(jsonResponse(200, { ...HOUSEHOLD_SETTINGS, dinner_time: '18:15' }))
-    expect(await screen.findByText('Changes saved.')).toBeInTheDocument()
-    expect(input('Dinner time')).toBeEnabled()
-    expect(input('Dinner time')).toHaveValue('18:15')
-    await waitFor(() => expect(unload()).toBe(false))
-  })
-
-  it('leaves without asking when nothing changed', async () => {
-    stubAPI()
-    await renderPage()
-    fireEvent.click(screen.getByRole('button', { name: 'Back to Settings' }))
-    expect(await screen.findByTestId('path')).toHaveTextContent('/settings')
-  })
-
-  it('keeps 44 px tap targets', async () => {
-    stubAPI()
-    await renderPage()
-    for (const control of [
-      screen.getByRole('button', { name: 'Back to Settings' }),
-      within(zoneGroup()).getByRole('button', { name: 'Change' }),
-      input('Dinner time'),
-      input('Plan draft day'),
-      input('Plan draft time'),
-      save(),
-    ]) {
-      expectMinHitArea(control)
-    }
-    fireEvent.click(within(zoneGroup()).getByRole('button', { name: 'Change' }))
-    expectMinHitArea(within(screen.getByRole('dialog')).getAllByRole('button', { pressed: true })[0]!)
-  })
-})
-
-describe('householdSettingsProblems', () => {
-  it('reads each field the server names', () => {
-    const error = new ApiError(
-      400,
-      'invalid_settings',
-      'invalid household settings: plan_draft_dow: invalid day of the week 9 (want 0-6, Sunday = 0); review_time: invalid time "9" (want 24-hour HH:MM, 00:00-23:59)',
-      false,
-    )
-    expect(householdSettingsProblems(error)).toEqual({
-      fields: {
-        plan_draft_dow: 'invalid day of the week 9 (want 0-6, Sunday = 0)',
-        review_time: 'invalid time "9" (want 24-hour HH:MM, 00:00-23:59)',
-      },
-      other: [],
-    })
-  })
-
-  it('keeps a problem naming no field, and any other error, whole', () => {
-    expect(
-      householdSettingsProblems(
-        new ApiError(400, 'invalid_settings', 'invalid household settings: settings: no settings to change', false),
-      ),
-    ).toEqual({ fields: {}, other: ['settings: no settings to change'] })
-    expect(
-      householdSettingsProblems(new ApiError(400, 'invalid_request', 'plan_draft_dow: want a JSON int', false)),
-    ).toEqual({ fields: {}, other: ['plan_draft_dow: want a JSON int'] })
-  })
-})
-
-describe('time zones', () => {
-  it('formats the UTC offset', () => {
-    const winter = new Date('2026-01-15T12:00:00Z')
-    expect(utcOffset('America/New_York', winter)).toBe('UTC-05:00')
-    expect(utcOffset('Asia/Kolkata', winter)).toBe('UTC+05:30')
-    expect(utcOffset('UTC', winter)).toBe('UTC+00:00')
-  })
-
-  it('matches every search word against the name and offset', () => {
-    const option = { zone: 'America/Argentina/Buenos_Aires', offset: 'UTC-03:00' }
-    expect(zoneLabel(option.zone)).toBe('America / Argentina / Buenos Aires')
-    expect(matchesZone(option, 'buenos aires')).toBe(true)
-    expect(matchesZone(option, 'Buenos_Aires')).toBe(true)
-    expect(matchesZone(option, 'utc-03')).toBe(true)
-    expect(matchesZone(option, 'buenos paris')).toBe(false)
-  })
-})

web/src/settings/HouseholdSettingsPage.tsx

@@ -1,412 +0,0 @@
-import { Check, ChevronLeft } from 'lucide-react'
-import { useEffect, useId, useMemo, useState, type ReactNode } from 'react'
-import { useNavigate } from 'react-router'
-import { Button } from '../ui/Button.tsx'
-import { Card } from '../ui/Card.tsx'
-import { ErrorBanner } from '../ui/ErrorBanner.tsx'
-import { Icon } from '../ui/Icon.tsx'
-import { IconButton } from '../ui/IconButton.tsx'
-import { Select } from '../ui/Select.tsx'
-import { Sheet } from '../ui/Sheet.tsx'
-import { Skeleton } from '../ui/Skeleton.tsx'
-import { TextInput } from '../ui/TextInput.tsx'
-import {
-  householdSettingsProblems,
-  useHouseholdSettings,
-  useSaveHouseholdSettings,
-  type HouseholdSettings,
-  type HouseholdSettingsField,
-  type HouseholdSettingsPatch,
-} from './api.ts'
-import styles from './HouseholdSettingsPage.module.css'
-import { LeaveGuard } from './LeaveGuard.tsx'
-import { matchesZone, timeZoneOptions, utcOffset, zoneLabel } from './timezones.ts'
-
-// Days of the week as the server counts them, from Sunday = 0.
-const days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'] as const
-
-// Settings · Household: the time zone and the times the household's
-// reminders and weekly AI runs happen at. Every field is edited as a draft
-// and saved together; only the changed fields are sent.
-export function HouseholdSettingsPage() {
-  const [dirty, setDirty] = useState(false)
-  return (
-    <div className={styles.page}>
-      <Header />
-      <p className={styles.shared}>Changes apply to everyone in the household.</p>
-      <HouseholdSettingsSections onDirtyChange={setDirty} />
-      <LeaveGuard dirty={dirty} />
-    </div>
-  )
-}
-
-type HouseholdSettingsProps = {
-  // Called with whether the form holds unsaved changes.
-  onDirtyChange: (dirty: boolean) => void
-}
-
-// HouseholdSettingsSections is the screen's form once its settings load,
-// without the screen's header, so the desktop settings (mock 2e) can embed
-// it.
-export function HouseholdSettingsSections({ onDirtyChange }: HouseholdSettingsProps) {
-  const settings = useHouseholdSettings()
-  return (
-    <>
-      {settings.isPending && <Skeleton className={styles.loading} />}
-      {settings.isError && (
-        <ErrorBanner onRetry={() => void settings.refetch()}>
-          Household settings could not load: {settings.error.message}
-        </ErrorBanner>
-      )}
-      {settings.isSuccess && <HouseholdSettingsForm saved={settings.data} onDirtyChange={onDirtyChange} />}
-    </>
-  )
-}
-
-function Header() {
-  const navigate = useNavigate()
-  return (
-    <header className={styles.header}>
-      <IconButton label="Back to Settings" onClick={() => void navigate('/settings')}>
-        <Icon icon={ChevronLeft} size="nav" />
-      </IconButton>
-      <div>
-        <p className={styles.kicker}>Settings</p>
-        <h1 className={styles.title}>Household</h1>
-      </div>
-    </header>
-  )
-}
-
-// patchOf is the PATCH body for the fields draft changes.
-function patchOf(saved: HouseholdSettings, draft: HouseholdSettings): HouseholdSettingsPatch {
-  const patch: Record<string, string | number> = {}
-  for (const field of Object.keys(saved) as HouseholdSettingsField[]) {
-    if (draft[field] !== saved[field]) patch[field] = draft[field]
-  }
-  return patch as HouseholdSettingsPatch
-}
-
-type HouseholdSettingsFormProps = HouseholdSettingsProps & {
-  saved: HouseholdSettings
-}
-
-function HouseholdSettingsForm({ saved, onDirtyChange }: HouseholdSettingsFormProps) {
-  const [draft, setDraft] = useState(saved)
-  const save = useSaveHouseholdSettings()
-  const patch = patchOf(saved, draft)
-  const dirty = Object.keys(patch).length > 0
-  const problems = save.isError ? householdSettingsProblems(save.error) : { fields: {}, other: [] }
-
-  useEffect(() => {
-    onDirtyChange(dirty)
-  }, [dirty, onDirtyChange])
-  useEffect(() => () => onDirtyChange(false), [onDirtyChange])
-
-  function edit(change: Partial<HouseholdSettings>) {
-    save.reset()
-    setDraft((current) => ({ ...current, ...change }))
-  }
-
-  function onSave() {
-    save.mutate(patch, { onSuccess: setDraft })
-  }
-
-  return (
-    <fieldset className={styles.lock} disabled={save.isPending}>
-      <Section title="Time zone">
-        <TimeZoneField
-          value={draft.timezone}
-          saved={saved.timezone}
-          onChange={(timezone) => edit({ timezone })}
-          error={problems.fields.timezone}
-        />
-        <p className={styles.hint}>Every time on this screen is in this zone.</p>
-      </Section>
-
-      <Section title="Dinner">
-        <TimeField
-          draft={draft}
-          edit={edit}
-          problems={problems.fields}
-          name="dinner_time"
-          label="Dinner time"
-          hint="When dinner is on the table. Calendar events start then, and crock-pot dinners count back from it to show when to start."
-        />
-        <TimeField
-          draft={draft}
-          edit={edit}
-          problems={problems.fields}
-          name="reminder_time"
-          label="Day-of reminder"
-          hint="When we remind you what's for dinner tonight."
-        />
-        <TimeField
-          draft={draft}
-          edit={edit}
-          problems={problems.fields}
-          name="review_time"
-          label="Rotation check"
-          hint="When we ask whether to keep a new dinner: the day after you try a Quest-log dinner, we ask “Keep it in rotation?”"
-        />
-      </Section>
-
-      <Section title="Every week">
-        <DayTimeField
-          draft={draft}
-          edit={edit}
-          problems={problems.fields}
-          day="plan_draft_dow"
-          time="plan_draft_time"
-          label="Plan draft"
-          hint="When the AI drafts next week's plan on the Draft board for you to adjust."
-        />
-        <DayTimeField
-          draft={draft}
-          edit={edit}
-          problems={problems.fields}
-          day="suggestions_dow"
-          time="suggestions_time"
-          label="New suggestions"
-          hint="When a fresh batch of Side quests arrives to swipe through."
-        />
-        <DayTimeField
-          draft={draft}
-          edit={edit}
-          problems={problems.fields}
-          day="chat_autosend_dow"
-          time="chat_autosend_time"
-          label="Google Chat Supply run"
-          hint="When the week's Supply run is sent to your Google Chat space."
-        />
-      </Section>
-
-      <div className={styles.status} role="status">
-        {save.isSuccess && !dirty && 'Changes saved.'}
-      </div>
-      {save.isError && (
-        <div className={styles.errors} role="alert">
-          {Object.keys(problems.fields).length > 0 && (
-            <p className={styles.error}>Not saved: fix the settings marked below their fields.</p>
-          )}
-          {problems.other.map((reason) => (
-            <p key={reason} className={styles.error}>
-              Not saved: {reason}
-            </p>
-          ))}
-        </div>
-      )}
-
-      <div className={styles.actions}>
-        <Button className={styles.save} disabled={!dirty || save.isPending} onClick={onSave}>
-          {save.isPending ? 'Saving…' : 'Save changes'}
-        </Button>
-      </div>
-    </fieldset>
-  )
-}
-
-function Section({ title, children }: { title: string; children: ReactNode }) {
-  const titleId = useId()
-  return (
-    <Card role="region" aria-labelledby={titleId} className={styles.card}>
-      <h2 id={titleId} className={styles.cardTitle}>
-        {title}
-      </h2>
-      {children}
-    </Card>
-  )
-}
-
-function FieldError({ id, error }: { id: string; error: string | undefined }) {
-  if (error === undefined) return null
-  return (
-    <p id={id} className={styles.error}>
-      {error}
-    </p>
-  )
-}
-
-type FieldProps = {
-  draft: HouseholdSettings
-  edit: (change: Partial<HouseholdSettings>) => void
-  problems: Partial<Record<HouseholdSettingsField, string>>
-  label: string
-  hint: string
-}
-
-type TimeFieldProps = FieldProps & { name: 'dinner_time' | 'reminder_time' | 'review_time' }
-
-function TimeField({ draft, edit, problems, name, label, hint }: TimeFieldProps) {
-  const hintId = useId()
-  const errorId = useId()
-  const error = problems[name]
-  return (
-    <div className={styles.field}>
-      <TextInput
-        label={label}
-        type="time"
-        className={styles.time}
-        value={draft[name]}
-        aria-invalid={error !== undefined}
-        aria-describedby={error === undefined ? hintId : `${errorId} ${hintId}`}
-        onChange={(event) => edit({ [name]: event.target.value })}
-      />
-      <FieldError id={errorId} error={error} />
-      <p id={hintId} className={styles.hint}>
-        {hint}
-      </p>
-    </div>
-  )
-}
-
-type DayTimeFieldProps = FieldProps & {
-  day: 'plan_draft_dow' | 'suggestions_dow' | 'chat_autosend_dow'
-  time: 'plan_draft_time' | 'suggestions_time' | 'chat_autosend_time'
-}
-
-function DayTimeField({ draft, edit, problems, day, time, label, hint }: DayTimeFieldProps) {
-  const hintId = useId()
-  const dayErrorId = useId()
-  const timeErrorId = useId()
-  const dayError = problems[day]
-  const timeError = problems[time]
-  return (
-    <div className={styles.field} role="group" aria-label={label}>
-      <div className={styles.columns}>
-        <Select
-          label={`${label} day`}
-          value={draft[day]}
-          aria-invalid={dayError !== undefined}
-          aria-describedby={dayError === undefined ? hintId : `${dayErrorId} ${hintId}`}
-          onChange={(event) => edit({ [day]: Number(event.target.value) })}
-        >
-          {days.map((name, index) => (
-            <option key={name} value={index}>
-              {name}
-            </option>
-          ))}
-        </Select>
-        <TextInput
-          label={`${label} time`}
-          type="time"
-          className={`${styles.time} ${styles.pairedTime}`}
-          value={draft[time]}
-          aria-invalid={timeError !== undefined}
-          aria-describedby={timeError === undefined ? hintId : `${timeErrorId} ${hintId}`}
-          onChange={(event) => edit({ [time]: event.target.value })}
-        />
-      </div>
-      <FieldError id={dayErrorId} error={dayError} />
-      <FieldError id={timeErrorId} error={timeError} />
-      <p id={hintId} className={styles.hint}>
-        {hint}
-      </p>
-    </div>
-  )
-}
-
-type TimeZoneFieldProps = {
-  value: string
-  saved: string
-  onChange: (zone: string) => void
-  error: string | undefined
-}
-
-// TimeZoneField shows the chosen zone and its current UTC offset; Change
-// opens a searchable list of every IANA zone.
-function TimeZoneField({ value, saved, onChange, error }: TimeZoneFieldProps) {
-  const [open, setOpen] = useState(false)
-  const labelId = useId()
-  const errorId = useId()
-  const offset = useMemo(() => utcOffset(value, new Date()), [value])
-  return (
-    <div className={styles.field}>
-      <span id={labelId} className={styles.groupLabel}>
-        Time zone
-      </span>
-      <div
-        className={styles.zoneRow}
-        role="group"
-        aria-labelledby={labelId}
-        aria-describedby={error === undefined ? undefined : errorId}
-      >
-        <span className={styles.zoneValue}>
-          <span className={styles.zoneName}>{zoneLabel(value)}</span>
-          <span className={styles.offset}>{offset}</span>
-        </span>
-        <button type="button" className={styles.change} onClick={() => setOpen(true)}>
-          Change
-        </button>
-      </div>
-      <FieldError id={errorId} error={error} />
-      {open && (
-        <TimeZoneSheet
-          value={value}
-          saved={saved}
-          onClose={() => setOpen(false)}
-          onChoose={(zone) => {
-            onChange(zone)
-            setOpen(false)
-          }}
-        />
-      )}
-    </div>
-  )
-}
-
-type TimeZoneSheetProps = {
-  value: string
-  // The saved zone, offered even after another is chosen.
-  saved: string
-  onClose: () => void
-  onChoose: (zone: string) => void
-}
-
-function TimeZoneSheet({ value, saved, onClose, onChoose }: TimeZoneSheetProps) {
-  const [search, setSearch] = useState('')
-  const titleId = useId()
-  const options = useMemo(() => timeZoneOptions([saved, value], new Date()), [saved, value])
-  const shown = options.filter((option) => matchesZone(option, search))
-  return (
-    <Sheet open onClose={onClose} aria-labelledby={titleId}>
-      <div className={styles.sheet}>
-        <h2 id={titleId} className={styles.cardTitle}>
-          Choose a time zone
-        </h2>
-        <TextInput
-          label="Search time zones"
-          type="search"
-          value={search}
-          placeholder="City, region or UTC offset"
-          autoComplete="off"
-          spellCheck={false}
-          onChange={(event) => setSearch(event.target.value)}
-        />
-        <p className={styles.hint} role="status">
-          {shown.length === 0 ? 'No time zone matches.' : `${shown.length} ${shown.length === 1 ? 'time zone' : 'time zones'}`}
-        </p>
-        <ul className={styles.zoneList} aria-label="Time zones">
-          {shown.map((option) => {
-            const current = option.zone === value
-            return (
-              <li key={option.zone}>
-                <button
-                  type="button"
-                  className={styles.zoneOption}
-                  aria-pressed={current}
-                  aria-label={`${zoneLabel(option.zone)}, ${option.offset}`}
-                  onClick={() => onChoose(option.zone)}
-                >
-                  <span className={styles.zoneName}>{zoneLabel(option.zone)}</span>
-                  <span className={styles.offset}>{option.offset}</span>
-                  {current && <Icon icon={Check} className={styles.check} />}
-                </button>
-              </li>
-            )
-          })}
-        </ul>
-      </div>
-    </Sheet>
-  )
-}

web/src/settings/LeaveGuard.module.css

@@ -1,38 +0,0 @@
-/* The confirm sheet the settings screens share. */
-.sheet {
-  display: flex;
-  flex-direction: column;
-  gap: 14px;
-  max-width: 560px;
-  margin: 0 auto;
-}
-
-.title {
-  margin: 0;
-  font-family: var(--font-heading);
-  font-size: 22px;
-  font-weight: 400;
-}
-
-.text {
-  margin: 0;
-  font-family: var(--font-body);
-  font-size: 14px;
-  line-height: 1.45;
-  color: var(--color-neutral-700);
-}
-
-.error {
-  margin: 0;
-  font-family: var(--font-body);
-  font-size: 13px;
-  font-weight: 700;
-  line-height: 1.4;
-  color: var(--color-accent-700);
-}
-
-.actions {
-  display: flex;
-  justify-content: flex-end;
-  gap: 10px;
-}

web/src/settings/LeaveGuard.tsx

@@ -1,80 +0,0 @@
-import { useEffect, useId, type ReactNode } from 'react'
-import { useBlocker } from 'react-router'
-import { Button } from '../ui/Button.tsx'
-import { Sheet } from '../ui/Sheet.tsx'
-import styles from './LeaveGuard.module.css'
-
-// LeaveGuard asks before leaving the screen with unsaved changes.
-export function LeaveGuard({ dirty }: { dirty: boolean }) {
-  const blocker = useBlocker(
-    ({ currentLocation, nextLocation }) => dirty && currentLocation.pathname !== nextLocation.pathname,
-  )
-  useEffect(() => {
-    if (!dirty) return
-    const onBeforeUnload = (event: BeforeUnloadEvent) => event.preventDefault()
-    window.addEventListener('beforeunload', onBeforeUnload)
-    return () => window.removeEventListener('beforeunload', onBeforeUnload)
-  }, [dirty])
-  return (
-    <Confirm
-      open={blocker.state === 'blocked'}
-      title="Leave without saving?"
-      confirmLabel="Leave"
-      cancelLabel="Keep editing"
-      onCancel={() => blocker.reset?.()}
-      onConfirm={() => blocker.proceed?.()}
-    >
-      Your changes on this screen have not been saved.
-    </Confirm>
-  )
-}
-
-type ConfirmProps = {
-  open: boolean
-  title: string
-  children: ReactNode
-  confirmLabel: string
-  cancelLabel?: string
-  busy?: boolean
-  error?: string | null
-  onCancel: () => void
-  onConfirm: () => void
-}
-
-// Confirm is a sheet asking the household to confirm one action.
-export function Confirm({
-  open,
-  title,
-  children,
-  confirmLabel,
-  cancelLabel = 'Cancel',
-  busy = false,
-  error = null,
-  onCancel,
-  onConfirm,
-}: ConfirmProps) {
-  const titleId = useId()
-  return (
-    <Sheet open={open} onClose={onCancel} aria-labelledby={titleId}>
-      <div className={styles.sheet}>
-        <h2 id={titleId} className={styles.title}>
-          {title}
-        </h2>
-        <p className={styles.text}>{children}</p>
-        {error !== null && (
-          <p className={styles.error} role="alert">
-            {error}
-          </p>
-        )}
-        <div className={styles.actions}>
-          <Button variant="outline" onClick={onCancel}>
-            {cancelLabel}
-          </Button>
-          <Button disabled={busy} onClick={onConfirm}>
-            {confirmLabel}
-          </Button>
-        </div>
-      </div>
-    </Sheet>
-  )
-}

web/src/settings/RecipeSearchCard.tsx

@@ -1,275 +0,0 @@
-import { useEffect, useId, useState } from 'react'
-import { ApiError } from '../api/index.ts'
-import { Button } from '../ui/Button.tsx'
-import { Card } from '../ui/Card.tsx'
-import { ErrorBanner } from '../ui/ErrorBanner.tsx'
-import { Segmented } from '../ui/Segmented.tsx'
-import { Sheet } from '../ui/Sheet.tsx'
-import { Skeleton } from '../ui/Skeleton.tsx'
-import { TextInput } from '../ui/TextInput.tsx'
-import {
-  maskedKey,
-  recipeSearchProviderLabels,
-  useRecipeSearchSettings,
-  useSaveRecipeSearchSettings,
-  useTestRecipeSearch,
-  type RecipeSearchProvider,
-  type RecipeSearchSettings,
-  type RecipeSearchSettingsPatch,
-} from './api.ts'
-import styles from './AISettingsPage.module.css'
-
-const providerOptions = Object.entries(recipeSearchProviderLabels).map(([value, label]) => ({
-  value: value as RecipeSearchProvider,
-  label,
-}))
-
-type RecipeSearchCardProps = {
-  // Called with whether the card holds unsaved changes.
-  onDirtyChange: (dirty: boolean) => void
-}
-
-// RecipeSearchCard is where recipes are searched for: a SearXNG instance or
-// Brave. The provider, SearXNG URL and a new Brave key are edited as a draft
-// and saved together; the client only ever sees the stored key's last four
-// characters. Test searches with the saved settings.
-export function RecipeSearchCard({ onDirtyChange }: RecipeSearchCardProps) {
-  const settings = useRecipeSearchSettings()
-  const titleId = useId()
-  return (
-    <Card className={styles.card} aria-labelledby={titleId} role="region">
-      <h2 id={titleId} className={styles.cardTitle}>
-        Recipe search
-      </h2>
-      <p className={styles.hint}>Where MealQuest looks for real recipes behind each Side quest.</p>
-      {settings.isPending && <Skeleton className={styles.cardLoading} />}
-      {settings.isError && (
-        <ErrorBanner onRetry={() => void settings.refetch()}>
-          Recipe search settings could not load: {settings.error.message}
-        </ErrorBanner>
-      )}
-      {settings.isSuccess && <RecipeSearchForm saved={settings.data} onDirtyChange={onDirtyChange} />}
-    </Card>
-  )
-}
-
-type Draft = {
-  provider: RecipeSearchProvider
-  base_url: string
-  // A new Brave key to store, null when the stored one stays.
-  api_key: string | null
-}
-
-// draftOf starts a household that has not set up recipe search on SearXNG,
-// the sidecar every deployment runs. With no URL saved the field holds the
-// deployment's SearXNG URL, which saving stores.
-function draftOf(saved: RecipeSearchSettings): Draft {
-  return {
-    provider: saved.provider ?? 'searxng',
-    base_url: saved.base_url ?? saved.default_base_url ?? '',
-    api_key: null,
-  }
-}
-
-// patchOf is the PATCH body for what draft changes. Only the chosen
-// provider's field is sent: the other provider's is left as it is.
-function patchOf(saved: RecipeSearchSettings, draft: Draft): RecipeSearchSettingsPatch {
-  const patch: RecipeSearchSettingsPatch = {}
-  if (draft.provider !== saved.provider) patch.provider = draft.provider
-  if (draft.provider === 'searxng' && draft.base_url !== (saved.base_url ?? '')) patch.base_url = draft.base_url
-  if (draft.provider === 'brave' && draft.api_key !== null) patch.api_key = draft.api_key
-  return patch
-}
-
-function sameDraft(a: Draft, b: Draft): boolean {
-  return a.provider === b.provider && a.base_url === b.base_url && a.api_key === b.api_key
-}
-
-function RecipeSearchForm({ saved, onDirtyChange }: { saved: RecipeSearchSettings } & RecipeSearchCardProps) {
-  const [draft, setDraft] = useState(() => draftOf(saved))
-  const save = useSaveRecipeSearchSettings()
-  const test = useTestRecipeSearch()
-  const patch = patchOf(saved, draft)
-  const dirty = Object.keys(patch).length > 0
-  // Only the household's own edits are unsaved changes. Before recipe search
-  // is set up the untouched draft already differs from what is saved — it
-  // suggests SearXNG and the deployment's URL — but leaving it loses nothing.
-  const edited = dirty && !sameDraft(draft, draftOf(saved))
-
-  useEffect(() => {
-    onDirtyChange(edited)
-  }, [edited, onDirtyChange])
-  useEffect(() => () => onDirtyChange(false), [onDirtyChange])
-
-  // An edit clears the last save and test results: they describe the saved
-  // settings, not the draft.
-  function edit(change: Partial<Draft>) {
-    save.reset()
-    test.reset()
-    setDraft((current) => ({ ...current, ...change }))
-  }
-
-  function onSave() {
-    save.mutate(patch, {
-      onSuccess: (settings) => {
-        setDraft(draftOf(settings))
-        test.reset()
-      },
-    })
-  }
-
-  return (
-    <fieldset className={styles.lock} disabled={save.isPending}>
-      <Segmented
-        label="Recipe search provider"
-        options={providerOptions}
-        value={draft.provider}
-        onValueChange={(provider) => edit({ provider })}
-      />
-      {draft.provider === 'searxng' ? (
-        <TextInput
-          label="SearXNG URL"
-          type="url"
-          className={styles.mono}
-          value={draft.base_url}
-          placeholder="https://"
-          autoComplete="off"
-          spellCheck={false}
-          onChange={(event) => edit({ base_url: event.target.value })}
-        />
-      ) : (
-        <BraveKey
-          last4={saved.api_key_last4}
-          newKey={draft.api_key}
-          onKey={(api_key) => edit({ api_key })}
-        />
-      )}
-
-      <div className={styles.status} role="status">
-        {save.isSuccess && !dirty && 'Recipe search saved.'}
-        {test.isSuccess && `Found ${test.data.count} ${test.data.count === 1 ? 'recipe' : 'recipes'} for '${test.data.query}'`}
-      </div>
-      {save.isError && (
-        <p className={styles.error} role="alert">
-          {saveErrorMessage(save.error)}
-        </p>
-      )}
-      {test.isError && (
-        <p className={styles.error} role="alert">
-          {testErrorMessage(test.error)}
-        </p>
-      )}
-      {dirty && saved.provider !== null && <p className={styles.note}>Save your changes to test them.</p>}
-
-      <div className={styles.cardActions}>
-        <Button
-          variant="outline"
-          disabled={dirty || saved.provider === null || test.isPending}
-          onClick={() => test.mutate()}
-        >
-          {test.isPending ? 'Testing…' : 'Test'}
-        </Button>
-        <Button disabled={!dirty || save.isPending} onClick={onSave}>
-          {save.isPending ? 'Saving…' : 'Save recipe search'}
-        </Button>
-      </div>
-    </fieldset>
-  )
-}
-
-type BraveKeyProps = {
-  last4: string | null
-  newKey: string | null
-  onKey: (key: string | null) => void
-}
-
-// BraveKey shows the stored key masked, or the new one waiting to be saved,
-// and takes a new key in a sheet. The key is sent only when the card is
-// saved.
-function BraveKey({ last4, newKey, onKey }: BraveKeyProps) {
-  const [replacing, setReplacing] = useState(false)
-  const [key, setKey] = useState('')
-  const labelId = useId()
-  const sheetTitleId = useId()
-
-  function close() {
-    setReplacing(false)
-    setKey('')
-  }
-
-  let shown = 'No key stored'
-  if (newKey !== null) shown = maskedKey(newKey.slice(-4))
-  else if (last4 !== null) shown = maskedKey(last4)
-
-  return (
-    <div className={styles.key}>
-      <span id={labelId} className={styles.label}>
-        Brave API key
-      </span>
-      <div className={styles.keyRow} role="group" aria-labelledby={labelId}>
-        <span className={styles.keyValue}>{shown}</span>
-        <button type="button" className={styles.replace} onClick={() => setReplacing(true)}>
-          {last4 === null && newKey === null ? 'Add key' : 'Replace'}
-        </button>
-      </div>
-      {newKey !== null && (
-        <div className={styles.keyStatus}>
-          <p className={styles.note}>New key not saved yet</p>
-          <button type="button" className={styles.link} onClick={() => onKey(null)}>
-            Discard
-          </button>
-        </div>
-      )}
-
-      <Sheet open={replacing} onClose={close} aria-labelledby={sheetTitleId}>
-        <form
-          className={styles.sheet}
-          onSubmit={(event) => {
-            event.preventDefault()
-            onKey(key)
-            close()
-          }}
-        >
-          <h2 id={sheetTitleId} className={styles.sheetTitle}>
-            {last4 === null ? 'Add Brave API key' : 'Replace Brave API key'}
-          </h2>
-          <p className={styles.sheetText}>
-            The key is stored on the server when you save recipe search. This device only ever sees its last four
-            characters.
-          </p>
-          <TextInput
-            label="Brave API key"
-            type="password"
-            className={styles.mono}
-            value={key}
-            autoComplete="off"
-            spellCheck={false}
-            onChange={(event) => setKey(event.target.value)}
-          />
-          <div className={styles.sheetActions}>
-            <Button variant="outline" onClick={close}>
-              Cancel
-            </Button>
-            <Button type="submit" disabled={key === ''}>
-              Use this key
-            </Button>
-          </div>
-        </form>
-      </Sheet>
-    </div>
-  )
-}
-
-function saveErrorMessage(error: Error): string {
-  if (error instanceof ApiError && error.code === 'invalid_settings') return `Not saved: ${error.message}.`
-  return `Not saved: ${error.message}`
-}
-
-// testErrorMessage says why POST /settings/recipe-search/test failed, by
-// the error code the server names (internal/server/recipesearch.go).
-function testErrorMessage(error: Error): string {
-  if (error instanceof ApiError && error.code === 'not_configured') {
-    return 'Test failed: recipe search is not set up yet.'
-  }
-  return `Test failed: ${error.message}`
-}

web/src/settings/SettingsPage.test.tsx

@@ -1,24 +1,21 @@
 import { QueryClientProvider } from '@tanstack/react-query'
 import { fireEvent, render, screen, within } from '@testing-library/react'
-import { Route, Routes, useLocation } from 'react-router'
+import { MemoryRouter, Route, Routes, useLocation } from 'react-router'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { ApiProvider, createApiClient, createQueryClient, createVerifiedSession } from '../api/index.ts'
 import { createNetworkStatus } from '../pwa/networkStatus.ts'
-import { AI_SETTINGS, HOUSEHOLD_SETTINGS, SETTINGS_API } from '../test/ApiProviders.tsx'
+import { AI_SETTINGS, SETTINGS_API } from '../test/ApiProviders.tsx'
 import { declaredStyle } from '../test/cssRules.ts'
-import { InDataRouter } from '../test/dataRouter.tsx'
 import { errorResponse, fakeLocation, jsonResponse, stubFetchByPath } from '../test/fetchStub.ts'
 import { expectMinHitArea } from '../test/hitArea.ts'
-import { mockViewport } from '../test/matchMedia.ts'
 import { formatClockTime, modelDisplayName } from './api.ts'
 import { SettingsPage } from './SettingsPage.tsx'
 
-const HOUSEHOLD = HOUSEHOLD_SETTINGS
+const HOUSEHOLD = { timezone: 'America/New_York', dinner_time: '17:30' }
 const AI = AI_SETTINGS
 
 afterEach(() => {
   vi.unstubAllGlobals()
-  Reflect.deleteProperty(window, 'matchMedia')
 })
 
 const REGULARS_PATH = '/api/v1/dinners?status=regular'
@@ -40,21 +37,17 @@ function CurrentPath() {
   return <p data-testid="path">{useLocation().pathname}</p>
 }
 
-// renderSettings renders the settings home on a 390 px phone (mock 1p) in a
-// data router (the hidden sub-tabs' leave guard needs one);
-// SettingsTabs.test.tsx covers 768 px and up.
 function renderSettings() {
-  mockViewport(390)
   const api = createApiClient(fakeLocation('/settings'), createNetworkStatus(window), createVerifiedSession(localStorage))
   return render(
     <ApiProvider client={api}>
       <QueryClientProvider client={createQueryClient()}>
-        <InDataRouter path="/settings">
+        <MemoryRouter initialEntries={['/settings']}>
           <Routes>
             <Route path="/settings" element={<SettingsPage />} />
             <Route path="*" element={<CurrentPath />} />
           </Routes>
-        </InDataRouter>
+        </MemoryRouter>
       </QueryClientProvider>
     </ApiProvider>,
   )
@@ -97,11 +90,9 @@ describe('SettingsPage', () => {
     expect(fetchMock.mock.calls.map(([input]) => String(input)).sort()).toEqual([
       REGULARS_PATH,
       '/api/v1/settings/ai',
-      '/api/v1/settings/ai/models',
       CALENDAR_PATH,
       '/api/v1/settings/household',
       NOTIFICATIONS_PATH,
-      '/api/v1/settings/recipe-search',
     ])
   })
 
@@ -230,7 +221,7 @@ describe('SettingsPage', () => {
 
   it('refuses a dinner time that is not HH:MM', async () => {
     stubSettings({
-      '/api/v1/settings/household': () => jsonResponse(200, { ...HOUSEHOLD, timezone: 'UTC', dinner_time: '5:30pm' }),
+      '/api/v1/settings/household': () => jsonResponse(200, { timezone: 'UTC', dinner_time: '5:30pm' }),
     })
     renderSettings()
     expect(await screen.findByRole('alert')).toHaveTextContent('dinner_time "5:30pm" is not HH:MM')

web/src/settings/SettingsPage.tsx

@@ -8,7 +8,6 @@ import { ErrorBanner } from '../ui/ErrorBanner.tsx'
 import { Icon } from '../ui/Icon.tsx'
 import { Skeleton } from '../ui/Skeleton.tsx'
 import { Tag } from '../ui/Tag.tsx'
-import { useBreakpoint } from '../shell/useBreakpoint.ts'
 import {
   aiStatus,
   calendarStatus,
@@ -22,27 +21,12 @@ import {
   useRegularDinnersCount,
 } from './api.ts'
 import styles from './SettingsPage.module.css'
-import { SettingsTabs } from './SettingsTabs.tsx'
 
-// Settings home: the list of settings pages on mobile (mock 1p), one page
-// with sub-tabs from 768 px (mock 2e). The sub-tabs stay mounted, hidden, on
-// mobile, so an unsaved draft survives the viewport crossing 768 px and its
-// leave guard keeps asking before the list navigates away.
-export function SettingsPage() {
-  const mobile = useBreakpoint() === 'mobile'
-  return (
-    <>
-      {mobile && <SettingsList />}
-      <SettingsTabs hidden={mobile} />
-    </>
-  )
-}
-
-// The mobile settings list (handoff mock 1p). Each row opens its settings
-// page and shows a live status line. Regular dinners, Google Calendar and
+// Settings home (handoff mock 1p). Each row opens its settings page and
+// shows a live status line. Regular dinners, Google Calendar and
 // Notifications & Google Chat read endpoints their features have not served
 // yet; until then each shows its not-yet-available state (see api.ts).
-function SettingsList() {
+export function SettingsPage() {
   const household = useHouseholdSettings()
   const ai = useAISettings()
   const regulars = useRegularDinnersCount()

web/src/settings/SettingsTabs.module.css

@@ -1,118 +0,0 @@
-/* Settings at tablet and desktop widths, handoff mock 2e. */
-.page {
-  box-sizing: border-box;
-  min-height: 100%;
-  display: flex;
-  flex-direction: column;
-  gap: 20px;
-}
-
-.header {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: flex-end;
-  gap: 14px;
-}
-
-.heading {
-  flex: 1;
-  min-width: 0;
-}
-
-.title {
-  margin: 0;
-  font-family: var(--font-heading);
-  font-size: 40px;
-  font-weight: 400;
-  line-height: 1.1;
-}
-
-.shared {
-  margin: 6px 0 0;
-  font-family: var(--font-body);
-  font-size: 14px;
-  color: var(--color-neutral-800);
-}
-
-.tabs {
-  display: flex;
-  gap: 6px;
-}
-
-.tab {
-  min-width: 44px;
-  min-height: 44px;
-  padding: 0 16px;
-  border: 0;
-  border-radius: var(--radius-pill);
-  background: transparent;
-  color: var(--color-text);
-  font-family: var(--font-body);
-  font-size: 14px;
-  font-weight: 700;
-  white-space: nowrap;
-  cursor: pointer;
-}
-
-.selected {
-  background: var(--color-text);
-  color: var(--color-bg);
-}
-
-/* A page's or panel's display would override the hidden attribute. */
-.page[hidden],
-.single[hidden],
-.columns[hidden] {
-  display: none;
-}
-
-.single {
-  max-width: 560px;
-  display: flex;
-  flex-direction: column;
-  gap: 18px;
-}
-
-/* Notifications on the left; the AI assistant and Recipe search on the
-   right, the AI assistant card growing to fill the column. */
-.columns {
-  flex: 1;
-  display: grid;
-  grid-template-columns: minmax(0, 1fr) minmax(0, 1.15fr);
-  align-items: stretch;
-  gap: 20px;
-}
-
-.column {
-  min-width: 0;
-  display: flex;
-  flex-direction: column;
-  gap: 20px;
-}
-
-/* Mock 2e's cards: 24 px padding, 30 px corners. */
-.column > * {
-  padding: 24px;
-  border-radius: 30px;
-}
-
-.placeholder {
-  display: flex;
-  flex-direction: column;
-  gap: 14px;
-}
-
-.cardTitle {
-  margin: 0;
-  font-family: var(--font-heading);
-  font-size: 22px;
-  font-weight: 400;
-}
-
-.hint {
-  margin: 0;
-  font-family: var(--font-body);
-  font-size: 14px;
-  line-height: 1.45;
-  color: var(--color-neutral-700);
-}

web/src/settings/SettingsTabs.test.tsx

@@ -1,193 +0,0 @@
-import { QueryClientProvider } from '@tanstack/react-query'
-import { fireEvent, render, screen, waitFor, within } from '@testing-library/react'
-import { afterEach, describe, expect, it, vi, type Mock } from 'vitest'
-import { ApiProvider, createApiClient, createQueryClient, createVerifiedSession } from '../api/index.ts'
-import { createNetworkStatus } from '../pwa/networkStatus.ts'
-import { AI_MODELS, AI_SETTINGS, HOUSEHOLD_SETTINGS, RECIPE_SEARCH_SETTINGS } from '../test/ApiProviders.tsx'
-import { InDataRouter } from '../test/dataRouter.tsx'
-import { errorResponse, fakeLocation, jsonResponse, ME } from '../test/fetchStub.ts'
-import { expectMinHitArea } from '../test/hitArea.ts'
-import { mockViewport } from '../test/matchMedia.ts'
-import { SettingsPage } from './SettingsPage.tsx'
-
-type Responder = (body: unknown) => Response
-
-// stubAPI answers "METHOD path" from responders, each called with the
-// request's decoded JSON body; the settings the page loads answer their
-// fixtures unless overridden. Any other request fails the test.
-function stubAPI(responders: Record<string, Responder> = {}): Mock<typeof fetch> {
-  const all: Record<string, Responder> = {
-    'GET /api/v1/me': () => jsonResponse(200, ME),
-    'GET /api/v1/settings/household': () => jsonResponse(200, HOUSEHOLD_SETTINGS),
-    'GET /api/v1/settings/ai': () => jsonResponse(200, AI_SETTINGS),
-    'GET /api/v1/settings/ai/models': () => jsonResponse(200, AI_MODELS),
-    'GET /api/v1/settings/recipe-search': () => jsonResponse(200, RECIPE_SEARCH_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}`)
-    const body = typeof init?.body === 'string' ? (JSON.parse(init.body) as unknown) : undefined
-    return Promise.resolve(respond(body))
-  })
-  vi.stubGlobal('fetch', fetchMock)
-  return fetchMock
-}
-
-afterEach(() => {
-  vi.unstubAllGlobals()
-  Reflect.deleteProperty(window, 'matchMedia')
-})
-
-// renderAt renders /settings at width px in a data router (the page's leave
-// guard needs one), after loading /me for the CSRF token writes need.
-// It returns the function that resizes the viewport.
-async function renderAt(width: number) {
-  const resize = mockViewport(width)
-  const api = createApiClient(fakeLocation('/settings'), createNetworkStatus(window), createVerifiedSession(localStorage))
-  await api.loadMe()
-  render(
-    <ApiProvider client={api}>
-      <QueryClientProvider client={createQueryClient()}>
-        <InDataRouter path="/settings">
-          <SettingsPage />
-        </InDataRouter>
-      </QueryClientProvider>
-    </ApiProvider>,
-  )
-  return resize
-}
-
-const tab = (name: string) => screen.getByRole('tab', { name })
-// panel is the panel a tab controls, shown or hidden.
-function panel(name: string): HTMLElement {
-  const id = tab(name).getAttribute('aria-controls')
-  const element = id === null ? null : document.getElementById(id)
-  if (element === null) throw new Error(`tab "${name}" controls no panel`)
-  expect(element).toHaveAttribute('role', 'tabpanel')
-  return element
-}
-
-describe.each([1440, 1180])('SettingsPage at %i px (mock 2e)', (width) => {
-  it('shows the title, the shared line and the sub-tabs, Notifications & AI first', async () => {
-    stubAPI()
-    await renderAt(width)
-    expect(screen.getByRole('heading', { level: 1, name: 'Settings' })).toBeInTheDocument()
-    expect(screen.getByText('Changes apply to everyone in the household.')).toBeInTheDocument()
-    expect(screen.queryByRole('link')).not.toBeInTheDocument()
-    const tabs = within(screen.getByRole('tablist', { name: 'Settings sections' })).getAllByRole('tab')
-    expect(tabs.map((t) => t.textContent)).toEqual(['Household', 'Regular dinners', 'Notifications & AI'])
-    expect(tab('Notifications & AI')).toHaveAttribute('aria-selected', 'true')
-    tabs.forEach(expectMinHitArea)
-
-    const columns = panel('Notifications & AI')
-    expect(columns).toBeVisible()
-    const [left, right] = Array.from(columns.children)
-    expect(within(left as HTMLElement).getByRole('region', { name: 'Notifications & Google Chat' })).toBeInTheDocument()
-    const ai = within(right as HTMLElement).getByRole('region', { name: 'AI assistant' })
-    expect(within(ai).getByText('Admin')).toBeInTheDocument()
-    expect(await within(ai).findByRole('combobox', { name: 'Provider' })).toHaveValue('anthropic')
-    expect(within(ai).getByRole('textbox', { name: 'System prompt' })).toHaveValue(AI_SETTINGS.system_prompt)
-    expect(within(right as HTMLElement).getByRole('region', { name: 'Recipe search' })).toBeInTheDocument()
-  })
-
-  it('switches tabs by click and by arrow keys', async () => {
-    stubAPI()
-    await renderAt(width)
-
-    fireEvent.click(tab('Household'))
-    expect(tab('Household')).toHaveAttribute('aria-selected', 'true')
-    expect(panel('Household')).toBeVisible()
-    expect(panel('Notifications & AI')).not.toBeVisible()
-    expect(await within(panel('Household')).findByRole('button', { name: 'Save changes' })).toBeInTheDocument()
-
-    fireEvent.keyDown(tab('Household'), { key: 'ArrowRight' })
-    expect(tab('Regular dinners')).toHaveAttribute('aria-selected', 'true')
-    expect(tab('Regular dinners')).toHaveFocus()
-    expect(panel('Regular dinners')).toBeVisible()
-    expect(within(panel('Regular dinners')).getByRole('region', { name: 'Regular dinners' })).toBeInTheDocument()
-    expect(panel('Household')).not.toBeVisible()
-
-    fireEvent.keyDown(tab('Regular dinners'), { key: 'End' })
-    expect(tab('Notifications & AI')).toHaveAttribute('aria-selected', 'true')
-    fireEvent.keyDown(tab('Notifications & AI'), { key: 'ArrowRight' })
-    expect(tab('Household')).toHaveAttribute('aria-selected', 'true')
-    expect(tab('Household')).toHaveFocus()
-  })
-
-  it('saves the AI assistant card through the AI settings API', async () => {
-    const fetchMock = stubAPI({
-      'PATCH /api/v1/settings/ai': (body) => jsonResponse(200, { ...AI_SETTINGS, ...(body as object) }),
-    })
-    await renderAt(width)
-    const ai = within(screen.getByRole('region', { name: 'AI assistant' }))
-    const prompt = await ai.findByRole('textbox', { name: 'System prompt' })
-    const save = ai.getByRole('button', { name: 'Save changes' })
-    expect(save).toBeDisabled()
-
-    fireEvent.change(prompt, { target: { value: 'Plan dinners for us.' } })
-    fireEvent.click(save)
-    expect(await ai.findByText('Changes saved.')).toBeInTheDocument()
-
-    const writes = fetchMock.mock.calls.filter(([, init]) => (init?.method ?? 'GET') !== 'GET')
-    expect(writes.map(([input, init]) => [init?.method, String(input), init?.body])).toEqual([
-      ['PATCH', '/api/v1/settings/ai', JSON.stringify({ system_prompt: 'Plan dinners for us.' })],
-    ])
-    expect(prompt).toHaveValue('Plan dinners for us.')
-    expect(save).toBeDisabled()
-  })
-
-  it('keeps an unsaved draft while another tab is shown', async () => {
-    stubAPI()
-    await renderAt(width)
-    const prompt = await screen.findByRole('textbox', { name: 'System prompt' })
-    fireEvent.change(prompt, { target: { value: 'A draft' } })
-
-    fireEvent.click(tab('Household'))
-    fireEvent.click(tab('Notifications & AI'))
-    expect(screen.getByRole('textbox', { name: 'System prompt' })).toHaveValue('A draft')
-  })
-})
-
-describe('SettingsPage across the 768 px breakpoint', () => {
-  it('shows the mobile list below 768 px and the sub-tabs from 768 px', async () => {
-    stubAPI({
-      'GET /api/v1/dinners?status=regular': () => errorResponse(404, 'not_found'),
-      'GET /api/v1/settings/calendar': () => errorResponse(404, 'not_found'),
-      'GET /api/v1/settings/notifications': () => errorResponse(404, 'not_found'),
-    })
-    const resize = await renderAt(767)
-    expect(screen.getByRole('link', { name: /^AI assistant/ })).toHaveAttribute('href', '/settings/ai')
-    expect(screen.queryByRole('tablist')).not.toBeInTheDocument()
-
-    resize(768)
-    expect(screen.getByRole('tablist', { name: 'Settings sections' })).toBeInTheDocument()
-    expect(screen.queryByRole('link')).not.toBeInTheDocument()
-  })
-
-  it('keeps an unsaved draft and its leave guard across 1180 px, 390 px and back', async () => {
-    stubAPI({
-      'GET /api/v1/dinners?status=regular': () => errorResponse(404, 'not_found'),
-      'GET /api/v1/settings/calendar': () => errorResponse(404, 'not_found'),
-      'GET /api/v1/settings/notifications': () => errorResponse(404, 'not_found'),
-    })
-    const resize = await renderAt(1180)
-    fireEvent.change(await screen.findByRole('textbox', { name: 'System prompt' }), {
-      target: { value: 'A draft' },
-    })
-
-    resize(390)
-    expect(screen.queryByRole('tablist')).not.toBeInTheDocument()
-    fireEvent.click(screen.getByRole('link', { name: /^AI assistant/ }))
-    const confirm = await screen.findByRole('dialog', { name: 'Leave without saving?' })
-    fireEvent.click(within(confirm).getByRole('button', { name: 'Keep editing' }))
-    await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())
-
-    resize(1180)
-    expect(screen.getByRole('textbox', { name: 'System prompt' })).toHaveValue('A draft')
-    const unload = new Event('beforeunload', { cancelable: true })
-    window.dispatchEvent(unload)
-    expect(unload.defaultPrevented).toBe(true)
-  })
-})

web/src/settings/SettingsTabs.tsx

@@ -1,138 +0,0 @@
-import { useId, useRef, useState, type KeyboardEvent, type ReactNode } from 'react'
-import { Card } from '../ui/Card.tsx'
-import { AIAssistantCard } from './AISettingsPage.tsx'
-import { HouseholdSettingsSections } from './HouseholdSettingsPage.tsx'
-import { LeaveGuard } from './LeaveGuard.tsx'
-import { RecipeSearchCard } from './RecipeSearchCard.tsx'
-import styles from './SettingsTabs.module.css'
-
-type Tab = 'household' | 'regulars' | 'notifications-ai'
-
-const tabs: readonly { value: Tab; label: string }[] = [
-  { value: 'household', label: 'Household' },
-  { value: 'regulars', label: 'Regular dinners' },
-  { value: 'notifications-ai', label: 'Notifications & AI' },
-]
-
-const step: Record<string, number> = { ArrowRight: 1, ArrowLeft: -1 }
-
-// Settings at tablet and desktop widths (handoff mock 2e): one page with
-// sub-tabs instead of the mobile list. Every tab stays mounted while hidden,
-// so a draft survives switching tabs, and one leave guard covers them all.
-// hidden hides the page but keeps it mounted, drafts and leave guard included.
-export function SettingsTabs({ hidden = false }: { hidden?: boolean }) {
-  const [tab, setTab] = useState<Tab>('notifications-ai')
-  const [householdDirty, setHouseholdDirty] = useState(false)
-  const [aiDirty, setAIDirty] = useState(false)
-  const [recipeSearchDirty, setRecipeSearchDirty] = useState(false)
-  const refs = useRef<(HTMLButtonElement | null)[]>([])
-  const id = useId()
-  const tabId = (value: Tab) => `${id}-tab-${value}`
-  const panelId = (value: Tab) => `${id}-panel-${value}`
-
-  // Arrow keys move between the tabs, wrapping at the ends; Home and End
-  // jump to the first and last. Moving selects the tab.
-  function onKeyDown(event: KeyboardEvent<HTMLDivElement>) {
-    const selected = tabs.findIndex((t) => t.value === tab)
-    const delta = step[event.key]
-    let next: number
-    if (delta !== undefined) next = (selected + delta + tabs.length) % tabs.length
-    else if (event.key === 'Home') next = 0
-    else if (event.key === 'End') next = tabs.length - 1
-    else return
-    const nextTab = tabs[next]
-    if (!nextTab) throw new Error(`Settings tabs: no tab at index ${next}`)
-    event.preventDefault()
-    setTab(nextTab.value)
-    refs.current[next]?.focus()
-  }
-
-  function panel(value: Tab, className: string | undefined, children: ReactNode) {
-    return (
-      <div
-        id={panelId(value)}
-        role="tabpanel"
-        aria-labelledby={tabId(value)}
-        hidden={tab !== value}
-        className={className}
-      >
-        {children}
-      </div>
-    )
-  }
-
-  return (
-    <div className={styles.page} hidden={hidden}>
-      <header className={styles.header}>
-        <div className={styles.heading}>
-          <h1 className={styles.title}>Settings</h1>
-          <p className={styles.shared}>Changes apply to everyone in the household.</p>
-        </div>
-        <div role="tablist" aria-label="Settings sections" className={styles.tabs} onKeyDown={onKeyDown}>
-          {tabs.map(({ value, label }, index) => (
-            <button
-              key={value}
-              ref={(el) => {
-                refs.current[index] = el
-              }}
-              id={tabId(value)}
-              type="button"
-              role="tab"
-              aria-selected={tab === value}
-              aria-controls={panelId(value)}
-              tabIndex={tab === value ? 0 : -1}
-              className={tab === value ? `${styles.tab} ${styles.selected}` : styles.tab}
-              onClick={() => setTab(value)}
-            >
-              {label}
-            </button>
-          ))}
-        </div>
-      </header>
-
-      {panel('household', styles.single, <HouseholdSettingsSections onDirtyChange={setHouseholdDirty} />)}
-
-      {panel(
-        'regulars',
-        styles.single,
-        // TODO(Feature 12): embed the Regular dinners screen here once Feature
-        // 12 builds it.
-        <Placeholder title="Regular dinners">Managing the household's Regulars arrives in a later update.</Placeholder>,
-      )}
-
-      {panel(
-        'notifications-ai',
-        styles.columns,
-        <>
-          <div className={styles.column}>
-            {/* TODO(Feature 19): the Notifications matrix and Google Chat
-                webhook cards replace this placeholder. */}
-            <Placeholder title="Notifications & Google Chat">
-              Notification and Google Chat webhook settings arrive in a later update.
-            </Placeholder>
-          </div>
-          <div className={styles.column}>
-            <AIAssistantCard onDirtyChange={setAIDirty} />
-            <RecipeSearchCard onDirtyChange={setRecipeSearchDirty} />
-          </div>
-        </>,
-      )}
-
-      <LeaveGuard dirty={householdDirty || aiDirty || recipeSearchDirty} />
-    </div>
-  )
-}
-
-// Placeholder is a neutral card holding a section's place until the feature
-// that owns it renders it.
-function Placeholder({ title, children }: { title: string; children: ReactNode }) {
-  const titleId = useId()
-  return (
-    <Card className={styles.placeholder} aria-labelledby={titleId} role="region">
-      <h2 id={titleId} className={styles.cardTitle}>
-        {title}
-      </h2>
-      <p className={styles.hint}>{children}</p>
-    </Card>
-  )
-}

web/src/settings/api.ts

@@ -8,8 +8,6 @@ export const AI_MODELS_PATH = '/api/v1/settings/ai/models'
 export const AI_KEY_PATH = '/api/v1/settings/ai/api-key'
 export const AI_VERIFY_PATH = '/api/v1/settings/ai/verify'
 export const AI_RESET_PROMPT_PATH = '/api/v1/settings/ai/reset-prompt'
-export const RECIPE_SEARCH_PATH = '/api/v1/settings/recipe-search'
-export const RECIPE_SEARCH_TEST_PATH = '/api/v1/settings/recipe-search/test'
 // TODO(Feature 12): GET /api/v1/dinners?status=regular is Feature 12's
 // dinners read API. Until it lands the server answers 404 and the Regular
 // dinners row says the count is unavailable.
@@ -23,45 +21,13 @@ export const CALENDAR_STATUS_PATH = '/api/v1/settings/calendar'
 export const NOTIFICATIONS_STATUS_PATH = '/api/v1/settings/notifications'
 
 // HouseholdSettings is the part of GET /api/v1/settings/household the
-// settings pages read. Times are zero-padded 24-hour HH:MM in timezone; days
-// of the week count from Sunday = 0.
+// settings pages read.
 export type HouseholdSettings = {
   timezone: string
+  // Zero-padded 24-hour HH:MM.
   dinner_time: string
-  reminder_time: string
-  // The rotation check: when the household is asked "Keep it in rotation?".
-  review_time: string
-  plan_draft_dow: number
-  plan_draft_time: string
-  suggestions_dow: number
-  suggestions_time: string
-  chat_autosend_dow: number
-  chat_autosend_time: string
 }
 
-// HouseholdSettingsPatch is the PATCH /api/v1/settings/household body: only
-// the fields that change.
-export type HouseholdSettingsPatch = Partial<HouseholdSettings>
-
-export type HouseholdSettingsField = keyof HouseholdSettings
-
-const householdTimeFields = [
-  'dinner_time',
-  'reminder_time',
-  'review_time',
-  'plan_draft_time',
-  'suggestions_time',
-  'chat_autosend_time',
-] as const satisfies readonly HouseholdSettingsField[]
-
-const householdDayFields = [
-  'plan_draft_dow',
-  'suggestions_dow',
-  'chat_autosend_dow',
-] as const satisfies readonly HouseholdSettingsField[]
-
-const householdFields: readonly HouseholdSettingsField[] = ['timezone', ...householdTimeFields, ...householdDayFields]
-
 // aiProviderLabels names every AI provider preset the server accepts
 // (internal/ai/llm/presets) as the household reads it.
 export const aiProviderLabels = {
@@ -226,199 +192,24 @@ export function useResetAIPrompt() {
   return useAISettingsMutation(AI_RESET_PROMPT_PATH, 'POST', () => undefined)
 }
 
-// recipeSearchProviderLabels names every recipe search provider the server
-// accepts (internal/recipes/searchsettings.go).
-export const recipeSearchProviderLabels = {
-  searxng: 'SearXNG',
-  brave: 'Brave',
-} as const
-
-export type RecipeSearchProvider = keyof typeof recipeSearchProviderLabels
-
-// RecipeSearchSettings is GET /api/v1/settings/recipe-search. The Brave API
-// key itself is never sent: only whether one is stored and its last four
-// characters.
-export type RecipeSearchSettings = {
-  // Null until recipe search is first set up.
-  provider: RecipeSearchProvider | null
-  // The saved SearXNG instance's URL, null when none is set.
-  base_url: string | null
-  // The deployment's SearXNG URL (MEALQUEST_SEARXNG_URL) to suggest while
-  // base_url is null; null when the deployment names none. Only saving
-  // base_url stores a URL.
-  default_base_url: string | null
-  api_key_set: boolean
-  api_key_last4: string | null
-  updated_at: string | null
-}
-
-// RecipeSearchSettingsPatch is the PATCH /api/v1/settings/recipe-search
-// body: only the fields that change. api_key is the Brave key in plain text.
-export type RecipeSearchSettingsPatch = {
-  provider?: RecipeSearchProvider
-  base_url?: string
-  api_key?: string
-}
-
-// RecipeSearchTest is POST /api/v1/settings/recipe-search/test: how many
-// recipes the saved provider found for query.
-export type RecipeSearchTest = { query: string; count: number }
-
-function isRecipeSearchProvider(value: string): value is RecipeSearchProvider {
-  return Object.hasOwn(recipeSearchProviderLabels, value)
-}
-
-function parseRecipeSearchSettings(where: string, body: unknown): RecipeSearchSettings {
-  if (
-    !isRecord(body) ||
-    !isStringOrNull(body.provider) ||
-    !isStringOrNull(body.base_url) ||
-    !isStringOrNull(body.default_base_url) ||
-    typeof body.api_key_set !== 'boolean' ||
-    !isStringOrNull(body.api_key_last4) ||
-    !isStringOrNull(body.updated_at)
-  ) {
-    throw new Error(`${where}: response is not the recipe search settings`)
-  }
-  if (body.provider !== null && !isRecipeSearchProvider(body.provider)) {
-    throw new Error(`${where}: unknown recipe search provider "${body.provider}"`)
-  }
-  return {
-    provider: body.provider,
-    base_url: body.base_url,
-    default_base_url: body.default_base_url,
-    api_key_set: body.api_key_set,
-    api_key_last4: body.api_key_last4,
-    updated_at: body.updated_at,
-  }
-}
-
-const RECIPE_SEARCH_KEY = ['settings', 'recipe-search'] as const
-
-export function useRecipeSearchSettings() {
-  const { apiFetch } = useApi()
-  return useQuery({
-    queryKey: RECIPE_SEARCH_KEY,
-    queryFn: async () =>
-      parseRecipeSearchSettings(`GET ${RECIPE_SEARCH_PATH}`, await apiFetch<unknown>(RECIPE_SEARCH_PATH)),
-  })
-}
-
-export function useSaveRecipeSearchSettings() {
-  const { apiFetch } = useApi()
-  const queryClient = useQueryClient()
-  return useMutation({
-    mutationFn: async (patch: RecipeSearchSettingsPatch) =>
-      parseRecipeSearchSettings(
-        `PATCH ${RECIPE_SEARCH_PATH}`,
-        await apiFetch<unknown>(RECIPE_SEARCH_PATH, { method: 'PATCH', body: patch }),
-      ),
-    onSuccess: (settings) => queryClient.setQueryData(RECIPE_SEARCH_KEY, settings),
-  })
-}
-
-// useTestRecipeSearch searches with the saved settings.
-export function useTestRecipeSearch() {
-  const { apiFetch } = useApi()
-  return useMutation({
-    mutationFn: async () => {
-      const body = await apiFetch<unknown>(RECIPE_SEARCH_TEST_PATH, { method: 'POST' })
-      if (!isRecord(body) || typeof body.query !== 'string' || typeof body.count !== 'number') {
-        throw new Error(`POST ${RECIPE_SEARCH_TEST_PATH}: response is not a search test result`)
-      }
-      return { query: body.query, count: body.count } satisfies RecipeSearchTest
-    },
-  })
-}
-
 const clockTime = /^([01][0-9]|2[0-3]):([0-5][0-9])$/
 
-// parseHouseholdSettings refuses a body that is not the household settings,
-// or has a time that is not HH:MM, so formatClockTime never sees one.
-function parseHouseholdSettings(where: string, body: unknown): HouseholdSettings {
-  if (!isRecord(body) || typeof body.timezone !== 'string') {
-    throw new Error(`${where}: response is not the household settings`)
-  }
-  const times = {} as Record<(typeof householdTimeFields)[number], string>
-  for (const field of householdTimeFields) {
-    const value = body[field]
-    if (typeof value !== 'string' || !clockTime.test(value)) {
-      throw new Error(`${where}: ${field} ${JSON.stringify(value)} is not HH:MM`)
-    }
-    times[field] = value
-  }
-  const days = {} as Record<(typeof householdDayFields)[number], number>
-  for (const field of householdDayFields) {
-    const value = body[field]
-    if (typeof value !== 'number' || !Number.isInteger(value) || value < 0 || value > 6) {
-      throw new Error(`${where}: ${field} ${JSON.stringify(value)} is not a day of the week (0-6)`)
-    }
-    days[field] = value
-  }
-  return { timezone: body.timezone, ...times, ...days }
-}
-
-const HOUSEHOLD_SETTINGS_KEY = ['settings', 'household'] as const
-
+// useHouseholdSettings refuses a dinner time that is not HH:MM, so
+// formatClockTime never sees one.
 export function useHouseholdSettings() {
   const { apiFetch } = useApi()
   return useQuery({
-    queryKey: HOUSEHOLD_SETTINGS_KEY,
-    queryFn: async () =>
-      parseHouseholdSettings(`GET ${HOUSEHOLD_SETTINGS_PATH}`, await apiFetch<unknown>(HOUSEHOLD_SETTINGS_PATH)),
+    queryKey: ['settings', 'household'],
+    queryFn: async () => {
+      const settings = await apiFetch<HouseholdSettings>(HOUSEHOLD_SETTINGS_PATH)
+      if (!clockTime.test(settings.dinner_time)) {
+        throw new Error(`GET ${HOUSEHOLD_SETTINGS_PATH}: dinner_time "${settings.dinner_time}" is not HH:MM`)
+      }
+      return { timezone: settings.timezone, dinner_time: settings.dinner_time } satisfies HouseholdSettings
+    },
   })
 }
 
-export function useSaveHouseholdSettings() {
-  const { apiFetch } = useApi()
-  const queryClient = useQueryClient()
-  return useMutation({
-    mutationFn: async (patch: HouseholdSettingsPatch) =>
-      parseHouseholdSettings(
-        `PATCH ${HOUSEHOLD_SETTINGS_PATH}`,
-        await apiFetch<unknown>(HOUSEHOLD_SETTINGS_PATH, { method: 'PATCH', body: patch }),
-      ),
-    onSuccess: (settings) => queryClient.setQueryData(HOUSEHOLD_SETTINGS_KEY, settings),
-  })
-}
-
-// HouseholdSettingsProblems is a refused household settings save: the reason
-// for each field the server named, and any reasons that name no field.
-export type HouseholdSettingsProblems = {
-  fields: Partial<Record<HouseholdSettingsField, string>>
-  other: string[]
-}
-
-const invalidHouseholdPrefix = 'invalid household settings: '
-
-// A problem starts with a field name and ": " (internal/household
-// ValidationError.Error joins them with "; ").
-const problemStart = /; (?=[a-z_]+: )/
-
-// householdSettingsProblems reads the server's invalid_settings error into
-// the problems it lists. Any other error is one problem naming no field.
-export function householdSettingsProblems(error: Error): HouseholdSettingsProblems {
-  const problems: HouseholdSettingsProblems = { fields: {}, other: [] }
-  if (
-    !(error instanceof ApiError) ||
-    error.code !== 'invalid_settings' ||
-    !error.message.startsWith(invalidHouseholdPrefix)
-  ) {
-    problems.other.push(error.message)
-    return problems
-  }
-  for (const problem of error.message.slice(invalidHouseholdPrefix.length).split(problemStart)) {
-    const colon = problem.indexOf(': ')
-    const field = problem.slice(0, colon)
-    if (colon !== -1 && (householdFields as readonly string[]).includes(field)) {
-      problems.fields[field as HouseholdSettingsField] = problem.slice(colon + 2)
-    } else {
-      problems.other.push(problem)
-    }
-  }
-  return problems
-}
-
 // aiStatus is the AI assistant row's status line: the provider and the
 // model's display name, or that no model is chosen yet (the seed).
 export function aiStatus(settings: Pick<AISettings, 'provider' | 'model'>): string {
@@ -530,12 +321,6 @@ export function notificationsStatus(status: NotificationsStatus | null): string
   return `${push} · ${status?.chat_space ?? 'Google Chat not connected'}`
 }
 
-// maskedKey shows a stored key as dots and its last four characters, all
-// the client ever knows of it.
-export function maskedKey(last4: string): string {
-  return `••••••••${last4}`
-}
-
 // formatClockTime turns a 24-hour HH:MM time into the handoff's "5:30 pm".
 export function formatClockTime(time: string): string {
   const match = clockTime.exec(time)

web/src/settings/timezones.ts

@@ -1,46 +0,0 @@
-// The IANA time zones the browser knows, with their current UTC offsets, for
-// the household time zone picker.
-
-export type TimeZoneOption = {
-  zone: string
-  // "UTC-04:00"; "UTC+00:00" for UTC itself.
-  offset: string
-}
-
-// utcOffset is zone's offset from UTC at instant, as "UTC+05:30".
-export function utcOffset(zone: string, instant: Date): string {
-  const name = new Intl.DateTimeFormat('en-US', { timeZone: zone, timeZoneName: 'longOffset' })
-    .formatToParts(instant)
-    .find((part) => part.type === 'timeZoneName')?.value
-  if (name === undefined) throw new Error(`no UTC offset for time zone "${zone}"`)
-  if (name === 'GMT') return 'UTC+00:00'
-  if (!/^GMT[+-]\d\d:\d\d$/.test(name)) throw new Error(`time zone "${zone}" has an unreadable offset "${name}"`)
-  return `UTC${name.slice(3)}`
-}
-
-// Zones the server accepts that Intl.supportedValuesOf('timeZone') leaves
-// out: it lists only canonical zones, and UTC is not one of them.
-const unlistedZones = ['UTC', 'Etc/UTC', 'GMT', 'Etc/GMT']
-
-// timeZoneOptions lists every zone the browser supports, the unlisted UTC
-// zones, and kept (the saved and chosen zones, which may be aliases the
-// list leaves out), sorted by name.
-export function timeZoneOptions(kept: string[], instant: Date): TimeZoneOption[] {
-  const zones = new Set([...Intl.supportedValuesOf('timeZone'), ...unlistedZones, ...kept])
-  return [...zones].sort().map((zone) => ({ zone, offset: utcOffset(zone, instant) }))
-}
-
-// zoneLabel reads a zone as words: "America/Argentina/Buenos_Aires" is
-// "America / Argentina / Buenos Aires".
-export function zoneLabel(zone: string): string {
-  return zone.replaceAll('_', ' ').replaceAll('/', ' / ')
-}
-
-// matchesZone is whether every word of the search text is in option's name
-// or offset, in any case.
-export function matchesZone(option: TimeZoneOption, search: string): boolean {
-  const needle = search.trim().toLowerCase()
-  if (needle === '') return true
-  const haystack = `${option.zone} ${zoneLabel(option.zone)} ${option.offset}`.toLowerCase()
-  return needle.split(/\s+/).every((word) => haystack.includes(word))
-}

web/src/shell/AppShell.test.tsx

@@ -1,9 +1,9 @@
 import { render, screen, within } from '@testing-library/react'
+import { MemoryRouter } from 'react-router'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { AppRoutes } from '../App.tsx'
 import { ApiProviders, SETTINGS_API } from '../test/ApiProviders.tsx'
 import { declaredStyle, outerSize } from '../test/cssRules.ts'
-import { InDataRouter } from '../test/dataRouter.tsx'
 import { expectMinHitArea } from '../test/hitArea.ts'
 import { stubFetchByPath } from '../test/fetchStub.ts'
 import { mockViewport } from '../test/matchMedia.ts'
@@ -25,11 +25,11 @@ function renderAt(path: string, width: number) {
   const resize = mockViewport(width)
   stubFetchByPath(SETTINGS_API)
   render(
-    <InDataRouter path={path}>
+    <MemoryRouter initialEntries={[path]}>
       <ApiProviders>
         <AppRoutes />
       </ApiProviders>
-    </InDataRouter>,
+    </MemoryRouter>,
   )
   return resize
 }

web/src/shell/BottomBar.test.tsx

@@ -1,9 +1,9 @@
 import { fireEvent, render, screen, within } from '@testing-library/react'
+import { MemoryRouter } from 'react-router'
 import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest'
 import { AppRoutes } from '../App.tsx'
 import { ApiProviders, SETTINGS_API } from '../test/ApiProviders.tsx'
 import { declaredStyle } from '../test/cssRules.ts'
-import { InDataRouter } from '../test/dataRouter.tsx'
 import { stubFetchByPath } from '../test/fetchStub.ts'
 import { mockViewport } from '../test/matchMedia.ts'
 import styles from './BottomBar.module.css'
@@ -74,11 +74,11 @@ function renderAt(path: string, reducedMotion = false) {
   mockViewport(MOBILE, { reducedMotion })
   stubFetchByPath(SETTINGS_API)
   render(
-    <InDataRouter path={path}>
+    <MemoryRouter initialEntries={[path]}>
       <ApiProviders>
         <AppRoutes />
       </ApiProviders>
-    </InDataRouter>,
+    </MemoryRouter>,
   )
 }
 

web/src/test/ApiProviders.tsx

@@ -16,53 +16,15 @@ export const AI_SETTINGS = {
   updated_at: '2026-10-01T15:00:00.000Z',
 }
 
-// AI_MODELS is a GET /api/v1/settings/ai/models body: the model AI_SETTINGS
-// chooses.
-export const AI_MODELS = { models: [{ id: 'claude-sonnet-4-5', display_name: 'Claude Sonnet' }] }
-
-// HOUSEHOLD_SETTINGS is a GET /api/v1/settings/household body: the seed
-// times in New York.
-export const HOUSEHOLD_SETTINGS = {
-  timezone: 'America/New_York',
-  dinner_time: '17:30',
-  reminder_time: '16:30',
-  review_time: '09:00',
-  plan_draft_dow: 5,
-  plan_draft_time: '09:00',
-  suggestions_dow: 0,
-  suggestions_time: '08:00',
-  chat_autosend_dow: 6,
-  chat_autosend_time: '08:00',
-  onboarding_completed_at: null,
-  updates_seen_at: null,
-  updated_by: null,
-  created_at: '2026-10-01T15:00:00.000Z',
-  updated_at: '2026-10-01T15:00:00.000Z',
-}
-
-// RECIPE_SEARCH_SETTINGS is a GET /api/v1/settings/recipe-search body: the
-// SearXNG sidecar, no Brave key stored.
-export const RECIPE_SEARCH_SETTINGS = {
-  provider: 'searxng',
-  base_url: 'http://searxng:8080',
-  default_base_url: 'http://searxng:8080',
-  api_key_set: false,
-  api_key_last4: null,
-  updated_at: '2026-10-01T15:00:00.000Z',
-}
-
 // SETTINGS_API answers the settings home's requests, for stubFetchByPath, as
 // today's server does: the dinners, Google Calendar and notifications status
-// endpoints do not exist yet. The home's sub-tabs stay mounted on mobile, so
-// it also reads the AI models and recipe search settings.
+// endpoints do not exist yet.
 export const SETTINGS_API = {
   '/api/v1/dinners?status=regular': () => errorResponse(404, 'not_found'),
   '/api/v1/settings/calendar': () => errorResponse(404, 'not_found'),
   '/api/v1/settings/notifications': () => errorResponse(404, 'not_found'),
-  '/api/v1/settings/household': () => jsonResponse(200, HOUSEHOLD_SETTINGS),
+  '/api/v1/settings/household': () => jsonResponse(200, { timezone: 'America/New_York', dinner_time: '17:30' }),
   '/api/v1/settings/ai': () => jsonResponse(200, AI_SETTINGS),
-  '/api/v1/settings/ai/models': () => jsonResponse(200, AI_MODELS),
-  '/api/v1/settings/recipe-search': () => jsonResponse(200, RECIPE_SEARCH_SETTINGS),
 }
 
 // ApiProviders gives the pages under test what App gives them: an API client