nuxt-ai-ready 2.5.3 → 3.0.1

package/dist/runtime/server/db/shared.js

@@ -1,4 +1,3 @@
-import { subtle } from "uncrypto";
 import { isMap, isScalar, parseDocument } from "yaml";
 import { buildSchemaSql, DROP_TABLES_SQL, resolveFtsTokenizer, SCHEMA_VERSION } from "./schema-sql.js";
 const LEADING_BLOCK_RE = /^---\r?\n([\s\S]*?)\r?\n---(?:\r?\n|$)/;
@@ -16,7 +15,7 @@ function stripPageFrontmatter(markdown) {
 export async function computeContentHash(markdown) {
   const encoder = new TextEncoder();
   const data = encoder.encode(stripPageFrontmatter(markdown).trim());
-  const hashBuffer = await subtle.digest("SHA-256", data);
+  const hashBuffer = await crypto.subtle.digest("SHA-256", data);
   const hashArray = [...new Uint8Array(hashBuffer)];
   return hashArray.map((b) => b.toString(16).padStart(2, "0")).join("").slice(0, 16);
 }
@@ -78,6 +77,13 @@ export function likeSubstring(term) {
   return `%${escapeLikeTerm(term)}%`;
 }
 export const LIKE_ESCAPE = "\\";
+const RE_FTS_TERM_SPLIT = /\s+/;
+const RE_FTS_TOKEN_CHAR = /[\p{L}\p{N}]/u;
+const RE_DOUBLE_QUOTE = /"/g;
+export function toFtsMatchQuery(query) {
+  const terms = query.split(RE_FTS_TERM_SPLIT).filter((term) => RE_FTS_TOKEN_CHAR.test(term)).map((term) => `"${term.replace(RE_DOUBLE_QUOTE, '""')}"*`);
+  return terms.length ? terms.join(" ") : null;
+}
 const MAX_BIND_PARAMS_PER_STATEMENT = 100;
 export function maxRowsPerInsert(paramsPerRow) {
   return Math.max(1, Math.floor(MAX_BIND_PARAMS_PER_STATEMENT / paramsPerRow));

package/dist/runtime/server/index.d.ts

@@ -0,0 +1,2 @@
+export { closeDrizzle, countPages, getPageLastmods, getStaleRoutes, indexPage, indexPageByRoute, isPageFresh, pruneStaleRoutes, queryPages, searchPages, seedRoutes, streamPages, upsertPage, useDrizzle, useRawDb, } from '../index.js';
+export type { CountPagesOptions, DatabaseDialect, DrizzleDatabase, IndexPageOptions, IndexPageResult, MarkdownContext, PageData, PageEntry, PageIndexedContext, PageRow, QueryPagesOptions, RawExecutor, SearchPagesOptions, SearchResult, StreamPagesOptions, UpsertPageInput, } from '../index.js';

package/dist/runtime/server/index.js

@@ -0,0 +1,17 @@
+export {
+  closeDrizzle,
+  countPages,
+  getPageLastmods,
+  getStaleRoutes,
+  indexPage,
+  indexPageByRoute,
+  isPageFresh,
+  pruneStaleRoutes,
+  queryPages,
+  searchPages,
+  seedRoutes,
+  streamPages,
+  upsertPage,
+  useDrizzle,
+  useRawDb
+} from "../index.js";

package/dist/runtime/server/mcp/cache-key.js

@@ -0,0 +1,4 @@
+import { hash } from "ohash";
+export function siteToolCacheKey(args) {
+  return hash(args);
+}

package/dist/runtime/server/mcp/tools/get-page-markdown.js

@@ -3,6 +3,7 @@ import siteTools from "#ai-ready-virtual/site-tools.mjs";
 import { useEvent } from "#nuxtseo/nitro";
 import { normalizeSiteRoute, SITE_TOOL_CATALOG } from "../../../site-tool-catalog.js";
 import { queryPages } from "../../db/queries.js";
+import { siteToolCacheKey } from "../cache-key.js";
 const inputSchema = {
   route: z.string().describe(SITE_TOOL_CATALOG.get_page_markdown.parameters.route)
 };
@@ -11,9 +12,9 @@ const tool = {
   title: SITE_TOOL_CATALOG.get_page_markdown.title,
   description: SITE_TOOL_CATALOG.get_page_markdown.description,
   inputSchema,
-  annotations: { readOnlyHint: true, openWorldHint: false },
+  annotations: { readOnlyHint: true, destructiveHint: false, openWorldHint: false },
   enabled: () => siteTools.getPageMarkdown.mcp.enabled,
-  cache: "5m",
+  cache: { maxAge: "5m", getKey: siteToolCacheKey },
   async handler({ route }) {
     const path = normalizeSiteRoute(route);
     if (!path) {

package/dist/runtime/server/mcp/tools/list-pages.js

@@ -3,6 +3,7 @@ import siteTools from "#ai-ready-virtual/site-tools.mjs";
 import { useEvent } from "#nuxtseo/nitro";
 import { SITE_TOOL_CATALOG } from "../../../site-tool-catalog.js";
 import { countPages, queryPages } from "../../db/queries.js";
+import { siteToolCacheKey } from "../cache-key.js";
 const inputSchema = {
   limit: z.number().int().min(1).max(50).optional().default(siteTools.listPages.defaultLimit).describe(
     `${SITE_TOOL_CATALOG.list_pages.parameters.limit} Defaults to ${siteTools.listPages.defaultLimit}.`
@@ -14,9 +15,9 @@ const tool = {
   title: SITE_TOOL_CATALOG.list_pages.title,
   description: SITE_TOOL_CATALOG.list_pages.description,
   inputSchema,
-  annotations: { readOnlyHint: true, openWorldHint: false },
+  annotations: { readOnlyHint: true, destructiveHint: false, openWorldHint: false },
   enabled: () => siteTools.listPages.mcp.enabled,
-  cache: "1h",
+  cache: { maxAge: "1h", getKey: siteToolCacheKey },
   async handler({ limit, offset }) {
     const event = useEvent();
     const pages = await queryPages(event, { limit, offset });

package/dist/runtime/server/mcp/tools/search-pages.js

@@ -3,6 +3,7 @@ import siteTools from "#ai-ready-virtual/site-tools.mjs";
 import { useEvent } from "#nuxtseo/nitro";
 import { SITE_TOOL_CATALOG } from "../../../site-tool-catalog.js";
 import { searchPages } from "../../db/queries.js";
+import { siteToolCacheKey } from "../cache-key.js";
 const inputSchema = {
   query: z.string().describe(SITE_TOOL_CATALOG.search_pages.parameters.query),
   limit: z.number().int().min(1).max(50).optional().default(siteTools.searchPages.defaultLimit).describe(
@@ -14,9 +15,9 @@ const tool = {
   title: SITE_TOOL_CATALOG.search_pages.title,
   description: SITE_TOOL_CATALOG.search_pages.description,
   inputSchema,
-  annotations: { readOnlyHint: true, openWorldHint: false },
+  annotations: { readOnlyHint: true, destructiveHint: false, openWorldHint: false },
   enabled: () => siteTools.searchPages.mcp.enabled,
-  cache: "5m",
+  cache: { maxAge: "5m", getKey: siteToolCacheKey },
   async handler({ query, limit }) {
     const event = useEvent();
     const results = await searchPages(event, query, { limit });

package/dist/runtime/server/middleware/markdown.prerender.js

@@ -38,7 +38,7 @@ export default defineEventHandler(async (event) => {
   const { path } = renderInfo;
   const runtimeConfig = fullRuntimeConfig["nuxt-ai-ready"];
   const deployedPath = toDeployedRoute(path, fullRuntimeConfig.app.baseURL);
-  const canonicalUrl = withSiteUrl(event, deployedPath);
+  const canonicalUrl = withSiteUrl(event, deployedPath, { withBase: true });
   const contentPage = await tryGetContentMarkdown(event, path).catch((error) => {
     logger.debug(`[markdown.prerender] Content lookup failed for ${path}`, error);
     return null;

package/dist/runtime/server/plugins/db-lifecycle-nitro3.d.ts

@@ -0,0 +1,2 @@
+declare const _default: any;
+export default _default;

package/dist/runtime/server/plugins/db-lifecycle-nitro3.js

@@ -0,0 +1,16 @@
+import { defineNitroPlugin } from "#nuxtseo/nitro";
+import { DB_CONTEXT_KEY, DB_PROMISE_CONTEXT_KEY, DB_WORK_CONTEXT_KEY } from "../db/context.js";
+export default defineNitroPlugin((nitroApp) => {
+  const hooks = nitroApp.hooks;
+  hooks.hook("response", async (_response, event) => {
+    if (!event.context?.[DB_CONTEXT_KEY] && !event.context?.[DB_PROMISE_CONTEXT_KEY] && !event.context?.[DB_WORK_CONTEXT_KEY]) {
+      return;
+    }
+    const { finishDrizzleResponse } = await import("../db/index.js");
+    await finishDrizzleResponse(event);
+  });
+  hooks.hook("close", async () => {
+    const { closeDrizzle } = await import("../db/index.js");
+    await closeDrizzle();
+  });
+});

package/dist/runtime/server/plugins/html-capture.prerender.js

@@ -1,10 +1,12 @@
+import { getRequestURL } from "#nuxtseo/h3";
+import { useRuntimeConfig } from "#nuxtseo/nitro";
+import { toLogicalRoute } from "../../route-path.js";
 import { storePrerenderedHtml } from "../utils/prerender-html.js";
 export default function htmlCapturePlugin(nitroApp) {
   if (!import.meta.prerender)
     return;
-  nitroApp.hooks.hook("render:response", (response, { event }) => {
-    if (typeof response.body !== "string" || !String(response.headers?.["content-type"] || "").includes("text/html"))
-      return;
-    storePrerenderedHtml(event.path, response.body);
+  nitroApp.hooks.hook("render:html", (html, { event }) => {
+    const baseURL = useRuntimeConfig(event).app.baseURL;
+    storePrerenderedHtml(toLogicalRoute(getRequestURL(event).pathname, baseURL), html);
   });
 }

package/dist/runtime/server/plugins/link-header-nitro3.d.ts

@@ -0,0 +1,2 @@
+declare const _default: any;
+export default _default;

package/dist/runtime/server/plugins/link-header-nitro3.js

@@ -0,0 +1,20 @@
+import { defineNitroPlugin } from "#nuxtseo/nitro";
+import { ERROR_LINK_HEADER, STATUS_AWARE_LINK_HEADER } from "./link-header.js";
+function readHeader(event) {
+  return event.context[STATUS_AWARE_LINK_HEADER];
+}
+export default defineNitroPlugin((nitro) => {
+  const hooks = nitro.hooks;
+  hooks.hook("error", (_error, { event }) => {
+    if (!event)
+      return;
+    const header = readHeader(event);
+    if (header)
+      event.req.headers.set(ERROR_LINK_HEADER, header.error);
+  });
+  hooks.hook("response", (response, event) => {
+    const header = readHeader(event);
+    if (header)
+      response.headers.set("link", response.status >= 400 ? header.error : header.success);
+  });
+});

package/dist/runtime/server/plugins/link-header.d.ts

@@ -1,4 +1,10 @@
 import type { H3Event } from '#nuxtseo/h3';
+export declare const STATUS_AWARE_LINK_HEADER = "nuxt-ai-ready:status-aware-link-header";
+export declare const ERROR_LINK_HEADER = "x-nuxt-ai-ready-error-link";
+export interface StatusAwareLinkHeader {
+    error: string;
+    success: string;
+}
 export declare function setStatusAwareLinkHeader(event: H3Event, safeHeader: string, successHeader?: string): void;
 declare const _default: any;
 export default _default;

package/dist/runtime/server/plugins/link-header.js

@@ -1,7 +1,7 @@
 import { getHeader, getResponseStatus, setHeader } from "#nuxtseo/h3";
 import { defineNitroPlugin } from "#nuxtseo/nitro";
-const STATUS_AWARE_LINK_HEADER = "nuxt-ai-ready:status-aware-link-header";
-const ERROR_LINK_HEADER = "x-nuxt-ai-ready-error-link";
+export const STATUS_AWARE_LINK_HEADER = "nuxt-ai-ready:status-aware-link-header";
+export const ERROR_LINK_HEADER = "x-nuxt-ai-ready-error-link";
 export function setStatusAwareLinkHeader(event, safeHeader, successHeader) {
   event.context[STATUS_AWARE_LINK_HEADER] = {
     error: safeHeader,
@@ -23,18 +23,14 @@ export default defineNitroPlugin((nitro) => {
       return;
     setHeader(event, "link", getResponseStatus(event) >= 400 ? header.error : header.success);
   });
-  nitro.hooks.hook("render:response", (response, { event }) => {
+  nitro.hooks.hook("render:html", (_html, { event }) => {
     const header = event.context[STATUS_AWARE_LINK_HEADER];
-    const errorHeader = event.path.startsWith("/__nuxt_error") && getHeader(event, "x-nuxt-error") === "true" ? getHeader(event, ERROR_LINK_HEADER) : void 0;
+    const errorHeader = event.path.startsWith("/__nuxt_error") ? getHeader(event, ERROR_LINK_HEADER) : void 0;
     if (errorHeader) {
-      response.headers ||= {};
-      response.headers.link = errorHeader;
+      setHeader(event, "link", errorHeader);
       return;
     }
-    if (!header)
-      return;
-    response.headers ||= {};
-    const statusCode = response.statusCode ?? getResponseStatus(event);
-    response.headers.link = statusCode >= 400 ? header.error : header.success;
+    if (header)
+      setHeader(event, "link", getResponseStatus(event) >= 400 ? header.error : header.success);
   });
 });

package/dist/runtime/server/plugins/markdown-negotiation.js

@@ -1,6 +1,7 @@
 import { defineEventHandler } from "#nuxtseo/h3";
 import { defineNitroPlugin, useRuntimeConfig } from "#nuxtseo/nitro";
 import { logger } from "../logger.js";
+import { serveCloudflarePrerenderedPage } from "../utils/cloudflare-prerendered.js";
 import { applyNegotiation, decideNegotiation } from "../utils/negotiation-response.js";
 function isH3App(candidate) {
   if (!candidate || typeof candidate !== "object")
@@ -21,7 +22,13 @@ function resolveH3Runtime(candidate) {
     return { _tag: "h3-v2", app: nitro.h3 };
   return { _tag: "unsupported" };
 }
-const negotiationHandler = defineEventHandler((event) => applyNegotiation(event, decideNegotiation(event, "early")));
+const negotiationHandler = defineEventHandler(async (event) => {
+  const decision = decideNegotiation(event, "early");
+  const response = await applyNegotiation(event, decision);
+  if (response !== void 0 || decision._tag !== "html")
+    return response;
+  return serveCloudflarePrerenderedPage(event);
+});
 export default defineNitroPlugin((nitro) => {
   const runtime = resolveH3Runtime(nitro);
   if (runtime._tag === "unsupported") {

package/dist/runtime/server/plugins/sitemap-seeder.js

@@ -4,8 +4,8 @@ import { getPageLastmods, getSitemapLastCrawledAt, markSitemapSeeded, resolveSee
 import { logger } from "../logger.js";
 import { mapSitemapRoutes } from "../utils/sitemap-routes.js";
 const DIAGNOSTICS_KEY = "_aiReadySitemapDiagnostics";
-function isDebug(event) {
-  return !!useRuntimeConfig(event)["nuxt-ai-ready"]?.debug;
+function isDebug(_event) {
+  return !!useRuntimeConfig()["nuxt-ai-ready"]?.debug;
 }
 function recordDiagnostic(event, message) {
   const ctx = event.context;
@@ -96,7 +96,7 @@ export default function sitemapSeederPlugin(nitroApp) {
     const urlCount = urls.length;
     const seed = async () => {
       const seedStart = Date.now();
-      const pruneTtl = useRuntimeConfig(event)["nuxt-ai-ready"]?.runtimeSync?.pruneTtl ?? 0;
+      const pruneTtl = useRuntimeConfig()["nuxt-ai-ready"]?.runtimeSync?.pruneTtl ?? 0;
       const seeded = await seedRoutes(event, routes, { refreshWindowMs: resolveSeedRefreshWindowMs(pruneTtl) }).catch((e) => {
         logger.warn(`[sitemap-seeder] Failed to seed routes: ${e.message}`);
         return 0;

package/dist/runtime/server/routes/agent-skills-artifact.d.ts

@@ -1,2 +1,2 @@
-declare const _default: any;
+declare const _default: import("nuxt/server").EventHandler<any>;
 export default _default;

package/dist/runtime/server/routes/agent-skills-artifact.js

@@ -1,20 +1,20 @@
+import { createError, defineEventHandler, getRequestURL, useRuntimeConfig } from "nuxt/server";
 import { localAgentSkillArtifacts } from "#ai-ready-virtual/agent-skills.mjs";
-import { assertMethod, createError, eventHandler, getRequestURL, setHeader } from "#nuxtseo/h3";
-import { useRuntimeConfig } from "#nuxtseo/nitro";
 import { publicCacheControl } from "../../cache-control.js";
 import { toLogicalRoute } from "../../route-path.js";
-export default eventHandler((event) => {
-  assertMethod(event, ["GET", "HEAD"]);
-  const path = toLogicalRoute(getRequestURL(event).pathname, useRuntimeConfig(event).app.baseURL);
+export default defineEventHandler((event) => {
+  if (!["GET", "HEAD"].includes(event.req.method))
+    throw createError({ status: 405, statusText: "Method Not Allowed" });
+  const path = toLogicalRoute(getRequestURL(event).pathname, useRuntimeConfig().app.baseURL);
   const content = localAgentSkillArtifacts[path];
   if (content === void 0) {
     throw createError({
-      statusCode: 404,
-      statusMessage: "Agent skill artifact not found"
+      status: 404,
+      statusText: "Agent skill artifact not found"
     });
   }
-  setHeader(event, "Content-Type", "text/markdown; charset=utf-8");
-  setHeader(event, "Cache-Control", publicCacheControl(3600, 86400));
-  setHeader(event, "Access-Control-Allow-Origin", "*");
+  event.res.headers.set("Content-Type", "text/markdown; charset=utf-8");
+  event.res.headers.set("Cache-Control", publicCacheControl(3600, 86400));
+  event.res.headers.set("Access-Control-Allow-Origin", "*");
   return content;
 });

package/dist/runtime/server/routes/agent-skills-index.d.ts

@@ -1,2 +1,2 @@
-declare const _default: any;
+declare const _default: import("nuxt/server").EventHandler<any>;
 export default _default;

package/dist/runtime/server/routes/agent-skills-index.js

@@ -1,10 +1,11 @@
+import { createError, defineEventHandler } from "nuxt/server";
 import { agentSkillsIndex } from "#ai-ready-virtual/agent-skills.mjs";
-import { assertMethod, eventHandler, setHeader } from "#nuxtseo/h3";
 import { publicCacheControl } from "../../cache-control.js";
-export default eventHandler((event) => {
-  assertMethod(event, ["GET", "HEAD"]);
-  setHeader(event, "Content-Type", "application/json; charset=utf-8");
-  setHeader(event, "Cache-Control", publicCacheControl(3600, 86400));
-  setHeader(event, "Access-Control-Allow-Origin", "*");
+export default defineEventHandler((event) => {
+  if (!["GET", "HEAD"].includes(event.req.method))
+    throw createError({ status: 405, statusText: "Method Not Allowed" });
+  event.res.headers.set("Content-Type", "application/json; charset=utf-8");
+  event.res.headers.set("Cache-Control", publicCacheControl(3600, 86400));
+  event.res.headers.set("Access-Control-Allow-Origin", "*");
   return agentSkillsIndex;
 });

package/dist/runtime/server/routes/ai-catalog.d.ts

@@ -1,2 +1,3 @@
-declare const _default: any;
+import type { AiCatalog } from '../utils/discovery-response.js';
+declare const _default: import("nuxt/server").EventHandler<AiCatalog | null>;
 export default _default;

package/dist/runtime/server/routes/ai-catalog.js

@@ -1,9 +1,8 @@
-import { eventHandler, getHeader, setHeaders, setResponseStatus } from "#nuxtseo/h3";
-import { useRuntimeConfig } from "#nuxtseo/nitro";
+import { defineEventHandler, getRequestHeader, setResponseStatus, useRuntimeConfig } from "nuxt/server";
 import { AI_CATALOG_MEDIA_TYPE, matchesDiscoveryEtag } from "../utils/discovery-response.js";
-export default eventHandler((event) => {
-  const config = useRuntimeConfig(event)["nuxt-ai-ready"];
-  setHeaders(event, {
+export default defineEventHandler((event) => {
+  const config = useRuntimeConfig()["nuxt-ai-ready"];
+  Object.entries({
     "Access-Control-Allow-Headers": "Content-Type, If-None-Match",
     "Access-Control-Allow-Methods": "GET, HEAD",
     "Access-Control-Allow-Origin": "*",
@@ -11,12 +10,12 @@ export default eventHandler((event) => {
     "Cache-Control": `public, max-age=${config.aiCatalog.cacheMaxAge}`,
     "Content-Type": AI_CATALOG_MEDIA_TYPE,
     "ETag": config.aiCatalog.etag
-  });
-  if (event.method === "OPTIONS") {
+  }).forEach(([name, value]) => event.res.headers.set(name, value));
+  if (event.req.method === "OPTIONS") {
     setResponseStatus(event, 204);
     return null;
   }
-  if (matchesDiscoveryEtag(getHeader(event, "if-none-match"), config.aiCatalog.etag)) {
+  if (matchesDiscoveryEtag(getRequestHeader(event, "if-none-match"), config.aiCatalog.etag)) {
     setResponseStatus(event, 304);
     return null;
   }

package/dist/runtime/server/routes/api-catalog.d.ts

@@ -1,2 +1,4 @@
-declare const _default: any;
+declare const _default: import("nuxt/server").EventHandler<{
+    linkset: Array<Record<string, unknown>>;
+} | null | undefined>;
 export default _default;

package/dist/runtime/server/routes/api-catalog.js

@@ -1,22 +1,22 @@
-import { assertMethod, createError, defineEventHandler, setHeader, setHeaders, setResponseStatus } from "#nuxtseo/h3";
-import { useRuntimeConfig } from "#nuxtseo/nitro";
+import { createError, defineEventHandler, setResponseStatus, useRuntimeConfig } from "nuxt/server";
 export default defineEventHandler((event) => {
-  setHeader(event, "Access-Control-Allow-Origin", "*");
-  if (event.method === "OPTIONS") {
-    setHeaders(event, {
+  event.res.headers.set("Access-Control-Allow-Origin", "*");
+  if (event.req.method === "OPTIONS") {
+    Object.entries({
       "Access-Control-Allow-Headers": "Content-Type, If-None-Match",
       "Access-Control-Allow-Methods": "GET, HEAD"
-    });
+    }).forEach(([name, value]) => event.res.headers.set(name, value));
     setResponseStatus(event, 204);
     return null;
   }
-  assertMethod(event, ["GET", "HEAD"]);
-  const config = useRuntimeConfig(event)["nuxt-ai-ready"].apiCatalog;
+  if (!["GET", "HEAD"].includes(event.req.method))
+    throw createError({ status: 405, statusText: "Method Not Allowed" });
+  const config = useRuntimeConfig()["nuxt-ai-ready"].apiCatalog;
   if (!config)
-    throw createError({ statusCode: 404, message: "API catalog is not configured" });
-  setHeader(event, "content-type", config.mediaType);
-  setHeader(event, "link", `<${config.href}>; rel="api-catalog"`);
-  if (event.method === "HEAD")
+    throw createError({ status: 404, message: "API catalog is not configured" });
+  event.res.headers.set("content-type", config.mediaType);
+  event.res.headers.set("link", `<${config.href}>; rel="api-catalog"`);
+  if (event.req.method === "HEAD")
     return;
   return config.document;
 });

package/dist/runtime/server/routes/llms-full.txt.get.js

@@ -15,7 +15,7 @@ export default eventHandler(async (event) => {
   const config = runtimeConfig["nuxt-ai-ready"];
   const siteConfig = getSiteConfig(event);
   const baseURL = runtimeConfig.app.baseURL;
-  const canonicalSiteUrl = siteConfig.url ? withSiteUrl(event, toDeployedRoute("/", baseURL)) : void 0;
+  const canonicalSiteUrl = siteConfig.url ? withSiteUrl(event, toDeployedRoute("/", baseURL), { withBase: true }) : void 0;
   const header = buildLlmsFullTxtHeader(
     {
       name: siteConfig.name,

package/dist/runtime/server/routes/mcp-server-card.d.ts

@@ -1,2 +1,2 @@
-declare const _default: any;
+declare const _default: import("nuxt/server").EventHandler<Record<string, unknown> | null>;
 export default _default;

package/dist/runtime/server/routes/mcp-server-card.js

@@ -1,9 +1,8 @@
-import { eventHandler, getHeader, setHeaders, setResponseStatus } from "#nuxtseo/h3";
-import { useRuntimeConfig } from "#nuxtseo/nitro";
+import { defineEventHandler, getRequestHeader, setResponseStatus, useRuntimeConfig } from "nuxt/server";
 import { matchesDiscoveryEtag, MCP_SERVER_CARD_MEDIA_TYPE } from "../utils/discovery-response.js";
-export default eventHandler((event) => {
-  const config = useRuntimeConfig(event)["nuxt-ai-ready"];
-  setHeaders(event, {
+export default defineEventHandler((event) => {
+  const config = useRuntimeConfig()["nuxt-ai-ready"];
+  Object.entries({
     "Access-Control-Allow-Headers": "Content-Type, If-None-Match",
     "Access-Control-Allow-Methods": "GET, HEAD",
     "Access-Control-Allow-Origin": "*",
@@ -11,12 +10,12 @@ export default eventHandler((event) => {
     "Cache-Control": `public, max-age=${config.mcpServerCard.cacheMaxAge}`,
     "Content-Type": MCP_SERVER_CARD_MEDIA_TYPE,
     "ETag": config.mcpServerCard.etag
-  });
-  if (event.method === "OPTIONS") {
+  }).forEach(([name, value]) => event.res.headers.set(name, value));
+  if (event.req.method === "OPTIONS") {
     setResponseStatus(event, 204);
     return null;
   }
-  if (matchesDiscoveryEtag(getHeader(event, "if-none-match"), config.mcpServerCard.etag)) {
+  if (matchesDiscoveryEtag(getRequestHeader(event, "if-none-match"), config.mcpServerCard.etag)) {
     setResponseStatus(event, 304);
     return null;
   }

package/dist/runtime/server/utils/checkStale.d.ts

@@ -1,4 +1,4 @@
-import type { H3Event } from '#nuxtseo/h3';
+import type { AiReadyDatabaseEvent } from '../db/context.js';
 export interface BuildMeta {
     buildId: string;
     pageCount: number;
@@ -25,4 +25,4 @@ export declare const STALE_CHECK_INTERVAL_MS: number;
  * 2. Build ID changed → compare hashes, only mark changed pages pending, add new pages from dump
  * Skips HTTP fetch if checked within 5 minutes and DB is populated
  */
-export declare function checkAndHandleStale(event?: H3Event): Promise<StaleCheckResult>;
+export declare function checkAndHandleStale(event?: AiReadyDatabaseEvent): Promise<StaleCheckResult>;

package/dist/runtime/server/utils/cloudflare-prerendered.d.ts

@@ -0,0 +1,3 @@
+import type { H3Event } from '#nuxtseo/h3';
+/** Serve the original static HTML after negotiation, without rendering it again. */
+export declare function serveCloudflarePrerenderedPage(event: H3Event): Promise<Response | undefined>;

package/dist/runtime/server/utils/cloudflare-prerendered.js

@@ -0,0 +1,23 @@
+import { getRequestHeaders, getRequestURL, getResponseHeaders } from "#nuxtseo/h3";
+import { useRuntimeConfig } from "#nuxtseo/nitro";
+import { mergeVaryHeader } from "../../cache-control.js";
+export async function serveCloudflarePrerenderedPage(event) {
+  if (event.method !== "GET" && event.method !== "HEAD")
+    return;
+  const config = useRuntimeConfig(event)["nuxt-ai-ready"];
+  const url = getRequestURL(event);
+  if (!config.cloudflarePrerenderedPages?.includes(url.pathname))
+    return;
+  const assets = event.context.cloudflare?.env?.ASSETS;
+  if (!assets)
+    return;
+  const response = await assets.fetch(new Request(url, { method: event.method, headers: getRequestHeaders(event) }));
+  const headers = new Headers(response.headers);
+  for (const [name, value] of Object.entries(getResponseHeaders(event))) {
+    if (value === void 0)
+      continue;
+    const header = Array.isArray(value) ? value.join(", ") : String(value);
+    headers.set(name, name.toLowerCase() === "vary" ? mergeVaryHeader(headers.get(name) ?? void 0, header) : header);
+  }
+  return new Response(response.body, { status: response.status, statusText: response.statusText, headers });
+}

package/dist/runtime/server/utils/cloudflare.d.ts

@@ -1,4 +1,4 @@
-import type { H3Event } from '#nuxtseo/h3';
+import type { AiReadyDatabaseEvent } from '../db/context.js';
 export interface CloudflareEnv {
     ASSETS?: {
         fetch: (req: Request | string) => Promise<Response>;
@@ -7,15 +7,15 @@ export interface CloudflareEnv {
 /**
  * Get Cloudflare environment from event context or globalThis.__env__ (for scheduled tasks)
  */
-export declare function getCfEnv(event?: H3Event): CloudflareEnv | undefined;
+export declare function getCfEnv(event?: AiReadyDatabaseEvent): CloudflareEnv | undefined;
 /**
  * Check if Cloudflare ASSETS binding is available
  */
-export declare function hasAssets(event?: H3Event): boolean;
+export declare function hasAssets(event?: AiReadyDatabaseEvent): boolean;
 /**
  * Fetch a public asset, preferring Cloudflare ASSETS binding when available.
- * Falls back to $fetch with timeout to avoid self-fetch hangs on CF Workers.
+ * Falls back to Nitro localFetch with a timeout for unavailable assets.
  */
-export declare function fetchPublicAsset<T = unknown>(event: H3Event | undefined, path: string, options?: {
+export declare function fetchPublicAsset<T = unknown>(event: AiReadyDatabaseEvent | undefined, path: string, options?: {
     responseType?: 'json' | 'text' | 'arrayBuffer' | 'stream';
 }): Promise<T | null>;

package/dist/runtime/server/utils/cloudflare.js

@@ -1,11 +1,14 @@
 import { withBase } from "ufo";
-import { useRuntimeConfig } from "#nuxtseo/nitro";
+import { localFetch, useRuntimeConfig } from "#nuxtseo/nitro";
+import { DB_CONTEXT_KEY, DB_PROMISE_CONTEXT_KEY, DB_WORK_CONTEXT_KEY } from "../db/context.js";
 const FETCH_TIMEOUT = 5e3;
+const RETRY_STATUSES = /* @__PURE__ */ new Set([408, 409, 425, 429, 500, 502, 503, 504]);
 function unavailablePublicAsset(_error) {
   return null;
 }
 export function getCfEnv(event) {
-  return event?.context?.cloudflare?.env ?? globalThis.__env__;
+  const cloudflare = event?.context.cloudflare;
+  return cloudflare?.env ?? globalThis.__env__;
 }
 export function hasAssets(event) {
   return !!getCfEnv(event)?.ASSETS?.fetch;
@@ -31,9 +34,30 @@ export async function fetchPublicAsset(event, path, options) {
   }
   const controller = new AbortController();
   const timeout = setTimeout(() => controller.abort(), FETCH_TIMEOUT);
-  return globalThis.$fetch(withBase(path, useRuntimeConfig(event).app.baseURL), {
-    baseURL: "/",
-    signal: controller.signal,
-    responseType
-  }).catch(unavailablePublicAsset).finally(() => clearTimeout(timeout));
+  const assetContext = event && Object.fromEntries(
+    Object.entries(event.context).filter(([key]) => ![DB_CONTEXT_KEY, DB_PROMISE_CONTEXT_KEY, DB_WORK_CONTEXT_KEY].includes(key))
+  );
+  return (async () => {
+    for (let attempt = 0; attempt < 2; attempt++) {
+      const response = await localFetch(withBase(path, useRuntimeConfig().app.baseURL), {
+        signal: controller.signal
+      }, assetContext).catch(unavailablePublicAsset);
+      if (attempt === 0 && !controller.signal.aborted && (!response || RETRY_STATUSES.has(response.status))) {
+        await response?.body?.cancel().catch(unavailablePublicAsset);
+        continue;
+      }
+      if (!response?.ok) {
+        await response?.body?.cancel().catch(unavailablePublicAsset);
+        return null;
+      }
+      if (responseType === "stream")
+        return response.body;
+      if (responseType === "text")
+        return response.text().catch(unavailablePublicAsset);
+      if (responseType === "arrayBuffer")
+        return response.arrayBuffer().catch(unavailablePublicAsset);
+      return response.json().catch(unavailablePublicAsset);
+    }
+    return null;
+  })().finally(() => clearTimeout(timeout));
 }

package/dist/runtime/server/utils/content-negotiation.d.ts

@@ -1,22 +1,24 @@
 import type { ContentNegotiationPolicy } from '../../types.js';
-export declare const CONTENT_NEGOTIATION_VARY = "Accept, Sec-Fetch-Dest, User-Agent";
+export declare function getContentNegotiationVary(botNegotiation?: boolean): "Accept" | "Accept, Sec-Fetch-Dest, User-Agent";
 export interface NegotiationRouteRule {
     cache?: boolean | Record<string, unknown> & {
         headersOnly?: boolean;
-        varies?: string[];
+        varies?: readonly string[];
     };
     isr?: boolean | number | {
-        expiration: number;
+        expiration?: number | false;
     };
 }
 export type ContentNegotiationResolution = {
     _tag: 'enabled';
     source: 'default' | 'explicit';
+    vary: ReturnType<typeof getContentNegotiationVary>;
 } | {
     _tag: 'disabled';
     source: 'explicit' | 'isr' | 'route-cache';
 };
 export declare function resolveContentNegotiation(input: {
     policy: ContentNegotiationPolicy;
+    botNegotiation?: boolean;
     routeRule: NegotiationRouteRule;
 }): ContentNegotiationResolution;