refactor: rebuild the admin catalogue tables

apps/web/app/admin/courses/[code]/error.tsx

@@ -0,0 +1,2 @@
+"use client";
+export { CatalogueRecordError as default } from "@/ui/admin/catalogue-table/catalogue-error";

apps/web/app/admin/courses/error.tsx

@@ -0,0 +1,2 @@
+"use client";
+export { CatalogueError as default } from "@/ui/admin/catalogue-table/catalogue-error";

apps/web/app/admin/courses/imports/error.tsx

@@ -0,0 +1,2 @@
+"use client";
+export { CatalogueError as default } from "@/ui/admin/catalogue-table/catalogue-error";

apps/web/app/admin/courses/imports/loading.tsx

@@ -1,5 +1,5 @@
-import { CatalogueLoading } from "@/ui/admin/catalogue-table/catalogue-loading";
+import { ImportRecordsLoading } from "@/ui/admin/catalogue-table/catalogue-loading";
 
 export default function Loading() {
-  return <CatalogueLoading noun="import runs" imports />;
+  return <ImportRecordsLoading noun="imports" />;
 }

apps/web/app/admin/courses/imports/page.tsx

@@ -1,7 +1,8 @@
-import { CatalogueImportRunsPage } from "@/ui/admin/catalogue/catalogue-pages";
+import type { SearchParams } from "@/ui/admin/catalogue/catalogue-pages";
+import { CatalogueImportsPage } from "@/ui/admin/catalogue/catalogue-pages";
 
 export const dynamic = "force-dynamic";
 
-export default function Page() {
-  return <CatalogueImportRunsPage kind="course" />;
+export default function Page({ searchParams }: { searchParams: SearchParams }) {
+  return <CatalogueImportsPage kind="course" searchParams={searchParams} />;
 }

apps/web/app/admin/courses/loading.tsx

@@ -1,5 +1,5 @@
 import { CatalogueLoading } from "@/ui/admin/catalogue-table/catalogue-loading";
 
 export default function Loading() {
-  return <CatalogueLoading noun="courses" />;
+  return <CatalogueLoading noun="courses" layout="directory" />;
 }

apps/web/app/admin/majors/[code]/error.tsx

@@ -0,0 +1,2 @@
+"use client";
+export { CatalogueRecordError as default } from "@/ui/admin/catalogue-table/catalogue-error";

apps/web/app/admin/majors/error.tsx

@@ -0,0 +1,2 @@
+"use client";
+export { CatalogueError as default } from "@/ui/admin/catalogue-table/catalogue-error";

apps/web/app/admin/majors/imports/error.tsx

@@ -0,0 +1,2 @@
+"use client";
+export { CatalogueError as default } from "@/ui/admin/catalogue-table/catalogue-error";

apps/web/app/admin/majors/imports/loading.tsx

@@ -1,5 +1,5 @@
-import { CatalogueLoading } from "@/ui/admin/catalogue-table/catalogue-loading";
+import { ImportRecordsLoading } from "@/ui/admin/catalogue-table/catalogue-loading";
 
 export default function Loading() {
-  return <CatalogueLoading noun="import runs" imports />;
+  return <ImportRecordsLoading noun="imports" />;
 }

apps/web/app/admin/majors/imports/page.tsx

@@ -1,7 +1,8 @@
-import { CatalogueImportRunsPage } from "@/ui/admin/catalogue/catalogue-pages";
+import type { SearchParams } from "@/ui/admin/catalogue/catalogue-pages";
+import { CatalogueImportsPage } from "@/ui/admin/catalogue/catalogue-pages";
 
 export const dynamic = "force-dynamic";
 
-export default function Page() {
-  return <CatalogueImportRunsPage kind="major" />;
+export default function Page({ searchParams }: { searchParams: SearchParams }) {
+  return <CatalogueImportsPage kind="major" searchParams={searchParams} />;
 }

apps/web/app/admin/majors/loading.tsx

@@ -1,5 +1,5 @@
 import { CatalogueLoading } from "@/ui/admin/catalogue-table/catalogue-loading";
 
 export default function Loading() {
-  return <CatalogueLoading noun="majors" />;
+  return <CatalogueLoading noun="majors" layout="directory" />;
 }

apps/web/app/admin/minors/[code]/error.tsx

@@ -0,0 +1,2 @@
+"use client";
+export { CatalogueRecordError as default } from "@/ui/admin/catalogue-table/catalogue-error";

apps/web/app/admin/minors/error.tsx

@@ -0,0 +1,2 @@
+"use client";
+export { CatalogueError as default } from "@/ui/admin/catalogue-table/catalogue-error";

apps/web/app/admin/minors/imports/error.tsx

@@ -0,0 +1,2 @@
+"use client";
+export { CatalogueError as default } from "@/ui/admin/catalogue-table/catalogue-error";

apps/web/app/admin/minors/imports/loading.tsx

@@ -1,5 +1,5 @@
-import { CatalogueLoading } from "@/ui/admin/catalogue-table/catalogue-loading";
+import { ImportRecordsLoading } from "@/ui/admin/catalogue-table/catalogue-loading";
 
 export default function Loading() {
-  return <CatalogueLoading noun="import runs" imports />;
+  return <ImportRecordsLoading noun="imports" />;
 }

apps/web/app/admin/minors/imports/page.tsx

@@ -1,7 +1,8 @@
-import { CatalogueImportRunsPage } from "@/ui/admin/catalogue/catalogue-pages";
+import type { SearchParams } from "@/ui/admin/catalogue/catalogue-pages";
+import { CatalogueImportsPage } from "@/ui/admin/catalogue/catalogue-pages";
 
 export const dynamic = "force-dynamic";
 
-export default function Page() {
-  return <CatalogueImportRunsPage kind="minor" />;
+export default function Page({ searchParams }: { searchParams: SearchParams }) {
+  return <CatalogueImportsPage kind="minor" searchParams={searchParams} />;
 }

apps/web/app/admin/minors/loading.tsx

@@ -1,5 +1,5 @@
 import { CatalogueLoading } from "@/ui/admin/catalogue-table/catalogue-loading";
 
 export default function Loading() {
-  return <CatalogueLoading noun="minors" />;
+  return <CatalogueLoading noun="minors" layout="directory" />;
 }

apps/web/app/admin/programmes/[code]/error.tsx

@@ -0,0 +1,2 @@
+"use client";
+export { CatalogueRecordError as default } from "@/ui/admin/catalogue-table/catalogue-error";

apps/web/app/admin/programmes/error.tsx

@@ -0,0 +1,2 @@
+"use client";
+export { CatalogueError as default } from "@/ui/admin/catalogue-table/catalogue-error";

apps/web/app/admin/programmes/imports/error.tsx

@@ -0,0 +1,2 @@
+"use client";
+export { CatalogueError as default } from "@/ui/admin/catalogue-table/catalogue-error";

apps/web/app/admin/programmes/imports/loading.tsx

@@ -1,5 +1,5 @@
-import { CatalogueLoading } from "@/ui/admin/catalogue-table/catalogue-loading";
+import { ImportRecordsLoading } from "@/ui/admin/catalogue-table/catalogue-loading";
 
 export default function Loading() {
-  return <CatalogueLoading noun="import runs" imports />;
+  return <ImportRecordsLoading noun="imports" />;
 }

apps/web/app/admin/programmes/imports/page.tsx

@@ -1,7 +1,8 @@
-import { CatalogueImportRunsPage } from "@/ui/admin/catalogue/catalogue-pages";
+import type { SearchParams } from "@/ui/admin/catalogue/catalogue-pages";
+import { CatalogueImportsPage } from "@/ui/admin/catalogue/catalogue-pages";
 
 export const dynamic = "force-dynamic";
 
-export default function Page() {
-  return <CatalogueImportRunsPage kind="programme" />;
+export default function Page({ searchParams }: { searchParams: SearchParams }) {
+  return <CatalogueImportsPage kind="programme" searchParams={searchParams} />;
 }

apps/web/app/admin/programmes/loading.tsx

@@ -1,5 +1,5 @@
 import { CatalogueLoading } from "@/ui/admin/catalogue-table/catalogue-loading";
 
 export default function Loading() {
-  return <CatalogueLoading noun="programmes" />;
+  return <CatalogueLoading noun="programmes" layout="directory" />;
 }

apps/web/app/admin/specialisations/[code]/error.tsx

@@ -0,0 +1,2 @@
+"use client";
+export { CatalogueRecordError as default } from "@/ui/admin/catalogue-table/catalogue-error";

apps/web/app/admin/specialisations/error.tsx

@@ -0,0 +1,2 @@
+"use client";
+export { CatalogueError as default } from "@/ui/admin/catalogue-table/catalogue-error";

apps/web/app/admin/specialisations/imports/error.tsx

@@ -0,0 +1,2 @@
+"use client";
+export { CatalogueError as default } from "@/ui/admin/catalogue-table/catalogue-error";

apps/web/app/admin/specialisations/imports/loading.tsx

@@ -1,5 +1,5 @@
-import { CatalogueLoading } from "@/ui/admin/catalogue-table/catalogue-loading";
+import { ImportRecordsLoading } from "@/ui/admin/catalogue-table/catalogue-loading";
 
 export default function Loading() {
-  return <CatalogueLoading noun="import runs" imports />;
+  return <ImportRecordsLoading noun="imports" />;
 }

apps/web/app/admin/specialisations/imports/page.tsx

@@ -1,7 +1,10 @@
-import { CatalogueImportRunsPage } from "@/ui/admin/catalogue/catalogue-pages";
+import type { SearchParams } from "@/ui/admin/catalogue/catalogue-pages";
+import { CatalogueImportsPage } from "@/ui/admin/catalogue/catalogue-pages";
 
 export const dynamic = "force-dynamic";
 
-export default function Page() {
-  return <CatalogueImportRunsPage kind="specialisation" />;
+export default function Page({ searchParams }: { searchParams: SearchParams }) {
+  return (
+    <CatalogueImportsPage kind="specialisation" searchParams={searchParams} />
+  );
 }

apps/web/app/admin/specialisations/loading.tsx

@@ -1,5 +1,5 @@
 import { CatalogueLoading } from "@/ui/admin/catalogue-table/catalogue-loading";
 
 export default function Loading() {
-  return <CatalogueLoading noun="specialisations" />;
+  return <CatalogueLoading noun="specialisations" layout="directory" />;
 }

apps/web/lib/catalogue-import/changes.ts

@@ -30,6 +30,7 @@ const COURSE_COLLECTIONS = [
 ] as const;
 
 const STRUCTURE_COLLECTIONS = [
+  "summaryFields",
   "sections",
   "learningOutcomes",
   "fees",

apps/web/lib/catalogue-import/kind-adapter.ts

@@ -30,6 +30,14 @@ export type MergeOutcome<Extraction> = {
   warningCount: number;
   errorCount: number;
   report: unknown;
+  /**
+   * Set when the model output was discarded. The processor records it on the
+   * target so a snapshot built from deterministic parsing alone says so,
+   * rather than finishing `ready` with no error at all.
+   */
+  errorCode?: string | null;
+  /** The reason, for `catalogue_extractions.error_summary`. */
+  errorSummary?: string | null;
 };
 
 /**
@@ -75,6 +83,8 @@ export type CatalogueKindAdapter<Extraction = unknown> = {
     modelValid: boolean;
     modelInput: string;
     responseError: string | null;
+    /** The provider's stop reason; `length` means the response was truncated. */
+    finishReason: string | null;
   }): MergeOutcome<Extraction>;
   project(extraction: Extraction): CatalogueSnapshotWrite;
 };

apps/web/lib/catalogue-import/kinds/course/adapter.ts

@@ -113,6 +113,10 @@ export const courseKindAdapter: CatalogueKindAdapter<CourseExtraction> = {
       modelValid,
       warningCount,
       errorCount,
+      errorCode: modelValid ? null : "MODEL_OUTPUT_REJECTED",
+      errorSummary: modelValid
+        ? null
+        : "The model response failed the strict course extraction contract; only deterministic parsing reached this snapshot.",
       report: {
         schemaValid: modelValid,
         modelValidationIssues: result.modelValidationIssues,

apps/web/lib/catalogue-import/kinds/structure/adapter.ts

@@ -12,10 +12,13 @@ import {
   convertAcademicStructureHtmlToMarkdown,
 } from "./markdown.ts";
 import {
+  ACADEMIC_STRUCTURE_MODEL_FIELDS,
   academicStructureModelEvidenceIssues,
+  academicStructureModelFieldRoot,
   mergeAcademicStructureExtractions,
   normaliseAcademicStructureModelExtraction,
 } from "./merge.ts";
+import { academicStructureModelResponseError } from "./model-response-error.ts";
 import { projectAcademicStructureSnapshot } from "./project.ts";
 import {
   ACADEMIC_STRUCTURE_IMPORT_MAX_OUTPUT_TOKENS,
@@ -103,6 +106,7 @@ export const structureKindAdapter: CatalogueKindAdapter<AcademicStructureExtract
       modelValid,
       modelInput,
       responseError,
+      finishReason,
     }) {
       const normalised = normaliseAcademicStructureModelExtraction(model);
       const validation = validateAcademicStructureExtraction(normalised.value, {
@@ -111,20 +115,57 @@ export const structureKindAdapter: CatalogueKindAdapter<AcademicStructureExtract
         expectedYear: claim.academicYear,
         evidenceMethod: "model",
       });
+      // A truncated response reads as a cause rather than a bare finish
+      // reason, and travels to catalogue_extractions.error_summary.
+      const responseCause = academicStructureModelResponseError({
+        finishReason,
+        responseError,
+      });
       const evidenceIssues = validation.success
         ? academicStructureModelEvidenceIssues(validation.data, modelInput)
         : [];
-      const usable =
-        modelValid &&
-        validation.success &&
-        !responseError &&
-        evidenceIssues.length === 0;
-      const extraction = usable
-        ? mergeAcademicStructureExtractions({
-            deterministic,
-            model: validation.data,
-          })
-        : deterministic;
+      // A response that did not finish, or that failed the contract, carries
+      // no field worth trusting. Anything else is judged field by field: one
+      // unsupported fee no longer costs the requirement tree, which matters
+      // because the deterministic fallback models that tree as a single
+      // free-text condition.
+      const discarded = !modelValid || !validation.success || !!responseCause;
+      const modelFields = ACADEMIC_STRUCTURE_MODEL_FIELDS as readonly string[];
+      const rejectedFields = new Set<string>(
+        discarded
+          ? modelFields
+          : evidenceIssues
+              .map(({ fieldKey }) => academicStructureModelFieldRoot(fieldKey))
+              .filter((field) => modelFields.includes(field)),
+      );
+      const extraction =
+        discarded || !validation.success
+          ? structuredClone(deterministic)
+          : mergeAcademicStructureExtractions({
+              deterministic,
+              model: validation.data,
+              rejectedFields,
+            });
+
+      if (discarded) {
+        extraction.reviewItems.push({
+          fieldKey: "modelExtraction",
+          kind: "invalid",
+          severity: "error",
+          message:
+            responseCause ??
+            "The model response failed the strict academic structure extraction contract; only deterministic parsing reached this snapshot.",
+        });
+      } else {
+        for (const field of rejectedFields) {
+          extraction.reviewItems.push({
+            fieldKey: field,
+            kind: "evidence_missing",
+            severity: "warning",
+            message: `The model supplied ${field} without wording from the selected-year source; the deterministic value was kept.`,
+          });
+        }
+      }
       const warningCount = extraction.reviewItems.filter(
         ({ severity }) => severity === "warning",
       ).length;
@@ -133,17 +174,28 @@ export const structureKindAdapter: CatalogueKindAdapter<AcademicStructureExtract
       ).length;
       return {
         extraction,
-        modelValid: usable,
+        modelValid: !discarded,
         warningCount,
         errorCount,
+        errorCode: discarded ? "MODEL_OUTPUT_REJECTED" : null,
+        errorSummary: discarded
+          ? (responseCause ??
+            "The model response failed strict extraction validation; deterministic data was retained.")
+          : null,
         report: {
           responseError,
+          responseCause,
+          finishReason,
           schemaValid: validation.success,
           schemaIssues: validation.success ? [] : validation.issues,
           evidenceValid: evidenceIssues.length === 0,
           evidenceIssues,
           providerNormalisations: normalised.normalisations,
-          modelUsed: usable,
+          modelUsed: !discarded,
+          modelRejectedFields: [...rejectedFields].sort(),
+          modelAcceptedFields: discarded
+            ? []
+            : modelFields.filter((field) => !rejectedFields.has(field)),
         },
       };
     },

apps/web/lib/catalogue-import/persist-snapshot.ts

@@ -246,6 +246,16 @@ async function insertStructureContent(
       ${details.contactText}
     )
   `;
+  for (const field of content.summaryFields) {
+    await tx`
+      insert into public.structure_snapshot_summary_fields (
+        snapshot_id, position, value_position, field_key, label, field_value, source_text
+      ) values (
+        ${snapshotId}, ${field.position}, ${field.valuePosition}, ${field.fieldKey},
+        ${field.label}, ${field.fieldValue}, ${field.sourceText}
+      )
+    `;
+  }
   for (const section of content.sections) {
     await tx`
       insert into public.academic_structure_snapshot_sections (
@@ -634,6 +644,16 @@ export async function persistSnapshotCandidate(
         set draft_snapshot_id = ${snapshotId}
         where id = ${claim.itemYearId}
       `;
+      // A first import has nothing to compare against, so its changes are
+      // recorded as already accepted and the candidate becomes the draft
+      // without anyone pressing Apply. Recording that here keeps the target
+      // honest: it was applied, and leaving applied_snapshot_id null made a
+      // published record still read "Ready for review".
+      await tx`
+        update public.catalogue_import_targets
+        set applied_snapshot_id = ${snapshotId}, applied_at = now()
+        where id = ${claim.targetId}::uuid
+      `;
     }
     const changeKind: SnapshotChangeKind = becameDraft ? "new" : "changed";
     return {