fix(ofsted): badge and compare read the grade still in force

Search badges date a grade by the inspection that awarded or confirmed it (ofsted_grade_date) and say 'Inspected · year' when the latest inspection gave no grade. ofstedDisplay's kinds become graded / confirmed / no_overall_grade, read from current_grade rather than a carried-forward overall_effectiveness. lib/ofstedStatus.ts holds the two sentences the school and compare pages share.

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

nextjs-app/lib/compareLogic.ts

@@ -100,9 +100,8 @@ export function summariseReportCard(ofsted: OfstedInspection): ReportCardSummary
 
 export type OfstedDisplay =
   | { kind: 'none' }
-  | { kind: 'graded'; grade: number; gradeLabel: string; carriedForward: false }
-  | { kind: 'carried_forward'; grade: number; gradeLabel: string; carriedForward: true }
-  | { kind: 'transitional' }
+  | { kind: 'graded' | 'confirmed'; grade: number; gradeLabel: string; gradeDate: string | null }
+  | { kind: 'no_overall_grade' }
   | { kind: 'report_card'; summary: ReportCardSummary };
 
 export function ofstedDisplay(
@@ -116,19 +115,19 @@ export function ofstedDisplay(
     return { kind: 'report_card', summary: summariseReportCard(ofsted) };
   }
 
-  const grade = ofsted.overall_effectiveness;
-  const gradeLabel = grade != null ? OFSTED_LEGACY_GRADES[grade] : undefined;
-  if (grade == null || gradeLabel === undefined) {
-    if (ofsted.inspection_date) {
-      return { kind: 'transitional' };
-    }
-    return { kind: 'none' };
+  // The grade still in force (backend: fact_ofsted_latest), never one carried
+  // past a later inspection that gave none.
+  const current = ofsted.current_grade;
+  const gradeLabel = current ? OFSTED_LEGACY_GRADES[current.grade] : undefined;
+  if (current && gradeLabel !== undefined) {
+    return {
+      kind: current.basis === 'confirmed' ? 'confirmed' : 'graded',
+      grade: current.grade,
+      gradeLabel,
+      gradeDate: current.date,
+    };
   }
-
-  if (ofsted.grade_source === 'ungraded_carried_forward') {
-    return { kind: 'carried_forward', grade, gradeLabel, carriedForward: true };
-  }
-  return { kind: 'graded', grade, gradeLabel, carriedForward: false };
+  return ofsted.latest_visit ? { kind: 'no_overall_grade' } : { kind: 'none' };
 }
 
 // ---------------------------------------------------------------------------

nextjs-app/lib/ofstedStatus.ts

@@ -0,0 +1,48 @@
+/**
+ * The sentences the school page and the compare page print about where an
+ * Ofsted grade came from and what the latest visit was. One wording, two pages.
+ * Rule: docs/superpowers/specs/2026-10-05-ofsted-current-status-design.md
+ */
+
+import type { OfstedCurrentGrade, OfstedInspection, OfstedLatestVisit } from './types';
+
+export function formatOfstedDate(iso: string | null | undefined): string {
+  if (!iso) return '';
+  const d = new Date(iso);
+  if (Number.isNaN(d.getTime())) return '';
+  return d.toLocaleDateString('en-GB', { day: 'numeric', month: 'long', year: 'numeric' });
+}
+
+const VISIT_KIND: Record<OfstedLatestVisit['kind'], string> = {
+  report_card: 'Report card inspection',
+  graded: 'Graded inspection',
+  ungraded: 'Ungraded inspection',
+};
+
+/** "Graded inspection, 6 July 2016" or "Confirmed at an ungraded inspection, 14 March 2023". */
+export function gradeSourceLine(current: OfstedCurrentGrade): string {
+  const when = formatOfstedDate(current.date);
+  const what = current.basis === 'confirmed' ? 'Confirmed at an ungraded inspection' : 'Graded inspection';
+  return when ? `${what}, ${when}` : what;
+}
+
+/** "Ungraded inspection, 13 November 2024: Standards maintained". */
+export function latestVisitLine(visit: OfstedLatestVisit): string {
+  const head = `${VISIT_KIND[visit.kind]}, ${formatOfstedDate(visit.date)}`;
+  return visit.outcome ? `${head}: ${visit.outcome}` : head;
+}
+
+/**
+ * Whether the latest visit needs its own line: when it is not where the grade
+ * came from, or when there is no grade but an ungraded outcome to report. A
+ * graded visit without a grade is already dated by the section title.
+ */
+export function showLatestVisitLine(
+  ofsted: Pick<OfstedInspection, 'current_grade' | 'latest_visit'>,
+): boolean {
+  const visit = ofsted.latest_visit;
+  if (!visit || visit.kind === 'report_card') return false;
+  const current = ofsted.current_grade;
+  if (current) return current.date !== visit.date;
+  return visit.kind === 'ungraded';
+}

nextjs-app/lib/types.ts

@@ -76,10 +76,14 @@ export interface School {
   parliamentary_constituency?: string | null;
 
   // Ofsted (for list view — summary only)
+  /** The overall grade still in force; null when the latest inspection gave none. */
   ofsted_grade?: 1 | 2 | 3 | 4 | null;
+  /** Date the grade was awarded or confirmed (null without a grade). */
+  ofsted_grade_date?: string | null;
   /** Report-card inspection date (Nov 2025+); non-null identifies a report
    * card in the list/map, where the full report_card object isn't available. */
   ofsted_rc_date?: string | null;
+  /** The school's latest inspection of any kind. */
   ofsted_date?: string | null;
   ofsted_framework?: string | null;
 }
@@ -95,6 +99,7 @@ export interface OfstedInspection {
   rc_inspection_date?: string | null;
   inspection_type: string | null;
   // OEIF fields (old framework, pre-Nov 2025)
+  /** The graded inspection's own overall grade; never carried forward. */
   overall_effectiveness: 1 | 2 | 3 | 4 | null;
   quality_of_education: number | null;
   behaviour_attitudes: number | null;
@@ -115,9 +120,12 @@ export interface OfstedInspection {
   rc_leadership_governance: number | null;
   rc_early_years: number | null;
   rc_sixth_form: number | null;
-  /** Where the effective overall grade came from: a graded (Section 5)
-   * inspection, or carried forward from an ungraded (Section 8) outcome. */
-  grade_source?: 'graded' | 'ungraded_carried_forward' | null;
+  /** The overall grade still in force, dated by the inspection that awarded
+   * ("graded") or confirmed ("confirmed", an ungraded visit) it. Null when the
+   * latest inspection gave no overall grade, or for a report card. */
+  current_grade?: OfstedCurrentGrade | null;
+  /** The school's most recent inspection of any kind. */
+  latest_visit?: OfstedLatestVisit | null;
   /** Renewed-framework (Nov 2025) area judgements, coded + labelled by the
    * backend from the live-sampled Ofsted vocabulary. Empty when the school
    * has no report-card inspection. Safeguarding is never included here. */
@@ -127,6 +135,18 @@ export interface OfstedInspection {
   report_url?: string | null;
 }
 
+export interface OfstedCurrentGrade {
+  grade: 1 | 2 | 3 | 4;
+  date: string | null;
+  basis: 'graded' | 'confirmed';
+}
+
+export interface OfstedLatestVisit {
+  date: string;
+  kind: 'report_card' | 'graded' | 'ungraded';
+  outcome: string | null;
+}
+
 export interface ReportCardEntry {
   code: number;
   label: string;

nextjs-app/lib/utils.ts

@@ -837,15 +837,18 @@ export interface OfstedListBadge {
  *     Checked FIRST so it wins over any carried-forward legacy grade — the
  *     list has no full report_card object, and ofsted_framework is the raw
  *     event grouping ("Schools - S5"), never "ReportCard".
- *   - OEIF school (ofsted_grade set): grade word + year, colour-keyed
- *   - Inspected without an overall grade (OEIF post-Sept-2024, where Ofsted no
- *     longer issues an overall judgement): "Inspected · YYYY" — mirrors the
- *     detail page's hero chip so a school never reads as both inspected and
+ *   - Current grade (ofsted_grade set): grade word + the year it was awarded
+ *     or confirmed (ofsted_grade_date), colour-keyed. Never the year of a later
+ *     visit: that paired old grades with new inspections (audit C1).
+ *   - Inspected with no grade in force (every inspection Sept 2024 – Nov 2025,
+ *     or an ungraded visit whose outcome names no grade): "Inspected · YYYY",
+ *     dated by the latest visit, so a school never reads as both inspected and
  *     "Not yet inspected"
  *   - No inspection on record: "Not yet inspected" in grey
  */
 export function buildOfstedListBadge(school: {
   ofsted_grade?: 1 | 2 | 3 | 4 | null;
+  ofsted_grade_date?: string | null;
   ofsted_date?: string | null;
   ofsted_framework?: string | null;
   ofsted_rc_date?: string | null;
@@ -858,10 +861,7 @@ export function buildOfstedListBadge(school: {
     return { label: `Report Card · ${rcYear}`, cssClass: 'ofstedRc' };
   }
 
-  const year = school.ofsted_date
-    ? new Date(school.ofsted_date).getFullYear()
-    : null;
-  const yearStr = year ? ` · ${year}` : '';
+  const yearOf = (iso?: string | null) => (iso ? new Date(iso).getFullYear() : null);
 
   if (school.ofsted_grade) {
     const labels: Record<number, string> = {
@@ -870,17 +870,19 @@ export function buildOfstedListBadge(school: {
       3: 'Req. Improvement',
       4: 'Inadequate',
     };
+    const gradeYear = yearOf(school.ofsted_grade_date);
     return {
-      label: `${labels[school.ofsted_grade]}${yearStr}`,
+      label: `${labels[school.ofsted_grade]}${gradeYear ? ` · ${gradeYear}` : ''}`,
       cssClass: `ofsted${school.ofsted_grade}`,
     };
   }
 
-  // An inspection is on record (date or framework present) but carries no
-  // overall grade — a post-Sept-2024 OEIF inspection. Distinct from a school
-  // that has genuinely never been inspected.
+  // An inspection is on record but no overall grade is in force: every
+  // inspection from Sept 2024 to Nov 2025, or an ungraded visit whose outcome
+  // names no grade. Dated by the latest visit.
   if (school.ofsted_date != null || school.ofsted_framework != null) {
-    return { label: `Inspected${yearStr}`, cssClass: 'ofstedInspected' };
+    const visitYear = yearOf(school.ofsted_date);
+    return { label: `Inspected${visitYear ? ` · ${visitYear}` : ''}`, cssClass: 'ofstedInspected' };
   }
 
   return { label: 'Not yet inspected', cssClass: 'ofstedPending' };