diff --git a/.gitignore b/.gitignore
index 797217f..0fd8c7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,4 +47,7 @@ next-env.d.ts
 .mcp.json
 
 # DB Backups
-db-backups
\ No newline at end of file
+db-backups
+
+# Eval run artifacts
+/evals/results
\ No newline at end of file
diff --git a/evals/golden.ts b/evals/golden.ts
new file mode 100644
index 0000000..29a2b08
--- /dev/null
+++ b/evals/golden.ts
@@ -0,0 +1,52 @@
+/**
+ * Golden dataset for bill-analysis evals.
+ *
+ * Each entry pins human-agreed expectations for a fixture bill. Reuses the XML
+ * fixtures already in tests/fixtures/, so adding a bill is just: drop its XML in
+ * tests/fixtures/, add an entry here. `expectedJudgment`/`expectedSocialIssue`
+ * are best-effort ground truth — adjust them as the team's view settles.
+ */
+export interface GoldenBill {
+  /** Fixture file basename in tests/fixtures (without .xml). */
+  fixture: string;
+  billId: string;
+  /** Expected final judgment, or "any" when reasonable people could differ. */
+  expectedJudgment: "yes" | "no" | "abstain" | "any";
+  expectedSocialIssue: "yes" | "no";
+  /** Lowercased substrings the summary must contain. */
+  mustMention: string[];
+}
+
+export const GOLDEN_BILLS: GoldenBill[] = [
+  {
+    fixture: "s-230",
+    billId: "S-230",
+    // Creates a new national-strategy reporting obligation (adds process).
+    expectedJudgment: "any",
+    expectedSocialIssue: "no",
+    mustMention: ["soil"],
+  },
+  {
+    fixture: "s-231",
+    billId: "S-231",
+    expectedJudgment: "any",
+    expectedSocialIssue: "no",
+    mustMention: ["corporation"],
+  },
+  {
+    fixture: "c-208",
+    billId: "C-208",
+    // Eases intergenerational small-business/farm transfers via the tax code.
+    expectedJudgment: "yes",
+    expectedSocialIssue: "no",
+    mustMention: ["tax"],
+  },
+  {
+    fixture: "c-206",
+    billId: "C-206",
+    // Carbon-pricing exemption for farmers — reduces a cost on producers.
+    expectedJudgment: "any",
+    expectedSocialIssue: "no",
+    mustMention: ["carbon"],
+  },
+];
diff --git a/package.json b/package.json
index bc1a69d..50dc201 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
     "test:ui": "vitest --ui",
     "test:coverage": "vitest run --coverage",
     "prompt": "tsx src/scripts/copy-bill-prompt.ts",
+    "eval": "tsx src/scripts/run-evals.ts",
     "prepare": "husky"
   },
   "dependencies": {
@@ -72,7 +73,8 @@
     "remark-gfm": "^4.0.1",
     "sonner": "^2.0.7",
     "tailwind-merge": "^3.3.1",
-    "vaul": "^1.1.2"
+    "vaul": "^1.1.2",
+    "zod": "^3.23.8"
   },
   "devDependencies": {
     "@biomejs/biome": "2.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f314661..2305a41 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -150,7 +150,7 @@ importers:
         version: 0.4.6(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
       openai:
         specifier: ^5.15.0
-        version: 5.20.2(ws@8.18.3)
+        version: 5.20.2(ws@8.18.3)(zod@3.25.76)
       react:
         specifier: 19.1.1
         version: 19.1.1
@@ -184,6 +184,9 @@ importers:
       vaul:
         specifier: ^1.1.2
         version: 1.1.2(@types/react-dom@19.1.9(@types/react@19.1.13))(@types/react@19.1.13)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+      zod:
+        specifier: ^3.23.8
+        version: 3.25.76
     devDependencies:
       '@biomejs/biome':
         specifier: 2.2.0
@@ -9066,6 +9069,9 @@ packages:
     resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
     engines: {node: '>=12'}
 
+  zod@3.25.76:
+    resolution: {integrity: sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==}
+
   zwitch@2.0.4:
     resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
 
@@ -17054,9 +17060,10 @@ snapshots:
       is-docker: 2.2.1
       is-wsl: 2.2.0
 
-  openai@5.20.2(ws@8.18.3):
+  openai@5.20.2(ws@8.18.3)(zod@3.25.76):
     optionalDependencies:
       ws: 8.18.3
+      zod: 3.25.76
 
   openid-client@5.7.1:
     dependencies:
@@ -20102,4 +20109,6 @@ snapshots:
       y18n: 5.0.8
       yargs-parser: 21.1.1
 
+  zod@3.25.76: {}
+
   zwitch@2.0.4: {}
diff --git a/src/app/[id]/edit/page.tsx b/src/app/[id]/edit/page.tsx
index 8e9f4b3..bd2e505 100644
--- a/src/app/[id]/edit/page.tsx
+++ b/src/app/[id]/edit/page.tsx
@@ -100,20 +100,6 @@ export default async function EditBillPage({ params }: Params) {
             className="w-full min-h-32 border rounded p-2"
           />
         </div>
-        <div className="space-y-2">
-          <label
-            className="block text-sm font-medium"
-            htmlFor="missing_details"
-          >
-            Missing Details (comma-separated)
-          </label>
-          <textarea
-            id="missing_details"
-            name="missing_details"
-            defaultValue={(bill.missing_details || []).join(", ")}
-            className="w-full min-h-20 border rounded p-2"
-          />
-        </div>
         <div className="space-y-2">
           <label className="block text-sm font-medium" htmlFor="genres">
             Genres (comma-separated)
diff --git a/src/app/[id]/page.tsx b/src/app/[id]/page.tsx
index cd5772f..2f3356c 100644
--- a/src/app/[id]/page.tsx
+++ b/src/app/[id]/page.tsx
@@ -1,13 +1,6 @@
 import Link from "next/link";
-import { getBillByIdFromDB } from "@/server/get-bill-by-id-from-db";
-import { getBillFromCivicsProjectApi } from "@/services/billApi";
-import {
-  fromBuildCanadaDbBill,
-  fromCivicsProjectApiBill,
-  type UnifiedBill,
-} from "@/utils/billConverters";
+import { getUnifiedBillByIdWithApiFallback } from "@/server/get-unified-bill-by-id";
 import type { Metadata, ResolvingMetadata } from "next";
-import { headers } from "next/headers";
 import { env } from "@/env";
 import {
   BillHeader,
@@ -18,8 +11,7 @@ import {
 } from "@/components/BillDetail";
 import { BillQuestions } from "@/components/BillDetail/BillQuestions";
 import { Separator } from "@/components/ui/separator";
-import { getServerSession } from "next-auth";
-import { authOptions } from "@/lib/auth";
+import { EditBillLink } from "@/components/BillDetail/EditBillLink";
 import { BillTenets } from "@/components/BillDetail/BillTenets";
 import { JudgementValue } from "@/components/Judgement/judgement.component";
 import { buildAbsoluteUrl, buildRelativePath } from "@/utils/basePath";
@@ -40,29 +32,12 @@ interface Params {
 export default async function BillDetail({ params }: Params) {
   const { id } = await params;
 
-  const session = await getServerSession(authOptions);
-  const headerList = await headers();
-  const host =
-    headerList.get("x-forwarded-host") || headerList.get("host") || "";
-  const proto = (headerList.get("x-forwarded-proto") || "https").split(",")[0];
-  const requestOrigin = host ? `${proto}://${host}` : "";
-  const origin = env.NEXT_PUBLIC_APP_URL || requestOrigin;
   const shareOrigin =
     env.NODE_ENV === "production"
       ? BUILD_CANADA_URL
-      : origin || BUILD_CANADA_URL;
-  // Try database first, then fallback to API
-  const dbBill = await getBillByIdFromDB(id);
-  let unifiedBill: UnifiedBill | null = null;
-
-  if (dbBill) {
-    unifiedBill = fromBuildCanadaDbBill(dbBill);
-  } else {
-    const apiBill = await getBillFromCivicsProjectApi(id);
-    if (apiBill) {
-      unifiedBill = await fromCivicsProjectApiBill(apiBill);
-    }
-  }
+      : env.NEXT_PUBLIC_APP_URL || BUILD_CANADA_URL;
+  // Try database first, then fall back to the Civics Project API
+  const unifiedBill = await getUnifiedBillByIdWithApiFallback(id);
 
   if (!unifiedBill) {
     return (
@@ -89,11 +64,7 @@ export default async function BillDetail({ params }: Params) {
         <Link href="/" className="text-sm underline  mb-6">
           ← Back to bills
         </Link>
-        {session?.user && (
-          <Link href={`/${id}/edit`} className="ml-4 text-sm underline">
-            Edit
-          </Link>
-        )}
+        <EditBillLink id={id} />
       </div>
       <BillHeader bill={unifiedBill} />
 
@@ -154,13 +125,12 @@ export async function generateMetadata(
   const q = sp?.q;
   const title = id;
   const description = `Bill ${id} analysis and judgement`;
-  const h = headers();
-  const host = (await h).get("x-forwarded-host") || (await h).get("host") || "";
-  const proto = ((await h).get("x-forwarded-proto") || "https").split(",")[0];
   // Ensure we always have a base URL for absolute image URLs (required for Twitter Cards)
   const baseUrl =
     env.NEXT_PUBLIC_APP_URL ||
-    (host ? `${proto}://${host}` : "http://localhost:3000");
+    (env.NODE_ENV === "production"
+      ? BUILD_CANADA_URL
+      : "http://localhost:3000");
   const pagePath = buildRelativePath(id);
   const pageUrl = `${baseUrl}${pagePath}`;
   const pageUrlWithQuery = q
diff --git a/src/app/api/[id]/reprocess/route.ts b/src/app/api/[id]/reprocess/route.ts
index 63a50ad..7e217d1 100644
--- a/src/app/api/[id]/reprocess/route.ts
+++ b/src/app/api/[id]/reprocess/route.ts
@@ -89,7 +89,17 @@ export async function POST(
     );
   }
 
-  const analysis = await summarizeBillText(markdown);
+  let analysis: Awaited<ReturnType<typeof summarizeBillText>>;
+  try {
+    analysis = await summarizeBillText(markdown);
+  } catch (error) {
+    // Never overwrite a good stored analysis with a failure stub.
+    console.error(`Reprocess ${id}: AI analysis failed`, error);
+    return NextResponse.json(
+      { error: "AI analysis failed; existing analysis left unchanged" },
+      { status: 502 },
+    );
+  }
 
   const latestStageDate =
     apiBill.stages && apiBill.stages.length > 0
@@ -123,10 +133,9 @@ export async function POST(
         tenet_evaluations: analysis.tenet_evaluations,
         final_judgment: analysis.final_judgment,
         rationale: analysis.rationale,
-        needs_more_info: analysis.needs_more_info,
-        missing_details: analysis.missing_details,
         steel_man: analysis.steel_man,
         question_period_questions: analysis.question_period_questions ?? [],
+        isSocialIssue: analysis.is_social_issue === "yes",
         lastUpdatedOn: new Date(latestStageDate),
       },
     },
diff --git a/src/app/api/[id]/route.ts b/src/app/api/[id]/route.ts
index e953709..15a5f9b 100644
--- a/src/app/api/[id]/route.ts
+++ b/src/app/api/[id]/route.ts
@@ -33,10 +33,8 @@ export async function POST(
   let final_judgment: string | undefined;
   let rationale: string | undefined;
   let steel_man: string | undefined;
-  let missing_details_input: unknown;
   let genres_input: unknown;
   let question_period_questions_input: unknown;
-  let hasMissingDetails = false;
   let hasGenres = false;
   let hasQuestionPeriodQuestions = false;
   let tenet_ids: string[] = [];
@@ -53,10 +51,6 @@ export async function POST(
     final_judgment = params.get("final_judgment") || undefined;
     rationale = params.get("rationale") || undefined;
     steel_man = params.get("steel_man") || undefined;
-    if (params.has("missing_details")) {
-      hasMissingDetails = true;
-      missing_details_input = params.get("missing_details") || "";
-    }
     if (params.has("genres")) {
       hasGenres = true;
       genres_input = params.get("genres") || "";
@@ -80,10 +74,6 @@ export async function POST(
     final_judgment = asString(json.final_judgment);
     rationale = asString(json.rationale);
     steel_man = asString(json.steel_man);
-    if ("missing_details" in json) {
-      hasMissingDetails = true;
-      missing_details_input = (json as any).missing_details;
-    }
     if ("genres" in json) {
       hasGenres = true;
       genres_input = (json as any).genres;
@@ -115,11 +105,6 @@ export async function POST(
         (form.get("final_judgment") as string | null) || undefined;
       rationale = (form.get("rationale") as string | null) || undefined;
       steel_man = (form.get("steel_man") as string | null) || undefined;
-      if (typeof form.has === "function" && form.has("missing_details")) {
-        hasMissingDetails = true;
-        missing_details_input =
-          (form.get("missing_details") as string | null) || "";
-      }
       if (typeof form.has === "function" && form.has("genres")) {
         hasGenres = true;
         genres_input = (form.get("genres") as string | null) || "";
@@ -259,11 +244,6 @@ export async function POST(
     return questions.map((question) => ({ question }));
   };
 
-  let missing_details: string[] | undefined;
-  if (hasMissingDetails) {
-    missing_details = parseCommaSeparated(missing_details_input);
-  }
-
   let genres: string[] | undefined;
   if (hasGenres) {
     genres = parseCommaSeparated(genres_input);
@@ -285,9 +265,6 @@ export async function POST(
   if (final_judgment !== undefined) update.final_judgment = final_judgment;
   if (rationale !== undefined) update.rationale = rationale;
   if (steel_man !== undefined) update.steel_man = steel_man;
-  if (missing_details !== undefined) {
-    update.missing_details = missing_details;
-  }
   if (genres !== undefined) {
     update.genres = genres;
   }
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 317e52e..0c12feb 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -2,8 +2,6 @@ import { BillSummary } from "./types";
 import BillExplorer from "./BillExplorer";
 import { getAllBillsFromDB } from "@/server/get-all-bills-from-db";
 import { fromBuildCanadaDbBill } from "@/utils/billConverters";
-import { getParliament45Header } from "@/components/BillDetail/BillHeader";
-import Markdown from "react-markdown";
 import type { Metadata } from "next";
 import { headers } from "next/headers";
 import { env } from "@/env";
@@ -137,8 +135,6 @@ async function getMergedBills(): Promise<BillSummary[]> {
         isSocialIssue: dbBill.isSocialIssue,
         final_judgment: dbBill.final_judgment as BillSummary["final_judgment"],
         rationale: dbBill.rationale,
-        needs_more_info: dbBill.needs_more_info,
-        missing_details: dbBill.missing_details,
         genres: dbBill.genres,
         parliamentNumber: dbBill.parliamentNumber,
         sessionNumber: dbBill.sessionNumber,
@@ -173,8 +169,6 @@ async function getMergedBills(): Promise<BillSummary[]> {
         isSocialIssue: dbBill.isSocialIssue,
         final_judgment: dbBill.final_judgment as BillSummary["final_judgment"],
         rationale: dbBill.rationale,
-        needs_more_info: dbBill.needs_more_info,
-        missing_details: dbBill.missing_details,
         genres: dbBill.genres,
         parliamentNumber: dbBill.parliamentNumber,
         sessionNumber: dbBill.sessionNumber,
@@ -225,8 +219,6 @@ export default async function Home({
             <FAQModalTrigger />
           </header>
 
-          <Markdown>{getParliament45Header()}</Markdown>
-
           <section className="mt-6">
             <BillExplorer bills={bills} />
           </section>
diff --git a/src/app/types.ts b/src/app/types.ts
index 22897bb..5ad4cce 100644
--- a/src/app/types.ts
+++ b/src/app/types.ts
@@ -31,8 +31,6 @@ export interface BillSummary {
   summary?: string;
   final_judgment?: "yes" | "no" | "abstain";
   rationale?: string;
-  needs_more_info?: boolean;
-  missing_details?: string[];
   genres?: string[];
   tenet_evaluations?: Array<{
     id?: number;
diff --git a/src/components/BillDetail/BillHeader.tsx b/src/components/BillDetail/BillHeader.tsx
index 133e82f..7b953b3 100644
--- a/src/components/BillDetail/BillHeader.tsx
+++ b/src/components/BillDetail/BillHeader.tsx
@@ -4,37 +4,6 @@ interface BillHeaderProps {
   bill: UnifiedBill;
 }
 
-export function getParliament45Header() {
-  const termStart = new Date("2025-05-26T00:00:00-04:00"); // Opening of the 45th Parliament (1st session)
-  const today = new Date();
-  const msPerDay = 24 * 60 * 60 * 1000;
-  const _daysSinceStart = Math.floor(
-    (today.getTime() - termStart.getTime()) / msPerDay,
-  );
-  // const daySinceStartSuffix =
-
-  // const primeMinister = "Mark Carney";        // PM since Mar 14, 2025
-  // const oppositionLeader = "Pierre Poilievre"; // Official Opposition Leader since Aug 18, 2025
-
-  // // House of Commons party standings at opening of the 45th Parliament
-  // const seats = {
-  //   Liberal: 169,
-  //   Conservative: 144,
-  //   "Bloc Québécois": 22,
-  //   NDP: 7,
-  //   Green: 1,
-  // };
-
-  // // const seatList = Object.entries(seats)
-  //   .map(([party, count]) => `${party} ${count}`)
-  //   .join(" • ");
-
-  // return `It's is the
-  // **${daysSinceStart}**${daySinceStartSuffix}
-  // day of the 45th Canadian Parliament began.
-  //  `;
-}
-
 export function BillHeader({ bill }: BillHeaderProps) {
   return (
     <header className="pb-4">
diff --git a/src/components/BillDetail/BillMetadata.tsx b/src/components/BillDetail/BillMetadata.tsx
index 26bc967..6e66d73 100644
--- a/src/components/BillDetail/BillMetadata.tsx
+++ b/src/components/BillDetail/BillMetadata.tsx
@@ -16,6 +16,14 @@ const DataPoint = ({ label, value }: { label: string; value: string }) => {
   );
 };
 
+const TopicTag = ({ topic }: { topic: string }) => {
+  return (
+    <span className="text-xs bg-gray-100 text-gray-800 px-2 py-1 rounded-md">
+      {topic}
+    </span>
+  );
+};
+
 export function BillMetadata({ bill }: BillMetadataProps) {
   const billDates = getBillStageDates(bill.stages);
   const lastUpdatedDate = billDates.lastUpdated
@@ -53,7 +61,11 @@ export function BillMetadata({ bill }: BillMetadataProps) {
           <DataPoint label="Last updated" value={lastUpdatedDate} />
         )}
         {bill.genres && bill.genres.length > 0 && (
-          <DataPoint label="Topics" value={bill.genres.join(", ")} />
+          <div className="flex flex-wrap gap-1">
+            {bill.genres.map((genre) => (
+              <TopicTag key={genre} topic={genre} />
+            ))}
+          </div>
         )}
         {bill.parliamentNumber && bill.sessionNumber && (
           <DataPoint label="Parliament" value={`${bill.parliamentNumber}`} />
diff --git a/src/components/BillDetail/EditBillLink.tsx b/src/components/BillDetail/EditBillLink.tsx
new file mode 100644
index 0000000..addd221
--- /dev/null
+++ b/src/components/BillDetail/EditBillLink.tsx
@@ -0,0 +1,20 @@
+"use client";
+
+import { useSession } from "next-auth/react";
+import Link from "next/link";
+
+interface EditBillLinkProps {
+  id: string;
+}
+
+export function EditBillLink({ id }: EditBillLinkProps) {
+  const { data: session } = useSession();
+
+  if (!session?.user) return null;
+
+  return (
+    <Link href={`/${id}/edit`} className="ml-4 text-sm underline">
+      Edit
+    </Link>
+  );
+}
diff --git a/src/consts/general.ts b/src/consts/general.ts
index 77ed50f..6cfa264 100644
--- a/src/consts/general.ts
+++ b/src/consts/general.ts
@@ -9,3 +9,7 @@ export const BUILD_CANADA_TWITTER_HANDLE = "@buildcanada";
 // Note: Route segment configs (export const revalidate in page.tsx files) must use literal values
 // due to Next.js static analysis requirements. Use these constants only for runtime fetch calls.
 export const BILL_API_REVALIDATE_INTERVAL = 600; // Bill API data cache (fetch revalidation)
+
+// AI bill-analysis configuration.
+export const BILL_ANALYSIS_MODEL = "gpt-5";
+export const BILL_ANALYSIS_EFFORT = "high" as const;
diff --git a/src/env.ts b/src/env.ts
index b12aa9d..e9f7cdf 100644
--- a/src/env.ts
+++ b/src/env.ts
@@ -32,6 +32,7 @@ export const env = {
     process.env.CIVICS_PROJECT_API_KEY,
   ),
   CIVICS_PROJECT_BASE_URL: optional("CIVICS_PROJECT_BASE_URL", ENDPOINT),
+  OPENAI_API_KEY: optional("OPENAI_API_KEY", process.env.OPENAI_API_KEY),
   MONGO_URI: optional(
     "MONGO_URI",
     (process.env.MONGO_URI || process.env.MONGODB_URI)?.trim(),
diff --git a/src/lib/openai.ts b/src/lib/openai.ts
new file mode 100644
index 0000000..2a22803
--- /dev/null
+++ b/src/lib/openai.ts
@@ -0,0 +1,25 @@
+import OpenAI from "openai";
+
+let client: OpenAI | null = null;
+
+/**
+ * Lazily construct the shared OpenAI client.
+ *
+ * Construction is deferred (not at module load) because the SDK throws when
+ * `OPENAI_API_KEY` is absent, and many modules that import the analysis code
+ * are also loaded in contexts without a key (CI builds, tests, no-AI dev).
+ * Callers must check `hasOpenAIKey()` first.
+ *
+ * `maxRetries` enables the SDK's built-in exponential backoff on transient
+ * failures (429s/5xx); `timeout` bounds a single request.
+ */
+export function getOpenAI(): OpenAI {
+  if (!client) {
+    client = new OpenAI({ maxRetries: 3, timeout: 120_000 });
+  }
+  return client;
+}
+
+export function hasOpenAIKey(): boolean {
+  return Boolean(process.env.OPENAI_API_KEY);
+}
diff --git a/src/models/Bill.ts b/src/models/Bill.ts
index 38185ea..91eb9b4 100644
--- a/src/models/Bill.ts
+++ b/src/models/Bill.ts
@@ -40,8 +40,6 @@ export interface BillDocument extends mongoose.Document {
   tenet_evaluations: TenetEvaluation[];
   final_judgment: string; // "yes", "no", or "abstain"
   rationale: string;
-  needs_more_info: boolean;
-  missing_details: string[];
   steel_man: string;
 
   status: string;
@@ -113,8 +111,6 @@ const BillSchema = new Schema<BillDocument>(
     tenet_evaluations: { type: [TenetEvaluationSchema], default: [] },
     final_judgment: { type: String, enum: ["yes", "no", "abstain"] },
     rationale: { type: String },
-    needs_more_info: { type: Boolean, default: false },
-    missing_details: { type: [String], default: [] },
     steel_man: { type: String },
 
     status: { type: String, required: true },
diff --git a/src/prompt/schema.ts b/src/prompt/schema.ts
new file mode 100644
index 0000000..6bab40e
--- /dev/null
+++ b/src/prompt/schema.ts
@@ -0,0 +1,57 @@
+import { z } from "zod";
+
+/**
+ * Single source of truth for the shape of an AI bill analysis.
+ *
+ * This Zod schema is passed to OpenAI Structured Outputs (via `zodTextFormat`)
+ * so the model is *forced* to return JSON matching it exactly — no hand-parsing
+ * or regex fallback.
+ *
+ * The model does NOT emit each tenet's `title` (it's wasted tokens and a
+ * hallucination surface). `summarizeBillText` joins the canonical title from
+ * `TENETS` by id after parsing, so the `BillAnalysis` type below — what callers
+ * actually consume — carries the title while the model output omits it.
+ *
+ * Note: every field is required (no `.optional()`) because OpenAI strict
+ * structured outputs require all keys to be present.
+ */
+export const ModelTenetEvaluationSchema = z.object({
+  id: z.number().int(),
+  alignment: z.enum(["aligns", "conflicts", "neutral"]),
+  explanation: z.string(),
+});
+
+export const QuestionSchema = z.object({
+  question: z.string(),
+});
+
+/** The schema the model is constrained to (no tenet titles). */
+export const BillAnalysisSchema = z.object({
+  summary: z.string(),
+  short_title: z.string(),
+  tenet_evaluations: z.array(ModelTenetEvaluationSchema),
+  question_period_questions: z.array(QuestionSchema),
+  final_judgment: z.enum(["yes", "no", "abstain"]),
+  rationale: z.string(),
+  steel_man: z.string(),
+  is_social_issue: z.enum(["yes", "no"]),
+});
+
+/** Raw model output, exactly as Structured Outputs returns it (no titles). */
+export type ModelBillAnalysis = z.infer<typeof BillAnalysisSchema>;
+
+/** A tenet evaluation enriched with its canonical title (server-side join). */
+export interface TenetEvaluation {
+  id: number;
+  title: string;
+  alignment: "aligns" | "conflicts" | "neutral";
+  explanation: string;
+}
+
+/** The analysis callers consume — model output plus the joined tenet titles. */
+export type BillAnalysis = Omit<
+  z.infer<typeof BillAnalysisSchema>,
+  "tenet_evaluations"
+> & {
+  tenet_evaluations: TenetEvaluation[];
+};
diff --git a/src/prompt/summary-and-vote-prompt.ts b/src/prompt/summary-and-vote-prompt.ts
index ce92140..2aad489 100644
--- a/src/prompt/summary-and-vote-prompt.ts
+++ b/src/prompt/summary-and-vote-prompt.ts
@@ -51,28 +51,30 @@ You are analyzing Canadian legislation. You must assess whether the bill aligns
   For general guidelines:
   - Be critical.
   - Bias to the overall wellbeing of Canadians.
+  - Base every claim only on the provided bill text. Do not invent or infer provisions that are not present. If the text is insufficient to judge the bill or a specific tenet, say so explicitly rather than guessing.
   - Use markdown formatting.
   - Use bullet points to summarize the highlights of the bill.
   - Do not include any other text in the summary.
-  - Never self reference Build Canada.
   - Never advocate for adding more red tape.
   - Always advocate for safety and security for Canadians.
   - Never self reference Build Canada, or use "We" or "Our", use the idea of "Builders" instead.
-  - Never self reference the tenents outside of the tenet evaluations.
+  - Never self reference the tenets outside of the tenet evaluations.
 
   ## Your Task
 
   1. Read the bill.
   2. Provide a concise summary of what the bill does in plain language (3-5 sentences).
-  3. Evaluate the bill against the 8 tenets above:
+  3. Evaluate the bill against the 8 tenets above. Provide exactly one evaluation per tenet (ids 1 through 8), each with only its id, alignment, and a short explanation grounded in the bill text. Do NOT include the tenet title — it is added automatically.
     3.1 Does it clearly support one or more tenets?
     3.2 Does it conflict with one or more tenets?
     3.3 Is its impact neutral or unclear?
-  4. Give a final judgment (choose exactly one; output in lowercase):
-    4.1 Output "abstain" if the bill is primarily a social issue (per the social-issue criteria above).
-    4.2 Output “yes” if the bill aligns overall with Build Canada's tenets.
-    4.3 Output “no” if it conflicts overall with Build Canada's tenets.
+  4. Give a final judgment on the bill's ECONOMIC merit against the tenets (choose exactly one; output in lowercase). Judge the merit regardless of whether the bill is a social issue — the social-issue determination is a separate field (step 6), not a reason to abstain.
+    4.1 Output “yes” if the bill aligns overall with the tenets.
+    4.2 Output “no” if it conflicts overall with the tenets.
+    4.3 Output "abstain" only if the bill's economic impact is genuinely neutral or the text is too unclear to judge.
   5. Generate 3 critical questions, pertaining to this and only about this bill, for Question Period in the House of Commons phrased in a way that a Member of Parliament might actually ask in Question Period. Omit any prefix like "Mr. Speaker" or "Madam Speaker".
+  6. Write a "steel man": the strongest good-faith case in favour of the bill, in 2-3 sentences, even if your final judgment is "no".
+  7. Separately classify whether the bill is primarily a social issue (per the Social Issue Grading criteria above). This is an independent routing flag and must not influence the final judgment in step 4.
 
   Important: All enum values must be lowercase exactly as specified.
   - tenet_evaluations.alignment: aligns|conflicts|neutral
@@ -88,67 +90,25 @@ You are analyzing Canadian legislation. You must assess whether the bill aligns
     "tenet_evaluations": [
       {
         "id": 1,
-        "title": "${TENETS[1]}",
         "alignment": "aligns|conflicts|neutral",
-        "explanation": "Short explanation of how this bill relates to this tenet"
-      },
-      {
-        "id": 2,
-        "title": "${TENETS[2]}",
-        "alignment": "aligns|conflicts|neutral",
-        "explanation": "Short explanation of how this bill relates to this tenet"
-      },
-      {
-        "id": 3,
-        "title": "${TENETS[3]}",
-        "alignment": "aligns|conflicts|neutral",
-        "explanation": "Short explanation of how this bill relates to this tenet"
-      },
-      {
-        "id": 4,
-        "title": "${TENETS[4]}",
-        "alignment": "aligns|conflicts|neutral",
-        "explanation": "Short explanation of how this bill relates to this tenet"
-      },
-      {
-        "id": 5,
-        "title": "${TENETS[5]}",
-        "alignment": "aligns|conflicts|neutral",
-        "explanation": "Short explanation of how this bill relates to this tenet"
-      },
-      {
-        "id": 6,
-        "title": "${TENETS[6]}",
-        "alignment": "aligns|conflicts|neutral",
-        "explanation": "Short explanation of how this bill relates to this tenet"
-      },
-      {
-        "id": 7,
-        "title": "${TENETS[7]}",
-        "alignment": "aligns|conflicts|neutral",
-        "explanation": "Short explanation of how this bill relates to this tenet"
-      },
-      {
-        "id": 8,
-        "title": "${TENETS[8]}",
-        "alignment": "aligns|conflicts|neutral",
-        "explanation": "Short explanation of how this bill relates to this tenet"
+        "explanation": "Short explanation, grounded in the bill text, of how this bill relates to tenet 1"
       }
+      // ...one object for every tenet, ids 1 through 8 (do not include the tenet title)
     ],
     "question_period_questions": [
       {
-        "question": "A crticial question, pertaining to this and only about this bill, for Question Period in the House of Commons phrased in a way that a Member of Parliament might actually ask in Question Period. Omit any prefix like "Mr. Speaker" or "Madam Speaker""
+        "question": "A critical question, pertaining to this and only about this bill, for Question Period in the House of Commons phrased in a way that a Member of Parliament might actually ask in Question Period. Omit any prefix like 'Mr. Speaker' or 'Madam Speaker'"
       },
       {
-        "question": "A crticial question, pertaining to this and only about this bill, for Question Period in the House of Commons phrased in a way that a Member of Parliament might actually ask in Question Period. Omit any prefix like "Mr. Speaker" or "Madam Speaker""
+        "question": "A critical question, pertaining to this and only about this bill, for Question Period in the House of Commons phrased in a way that a Member of Parliament might actually ask in Question Period. Omit any prefix like 'Mr. Speaker' or 'Madam Speaker'"
       },
       {
-        "question": "A crticial question, pertaining to this and only about this bill, for Question Period in the House of Commons phrased in a way that a Member of Parliament might actually ask in Question Period. Omit any prefix like "Mr. Speaker" or "Madam Speaker""
-      },
-
+        "question": "A critical question, pertaining to this and only about this bill, for Question Period in the House of Commons phrased in a way that a Member of Parliament might actually ask in Question Period. Omit any prefix like 'Mr. Speaker' or 'Madam Speaker'"
+      }
     ],
     "final_judgment": "yes|no|abstain",
-    "rationale": "2 sentences explaining the overall judgment and then bullet points explaining the rationale for the judgment and suggestions for what we might change. Use markdown formatting.",
+    "rationale": "2 sentences explaining the overall judgment and then bullet points explaining the rationale for the judgment and suggestions for what might change. Use markdown formatting.",
+    "steel_man": "The strongest good-faith case in favour of the bill, in 2-3 sentences.",
     "is_social_issue": "yes|no"
   }
   \`\`\`
diff --git a/src/scripts/run-evals.ts b/src/scripts/run-evals.ts
new file mode 100644
index 0000000..8f84a9e
--- /dev/null
+++ b/src/scripts/run-evals.ts
@@ -0,0 +1,179 @@
+#!/usr/bin/env tsx
+
+/**
+ * Bill-analysis eval harness.
+ *
+ *   npm run eval            # deterministic checks against the golden dataset
+ *   npm run eval -- --judge # also run an LLM-as-judge faithfulness score
+ *
+ * For each golden bill: fixture XML → markdown → summarizeBillText (real OpenAI
+ * call) → score. Deterministic checks are free; the optional judge adds one
+ * extra model call per bill. Needs OPENAI_API_KEY (loaded from .env.local/.env).
+ *
+ * This is intentionally NOT wired into CI — it costs money and hits the network.
+ * CI runs the fast, mocked unit tests in tests/unit instead.
+ */
+import dotenv from "dotenv";
+import path from "node:path";
+
+dotenv.config({ path: path.join(process.cwd(), ".env.local") });
+dotenv.config({ path: path.join(process.cwd(), ".env") });
+
+import fs from "node:fs";
+import { z } from "zod";
+import { zodTextFormat } from "openai/helpers/zod";
+import { xmlToMarkdown } from "@/utils/xml-to-md/xml-to-md.util";
+import { summarizeBillText } from "@/services/billApi";
+import { BillAnalysisSchema } from "@/prompt/schema";
+import { checkAnalysisGuardrails } from "@/utils/analysis-guardrails/analysis-guardrails.util";
+import { getOpenAI, hasOpenAIKey } from "@/lib/openai";
+import { BILL_ANALYSIS_MODEL } from "@/consts/general";
+import { GOLDEN_BILLS } from "../../evals/golden";
+
+const FIXTURES_DIR = path.join(process.cwd(), "tests", "fixtures");
+const RESULTS_DIR = path.join(process.cwd(), "evals", "results");
+
+const JudgeSchema = z.object({
+  faithfulness: z.number().int().min(1).max(5),
+  rationale: z.string(),
+});
+
+async function judgeFaithfulness(
+  billText: string,
+  summary: string,
+): Promise<z.infer<typeof JudgeSchema>> {
+  const prompt = `You are grading whether a summary faithfully reflects a bill's text.
+Score 1 (fabricated/misleading) to 5 (fully accurate, no hallucinations).
+
+BILL TEXT:
+${billText.slice(0, 12000)}
+
+SUMMARY:
+${summary}`;
+  const response = await getOpenAI().responses.parse({
+    model: BILL_ANALYSIS_MODEL,
+    input: prompt,
+    text: { format: zodTextFormat(JudgeSchema, "faithfulness_judgment") },
+  });
+  if (!response.output_parsed) throw new Error("Judge returned no output");
+  return response.output_parsed;
+}
+
+async function main() {
+  const withJudge = process.argv.includes("--judge");
+
+  if (!hasOpenAIKey()) {
+    console.error("OPENAI_API_KEY is not set. Add it to .env.local or .env.");
+    process.exit(1);
+  }
+
+  const results: unknown[] = [];
+  let passed = 0;
+  let failed = 0;
+
+  for (const golden of GOLDEN_BILLS) {
+    const xmlPath = path.join(FIXTURES_DIR, `${golden.fixture}.xml`);
+    if (!fs.existsSync(xmlPath)) {
+      console.warn(`SKIP ${golden.billId}: fixture ${xmlPath} not found`);
+      continue;
+    }
+
+    const markdown = xmlToMarkdown(fs.readFileSync(xmlPath, "utf-8"));
+    console.log(`\n=== ${golden.billId} ===`);
+
+    const failures: string[] = [];
+    let analysis: Awaited<ReturnType<typeof summarizeBillText>> | null = null;
+    try {
+      analysis = await summarizeBillText(markdown);
+    } catch (error) {
+      failures.push(`analysis threw: ${(error as Error).message}`);
+    }
+
+    if (analysis) {
+      // Schema (belt-and-suspenders; the call already enforces it).
+      if (!BillAnalysisSchema.safeParse(analysis).success) {
+        failures.push("output failed schema validation");
+      }
+      // Exactly 8 tenet evaluations.
+      if (analysis.tenet_evaluations.length !== 8) {
+        failures.push(
+          `expected 8 tenet evaluations, got ${analysis.tenet_evaluations.length}`,
+        );
+      }
+      // Judgment.
+      if (
+        golden.expectedJudgment !== "any" &&
+        analysis.final_judgment !== golden.expectedJudgment
+      ) {
+        failures.push(
+          `final_judgment: expected ${golden.expectedJudgment}, got ${analysis.final_judgment}`,
+        );
+      }
+      // Social-issue classification.
+      if (analysis.is_social_issue !== golden.expectedSocialIssue) {
+        failures.push(
+          `is_social_issue: expected ${golden.expectedSocialIssue}, got ${analysis.is_social_issue}`,
+        );
+      }
+      // Must-mention facts.
+      const lowerSummary = analysis.summary.toLowerCase();
+      for (const phrase of golden.mustMention) {
+        if (!lowerSummary.includes(phrase.toLowerCase())) {
+          failures.push(`summary missing required mention: "${phrase}"`);
+        }
+      }
+      // Guardrails.
+      const guardrail = checkAnalysisGuardrails({
+        summary: analysis.summary,
+        rationale: analysis.rationale,
+        steel_man: analysis.steel_man,
+        questions: analysis.question_period_questions,
+      });
+      for (const v of guardrail) failures.push(`guardrail ${v}`);
+    }
+
+    let judge: z.infer<typeof JudgeSchema> | null = null;
+    if (withJudge && analysis) {
+      try {
+        judge = await judgeFaithfulness(markdown, analysis.summary);
+        if (judge.faithfulness < 4) {
+          failures.push(
+            `faithfulness ${judge.faithfulness}/5: ${judge.rationale}`,
+          );
+        }
+      } catch (error) {
+        failures.push(`judge threw: ${(error as Error).message}`);
+      }
+    }
+
+    const ok = failures.length === 0;
+    ok ? passed++ : failed++;
+    console.log(ok ? "PASS" : "FAIL");
+    for (const f of failures) console.log(`  - ${f}`);
+    if (judge) console.log(`  faithfulness: ${judge.faithfulness}/5`);
+
+    results.push({
+      billId: golden.billId,
+      ok,
+      failures,
+      judge,
+      final_judgment: analysis?.final_judgment,
+      is_social_issue: analysis?.is_social_issue,
+    });
+  }
+
+  console.log(`\n${passed} passed, ${failed} failed`);
+
+  fs.mkdirSync(RESULTS_DIR, { recursive: true });
+  const stamp = new Date().toISOString().replace(/[:.]/g, "-");
+  const outPath = path.join(RESULTS_DIR, `${stamp}.json`);
+  fs.writeFileSync(outPath, JSON.stringify(results, null, 2));
+  console.log(`Wrote ${outPath}`);
+
+  process.exit(failed === 0 ? 0 : 1);
+}
+
+main().catch((error) => {
+  console.error(error);
+  process.exit(1);
+});
diff --git a/src/server/get-unified-bill-by-id.ts b/src/server/get-unified-bill-by-id.ts
index f45bf9d..4c9d8cd 100644
--- a/src/server/get-unified-bill-by-id.ts
+++ b/src/server/get-unified-bill-by-id.ts
@@ -1,7 +1,9 @@
 import "server-only";
 import { getBillByIdFromDB } from "@/server/get-bill-by-id-from-db";
+import { getBillFromCivicsProjectApi } from "@/services/billApi";
 import {
   fromBuildCanadaDbBill,
+  fromCivicsProjectApiBill,
   type UnifiedBill,
 } from "@/utils/billConverters";
 
@@ -14,3 +16,21 @@ export async function getUnifiedBillById(
   }
   return null;
 }
+
+/**
+ * Like {@link getUnifiedBillById}, but falls back to the Civics Project API
+ * when the bill isn't in our database. Note the API path can trigger bill-text
+ * fetching and AI summarization via `fromCivicsProjectApiBill`, so prefer the
+ * DB-only `getUnifiedBillById` for cheap reads (e.g. OG image rendering).
+ */
+export async function getUnifiedBillByIdWithApiFallback(
+  id: string,
+): Promise<UnifiedBill | null> {
+  const dbBill = await getUnifiedBillById(id);
+  if (dbBill) {
+    return dbBill;
+  }
+
+  const apiBill = await getBillFromCivicsProjectApi(id);
+  return apiBill ? fromCivicsProjectApiBill(apiBill) : null;
+}
diff --git a/src/services/billApi.ts b/src/services/billApi.ts
index aa3eaaf..87ec481 100644
--- a/src/services/billApi.ts
+++ b/src/services/billApi.ts
@@ -1,9 +1,34 @@
 import { xmlToMarkdown } from "@/utils/xml-to-md/xml-to-md.util";
-import { SUMMARY_AND_VOTE_PROMPT } from "@/prompt/summary-and-vote-prompt";
-import OpenAI from "openai";
-import { BILL_API_REVALIDATE_INTERVAL } from "@/consts/general";
+import {
+  SUMMARY_AND_VOTE_PROMPT,
+  TENETS,
+} from "@/prompt/summary-and-vote-prompt";
+import { zodTextFormat } from "openai/helpers/zod";
+import { getOpenAI, hasOpenAIKey } from "@/lib/openai";
+import {
+  type BillAnalysis,
+  BillAnalysisSchema,
+  type ModelBillAnalysis,
+} from "@/prompt/schema";
+import {
+  BILL_API_REVALIDATE_INTERVAL,
+  BILL_ANALYSIS_EFFORT,
+  BILL_ANALYSIS_MODEL,
+} from "@/consts/general";
 import { env } from "@/env";
 
+export type { BillAnalysis } from "@/prompt/schema";
+
+/** Thrown when AI analysis cannot be produced. Callers must NOT persist a
+ * fabricated analysis on failure — they should skip the write and/or surface
+ * an error so a transient outage never overwrites a real verdict. */
+export class BillAnalysisError extends Error {
+  constructor(message: string, options?: { cause?: unknown }) {
+    super(message, options);
+    this.name = "BillAnalysisError";
+  }
+}
+
 export type ApiStage = {
   stage: string;
   state: string;
@@ -39,24 +64,6 @@ export type ApiBillDetail = {
 
 const CANADIAN_PARLIAMENT_NUMBER = 45;
 
-/** Types for AI analysis results */
-export interface BillAnalysis {
-  summary: string;
-  short_title?: string;
-  tenet_evaluations: Array<{
-    id: number;
-    title: string;
-    alignment: "aligns" | "conflicts" | "neutral";
-    explanation: string;
-  }>;
-  final_judgment: "yes" | "no" | "abstain";
-  rationale?: string;
-  needs_more_info: boolean;
-  missing_details: string[];
-  steel_man: string;
-  question_period_questions?: Array<{ question: string }>;
-}
-
 export async function getBillFromCivicsProjectApi(
   billId: string,
 ): Promise<ApiBillDetail | null> {
@@ -88,268 +95,54 @@ export async function getBillFromCivicsProjectApi(
   return data;
 }
 
+/**
+ * Run the full Build Canada analysis on a bill's text.
+ *
+ * Uses OpenAI Structured Outputs so the response is guaranteed to match
+ * `BillAnalysisSchema` — there is no JSON.parse/regex fallback. On any failure
+ * (missing key, API error after retries, refusal) this THROWS a
+ * `BillAnalysisError`. Callers must catch it and avoid persisting a fabricated
+ * analysis, so a transient outage never overwrites a real verdict in the DB.
+ */
 export async function summarizeBillText(input: string): Promise<BillAnalysis> {
-  if (!process.env.OPENAI_API_KEY) {
-    console.log("No OPENAI API key, using fallback analysis");
-    // Fallback analysis
-    const text = input?.trim() || "";
-    const truncatedSummary =
-      text.length <= 500 ? text : `${text.slice(0, 500)}…`;
-
-    return {
-      summary: truncatedSummary || "No bill text available for analysis.",
-      short_title: undefined,
-      tenet_evaluations: [
-        {
-          id: 1,
-          title: "Canada should aim to be the world's most prosperous country",
-          alignment: "neutral",
-          explanation: "Unable to analyze without AI",
-        },
-        {
-          id: 2,
-          title:
-            "Promote economic freedom, ambition, and breaking from bureaucratic inertia",
-          alignment: "neutral",
-          explanation: "Unable to analyze without AI",
-        },
-        {
-          id: 3,
-          title: "Drive national productivity and global competitiveness",
-          alignment: "neutral",
-          explanation: "Unable to analyze without AI",
-        },
-        {
-          id: 4,
-          title: "Grow exports of Canadian products and resources",
-          alignment: "neutral",
-          explanation: "Unable to analyze without AI",
-        },
-        {
-          id: 5,
-          title: "Encourage investment, innovation, and resource development",
-          alignment: "neutral",
-          explanation: "Unable to analyze without AI",
-        },
-        {
-          id: 6,
-          title:
-            "Deliver better public services at lower cost (government efficiency)",
-          alignment: "neutral",
-          explanation: "Unable to analyze without AI",
-        },
-        {
-          id: 7,
-          title:
-            "Reform taxes to incentivize work, risk-taking, and innovation",
-          alignment: "neutral",
-          explanation: "Unable to analyze without AI",
-        },
-        {
-          id: 8,
-          title: "Focus on large-scale prosperity, not incrementalism",
-          alignment: "neutral",
-          explanation: "Unable to analyze without AI",
-        },
-      ],
-      final_judgment: "abstain",
-      rationale: undefined,
-      needs_more_info: true,
-      missing_details: ["AI analysis capabilities required"],
-      steel_man:
-        "The steel man for this bill is the bill that aligns with the tenets of Build Canada.",
-      question_period_questions: [],
-    };
+  if (!hasOpenAIKey()) {
+    throw new BillAnalysisError(
+      "OPENAI_API_KEY is not set; cannot analyze bill text",
+    );
   }
 
-  try {
-    console.log("Analyzing bill text with AI");
-    const OpenAIClient = new OpenAI();
+  console.log("Analyzing bill text with AI");
+  const prompt = `${SUMMARY_AND_VOTE_PROMPT}\n\nBill Text:\n${input}`;
 
-    const prompt = `${SUMMARY_AND_VOTE_PROMPT}\n\nBill Text:\n${input}`;
-    const response = await OpenAIClient.responses.create({
-      model: "gpt-5",
+  let parsed: ModelBillAnalysis | null;
+  try {
+    const response = await getOpenAI().responses.parse({
+      model: BILL_ANALYSIS_MODEL,
       input: prompt,
-      reasoning: {
-        effort: "high",
-      },
+      reasoning: { effort: BILL_ANALYSIS_EFFORT },
+      text: { format: zodTextFormat(BillAnalysisSchema, "bill_analysis") },
     });
-    const responseText = response.output_text;
-
-    // Parse JSON response
-    try {
-      const parsed = JSON.parse(responseText);
-      const rawFj = String(parsed.final_judgment || "")
-        .trim()
-        .toLowerCase();
-      const normalizedFj: "yes" | "no" | "abstain" =
-        rawFj === "yes" || rawFj === "no" || rawFj === "abstain"
-          ? rawFj
-          : "abstain";
-      const analysis: BillAnalysis = {
-        summary: parsed.summary ?? "",
-        short_title: parsed.short_title ?? undefined,
-        tenet_evaluations: parsed.tenet_evaluations ?? [],
-        final_judgment: normalizedFj,
-        rationale: parsed.rationale ?? undefined,
-        needs_more_info: parsed.needs_more_info ?? false,
-        missing_details: parsed.missing_details ?? [],
-        steel_man: parsed.steel_man ?? "",
-        question_period_questions: Array.isArray(
-          parsed.question_period_questions,
-        )
-          ? parsed.question_period_questions
-          : [],
-      };
-      return analysis;
-    } catch (parseError) {
-      console.error("Failed to parse AI response as JSON:", parseError);
-      console.log("Raw response:", responseText);
-
-      // Fallback to extracting summary from text response
-      const summaryMatch = responseText.match(
-        /summary['":\s]*["']([^"']+)["']/i,
-      );
-      const summary = summaryMatch
-        ? summaryMatch[1]
-        : `${responseText.slice(0, 500)}…`;
-
-      return {
-        summary,
-        short_title: undefined,
-        tenet_evaluations: [
-          {
-            id: 1,
-            title:
-              "Canada should aim to be the world's most prosperous country",
-            alignment: "neutral",
-            explanation: "JSON parse failed",
-          },
-          {
-            id: 2,
-            title:
-              "Promote economic freedom, ambition, and breaking from bureaucratic inertia",
-            alignment: "neutral",
-            explanation: "JSON parse failed",
-          },
-          {
-            id: 3,
-            title: "Drive national productivity and global competitiveness",
-            alignment: "neutral",
-            explanation: "JSON parse failed",
-          },
-          {
-            id: 4,
-            title: "Grow exports of Canadian products and resources",
-            alignment: "neutral",
-            explanation: "JSON parse failed",
-          },
-          {
-            id: 5,
-            title: "Encourage investment, innovation, and resource development",
-            alignment: "neutral",
-            explanation: "JSON parse failed",
-          },
-          {
-            id: 6,
-            title:
-              "Deliver better public services at lower cost (government efficiency)",
-            alignment: "neutral",
-            explanation: "JSON parse failed",
-          },
-          {
-            id: 7,
-            title:
-              "Reform taxes to incentivize work, risk-taking, and innovation",
-            alignment: "neutral",
-            explanation: "JSON parse failed",
-          },
-          {
-            id: 8,
-            title: "Focus on large-scale prosperity, not incrementalism",
-            alignment: "neutral",
-            explanation: "JSON parse failed",
-          },
-        ],
-        final_judgment: "abstain",
-        rationale: undefined,
-        needs_more_info: true,
-        missing_details: ["Valid AI response format"],
-        steel_man: "Analysis parsing failed",
-        question_period_questions: [],
-      };
-    }
+    parsed = response.output_parsed;
   } catch (error) {
-    console.error("Error analyzing bill:", error);
-    // Fallback analysis
-    const text = input?.trim() || "";
-    const truncatedSummary =
-      text.length <= 500 ? text : `${text.slice(0, 500)}…`;
+    throw new BillAnalysisError("OpenAI request failed", { cause: error });
+  }
 
-    return {
-      summary: truncatedSummary || "Error occurred during analysis.",
-      short_title: undefined,
-      tenet_evaluations: [
-        {
-          id: 1,
-          title: "Canada should aim to be the world's most prosperous country",
-          alignment: "neutral",
-          explanation: "Analysis failed",
-        },
-        {
-          id: 2,
-          title:
-            "Promote economic freedom, ambition, and breaking from bureaucratic inertia",
-          alignment: "neutral",
-          explanation: "Analysis failed",
-        },
-        {
-          id: 3,
-          title: "Drive national productivity and global competitiveness",
-          alignment: "neutral",
-          explanation: "Analysis failed",
-        },
-        {
-          id: 4,
-          title: "Grow exports of Canadian products and resources",
-          alignment: "neutral",
-          explanation: "Analysis failed",
-        },
-        {
-          id: 5,
-          title: "Encourage investment, innovation, and resource development",
-          alignment: "neutral",
-          explanation: "Analysis failed",
-        },
-        {
-          id: 6,
-          title:
-            "Deliver better public services at lower cost (government efficiency)",
-          alignment: "neutral",
-          explanation: "Analysis failed",
-        },
-        {
-          id: 7,
-          title:
-            "Reform taxes to incentivize work, risk-taking, and innovation",
-          alignment: "neutral",
-          explanation: "Analysis failed",
-        },
-        {
-          id: 8,
-          title: "Focus on large-scale prosperity, not incrementalism",
-          alignment: "neutral",
-          explanation: "Analysis failed",
-        },
-      ],
-      final_judgment: "abstain",
-      rationale: "Technical error during analysis",
-      needs_more_info: true,
-      missing_details: ["Technical issue resolution"],
-      steel_man: "Technical error during analysis",
-      question_period_questions: [],
-    };
+  if (!parsed) {
+    throw new BillAnalysisError(
+      "OpenAI returned no parsed analysis (possible refusal)",
+    );
   }
+
+  // Join canonical tenet titles by id (the model is not asked to echo them).
+  return {
+    ...parsed,
+    tenet_evaluations: parsed.tenet_evaluations.map((te) => ({
+      id: te.id,
+      title: TENETS[te.id as keyof typeof TENETS] ?? "",
+      alignment: te.alignment,
+      explanation: te.explanation,
+    })),
+  };
 }
 
 export async function fetchBillMarkdown(
@@ -454,8 +247,6 @@ export async function onBillNotInDatabase(params: {
             tenet_evaluations: params.analysis.tenet_evaluations,
             final_judgment: params.analysis.final_judgment,
             rationale: params.analysis.rationale,
-            needs_more_info: params.analysis.needs_more_info,
-            missing_details: params.analysis.missing_details,
             steel_man: params.analysis.steel_man,
             status: params.bill.status,
             sponsorParty: params.bill.sponsorParty,
@@ -489,8 +280,6 @@ export async function onBillNotInDatabase(params: {
       tenet_evaluations: params.analysis.tenet_evaluations,
       final_judgment: params.analysis.final_judgment,
       rationale: params.analysis.rationale,
-      needs_more_info: params.analysis.needs_more_info,
-      missing_details: params.analysis.missing_details,
       steel_man: params.analysis.steel_man,
       status: params.bill.status,
       sponsorParty: params.bill.sponsorParty,
diff --git a/src/services/social-issue-grader.ts b/src/services/social-issue-grader.ts
deleted file mode 100644
index f5a8805..0000000
--- a/src/services/social-issue-grader.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { OpenAI } from "openai";
-
-const SOCIAL_ISSUE_GRADER_PROMPT = `
-You are a policy classifier. Your sole task is to decide whether a bill is primarily a social issue.
-
-Definition — Social Issue (for this classifier):
-A bill is a social issue if its primary purpose centers on culture, identity, values, or rights in society — including recognition/commemoration, national symbols, moral/ethical questions, language and heritage, religion, family/sex/reproduction, education content, speech/censorship, discrimination/equality, civil liberties, and community identity.
-
-Positive signals (any one can qualify if it is the main focus):
-- Recognition/commemoration: heritage months/days, awareness days, honorary observances, national symbols (e.g., national bird/anthem/flag changes).
-- Rights & identity: assisted dying, abortion, marriage/family status, gender identity/expression, LGBTQ+ rights, indigenous rights, disability rights, hate speech/hate crimes, religious freedoms.
-- Culture & language: multiculturalism, official languages, curriculum content on culture/history, media/broadcast standards on content/morality.
-- Civil liberties & expression: protests/assembly, press/speech regulations primarily about expression or social values.
-
-Negative/Non-social (unless rights/identity are the central focus):
-- Core economics/fiscal: budgets, taxation, appropriations, trade, monetary policy.
-- Infrastructure/operations: transportation, energy, housing supply mechanics, procurement, zoning mechanics.
-- Technical/administrative: agency powers, forms, reporting, definitions not tied to values/identity.
-- Environmental/health/safety mainly as regulation/operations (e.g., emissions standards, workplace safety), unless framed around rights/identity or moral controversy.
-
-Tie-breakers:
-- Classify based on primary purpose, not incidental mentions.
-- If the bill materially creates or changes an observance/day/month or declares a national symbol, classify as social issue = yes.
-- If mixed, choose "no".
-
-Output exactly this JSON:
-{
-  "is_social_issue": "yes|no"
-}`;
-
-// This defaults to false and a verdict will present to the user
-export const socialIssueGrader = async (text: string): Promise<boolean> => {
-  // Fast path when no API key
-  if (!process.env.OPENAI_API_KEY) {
-    return false;
-  }
-
-  try {
-    const client = new OpenAI();
-    const input = `${SOCIAL_ISSUE_GRADER_PROMPT}\n\nBill content:\n${text?.slice(0, 8000)}`;
-    const response = await client.responses.create({ model: "gpt-5", input });
-    const raw = response.output_text;
-    try {
-      const parsed = JSON.parse(raw || "{}") as { is_social_issue?: string };
-      return (parsed.is_social_issue || "no").toLowerCase() === "yes";
-    } catch {
-      // Try to detect yes/no in raw
-      const yes = /is[_\s-]?social[_\s-]?issue\s*["':\s]*yes/i.test(raw || "");
-      const no = /is[_\s-]?social[_\s-]?issue\s*["':\s]*no/i.test(raw || "");
-      if (yes || no) return yes;
-      return false;
-    }
-  } catch (_err) {
-    return false;
-  }
-};
diff --git a/src/utils/analysis-guardrails/analysis-guardrails.util.ts b/src/utils/analysis-guardrails/analysis-guardrails.util.ts
new file mode 100644
index 0000000..aed5d43
--- /dev/null
+++ b/src/utils/analysis-guardrails/analysis-guardrails.util.ts
@@ -0,0 +1,56 @@
+/**
+ * Guardrail checks for AI-generated bill analysis text.
+ *
+ * The prompt forbids the model from self-referencing Build Canada, using
+ * first-person "we"/"our", or naming the tenets outside the tenet evaluations.
+ * These checks turn those rules into something testable and re-runnable — both
+ * in the eval harness and (offline) against summaries already stored in the DB.
+ *
+ * Pure and dependency-free so it can be unit tested and reused anywhere.
+ */
+export interface GuardrailRule {
+  label: string;
+  pattern: RegExp;
+}
+
+export const GUARDRAIL_RULES: GuardrailRule[] = [
+  { label: "self-reference: 'Build Canada'", pattern: /\bbuild canada\b/i },
+  { label: "first-person: 'we'", pattern: /\bwe\b/i },
+  { label: "first-person: 'our'", pattern: /\bour\b/i },
+  { label: "tenet self-reference", pattern: /\btenets?\b/i },
+];
+
+/** Return the labels of any guardrail rules the given text violates. */
+export function findGuardrailViolations(
+  text: string | null | undefined,
+): string[] {
+  if (!text) return [];
+  return GUARDRAIL_RULES.filter((rule) => rule.pattern.test(text)).map(
+    (rule) => rule.label,
+  );
+}
+
+/**
+ * Check every prose field of an analysis. Returns a flat list of
+ * `field: violation` strings (empty when clean).
+ */
+export function checkAnalysisGuardrails(fields: {
+  summary?: string;
+  rationale?: string;
+  steel_man?: string;
+  questions?: Array<{ question: string }>;
+}): string[] {
+  const violations: string[] = [];
+  const add = (field: string, text: string | undefined) => {
+    for (const v of findGuardrailViolations(text)) {
+      violations.push(`${field}: ${v}`);
+    }
+  };
+  add("summary", fields.summary);
+  add("rationale", fields.rationale);
+  add("steel_man", fields.steel_man);
+  (fields.questions ?? []).forEach((q, i) => {
+    add(`question[${i}]`, q.question);
+  });
+  return violations;
+}
diff --git a/src/utils/billConverters.ts b/src/utils/billConverters.ts
index d4f0e4c..3f59c60 100644
--- a/src/utils/billConverters.ts
+++ b/src/utils/billConverters.ts
@@ -6,7 +6,6 @@ import {
   onBillNotInDatabase,
   type BillAnalysis,
 } from "@/services/billApi";
-import { socialIssueGrader } from "@/services/social-issue-grader";
 
 // Unified bill data structure
 export interface UnifiedBill {
@@ -42,8 +41,6 @@ export interface UnifiedBill {
   }>;
   final_judgment: "yes" | "no" | "abstain";
   rationale?: string;
-  needs_more_info?: boolean;
-  missing_details?: string[];
   steel_man?: string;
 }
 
@@ -93,10 +90,6 @@ export function fromBuildCanadaDbBill(bill: BillDocument): UnifiedBill {
         ? (bill.final_judgment as "yes" | "no")
         : "abstain",
     rationale: bill.rationale,
-    needs_more_info: bill.needs_more_info,
-    missing_details: bill.missing_details
-      ? [...bill.missing_details]
-      : undefined,
     steel_man: bill.steel_man,
   };
 }
@@ -128,69 +121,13 @@ export async function fromCivicsProjectApiBill(
     billMarkdown = await fetchBillMarkdown(latestBillSource);
   }
 
-  // Check if we need to regenerate summary based on source changes from Civics Project API
-  let analysis: BillAnalysis = {
-    summary: bill.header || "",
-    tenet_evaluations: [
-      {
-        id: 1,
-        title: "Canada should aim to be the world's most prosperous country",
-        alignment: "neutral",
-        explanation: "Not analyzed",
-      },
-      {
-        id: 2,
-        title:
-          "Promote economic freedom, ambition, and breaking from bureaucratic inertia",
-        alignment: "neutral",
-        explanation: "Not analyzed",
-      },
-      {
-        id: 3,
-        title: "Drive national productivity and global competitiveness",
-        alignment: "neutral",
-        explanation: "Not analyzed",
-      },
-      {
-        id: 4,
-        title: "Grow exports of Canadian products and resources",
-        alignment: "neutral",
-        explanation: "Not analyzed",
-      },
-      {
-        id: 5,
-        title: "Encourage investment, innovation, and resource development",
-        alignment: "neutral",
-        explanation: "Not analyzed",
-      },
-      {
-        id: 6,
-        title:
-          "Deliver better public services at lower cost (government efficiency)",
-        alignment: "neutral",
-        explanation: "Not analyzed",
-      },
-      {
-        id: 7,
-        title: "Reform taxes to incentivize work, risk-taking, and innovation",
-        alignment: "neutral",
-        explanation: "Not analyzed",
-      },
-      {
-        id: 8,
-        title: "Focus on large-scale prosperity, not incrementalism",
-        alignment: "neutral",
-        explanation: "Not analyzed",
-      },
-    ],
-    final_judgment: "no",
-    rationale: undefined,
-    needs_more_info: false,
-    missing_details: [],
-    steel_man: "Not analyzed",
-  };
+  // The AI analysis. Stays null until we either reuse a stored analysis or
+  // successfully generate a new one. If generation fails we leave it null and
+  // skip persisting, so a transient AI outage never writes a fake verdict.
+  let analysis: BillAnalysis | null = null;
+  let isSocialIssue = false;
 
-  // Check existing bill in database to see if source changed
+  // Check existing bill in database; reuse its analysis when present.
   try {
     const { connectToDatabase } = await import("@/lib/mongoose");
     const { Bill } = await import("@/models/Bill");
@@ -201,72 +138,66 @@ export async function fromCivicsProjectApiBill(
         .lean()
         .exec()) as BillDocument | null;
 
-      if (existingBill && !analysis.rationale) {
-        // Source hasn't changed, use existing analysis
+      if (existingBill) {
+        const raw = String(existingBill.final_judgment || "")
+          .trim()
+          .toLowerCase();
+        const final_judgment: "yes" | "no" | "abstain" =
+          raw === "yes" || raw === "no" ? (raw as "yes" | "no") : "abstain";
+        isSocialIssue =
+          typeof existingBill.isSocialIssue === "boolean"
+            ? existingBill.isSocialIssue
+            : false;
         analysis = {
           summary: existingBill.summary,
-          tenet_evaluations:
-            existingBill.tenet_evaluations || analysis.tenet_evaluations,
-          final_judgment: (() => {
-            const raw = String(existingBill.final_judgment || "")
-              .trim()
-              .toLowerCase();
-            if (raw === "yes" || raw === "no") return raw as "yes" | "no";
-            // Treat legacy "neutral" and any unknown value as "abstain"
-            if (raw === "abstain" || raw === "neutral") return "abstain";
-            return analysis.final_judgment;
-          })(),
-          rationale: existingBill.rationale || analysis.rationale,
-          needs_more_info:
-            existingBill.needs_more_info || analysis.needs_more_info,
-          missing_details:
-            existingBill.missing_details || analysis.missing_details,
-          steel_man: existingBill.steel_man || analysis.steel_man,
+          short_title: existingBill.short_title || "",
+          tenet_evaluations: existingBill.tenet_evaluations || [],
+          question_period_questions:
+            existingBill.question_period_questions || [],
+          final_judgment,
+          rationale: existingBill.rationale || "",
+          steel_man: existingBill.steel_man || "",
+          is_social_issue: isSocialIssue ? "yes" : "no",
         };
-        console.log(
-          `Using existing analysis for ${bill.billID} (source unchanged)`,
-        );
+        console.log(`Using existing analysis for ${bill.billID}`);
       }
     }
   } catch (error) {
     console.error("Error checking existing bill:", error);
-    // Continue with regeneration if DB check fails
+    // Continue; we may still generate fresh analysis below.
   }
 
-  if (!analysis?.rationale && billMarkdown) {
-    console.log(`Regenerating analysis for ${bill.billID} (source changed)`);
-    analysis = await summarizeBillText(billMarkdown);
+  // Generate fresh analysis only when there's no stored analysis and we have
+  // bill text. Failures are swallowed here (logged) so the page still renders
+  // the raw bill — but nothing is persisted.
+  if (!analysis && billMarkdown) {
+    console.log(`Generating analysis for ${bill.billID}`);
+    try {
+      analysis = await summarizeBillText(billMarkdown);
+      isSocialIssue = analysis.is_social_issue === "yes";
+    } catch (error) {
+      console.error(`Failed to analyze ${bill.billID}; skipping save:`, error);
+    }
   }
 
-  // Only classify if missing (new bill or classification absent). Avoid calling otherwise.
-  let isSocialIssueFinal: boolean =
-    typeof existingBill?.isSocialIssue === "boolean"
-      ? ((existingBill as BillDocument).isSocialIssue as boolean)
-      : false;
-  if (
-    hasValidMongoUri &&
-    (existingBill === null || typeof existingBill.isSocialIssue !== "boolean")
-  ) {
-    isSocialIssueFinal = await socialIssueGrader(
-      billMarkdown || analysis.summary || bill.header || bill.title,
-    );
+  // Persist only when we have a real analysis.
+  if (analysis) {
+    await onBillNotInDatabase({
+      billId: bill.billID,
+      source: bill.source,
+      markdown: billMarkdown,
+      bill,
+      analysis,
+      billTextsCount: Array.isArray(bill.billTexts) ? bill.billTexts.length : 0,
+      isSocialIssue,
+    });
   }
 
-  await onBillNotInDatabase({
-    billId: bill.billID,
-    source: bill.source,
-    markdown: billMarkdown,
-    bill,
-    analysis,
-    billTextsCount: Array.isArray(bill.billTexts) ? bill.billTexts.length : 0,
-    isSocialIssue: isSocialIssueFinal,
-  });
-
   return {
     billId: bill.billID,
     title: bill.title,
     short_title: bill.shortTitle,
-    summary: analysis.summary,
+    summary: analysis?.summary ?? bill.header ?? "",
     status: bill.status,
     stages: bill.stages
       ? bill.stages.map((stage) => ({
@@ -285,13 +216,13 @@ export async function fromCivicsProjectApiBill(
     parliamentNumber: bill.parliamentNumber,
     sessionNumber: bill.sessionNumber,
     fullTextMarkdown: billMarkdown,
-    question_period_questions: analysis.question_period_questions,
-    // Include analysis data
-    tenet_evaluations: analysis.tenet_evaluations,
-    final_judgment: analysis.final_judgment,
-    rationale: analysis.rationale,
-    needs_more_info: analysis.needs_more_info,
-    missing_details: analysis.missing_details,
-    steel_man: analysis.steel_man,
+    isSocialIssue,
+    question_period_questions: analysis?.question_period_questions,
+    // Include analysis data when available.
+    tenet_evaluations: analysis?.tenet_evaluations,
+    // No real verdict yet → "abstain" so the UI hides the determination.
+    final_judgment: analysis?.final_judgment ?? "abstain",
+    rationale: analysis?.rationale,
+    steel_man: analysis?.steel_man,
   };
 }
diff --git a/tests/unit/analysis-guardrails.test.ts b/tests/unit/analysis-guardrails.test.ts
new file mode 100644
index 0000000..c4c357b
--- /dev/null
+++ b/tests/unit/analysis-guardrails.test.ts
@@ -0,0 +1,60 @@
+import { describe, it, expect } from "vitest";
+import {
+  findGuardrailViolations,
+  checkAnalysisGuardrails,
+} from "@/utils/analysis-guardrails/analysis-guardrails.util";
+
+describe("findGuardrailViolations", () => {
+  const cases: Array<[string, number]> = [
+    ["This bill improves agricultural productivity.", 0],
+    ["Build Canada supports this bill.", 1], // build canada
+    ["We believe this is positive.", 1], // we
+    ["This conflicts with our goals.", 1], // our
+    ["It undermines the tenets of prosperity.", 1], // tenets
+    ["We at Build Canada reviewed the tenets.", 3], // we + build canada + tenets
+  ];
+
+  it.each(cases)("flags %j with %i violations", (text, expected) => {
+    expect(findGuardrailViolations(text)).toHaveLength(expected);
+  });
+
+  it("returns nothing for empty input", () => {
+    expect(findGuardrailViolations("")).toEqual([]);
+    expect(findGuardrailViolations(undefined)).toEqual([]);
+  });
+
+  it("does not flag substrings inside words (e.g. 'website', 'powerful')", () => {
+    expect(findGuardrailViolations("The website is powerful.")).toEqual([]);
+  });
+});
+
+describe("checkAnalysisGuardrails", () => {
+  it("reports violations per field", () => {
+    const violations = checkAnalysisGuardrails({
+      summary: "Build Canada likes this.",
+      rationale: "We approve.",
+      steel_man: "A strong, clean case.",
+      questions: [{ question: "Why do our farmers suffer?" }],
+    });
+    expect(violations).toEqual(
+      expect.arrayContaining([
+        expect.stringContaining("summary:"),
+        expect.stringContaining("rationale:"),
+        expect.stringContaining("question[0]:"),
+      ]),
+    );
+    // steel_man is clean.
+    expect(violations.some((v) => v.startsWith("steel_man:"))).toBe(false);
+  });
+
+  it("returns empty for a clean analysis", () => {
+    expect(
+      checkAnalysisGuardrails({
+        summary: "Reduces costs for producers.",
+        rationale: "Improves competitiveness.",
+        steel_man: "Strongest case in favour.",
+        questions: [{ question: "What is the fiscal impact?" }],
+      }),
+    ).toEqual([]);
+  });
+});
diff --git a/tests/unit/analysis-schema.test.ts b/tests/unit/analysis-schema.test.ts
new file mode 100644
index 0000000..db7f585
--- /dev/null
+++ b/tests/unit/analysis-schema.test.ts
@@ -0,0 +1,50 @@
+import { describe, it, expect } from "vitest";
+import { BillAnalysisSchema } from "@/prompt/schema";
+
+const validAnalysis = {
+  summary: "This bill does X.",
+  short_title: "Soil Act",
+  tenet_evaluations: Array.from({ length: 8 }, (_, i) => ({
+    id: i + 1,
+    title: `Tenet ${i + 1}`,
+    alignment: "neutral" as const,
+    explanation: "n/a",
+  })),
+  question_period_questions: [{ question: "Why?" }],
+  final_judgment: "yes" as const,
+  rationale: "Because.",
+  steel_man: "The strongest case for it.",
+  is_social_issue: "no" as const,
+};
+
+describe("BillAnalysisSchema", () => {
+  it("accepts a well-formed analysis", () => {
+    expect(BillAnalysisSchema.safeParse(validAnalysis).success).toBe(true);
+  });
+
+  it("rejects an invalid final_judgment enum", () => {
+    const bad = { ...validAnalysis, final_judgment: "maybe" };
+    expect(BillAnalysisSchema.safeParse(bad).success).toBe(false);
+  });
+
+  it("rejects an invalid tenet alignment enum", () => {
+    const bad = {
+      ...validAnalysis,
+      tenet_evaluations: [
+        { id: 1, title: "T", alignment: "supports", explanation: "x" },
+      ],
+    };
+    expect(BillAnalysisSchema.safeParse(bad).success).toBe(false);
+  });
+
+  it("rejects a missing required field", () => {
+    const { steel_man, ...bad } = validAnalysis;
+    void steel_man;
+    expect(BillAnalysisSchema.safeParse(bad).success).toBe(false);
+  });
+
+  it("rejects an invalid is_social_issue enum", () => {
+    const bad = { ...validAnalysis, is_social_issue: "true" };
+    expect(BillAnalysisSchema.safeParse(bad).success).toBe(false);
+  });
+});
diff --git a/tests/unit/prompt-generation.test.ts b/tests/unit/prompt-generation.test.ts
index 03465cf..adec798 100644
--- a/tests/unit/prompt-generation.test.ts
+++ b/tests/unit/prompt-generation.test.ts
@@ -184,7 +184,9 @@ describe("Prompt Generation", () => {
       );
       expect(SUMMARY_AND_VOTE_PROMPT).toContain('"explanation":');
       expect(SUMMARY_AND_VOTE_PROMPT).toContain('"id": 1');
-      expect(SUMMARY_AND_VOTE_PROMPT).toContain('"id": 8');
+      // Titles are no longer echoed by the model; all 8 tenets are requested in prose.
+      expect(SUMMARY_AND_VOTE_PROMPT).toContain("ids 1 through 8");
+      expect(SUMMARY_AND_VOTE_PROMPT).not.toContain('"title":');
     });
   });
 
diff --git a/tests/unit/summarize-bill-text.test.ts b/tests/unit/summarize-bill-text.test.ts
new file mode 100644
index 0000000..de12a7e
--- /dev/null
+++ b/tests/unit/summarize-bill-text.test.ts
@@ -0,0 +1,62 @@
+import { describe, it, expect, vi, beforeEach } from "vitest";
+
+// Mock the shared OpenAI client so no network call happens.
+const parse = vi.fn();
+vi.mock("@/lib/openai", () => ({
+  getOpenAI: () => ({ responses: { parse } }),
+  hasOpenAIKey: vi.fn(),
+}));
+
+import { summarizeBillText, BillAnalysisError } from "@/services/billApi";
+import { hasOpenAIKey } from "@/lib/openai";
+
+const mockHasKey = vi.mocked(hasOpenAIKey);
+
+const validAnalysis = {
+  summary: "Does X.",
+  short_title: "X",
+  tenet_evaluations: [],
+  question_period_questions: [],
+  final_judgment: "yes" as const,
+  rationale: "ok",
+  steel_man: "case",
+  is_social_issue: "no" as const,
+};
+
+describe("summarizeBillText (fail-loud)", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it("throws BillAnalysisError when no API key is configured", async () => {
+    mockHasKey.mockReturnValue(false);
+    await expect(summarizeBillText("bill text")).rejects.toBeInstanceOf(
+      BillAnalysisError,
+    );
+    expect(parse).not.toHaveBeenCalled();
+  });
+
+  it("throws BillAnalysisError when the OpenAI request fails", async () => {
+    mockHasKey.mockReturnValue(true);
+    parse.mockRejectedValue(new Error("503 service unavailable"));
+    await expect(summarizeBillText("bill text")).rejects.toBeInstanceOf(
+      BillAnalysisError,
+    );
+  });
+
+  it("throws BillAnalysisError when the model returns no parsed output", async () => {
+    mockHasKey.mockReturnValue(true);
+    parse.mockResolvedValue({ output_parsed: null } as never);
+    await expect(summarizeBillText("bill text")).rejects.toBeInstanceOf(
+      BillAnalysisError,
+    );
+  });
+
+  it("returns the parsed analysis on success", async () => {
+    mockHasKey.mockReturnValue(true);
+    parse.mockResolvedValue({ output_parsed: validAnalysis } as never);
+    await expect(summarizeBillText("bill text")).resolves.toEqual(
+      validAnalysis,
+    );
+  });
+});