feat(deen): fold /review checklist into the Deen journey (Review tab)

AGENTS.md

@@ -35,12 +35,12 @@ day one.
   `recovery.ts` (12-word BIP39 secret + salted verifier), `transfer.ts`/`lan.ts` (QR/LAN), content
   loaders (`quran.ts`, `tafsir.ts`, `audio.ts`, `hadith-full.ts`),
   `privacy.ts` (sensitivity + network manifest), `strings.ts` (AR/EN
-  dictionary, ~1295 keys), `i18n.ts`.
+  dictionary, ~1307 keys), `i18n.ts`.
 - `app/components/` — React UI. `app/components/views/` route views,
   `app/components/library/` Quran/hadith, `transfer.tsx` (export infra),
   `profile-scope.tsx`, `login-gate.tsx`.
 - `app/` — routes: `/`(today), `/account`, `/calendar`, `/insights`,
-  `/review`, `/deen`, `/library`, `/recovery`.
+  `/deen`, `/library`, `/recovery`.
 - `e2e/` — Playwright (serial; `npm run test:e2e` pins `--workers=1`).
 - `public/data/` — generated bundles (only touched via pipeline).
 - `docs/`, `DOCUMENTATION.md`, `SECURITY.md`, `GOVERNANCE.md` — ground

CHANGELOG.md

@@ -5,6 +5,13 @@ or architecture-level changes are listed.
 
 ## Unreleased
 
+- **الحصاد folded into /deen**: the previous `/review` night-checklist page
+  now lives as a third "المراجعة / Review" tab inside the Deen journey
+  (`/deen`, tabs: Today · Library · Review); `/review` permanently
+  redirects (`308`→`/deen`) so old bookmarks, shared links, and PWA
+  notification deep-links keep working; nav, sitemap, SW `CORE` (bumped
+  to `wird-v7`), manifest shortcuts, notification defaults, metadata,
+  SEO/docs/audit counts, and all static + e2e suites updated.
 - Branch security: GitHub-server protection ENABLED on `main` + `develop`
   (`gh` API 2026-09-23): require PR + `CI / verify` status check (strict),
   linear history, no force pushes, no deletions, no admins bypass —

DOCUMENTATION.md

@@ -100,8 +100,7 @@ husky pre-commit (lint-staged) + commit-msg hooks.
 | `/`              | `app/page.tsx`       | Today: hero, habits, rescue plan, goals, night review                    |
 | `/calendar`      | `app/calendar/`      | 30-day month grid, Friday plan                                           |
 | `/insights`      | `app/insights/`      | Real stats, balance radar, coach brief, Hijri year                       |
-| `/review`        | `app/review/`        | End-of-day checklist (tri-state) + score + mood                          |
-| `/deen`          | `app/deen/`          | Deen journey: levels, quests, deeds, reflections, streaks (see §3)       |
+| `/deen`          | `app/deen/`          | Deen journey — tabs: Today · Library · Review (see §3)                   |
 | `/library`       | `app/library/`       | Tabs: Adhkar · Quran · Hadith · Paths · Dreams                           |
 | `/account`       | `app/account/`       | Profile, backup, transfer, reminders, times, theme                       |
 | `/recovery`      | `app/recovery/`      | Last-resort recovery: inspect, emergency export, restore, surgical reset |
@@ -114,6 +113,10 @@ Shared chrome (sidebar, bottom nav, header, zikr dock, login gate) lives in
 (`WirdProvider` + `useWird()`). Views that need props live in
 `app/components/views/`.
 
+> `/review` was folded into `/deen` (Review tab) and now permanently
+> redirects — old bookmarks, shared links, and PWA notification deep-links
+> keep working.
+
 ## 3. Features by route
 
 **Today (`/`)** — hero ring (live %), day-mode pills, focus card, quick tools,
@@ -126,10 +129,11 @@ reflection (persisted textarea), tiered return screen after ≥3 absent days
 adaptive companion card (one ranked guidance + verified verse/hadith, see
 §14), kids quests, qada / fasting / breaker cards, Ramadan banner in Ramadan.
 
-**Review (`/review`)** — auto-built checklist from today's real data plus six
-heart-check items; tri-state (done/partial/missed); mood + gratitude; weighted
-score saved immutably per day (`wird-reviews-v1`, merged into history);
-one-line night context for strong/low/return days (see §14).
+**Review (Deen journey, `/deen` → Review tab)** — auto-built checklist from
+today's real data plus six heart-check items; tri-state (done/partial/missed);
+mood + gratitude; weighted score saved immutably per day (`wird-reviews-v1`,
+merged into history); one-line night context for strong/low/return days
+(see §14). Retains tab state in memory only, like the other deen tabs.
 
 **Insights (`/insights`)** — period pills (1–365d buckets), weekly bars, 4
 metrics, coach brief (at-risk → neglect → pace → lift + praise), 6-axis

MASTER_AUDIT.md

@@ -30,8 +30,8 @@ the JSONs). This run's numbers: `AUDIT_REPORT.md`. Frozen snapshot:
 
 ## 5–7. Routes, journeys, navigation — PASS (+1 FIXED)
 
-- Inventory: 10 routes (`/`, account, calendar, insights, library,
-  recovery, review, private-plans, terms, privacy); static check
+- Inventory: 10 routes (`/`, account, calendar, insights, deen, library,
+  recovery, private-plans, terms, privacy); static check
   `app/lib/__tests__/audit.test.ts` asserts every `href="/…"` and
   `router.push("/…")` resolves, sitemap lists the public routes, and the
   SW `CORE` shell matches existing routes (a stale shell entry would

README.md

@@ -46,7 +46,7 @@ Node 22 (`.nvmrc`). CI (`.github/workflows/ci.yml`) runs typecheck → lint →
 
 - **اليوم**: صلوات وأوراد، خطة إنقاذ، جلسة قرآن بمؤقت، بطاقات الجمعة/الوتر، عادات مخصصة، تحديات، عهود، ركن الصغار، قضاء الفوائت، الصيام، كسر العادات، وضع رمضان التلقائي.
 - **المرشد التكيفي**: بطاقة واحدة ذكية (26 حالة: عودة، تعثر، زخم، إرهاق…) مع آية/حديث موثّقين من مجموعات محلية، ومسار توبة اختياري بعد الغياب الطويل — دون أحكام ودون ادعاء معرفة القلوب.
-- **الحصاد** (`/review`): مراجعة ليلية tri-state مع درجة ومزاج وامتنان — تُحفظ كسجل يومي، مع سطر سياق ليلي.
+- **الدين** (`/deen`): رحلة اليوم (أذكار ومهام وأعمال صالحة) + مكتبة وتعلم + مراجعة ليلية tri-state مع درجة ومزاج وامتنان — تُحفظ كسجل يومي، مع سطر سياق ليلي.
 - **التقدّم** (`/insights`): طبقات تحليلية محلية قابلة للتفسير (اتجاهات، عبادة-عبادة، قرآن وحفظ، أذكار، أهداف وتحديات وعهود، عودات واستمرارية، خريطة نشاط، مراجعة شهرية/سنوية، إنجازات) + مدى مخصص للمقارنة — لا بيانات مفتعلة أبدًا.
 - **المكتبة** (`/library`): قارئ قرآن كامل دون إنترنت (بحث، علامات، حفظ بتاريخ مراجعة)، مختارات الكتب التسعة + الأربعون النووية، مسارات علمية ٤ مستويات × ٨ علوم، لوحة الأحلام.
 - **العودة**: شاشة رجوع متدرجة حسب عمق الغياب (3/7/14/30/90 يومًا) + سلّم تنبيهات محلية + مواقيت يدوية بعدّادات حية + وضع المسجد.

app/components/views/deen-page.tsx

@@ -1,16 +1,18 @@
-// Deen page shell (STEP 10): Today/Library tabs over the two deen
-// views. Tab selection is in-memory only (never in the URL), so no
-// tracking state can leak into history, titles, or shared links.
+// Deen page shell (STEP 10): Today/Library/Review tabs over the three deen
+// views. Tab selection is in-memory only (never in the URL), so no tracking
+// state can leak into history, titles, or shared links. Review is the folded
+// /review (الحصاد) checklist, reachable now only through /deen.
 "use client";
 
 import { useState } from "react";
 import { useT } from "../../lib/i18n";
 import { DeenTodayView } from "./deen-today";
 import { DeenLibraryView } from "./deen-library";
+import { ReviewTab } from "./review-tab";
 
 export function DeenPage() {
   const t = useT();
-  const [tab, setTab] = useState<"today" | "library">("today");
+  const [tab, setTab] = useState<"today" | "library" | "review">("today");
   return (
     <>
       <div className="deen-tabs" role="tablist" aria-label={t("dn.title")}>
@@ -32,8 +34,23 @@ export function DeenPage() {
         >
           {t("dn.library")}
         </button>
+        <button
+          type="button"
+          role="tab"
+          aria-selected={tab === "review"}
+          onClick={() => setTab("review")}
+          className={tab === "review" ? "selected" : ""}
+        >
+          {t("dn.review")}
+        </button>
       </div>
-      {tab === "today" ? <DeenTodayView /> : <DeenLibraryView />}
+      {tab === "today" ? (
+        <DeenTodayView />
+      ) : tab === "library" ? (
+        <DeenLibraryView />
+      ) : (
+        <ReviewTab />
+      )}
     </>
   );
 }

app/review/page.tsx → app/components/views/review-tab.tsx

@@ -1,14 +1,20 @@
-// Review page (/review): tri-state nightly checklist + score/mood/gratitude.
-// Submits write BOTH the per-day review record (enveloped) and the history
-// merge. Includes one honest night-context line for strong/low/return days.
-
+// Review tab (Deen journey, /deen): tri-state nightly checklist + score/mood/
+// gratitude. Submits write BOTH the per-day review record (enveloped) and the
+// history merge. Includes one honest night-context line for strong/low/return
+// days. Moved here from /review (now a permanent redirect to /deen).
 "use client";
 
 import { useEffect, useMemo, useState } from "react";
-import { dayId, hijriParts, loadFromStorage, QURAN_GOAL_PAGES, saveToStorage } from "../lib/wird";
-import { assessUser, selectGuidance } from "../lib/companion";
-import { useT } from "../lib/i18n";
-import { useWird } from "../components/wird-store";
+import {
+  dayId,
+  hijriParts,
+  loadFromStorage,
+  QURAN_GOAL_PAGES,
+  saveToStorage,
+} from "../../lib/wird";
+import { assessUser, selectGuidance } from "../../lib/companion";
+import { useT } from "../../lib/i18n";
+import { useWird } from "../wird-store";
 
 type Status = "done" | "partial" | "missed";
 type Mood = "good" | "ok" | "low" | null;
@@ -47,7 +53,7 @@ function loadReviews(): Record<string, SavedReview> {
   return loadFromStorage<Record<string, SavedReview>>("wird-reviews-v1", {});
 }
 
-export default function ReviewPage() {
+export function ReviewTab() {
   const t = useT();
   const {
     done,
@@ -118,8 +124,8 @@ export default function ReviewPage() {
   const gradeTitle =
     loadedScore >= 85 ? t("rv.g85") : loadedScore >= 60 ? t("rv.g60") : t("rv.gLow");
 
-  // Night context (2.39): one honest line for the states that matter at
-  // night — no card, no logging (Today owns the guidance log).
+  // Night context: one honest line for the states that matter at night — no
+  // card, no logging (Today owns the guidance log).
   const nightLine = useMemo(() => {
     try {
       const todayId = dayId();

app/deen/page.tsx

@@ -1,19 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 // Deen route (/deen): the STEP 10 journey space — today dashboard plus
-// library/learning tabs (in-memory tab state, no URL params, static
-// generic title). Server component; views own all client state.
+// library/learning and nightly review tabs (in-memory tab state, no URL
+// params, static generic title). Server component; views own all client
+// state. Review was folded here from /review (permanent redirect).
 import type { Metadata } from "next";
 import { DeenPage } from "../components/views/deen-page";
 
 export const metadata: Metadata = {
   // Discreet by design: short generic title, one plain description of
   // the public feature — never user data, never scores or ranks.
   title: "دين",
-  description: "رحلة الدين: مستويات تتبع ومهام وأعمال صالحة وتأمل خاص.",
+  description: "رحلة الدين: متابعة اليوم، أذكار وتعلم، ومراجعة ليلية خاصة.",
   alternates: { canonical: "/deen" },
   openGraph: {
     title: "دين",
-    description: "رحلة الدين: مستويات تتبع ومهام وأعمال صالحة وتأمل خاص.",
+    description: "رحلة الدين: متابعة اليوم، أذكار وتعلم، ومراجعة ليلية خاصة.",
     url: "/deen",
     images: [{ url: "/opengraph-image", width: 1200, height: 630, alt: "Wird — Daily Companion" }],
   },

app/lib/__tests__/audit.test.ts

@@ -40,7 +40,6 @@ describe("route inventory (audit 4-5)", () => {
       "/insights",
       "/library",
       "/recovery",
-      "/review",
       "/private-plans",
       "/terms",
       "/privacy",
@@ -66,7 +65,6 @@ describe("route inventory (audit 4-5)", () => {
     for (const r of [
       "/calendar",
       "/insights",
-      "/review",
       "/deen",
       "/library",
       "/account",
@@ -80,7 +78,6 @@ describe("route inventory (audit 4-5)", () => {
       "/",
       "/calendar",
       "/insights",
-      "/review",
       "/deen",
       "/library",
       "/account",

app/lib/__tests__/seo.test.ts

@@ -40,16 +40,7 @@ describe("titles, descriptions, canonicals", () => {
       expect(seen.has(t), `duplicate title "${t}" in ${rel} (first: ${seen.get(t)})`).toBe(false);
       seen.set(t, rel);
     }
-    for (const r of [
-      "calendar",
-      "insights",
-      "review",
-      "library",
-      "account",
-      "terms",
-      "privacy",
-      "deen",
-    ]) {
+    for (const r of ["calendar", "insights", "library", "account", "terms", "privacy", "deen"]) {
       expect(
         [...seen.values()].some((v) => v.startsWith(`${r}/`)),
         `route ${r} titled`,
@@ -64,16 +55,7 @@ describe("titles, descriptions, canonicals", () => {
         return read(`app/${r}/page.tsx`);
       }
     };
-    for (const r of [
-      "calendar",
-      "insights",
-      "review",
-      "library",
-      "account",
-      "terms",
-      "privacy",
-      "deen",
-    ]) {
+    for (const r of ["calendar", "insights", "library", "account", "terms", "privacy", "deen"]) {
       expect(srcOf(r), `${r} description`).toMatch(/description:\s*"/);
     }
     // Recovery is fully discreet: no metadata export at all, so the
@@ -119,7 +101,7 @@ describe("long-tail content, internal links, duplicate content", () => {
   });
   it("home links descriptively to every core route", () => {
     const src = read("app/page.tsx");
-    for (const route of ["/library", "/deen", "/review", "/insights"]) {
+    for (const route of ["/library", "/deen", "/calendar", "/insights"]) {
       expect(src, `internal link ${route}`).toContain(`Link href="${route}"`);
     }
     expect(src, "descriptive anchor text (nav.* labels)").toContain('t("nav.library")');
@@ -134,16 +116,7 @@ describe("long-tail content, internal links, duplicate content", () => {
       }
     };
     const seen = new Map<string, string>();
-    for (const r of [
-      "calendar",
-      "insights",
-      "review",
-      "library",
-      "account",
-      "terms",
-      "privacy",
-      "deen",
-    ]) {
+    for (const r of ["calendar", "insights", "library", "account", "terms", "privacy", "deen"]) {
       const d = srcOf(r).match(/description:\s*"([^"]+)"/);
       if (!d) continue;
       expect(

app/lib/notify.ts

@@ -41,7 +41,7 @@ export async function ensurePermission(): Promise<boolean> {
   }
 }
 
-export function fireNotification(title: string, body: string, url = "/review"): void {
+export function fireNotification(title: string, body: string, url = "/deen"): void {
   try {
     if (!canNotify() || Notification.permission !== "granted") return;
     if ("serviceWorker" in navigator && navigator.serviceWorker.controller) {

app/lib/strings.ts

@@ -8,7 +8,6 @@ const AR: Record<string, string> = {
   "nav.today": "اليوم",
   "nav.calendar": "التقويم",
   "nav.insights": "التقدّم",
-  "nav.review": "الحصاد",
   "nav.library": "الأذكار",
   "nav.account": "حسابي",
   "nav.skip": "تخطَّ إلى المحتوى",
@@ -1141,6 +1140,7 @@ const AR: Record<string, string> = {
   "dn.ach.disciplined": "المنضبط",
   "dn.ach.disciplinedD": "حافظت على قاعدة شخصية 7 أيام.",
   "dn.library": "المكتبة والتعلم",
+  "dn.review": "المراجعة",
   "dn.mustahabb": "النمو بالمستحبات",
   "dn.mustahabbSub":
     "ممارسات مستحبة مجمعة للنمو. كل عنصر يوضح إن كان موثقا أو هدفا شخصيا — والأحكام تختلف بين المذاهب.",
@@ -1340,7 +1340,6 @@ const EN: Record<string, string> = {
   "nav.today": "Today",
   "nav.calendar": "Calendar",
   "nav.insights": "Progress",
-  "nav.review": "Review",
   "nav.library": "Adhkar",
   "nav.account": "Account",
   "nav.skip": "Skip to content",
@@ -2496,6 +2495,7 @@ const EN: Record<string, string> = {
   "dn.ach.disciplined": "Disciplined",
   "dn.ach.disciplinedD": "Kept a personal discipline rule for 7 days.",
   "dn.library": "Library and learning",
+  "dn.review": "Review",
   "dn.mustahabb": "Mustahabb growth",
   "dn.mustahabbSub":
     "Recommended practices grouped for growth. Each item shows whether it is sourced or a personal goal - rulings vary by school.",

app/lib/wird.ts

@@ -213,7 +213,6 @@ export const NAV_ITEMS: [string, string, string][] = [
   ["today", "⌂", "اليوم"],
   ["calendar", "▦", "التقويم"],
   ["insights", "↗", "التقدّم"],
-  ["review", "☾", "الحصاد"],
   ["deen", "✦", "الدين"],
   ["library", "◈", "الأذكار"],
   ["account", "◌", "حسابي"],
@@ -223,7 +222,6 @@ export const NAV_HREFS: Record<string, string> = {
   today: "/",
   calendar: "/calendar",
   insights: "/insights",
-  review: "/review",
   deen: "/deen",
   library: "/library",
   account: "/account",

app/page.tsx

@@ -430,7 +430,7 @@ export default function TodayPage() {
   const handleGuideAction = (kind: string) => {
     try {
       if (kind === "rescue") scrollToId("rescue-plan");
-      else if (kind === "review") router.push("/review");
+      else if (kind === "review") router.push("/deen");
       else if (kind === "core") {
         setMinimumPlan(true);
         scrollToId("rescue-plan");
@@ -1821,7 +1821,7 @@ export default function TodayPage() {
               <Link href="/deen">{t("nav.deen")}</Link>
             </li>
             <li>
-              <Link href="/review">{t("nav.review")}</Link>
+              <Link href="/calendar">{t("nav.calendar")}</Link>
             </li>
             <li>
               <Link href="/insights">{t("nav.insights")}</Link>

app/sitemap.ts

@@ -6,7 +6,6 @@ const routes = [
   "",
   "/calendar",
   "/insights",
-  "/review",
   "/deen",
   "/library",
   "/account",