Full cleanup pass

app/api/create-flow/methods/route.ts

@@ -1,7 +1,8 @@
 import { NextResponse, type NextRequest } from "next/server";
 import { isDatabaseConfigured } from "../../../../lib/server/env";
 import { listMethodRecommendations } from "../../../../lib/server/methodRecommendations";
-import { dbUnavailable } from "../../../../lib/server/responses";
+import { apiRoute } from "../../../../lib/server/apiRoute";
+import { dbUnavailable, errorJson } from "../../../../lib/server/responses";
 import {
   SECTION_IDS,
   type SectionId,
@@ -19,38 +20,37 @@ const SECTION_SET = new Set<string>(SECTION_IDS);
  *
  * See `docs/guides/template-recommendation-matrix.md` §9.2 / §10.
  */
-export async function GET(request: NextRequest) {
-  if (!isDatabaseConfigured()) {
-    return dbUnavailable();
-  }
+export const GET = apiRoute(
+  "createFlow.methods.get",
+  async (request: NextRequest) => {
+    if (!isDatabaseConfigured()) {
+      return dbUnavailable();
+    }
 
-  const sectionParam = request.nextUrl.searchParams.get("section");
-  if (!sectionParam || !SECTION_SET.has(sectionParam)) {
-    return NextResponse.json(
-      {
-        error: {
-          code: "validation_error",
-          message: `Unknown section. Expected one of: ${SECTION_IDS.join(", ")}`,
-        },
-      },
-      { status: 400 },
+    const sectionParam = request.nextUrl.searchParams.get("section");
+    if (!sectionParam || !SECTION_SET.has(sectionParam)) {
+      return errorJson(
+        "validation_error",
+        `Unknown section. Expected one of: ${SECTION_IDS.join(", ")}`,
+        400,
+      );
+    }
+    const section = sectionParam as SectionId;
+
+    const facets = parseRequestedFacetsFromSearchParams(
+      request.nextUrl.searchParams,
     );
-  }
-  const section = sectionParam as SectionId;
+    const result = await listMethodRecommendations({ section, facets });
+    if (!result) {
+      // DB query failed; return empty so the wizard falls back to its messages
+      // deck in authoring order (§10).
+      return NextResponse.json({ section, methods: [] });
+    }
 
-  const facets = parseRequestedFacetsFromSearchParams(
-    request.nextUrl.searchParams,
-  );
-  const result = await listMethodRecommendations({ section, facets });
-  if (!result) {
-    // DB query failed; return empty so the wizard falls back to its messages
-    // deck in authoring order (§10).
-    return NextResponse.json({ section, methods: [] });
-  }
-
-  const methods = result.rankedSlugs.map((slug) => ({
-    slug,
-    matches: result.matchesBySlug[slug] ?? { score: 0, matchedFacets: [] },
-  }));
-  return NextResponse.json({ section, methods });
-}
+    const methods = result.rankedSlugs.map((slug) => ({
+      slug,
+      matches: result.matchesBySlug[slug] ?? { score: 0, matchedFacets: [] },
+    }));
+    return NextResponse.json({ section, methods });
+  },
+);

app/api/health/route.ts

@@ -1,8 +1,9 @@
 import { NextResponse } from "next/server";
 import { prisma } from "../../../lib/server/db";
 import { isDatabaseConfigured } from "../../../lib/server/env";
+import { apiRoute } from "../../../lib/server/apiRoute";
 
-export async function GET() {
+export const GET = apiRoute("health.get", async () => {
   if (!isDatabaseConfigured()) {
     return NextResponse.json({
       ok: true,
@@ -16,4 +17,4 @@ export async function GET() {
   } catch {
     return NextResponse.json({ ok: false, database: "error" }, { status: 503 });
   }
-}
+});

app/api/templates/route.ts

@@ -3,6 +3,7 @@ import { isDatabaseConfigured } from "../../../lib/server/env";
 import { listRankedRuleTemplatesFromDb } from "../../../lib/server/ruleTemplates";
 import { dbUnavailable } from "../../../lib/server/responses";
 import { parseRequestedFacetsFromSearchParams } from "../../../lib/server/validation/methodFacetsSchemas";
+import { apiRoute } from "../../../lib/server/apiRoute";
 
 /**
  * GET /api/templates
@@ -15,7 +16,7 @@ import { parseRequestedFacetsFromSearchParams } from "../../../lib/server/valida
  *
  * See `docs/guides/template-recommendation-matrix.md` §9.1.
  */
-export async function GET(request: NextRequest) {
+export const GET = apiRoute("templates.get", async (request: NextRequest) => {
   if (!isDatabaseConfigured()) {
     return dbUnavailable();
   }
@@ -29,4 +30,4 @@ export async function GET(request: NextRequest) {
   return NextResponse.json(
     hasScores ? { templates, scores } : { templates },
   );
-}
+});

app/api/web-vitals/route.ts

@@ -1,5 +1,6 @@
 import { NextRequest, NextResponse } from "next/server";
 import { logger } from "../../../lib/logger";
+import { apiRoute } from "../../../lib/server/apiRoute";
 import { getWebVitalsStorageMode } from "../../../lib/server/webVitals/mode";
 import {
   appendLocalWebVital,
@@ -29,70 +30,54 @@ function logExternalIngest(body: WebVitalData): void {
   logger.info(line);
 }
 
-export async function POST(request: NextRequest) {
-  try {
-    const limited = await readLimitedJson(request);
-    if (limited.ok === false) {
-      return limited.response;
-    }
-
-    const parsed = webVitalIngestSchema.safeParse(limited.value);
-    if (!parsed.success) return jsonFromZodError(parsed.error);
-
-    const body = parsed.data;
-
-    const vitalsData: WebVitalData = {
-      metric: body.metric,
-      data: {
-        value: body.data.value,
-        rating: body.data.rating,
-      },
-      url: body.url,
-      userAgent: body.userAgent,
-      timestamp: normalizeTimestamp(body.timestamp),
-      receivedAt: new Date().toISOString(),
-    };
-
-    const mode = getWebVitalsStorageMode();
-
-    if (mode === "external") {
-      logExternalIngest(vitalsData);
-      return NextResponse.json({ success: true, storage: "external" });
-    }
-
-    appendLocalWebVital(vitalsData);
-    logger.info(
-      `Web Vital received: ${body.metric} = ${body.data.value}ms (${body.data.rating})`,
-    );
-
-    return NextResponse.json({ success: true, storage: "local" });
-  } catch (error) {
-    logger.error("Error processing web vital:", error);
-    return NextResponse.json(
-      { error: "Internal server error" },
-      { status: 500 },
-    );
+export const POST = apiRoute("webVitals.post", async (request: NextRequest) => {
+  const limited = await readLimitedJson(request);
+  if (limited.ok === false) {
+    return limited.response;
   }
-}
 
-export async function GET() {
-  try {
-    const mode = getWebVitalsStorageMode();
+  const parsed = webVitalIngestSchema.safeParse(limited.value);
+  if (!parsed.success) return jsonFromZodError(parsed.error);
 
-    if (mode === "external") {
-      return NextResponse.json({
-        metrics: {},
-        storage: "external" as const,
-      });
-    }
+  const body = parsed.data;
 
-    const metrics = readLocalAggregatedMetrics();
-    return NextResponse.json({ metrics, storage: "local" as const });
-  } catch (error) {
-    logger.error("Error fetching web vitals:", error);
-    return NextResponse.json(
-      { error: "Internal server error" },
-      { status: 500 },
-    );
+  const vitalsData: WebVitalData = {
+    metric: body.metric,
+    data: {
+      value: body.data.value,
+      rating: body.data.rating,
+    },
+    url: body.url,
+    userAgent: body.userAgent,
+    timestamp: normalizeTimestamp(body.timestamp),
+    receivedAt: new Date().toISOString(),
+  };
+
+  const mode = getWebVitalsStorageMode();
+
+  if (mode === "external") {
+    logExternalIngest(vitalsData);
+    return NextResponse.json({ success: true, storage: "external" });
   }
-}
+
+  appendLocalWebVital(vitalsData);
+  logger.info(
+    `Web Vital received: ${body.metric} = ${body.data.value}ms (${body.data.rating})`,
+  );
+
+  return NextResponse.json({ success: true, storage: "local" });
+});
+
+export const GET = apiRoute("webVitals.get", async () => {
+  const mode = getWebVitalsStorageMode();
+
+  if (mode === "external") {
+    return NextResponse.json({
+      metrics: {},
+      storage: "external" as const,
+    });
+  }
+
+  const metrics = readLocalAggregatedMetrics();
+  return NextResponse.json({ metrics, storage: "local" as const });
+});