nuxt-ai-ready 2.5.2 → 3.0.0

package/README.md

@@ -1,15 +1,10 @@
-# Nuxt AI Ready
+<h1><a href="https://nuxtseo.com"><img src=".github/assets/icon.svg" width="40" height="40" alt="Nuxt SEO" align="top"></a> Nuxt AI Ready</h1>
 
 [![npm version][npm-version-src]][npm-version-href]
 [![npm downloads][npm-downloads-src]][npm-downloads-href]
+[![License][license-src]][license-href]
 [![Nuxt][nuxt-src]][nuxt-href]
-<a href="https://skilld.dev/gh/harlan-zw/nuxt-ai-ready">
-  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://skilld.dev/b/harlan-zw/nuxt-ai-ready?theme=dark">
-    <source media="(prefers-color-scheme: light)" srcset="https://skilld.dev/b/harlan-zw/nuxt-ai-ready?theme=light">
-    <img alt="Skill repository on skilld.dev" src="https://skilld.dev/b/harlan-zw/nuxt-ai-ready?theme=light">
-  </picture>
-</a>
+[![Skill repository on skilld.dev][skilld-src]][skilld-href]
 
 > Best practice AI & LLM discoverability for Nuxt sites. Score 100 on [`npx @vercel/agent-readability audit <URL>`](https://github.com/vercel-labs/agent-readability).
 
@@ -41,7 +36,7 @@ Nuxt AI Ready implements both. It converts your pages to markdown, generates llm
 Install `nuxt-ai-ready` dependency to your project:
 
 ```bash
-npx nuxi@latest module add nuxt-ai-ready
+npx nuxt module add nuxt-ai-ready
 ```
 
 > [!TIP]
@@ -66,11 +61,17 @@ npx nuxi@latest module add nuxt-ai-ready
 [MIT](https://github.com/harlan-zw/nuxt-ai-ready/blob/main/LICENSE).
 
 <!-- Badges -->
-[npm-version-src]: https://img.shields.io/npm/v/nuxt-ai-ready/latest.svg?style=flat&colorA=18181B&colorB=28CF8D
+[npm-version-src]: https://img.shields.io/npm/v/nuxt-ai-ready/latest.svg?style=flat&labelColor=16152b&color=00a63e
 [npm-version-href]: https://npmjs.com/package/nuxt-ai-ready
 
-[npm-downloads-src]: https://img.shields.io/npm/dm/nuxt-ai-ready.svg?style=flat&colorA=18181B&colorB=28CF8D
+[npm-downloads-src]: https://img.shields.io/npm/dm/nuxt-ai-ready.svg?style=flat&labelColor=16152b&color=00a63e
 [npm-downloads-href]: https://npmjs.com/package/nuxt-ai-ready
 
-[nuxt-src]: https://img.shields.io/badge/Nuxt-18181B?logo=nuxt
+[license-src]: https://img.shields.io/github/license/harlan-zw/nuxt-ai-ready.svg?style=flat&labelColor=16152b&color=00a63e
+[license-href]: https://github.com/harlan-zw/nuxt-ai-ready/blob/main/LICENSE.md
+
+[nuxt-src]: https://img.shields.io/badge/Nuxt-16152b?logo=nuxt&style=flat
 [nuxt-href]: https://nuxt.com
+
+[skilld-src]: https://skilld.dev/b/harlan-zw/nuxt-ai-ready?style=flat&labelColor=16152b&color=00a63e&logoColor=ffffff
+[skilld-href]: https://skilld.dev/gh/harlan-zw/nuxt-ai-ready

package/dist/chunks/agent-skills.mjs

@@ -1,22 +1,26 @@
 import { createHash } from 'node:crypto';
 import { realpath, readFile, readdir } from 'node:fs/promises';
-import { resolve, isAbsolute, join, relative, sep } from 'node:path';
+import { join, resolve, isAbsolute, relative, sep } from 'node:path';
 import { parseDocument } from 'yaml';
-import { A as AGENT_SKILLS_SCHEMA } from '../shared/nuxt-ai-ready.CLSWou20.mjs';
+import { A as AGENT_SKILLS_SCHEMA } from '../shared/nuxt-ai-ready.C34F0LJo.mjs';
 import 'node:module';
+import 'node:url';
 import '@nuxt/kit';
 import 'defu';
 import 'nuxt-site-config/kit';
 import 'nuxtseo-shared/kit';
-import 'pkg-types';
-import 'node:url';
+import '../shared/nuxt-ai-ready.B3hAuOLQ.mjs';
+import 'node:fs';
 import '../../dist/runtime/markdown-path.js';
+import '../../dist/runtime/route-path.js';
 import '../../dist/runtime/server/utils/sitemap-md.js';
 import '../../dist/runtime/cache-control.js';
 import '../../dist/runtime/server/utils/discovery-response.js';
+import 'confbox';
+import 'nuxtseo-shared/server';
+import '../../dist/runtime/server/utils/content-negotiation.js';
 import 'pathe';
 import 'nuxtseo-shared/i18n';
-import '../../dist/runtime/route-path.js';
 
 const namePattern = /^(?!.*--)[a-z0-9](?:[a-z0-9-]{0,62}[a-z0-9])?$/;
 const digestPattern = /^sha256:[a-f0-9]{64}$/;
@@ -145,9 +149,10 @@ function parseLocalSkillMetadata(content, skill, index) {
   }
   return issues;
 }
-async function resolveLocalEntry(skill, index, rootDir) {
+async function resolveLocalEntry(skill, index, rootDir, publicDirs) {
   const file = resolve(rootDir, skill.file);
-  if (isAbsolute(skill.file) || !isWithinDirectory(rootDir, file)) {
+  const publicDirectory = publicDirs.map((directory) => resolve(directory, "skills")).find((directory) => isWithinDirectory(directory, file));
+  if (isAbsolute(skill.file) || !isWithinDirectory(rootDir, file) && !publicDirectory) {
     return {
       _tag: "Invalid",
       issues: [{
@@ -157,8 +162,8 @@ async function resolveLocalEntry(skill, index, rootDir) {
       }]
     };
   }
-  return Promise.all([realpath(rootDir), realpath(file)]).then(([realRootDir, realFile]) => {
-    if (!isWithinDirectory(realRootDir, realFile)) {
+  return Promise.all([realpath(rootDir), realpath(file), publicDirectory ? realpath(publicDirectory) : void 0]).then(([realRootDir, realFile, realPublicDirectory]) => {
+    if (!isWithinDirectory(realRootDir, realFile) && !(realPublicDirectory && isWithinDirectory(realPublicDirectory, realFile))) {
       return {
         _tag: "Invalid",
         issues: [{
@@ -243,7 +248,7 @@ async function resolveAgentSkillsConfig(config, rootDir, options = {}) {
   if (issues.length > 0)
     return { _tag: "Invalid", issues };
   const skills = configuredSkills;
-  const resolved = await Promise.all(skills.map((skill, index) => skill.source === "local" ? resolveLocalEntry(skill, index, rootDir) : Promise.resolve({ _tag: "Resolved", entry: resolveExternalEntry(skill) })));
+  const resolved = await Promise.all(skills.map((skill, index) => skill.source === "local" ? resolveLocalEntry(skill, index, rootDir, options.publicDirs ?? []) : Promise.resolve({ _tag: "Resolved", entry: resolveExternalEntry(skill) })));
   const fileIssues = resolved.flatMap((result) => result._tag === "Invalid" ? result.issues : []);
   if (fileIssues.length > 0)
     return { _tag: "Invalid", issues: fileIssues };
@@ -283,7 +288,7 @@ async function discoverAgentSkills(options) {
   const seen = /* @__PURE__ */ new Set();
   for (const scanDir of options.scanDirs) {
     const base = resolve(scanDir, dir);
-    if (!isWithinDirectory(options.rootDir, base) && base !== options.rootDir)
+    if (!options.publicOnly && !isWithinDirectory(options.rootDir, base) && base !== options.rootDir)
       continue;
     const entries = await readdir(base, { withFileTypes: true }).catch(() => {
       return [];
@@ -292,6 +297,19 @@ async function discoverAgentSkills(options) {
       if (seen.has(entry.name))
         continue;
       const file = join(base, entry.name, "SKILL.md");
+      if (options.publicOnly) {
+        const resolvedFile = await realpath(file).catch((error) => {
+          if (error.code === "ENOENT")
+            return null;
+          throw error;
+        });
+        if (resolvedFile === null)
+          continue;
+        if (!isWithinDirectory(await realpath(base), resolvedFile)) {
+          issues.push({ field: "file", message: `${toPosix(relative(options.rootDir, file))} must resolve within its public skills directory` });
+          continue;
+        }
+      }
       const content = await readFile(file, "utf8").catch(() => {
         return null;
       });
@@ -347,7 +365,12 @@ async function prepareAgentSkills(config, options) {
     return { _tag: "Invalid", issues: [{ field: "dir", message: "must be a string or false when set" }] };
   if (config.skills !== void 0 && !Array.isArray(config.skills))
     return { _tag: "Invalid", issues: [{ field: "agentSkills", message: "skills must be an array when set" }] };
-  const discovered = config.dir === false ? { skills: [], issues: [] } : await discoverAgentSkills({ rootDir: options.rootDir, scanDirs: options.scanDirs, dir: config.dir ?? "skills" });
+  const discovered = config.dir === false ? { skills: [], issues: [] } : await discoverAgentSkills({
+    rootDir: options.rootDir,
+    scanDirs: config.dir === void 0 ? options.publicDirs ?? options.scanDirs.map((directory) => join(directory, "public")) : options.scanDirs,
+    dir: config.dir ?? "skills",
+    publicOnly: config.dir === void 0
+  });
   if (discovered.issues.length > 0)
     return { _tag: "Invalid", issues: discovered.issues };
   return { _tag: "Ok", skills: mergeAgentSkills(discovered.skills, config.skills ?? []) };

package/dist/chunks/prerender.mjs

@@ -1,11 +1,12 @@
 import { mkdir, writeFile, appendFile, stat, readdir } from 'node:fs/promises';
 import { join, dirname, relative, resolve } from 'node:path';
-import { useNuxt, hasNuxtModule, resolveFiles } from '@nuxt/kit';
+import { useNuxt, getNitroVersion, hasNuxtModule, resolveFiles } from '@nuxt/kit';
 import { colorize } from 'consola/utils';
 import { resolveLocaleFromRoute } from 'nuxtseo-shared/i18n-runtime';
+import { createPrerenderFetch } from 'nuxtseo-shared/prerender';
 import { collectSitemap } from 'sitemapd/parse';
 import { withLeadingSlash, joinURL, withBase } from 'ufo';
-import { l as logger, s as supportsNativeNodeSqlite, M as MARKDOWN_LINK_AVAILABILITY_FILE } from '../shared/nuxt-ai-ready.CLSWou20.mjs';
+import { l as logger, M as MARKDOWN_LINK_AVAILABILITY_FILE } from '../shared/nuxt-ai-ready.C34F0LJo.mjs';
 import { normalizePagePath, toMarkdownPath } from '../../dist/runtime/markdown-path.js';
 import { toDeployedRoute, toLogicalRoute } from '../../dist/runtime/route-path.js';
 import { initSchema, computeContentHash, insertPage, queryAllPages, exportDbDump } from '../../dist/runtime/server/db/shared.js';
@@ -14,13 +15,17 @@ import { resolvePageUpdatedAt } from '../../dist/runtime/server/utils/page-updat
 import { SITEMAP_MD_ROUTE, appendSitemapSection } from '../../dist/runtime/server/utils/sitemap-md.js';
 import 'node:crypto';
 import 'node:module';
+import 'node:url';
 import 'defu';
 import 'nuxt-site-config/kit';
 import 'nuxtseo-shared/kit';
-import 'pkg-types';
-import 'node:url';
+import '../shared/nuxt-ai-ready.B3hAuOLQ.mjs';
+import 'node:fs';
 import '../../dist/runtime/cache-control.js';
 import '../../dist/runtime/server/utils/discovery-response.js';
+import 'confbox';
+import 'nuxtseo-shared/server';
+import '../../dist/runtime/server/utils/content-negotiation.js';
 import 'pathe';
 import 'nuxtseo-shared/i18n';
 
@@ -62,6 +67,11 @@ async function findOutputMarkdownPaths(publicDir, baseURL, srcDir, ignoredPaths,
   }
   return [...paths].sort();
 }
+function crawlerFetch(state) {
+  if (!state.fetch)
+    throw new Error("The Nitro prerender app is not initialized.");
+  return state.fetch;
+}
 function createCrawlerState(dbPath, llmsFullTxtPath, siteInfo, llmsTxtConfig, concurrency = 10, ftsTokenizer, i18n) {
   return {
     prerenderedRoutes: /* @__PURE__ */ new Set(),
@@ -130,15 +140,8 @@ function createSqliteAdapter(sqlite) {
   };
 }
 async function createPrerenderDatabase(dbPath) {
-  if (supportsNativeNodeSqlite(process.versions.node || "")) {
-    const { DatabaseSync } = await import('node:sqlite');
-    const sqlite2 = new DatabaseSync(dbPath);
-    for (const pragma of PRERENDER_PRAGMAS)
-      sqlite2.exec(pragma);
-    return createSqliteAdapter(sqlite2);
-  }
-  const { default: Database } = await import('better-sqlite3');
-  const sqlite = new Database(dbPath);
+  const { DatabaseSync } = await import('node:sqlite');
+  const sqlite = new DatabaseSync(dbPath);
   for (const pragma of PRERENDER_PRAGMAS)
     sqlite.exec(pragma);
   return createSqliteAdapter(sqlite);
@@ -191,7 +194,7 @@ async function processSitemapEntry(state, nuxt, nitro, entry) {
   const mdRoute = toMarkdownPath(route);
   const mdUrl = toDeployedRoute(mdRoute, nitro.options.baseURL);
   logger.debug(`Fetching markdown for ${route} \u2192 ${mdUrl}`);
-  const res = await globalThis.$fetch(mdUrl, {
+  const res = await crawlerFetch(state)(mdUrl, {
     headers: { "x-nitro-prerender": mdRoute },
     retry: 0,
     signal: AbortSignal.timeout(PRERENDER_PAGE_TIMEOUT)
@@ -268,11 +271,11 @@ function detectSitemapPrerender(sitemapName = "sitemap.xml") {
     usePrerenderHook: shouldHookIntoPrerender && !prerenderSitemap
   };
 }
-async function prerenderRoute(nitro, route) {
+async function prerenderRoute(nitro, route, fetch) {
   const start = Date.now();
   const encodedRoute = encodeURI(route);
   const fetchUrl = withBase(encodedRoute, nitro.options.baseURL);
-  const res = await globalThis.$fetch.raw(fetchUrl, {
+  const res = await fetch.raw(fetchUrl, {
     headers: { "x-nitro-prerender": encodedRoute },
     retry: nitro.options.prerender.retry,
     retryDelay: nitro.options.prerender.retryDelay
@@ -309,6 +312,14 @@ function setupPrerenderHandler(options, dbPath, siteInfo, llmsTxtConfig, extras
       extras.ftsTokenizer,
       extras.i18n
     );
+    let prerenderClient;
+    nitro.hooks.hook("prerender:init", (renderer) => {
+      const major = getNitroVersion(nuxt);
+      if (major !== 2 && major !== 3)
+        throw new Error(`Unsupported Nitro prerender builder: ${major}`);
+      prerenderClient = createPrerenderFetch(renderer, major);
+      state.fetch = prerenderClient.fetch;
+    });
     let initPromise = null;
     const artifactRoutes = new Set(extras.artifactRoutes ?? []);
     nitro.hooks.hook("prerender:generate", async (route) => {
@@ -327,7 +338,7 @@ function setupPrerenderHandler(options, dbPath, siteInfo, llmsTxtConfig, extras
       }
       if (!route.fileName?.endsWith(".md"))
         return;
-      let pageRoute = route.route.replace(RE_MD_EXT, "");
+      let pageRoute = withLeadingSlash(route.fileName).replace(RE_MD_EXT, "");
       if (pageRoute === "/index")
         pageRoute = "/";
       const pageStartTime = Date.now();
@@ -408,11 +419,11 @@ function setupPrerenderHandler(options, dbPath, siteInfo, llmsTxtConfig, extras
           paths
         }), "utf-8");
       }
-      const llmsStats = await prerenderRoute(nitro, "/llms.txt");
+      const llmsStats = await prerenderRoute(nitro, "/llms.txt", crawlerFetch(state));
       const llmsFullStats = await stat(state.llmsFullTxtPath);
       nitro._prerenderedRoutes.push({ route: "/llms-full.txt", fileName: "/llms-full.txt" });
       if (options.sitemapMd !== false) {
-        const sitemapMdStats = await prerenderRoute(nitro, SITEMAP_MD_ROUTE);
+        const sitemapMdStats = await prerenderRoute(nitro, SITEMAP_MD_ROUTE, crawlerFetch(state));
         logger.debug(`Wrote sitemap.md (${(sitemapMdStats.size / 1024).toFixed(1)}kb)`);
       }
       const kb = (b) => (b / 1024).toFixed(1);
@@ -426,7 +437,7 @@ function setupPrerenderHandler(options, dbPath, siteInfo, llmsTxtConfig, extras
     const { useSitemapHook, usePrerenderHook } = detectSitemapPrerender();
     logger.debug(`Prerender hooks: sitemap=${useSitemapHook}, prerender=${usePrerenderHook}`);
     if (useSitemapHook) {
-      nuxt.hooks.hook("sitemap:prerender:done", async (ctx) => {
+      nuxt.hooks.hook("sitemap:prerender:done", async (ctx) => (async () => {
         if (!state.initialized)
           return;
         for (const sitemap of ctx.sitemaps)
@@ -435,12 +446,12 @@ function setupPrerenderHandler(options, dbPath, siteInfo, llmsTxtConfig, extras
         state.prerenderedRoutes.clear();
         if (state.db)
           await state.db.close?.();
-      });
+      })().finally(() => prerenderClient?.close()));
     } else if (usePrerenderHook) {
-      nitro.hooks.hook("prerender:done", async () => {
+      nitro.hooks.hook("prerender:done", async () => (async () => {
         if (!state.initialized)
           return;
-        const sitemapContent = await globalThis.$fetch("/sitemap.xml", {
+        const sitemapContent = await crawlerFetch(state)(toDeployedRoute("/sitemap.xml", nitro.options.baseURL), {
           headers: { "x-nitro-prerender": "/sitemap.xml" },
           signal: AbortSignal.timeout(PRERENDER_PAGE_TIMEOUT)
         }).catch(() => {
@@ -452,7 +463,7 @@ function setupPrerenderHandler(options, dbPath, siteInfo, llmsTxtConfig, extras
         state.prerenderedRoutes.clear();
         if (state.db)
           await state.db.close?.();
-      });
+      })().finally(() => prerenderClient?.close()));
     }
   });
 }

package/dist/cli.mjs

@@ -5,7 +5,10 @@ import { defineCommand, runMain } from 'citty';
 import { consola } from 'consola';
 import { colors } from 'consola/utils';
 import { resolve, join } from 'pathe';
-import { readPackageJSON } from 'pkg-types';
+import { r as readPackageMetadata } from './shared/nuxt-ai-ready.B3hAuOLQ.mjs';
+import 'node:module';
+import 'node:path';
+import 'node:url';
 
 async function getSecret(cwd) {
   const secretPath = join(cwd, "node_modules/.cache/nuxt/ai-ready/secret");
@@ -47,7 +50,7 @@ const main = defineCommand({
   meta: {
     name: "nuxt-ai-ready",
     description: "Nuxt AI Ready CLI",
-    version: await readPackageJSON(import.meta.url).then((p) => p.version || "0.0.0")
+    version: await readPackageMetadata(import.meta.url).then((p) => p.version || "0.0.0")
   },
   subCommands: {
     status: () => defineCommand({

package/dist/module.d.mts

@@ -55,6 +55,8 @@ interface ResolvedWebMcpConfig {
 declare function resolveAiCatalog(input: {
     siteUrl: string;
     serverCardName: string;
+    serverCardTitle?: string;
+    serverCardDescription?: string;
     serverCardUrl: string;
 }): AiCatalog;
 
@@ -91,9 +93,11 @@ declare module '@nuxt/schema' {
     }
 }
 interface ModulePublicRuntimeConfig {
+    cloudflarePrerenderedPages?: string[];
     debug: boolean;
     debugCron: boolean;
     contentNegotiation: ContentNegotiationPolicy;
+    botNegotiation: boolean;
     version: string;
     sitemapMd: boolean;
     describedby: boolean;

package/dist/module.json

@@ -1,10 +1,10 @@
 {
   "name": "nuxt-ai-ready",
   "compatibility": {
-    "nuxt": ">=4.0.0"
+    "nuxt": "^4.6.0 || ^5.0.0-0"
   },
   "configKey": "aiReady",
-  "version": "2.5.2",
+  "version": "3.0.0",
   "builder": {
     "@nuxt/module-builder": "1.0.3",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -2,17 +2,21 @@ import 'node:crypto';
 import 'node:fs/promises';
 import 'node:module';
 import 'node:path';
+import 'node:url';
 import '@nuxt/kit';
 import 'defu';
 import 'nuxt-site-config/kit';
 import 'nuxtseo-shared/kit';
-import 'pkg-types';
-export { m as default } from './shared/nuxt-ai-ready.CLSWou20.mjs';
+export { m as default } from './shared/nuxt-ai-ready.C34F0LJo.mjs';
+import './shared/nuxt-ai-ready.B3hAuOLQ.mjs';
 import '../dist/runtime/markdown-path.js';
+import '../dist/runtime/route-path.js';
 import '../dist/runtime/server/utils/sitemap-md.js';
 import '../dist/runtime/server/utils/discovery-response.js';
-import 'node:url';
 import '../dist/runtime/cache-control.js';
+import 'confbox';
+import 'nuxtseo-shared/server';
+import '../dist/runtime/server/utils/content-negotiation.js';
 import 'pathe';
 import 'nuxtseo-shared/i18n';
-import '../dist/runtime/route-path.js';
+import 'node:fs';

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

@@ -0,0 +1,3 @@
+export * from '../webmcp-public.js';
+export { useWebMcpSupported, useWebMcpTool } from './composables/webmcp.js';
+export type { UseWebMcpToolOptions, UseWebMcpToolReturn } from './composables/webmcp.js';

package/dist/runtime/app/index.js

@@ -0,0 +1,2 @@
+export * from "../webmcp-public.js";
+export { useWebMcpSupported, useWebMcpTool } from "./composables/webmcp.js";

package/dist/runtime/cache-control.d.ts

@@ -6,3 +6,5 @@
  * the edge.
  */
 export declare function publicCacheControl(maxAgeSeconds: number, staleSeconds: number): string;
+/** Merge Vary tokens without removing cache dimensions or duplicating names. */
+export declare function mergeVaryHeader(current: string | undefined, added: string): string;

package/dist/runtime/cache-control.js

@@ -1,3 +1,14 @@
 export function publicCacheControl(maxAgeSeconds, staleSeconds) {
   return staleSeconds > 0 ? `public, max-age=${maxAgeSeconds}, stale-while-revalidate=${staleSeconds}` : `public, max-age=${maxAgeSeconds}`;
 }
+export function mergeVaryHeader(current, added) {
+  const tokens = [...(current || "").split(","), ...added.split(",")].map((token) => token.trim()).filter(Boolean);
+  if (tokens.includes("*"))
+    return "*";
+  const unique = /* @__PURE__ */ new Map();
+  for (const token of tokens) {
+    if (!unique.has(token.toLowerCase()))
+      unique.set(token.toLowerCase(), token);
+  }
+  return [...unique.values()].join(", ");
+}

package/dist/runtime/llms-txt-utils.js

@@ -122,7 +122,7 @@ export async function buildLlmsTxt(event) {
   const i18nContext = { host: getRequestHost(event, { xForwardedHost: true }) };
   const baseURL = runtimeConfig.app.baseURL;
   const resolvePath = (path) => withSiteTrailingSlash(event, toDeployedRoute(path, baseURL));
-  const resolveUrl = (path) => withSiteUrl(event, toDeployedRoute(path, baseURL));
+  const resolveUrl = (path) => withSiteUrl(event, toDeployedRoute(path, baseURL), { withBase: true });
   const canonicalSiteUrl = siteConfig.url ? resolveUrl("/") : void 0;
   const parts = [];
   parts.push(`# ${siteConfig.name || canonicalSiteUrl}`);

package/dist/runtime/server/db/context.d.ts

@@ -1,3 +1,16 @@
+import type { RequestEvent } from 'nuxt/server';
 export declare const DB_CONTEXT_KEY = "_aiReadyDrizzle";
 export declare const DB_PROMISE_CONTEXT_KEY = "_aiReadyDrizzlePromise";
 export declare const DB_WORK_CONTEXT_KEY = "_aiReadyDrizzleWork";
+/** Database clients need request context for bindings and response cleanup. */
+export type AiReadyDatabaseEvent = Pick<RequestEvent, 'context'> & {
+    req?: {
+        headers: Headers | Record<string, string | string[] | undefined>;
+    };
+    node?: {
+        req: {
+            headers: Record<string, string | string[] | undefined>;
+        };
+    };
+    waitUntil?: (promise: Promise<unknown>) => void;
+};

package/dist/runtime/server/db/drizzle/client.d.ts

@@ -1,25 +1,24 @@
-import type { BetterSQLite3Database } from 'drizzle-orm/better-sqlite3';
 import type { SQLiteBunDatabase } from 'drizzle-orm/bun-sqlite';
 import type { DrizzleD1Database } from 'drizzle-orm/d1';
 import type { LibSQLDatabase } from 'drizzle-orm/libsql';
 import type { NeonHttpDatabase } from 'drizzle-orm/neon-http';
 import type { NodeSQLiteDatabase } from 'drizzle-orm/node-sqlite';
 import type { PostgresJsDatabase } from 'drizzle-orm/postgres-js';
-import type { H3Event } from '#nuxtseo/h3';
+import type { AiReadyDatabaseEvent } from '../context.js';
 export type DatabaseDialect = 'sqlite' | 'postgres';
-type SQLiteDB = BetterSQLite3Database | SQLiteBunDatabase | LibSQLDatabase | DrizzleD1Database | NodeSQLiteDatabase;
+type SQLiteDB = SQLiteBunDatabase | LibSQLDatabase | DrizzleD1Database | NodeSQLiteDatabase;
 type PostgresDB = NeonHttpDatabase | PostgresJsDatabase;
 export interface DrizzleDatabase {
     dialect: DatabaseDialect;
     db: SQLiteDB | PostgresDB;
 }
 /** Keep request-scoped clients alive until deferred database work finishes. */
-export declare function trackDrizzleWork<T>(event: H3Event, work: Promise<T>): Promise<T>;
+export declare function trackDrizzleWork<T>(event: AiReadyDatabaseEvent, work: Promise<T>): Promise<T>;
 /** Transfer client cleanup to deferred work after the response ends. */
-export declare function finishDrizzleResponse(event: H3Event): Promise<void>;
+export declare function finishDrizzleResponse(event: AiReadyDatabaseEvent): Promise<void>;
 /**
  * Get Drizzle database instance
  */
-export declare function useDrizzle(event?: H3Event): Promise<DrizzleDatabase>;
-export declare function closeDrizzle(event?: H3Event): Promise<void>;
+export declare function useDrizzle(event?: AiReadyDatabaseEvent): Promise<DrizzleDatabase>;
+export declare function closeDrizzle(event?: AiReadyDatabaseEvent): Promise<void>;
 export {};

package/dist/runtime/server/db/drizzle/client.js

@@ -5,11 +5,16 @@ let fallbackClientPromise;
 function createDrizzleClient(event) {
   return import("#ai-ready-virtual/db-provider.mjs").then(({ createClient }) => createClient(event));
 }
+function getRequestOwner(event) {
+  return event.node?.req ?? event.req ?? event;
+}
 function getDrizzleWorkState(event) {
   const context = event.context;
   return context[DB_WORK_CONTEXT_KEY] ??= {
     _tag: "ResponseOpen",
-    pending: /* @__PURE__ */ new Set()
+    owner: getRequestOwner(event),
+    pending: /* @__PURE__ */ new Set(),
+    cleanup: () => closeDrizzle(event)
   };
 }
 export function trackDrizzleWork(event, work) {
@@ -17,13 +22,15 @@ export function trackDrizzleWork(event, work) {
   const tracked = work.finally(async () => {
     state.pending.delete(tracked);
     if (state._tag === "ResponseEnded" && state.pending.size === 0)
-      await closeDrizzle(event);
+      await state.cleanup();
   });
   state.pending.add(tracked);
   return tracked;
 }
 export async function finishDrizzleResponse(event) {
   const state = getDrizzleWorkState(event);
+  if (state.owner !== getRequestOwner(event))
+    return;
   state._tag = "ResponseEnded";
   if (state.pending.size === 0)
     await closeDrizzle(event);
@@ -41,6 +48,7 @@ export async function useDrizzle(event) {
   if (!event && fallbackClientPromise)
     return fallbackClientPromise;
   if (event?.context) {
+    getDrizzleWorkState(event);
     const context = event.context;
     const promise2 = createDrizzleClient(event).then((client) => {
       context[DB_CONTEXT_KEY] = client;
@@ -65,6 +73,9 @@ export async function useDrizzle(event) {
 export async function closeDrizzle(event) {
   if (event?.context) {
     const context = event.context;
+    const state = context[DB_WORK_CONTEXT_KEY];
+    if (state && state.owner !== getRequestOwner(event))
+      return;
     const client = context[DB_CONTEXT_KEY] ?? await context[DB_PROMISE_CONTEXT_KEY];
     if (!client)
       return;

package/dist/runtime/server/db/drizzle/providers/bun.d.ts

@@ -1,5 +1,5 @@
-import type { H3Event } from '#nuxtseo/h3';
-export declare function createClient(event?: H3Event): Promise<{
+import type { AiReadyDatabaseEvent } from '../../context.js';
+export declare function createClient(_event?: AiReadyDatabaseEvent): Promise<{
     dialect: "sqlite";
     db: import("drizzle-orm/bun-sqlite").SQLiteBunDatabase<import("drizzle-orm").EmptyRelations> & {
         $client: any;

package/dist/runtime/server/db/drizzle/providers/bun.js

@@ -4,8 +4,8 @@ import { useRuntimeConfig } from "#nuxtseo/nitro";
 import { logger } from "../../../logger.js";
 import { registerDriver } from "../raw.js";
 import { resolveWritableDbPath } from "./dbPath.js";
-export async function createClient(event) {
-  const config = useRuntimeConfig(event)["nuxt-ai-ready"];
+export async function createClient(_event) {
+  const config = useRuntimeConfig()["nuxt-ai-ready"];
   const dbPath = await resolveWritableDbPath(config.database.filename || ".data/ai-ready/pages.db");
   logger.debug(`[drizzle] Opening Bun SQLite database: ${dbPath}`);
   const sqlite = new Database(dbPath);

package/dist/runtime/server/db/drizzle/providers/d1.d.ts

@@ -1,5 +1,5 @@
-import type { H3Event } from '#nuxtseo/h3';
-export declare function createClient(event?: H3Event): Promise<{
+import type { AiReadyDatabaseEvent } from '../../context.js';
+export declare function createClient(event?: AiReadyDatabaseEvent): Promise<{
     dialect: "sqlite";
     db: import("drizzle-orm/d1").DrizzleD1Database<import("drizzle-orm").EmptyRelations> & {
         $client: any;

package/dist/runtime/server/db/drizzle/providers/d1.js

@@ -3,10 +3,11 @@ import { useRuntimeConfig } from "#nuxtseo/nitro";
 import { logger } from "../../../logger.js";
 import { registerDriver } from "../raw.js";
 export async function createClient(event) {
-  const config = useRuntimeConfig(event)["nuxt-ai-ready"];
+  const config = useRuntimeConfig()["nuxt-ai-ready"];
   const bindingName = config.database.bindingName || "DB";
   logger.debug(`[drizzle] Using D1 binding: ${bindingName}`);
-  const cfEnv = event?.context?.cloudflare?.env;
+  const cloudflare = event?.context.cloudflare;
+  const cfEnv = cloudflare?.env;
   const globalEnv = globalThis.__env__;
   const d1 = cfEnv?.[bindingName] || globalEnv?.[bindingName];
   if (!d1) {

package/dist/runtime/server/db/drizzle/providers/libsql.d.ts

@@ -1,5 +1,5 @@
-import type { H3Event } from '#nuxtseo/h3';
-export declare function createClient(event?: H3Event): Promise<{
+import type { AiReadyDatabaseEvent } from '../../context.js';
+export declare function createClient(_event?: AiReadyDatabaseEvent): Promise<{
     dialect: "sqlite";
     db: import("drizzle-orm/libsql").LibSQLDatabase<import("drizzle-orm").EmptyRelations> & {
         $client: import("@libsql/client").Client;

package/dist/runtime/server/db/drizzle/providers/libsql.js

@@ -4,8 +4,8 @@ import { useRuntimeConfig } from "#nuxtseo/nitro";
 import { logger } from "../../../logger.js";
 import { registerDriver } from "../raw.js";
 import { resolveWritableDbPath } from "./dbPath.js";
-export async function createClient(event) {
-  const config = useRuntimeConfig(event)["nuxt-ai-ready"];
+export async function createClient(_event) {
+  const config = useRuntimeConfig()["nuxt-ai-ready"];
   let dbUrl = config.database.url || `file:${config.database.filename || ".data/ai-ready/pages.db"}`;
   if (dbUrl.startsWith("file:") && !dbUrl.startsWith("file://")) {
     const resolved = await resolveWritableDbPath(dbUrl.slice("file:".length));

package/dist/runtime/server/db/drizzle/providers/neon.d.ts

@@ -1,5 +1,5 @@
-import type { H3Event } from '#nuxtseo/h3';
-export declare function createClient(event?: H3Event): Promise<{
+import type { AiReadyDatabaseEvent } from '../../context.js';
+export declare function createClient(_event?: AiReadyDatabaseEvent): Promise<{
     dialect: "postgres";
     db: import("drizzle-orm/neon-http").NeonHttpDatabase<import("drizzle-orm").EmptyRelations> & {
         $client: import("@neondatabase/serverless").NeonQueryFunction<false, false>;

package/dist/runtime/server/db/drizzle/providers/neon.js

@@ -3,8 +3,8 @@ import { drizzle } from "drizzle-orm/neon-http";
 import { useRuntimeConfig } from "#nuxtseo/nitro";
 import { logger } from "../../../logger.js";
 import { registerDriver } from "../raw.js";
-export async function createClient(event) {
-  const config = useRuntimeConfig(event)["nuxt-ai-ready"];
+export async function createClient(_event) {
+  const config = useRuntimeConfig()["nuxt-ai-ready"];
   const connectionString = config.database.url || process.env.POSTGRES_URL || process.env.DATABASE_URL;
   if (!connectionString) {
     throw new Error("[ai-ready] Missing database URL. Set POSTGRES_URL or configure database.url");