@farm.js/core 0.1.35 → 0.1.37

package/dist/{chunk-IPXLADVO.cjs → chunk-LOFKRKO7.cjs}

@@ -1,9 +1,12 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
+var _chunkPTZ2TVNEcjs = require('./chunk-PTZ2TVNE.cjs');
+
+
 var _chunkOWOUTKIJcjs = require('./chunk-OWOUTKIJ.cjs');
 
 
-var _chunkRU3M2FIKcjs = require('./chunk-RU3M2FIK.cjs');
+var _chunk4WQ6PGSJcjs = require('./chunk-4WQ6PGSJ.cjs');
 
 
 var _chunkJ63ZH5OQcjs = require('./chunk-J63ZH5OQ.cjs');
@@ -19,14 +22,15 @@ var _chunkTKJZFIMLcjs = require('./chunk-TKJZFIML.cjs');
 var _chunk75RZHGLScjs = require('./chunk-75RZHGLS.cjs');
 
 
-var _chunkOMVAU7NTcjs = require('./chunk-OMVAU7NT.cjs');
+
+var _chunkKIIMAWOJcjs = require('./chunk-KIIMAWOJ.cjs');
 
 
 
 var _chunkKNBBQHO2cjs = require('./chunk-KNBBQHO2.cjs');
 
 
-var _chunkYC6V7PWEcjs = require('./chunk-YC6V7PWE.cjs');
+var _chunkNQ6QFZWDcjs = require('./chunk-NQ6QFZWD.cjs');
 
 
 var _chunkBIDYX3SLcjs = require('./chunk-BIDYX3SL.cjs');
@@ -153,7 +157,7 @@ function ensureFarmDocumentHead(markup) {
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, ensureFarmDocumentHead, "ensureFarmDocumentHead");
 function ensureFarmDocumentRoot(markup) {
-  if (/\sid=["']root["']/i.test(markup)) return markup;
+  if (/<body\b[^>]*>\s*<div\b[^>]*\sid=["']root["']/i.test(markup)) return markup;
   return markup.replace(
     /<body\b([^>]*)>/i,
     (_match, attributes) => `<body${attributes}><div id="root">`
@@ -398,7 +402,7 @@ function createFarmMetadataRouteResponse(kind, value, routeModule = {}, options
   if (isResponse(value)) {
     return method === "HEAD" ? _chunkTKJZFIMLcjs.omitFarmResponseBody.call(void 0, value) : value;
   }
-  const body = kind === "sitemap" ? serializeSitemap(value) : kind === "robots" ? serializeRobots(value) : kind === "llms" || kind === "llms-full" ? _chunkRU3M2FIKcjs.serializeFarmLlmsTxt.call(void 0, value) : serializeManifest(value);
+  const body = kind === "sitemap" ? serializeSitemap(value) : kind === "robots" ? serializeRobots(value) : kind === "llms" || kind === "llms-full" ? _chunk4WQ6PGSJcjs.serializeFarmLlmsTxt.call(void 0, value) : serializeManifest(value);
   const contentType = kind === "sitemap" ? "application/xml; charset=utf-8" : kind === "robots" || kind === "llms" || kind === "llms-full" ? "text/plain; charset=utf-8" : "application/manifest+json; charset=utf-8";
   return new Response(method === "HEAD" ? null : body, {
     headers: {
@@ -436,6 +440,13 @@ function listFarmMCPServerSources(input) {
     if (sources.has(endpoint)) continue;
     sources.set(endpoint, { ...server, endpoint, local: Boolean(server.path) });
   }
+  if (sources.size === 0 && input.defaultMCP) {
+    const server = input.defaultMCP();
+    if (server) {
+      const endpoint = _chunkI57LW5VZcjs.applyFarmBasePath.call(void 0, server.path, input.basePath);
+      sources.set(endpoint, { ...server, endpoint, local: true });
+    }
+  }
   return [...sources.values()];
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, listFarmMCPServerSources, "listFarmMCPServerSources");
@@ -526,7 +537,7 @@ function createFarmAiCatalogResponse(request, input = {}, requestUrl) {
   const body = JSON.stringify(
     card ? card.card : { specVersion: "1.0", entries: servers.map(({ entry }) => entry) }
   );
-  const etag = `W/"${fnv1a(body)}"`;
+  const etag = _chunkKIIMAWOJcjs.createFarmWeakETag.call(void 0, body);
   const headers = {
     ...corsHeaders(),
     "Content-Type": card ? `${SERVER_CARD_TYPE}; charset=utf-8` : ard ? "application/json; charset=utf-8" : `${AI_CATALOG_TYPE}; charset=utf-8`,
@@ -535,7 +546,7 @@ function createFarmAiCatalogResponse(request, input = {}, requestUrl) {
     ETag: etag,
     "X-Content-Type-Options": "nosniff"
   };
-  if (_chunkOMVAU7NTcjs.matchesFarmIfNoneMatch.call(void 0, request.headers.get("if-none-match"), etag)) {
+  if (_chunkKIIMAWOJcjs.matchesFarmIfNoneMatch.call(void 0, request.headers.get("if-none-match"), etag)) {
     return new Response(null, { status: 304, headers });
   }
   _chunkJ63ZH5OQcjs.emitFarmAgentRead.call(void 0, request, card ? "mcp-server-card" : "ai-catalog", 200);
@@ -565,15 +576,6 @@ function truncate(text) {
   return text.length <= CARD_DESCRIPTION_MAX ? text : `${text.slice(0, CARD_DESCRIPTION_MAX - 1).trimEnd()}\u2026`;
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, truncate, "truncate");
-function fnv1a(value) {
-  let hash = 2166136261;
-  for (let index = 0; index < value.length; index++) {
-    hash ^= value.charCodeAt(index);
-    hash = Math.imul(hash, 16777619);
-  }
-  return (hash >>> 0).toString(16).padStart(8, "0");
-}
-_chunkS3JO3N4Hcjs.__name.call(void 0, fnv1a, "fnv1a");
 
 // src/components/error-page.ts
 var ERROR_STATUS_TEXT = {
@@ -868,7 +870,12 @@ function createFarmApiCatalogResponse(method, input, request) {
 _chunkS3JO3N4Hcjs.__name.call(void 0, createFarmApiCatalogResponse, "createFarmApiCatalogResponse");
 
 // src/app-manifest.ts
-var FARM_APP_MANIFEST_PATH = "/.well-known/farmjs";
+var FARM_APP_MANIFEST_PATH = "/.well-known/farmjs.json";
+var FARM_APP_MANIFEST_LEGACY_PATH = "/.well-known/farmjs";
+function isFarmAppManifestPath(pathname) {
+  return pathname === FARM_APP_MANIFEST_PATH || pathname === FARM_APP_MANIFEST_LEGACY_PATH;
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, isFarmAppManifestPath, "isFarmAppManifestPath");
 var FARM_INFRA_SIGNATURE_HEADER = "farmjs-infra-signature";
 var SIGNED_PURPOSE = "farmjs-manifest-v1";
 var SIGNATURE_WINDOW_SECONDS = 300;
@@ -901,48 +908,80 @@ var SOURCES = {
   standalone: "defineTool",
   serverFunction: "serverFunction"
 };
-function createFarmAppManifest(input) {
-  return {
+function createFarmAppManifest(input, { full = false } = {}) {
+  const manifest = {
     schemaVersion: 1,
     app: {
-      farm: _chunkYC6V7PWEcjs.FARM_VERSION,
+      farm: _chunkNQ6QFZWDcjs.FARM_VERSION,
       renderer: input.renderer,
       basePath: input.basePath,
       build: input.build
     },
     packages: input.packages,
     mcp: {
-      servers: _chunk75RZHGLScjs._listFarmMCPCatalogs.call(void 0, ).map(({ server, tools, details }) => ({
-        name: server.name,
-        version: server.version,
-        path: server.path,
-        resources: [..._nullishCoalesce(_optionalChain([details, 'optionalAccess', _37 => _37.resources]), () => ( []))],
-        prompts: [..._nullishCoalesce(_optionalChain([details, 'optionalAccess', _38 => _38.prompts]), () => ( []))],
-        tools: tools.map((tool) => {
-          const schemas = _optionalChain([details, 'optionalAccess', _39 => _39.schemas, 'optionalAccess', _40 => _40[tool.name]]);
-          const hints = Object.fromEntries(
-            ["readOnlyHint", "destructiveHint", "idempotentHint", "openWorldHint"].filter((hint) => typeof tool[hint] === "boolean").map((hint) => [hint, tool[hint]])
-          );
-          return {
-            name: tool.name,
-            ...tool.title ? { title: tool.title } : {},
-            ...tool.description ? { description: tool.description } : {},
-            source: SOURCES[tool.kind],
-            ...tool.kind === "endpoint" ? { method: tool.method, path: tool.path } : {},
-            ...hints,
-            ...schemas ? { inputSchema: schemas.input } : {},
-            ..._optionalChain([schemas, 'optionalAccess', _41 => _41.output]) ? { outputSchema: schemas.output } : {}
-          };
-        })
-      }))
+      servers: _chunk75RZHGLScjs._listFarmMCPCatalogs.call(void 0, ).map(({ server, tools, details }) => {
+        const listed = full || _optionalChain([details, 'optionalAccess', _37 => _37.public]) === true;
+        return {
+          name: server.name,
+          version: server.version,
+          path: server.path,
+          authorization: _optionalChain([details, 'optionalAccess', _38 => _38.public]) === true ? "none" : "required",
+          resources: listed ? [..._nullishCoalesce(_optionalChain([details, 'optionalAccess', _39 => _39.resources]), () => ( []))] : [],
+          prompts: listed ? [..._nullishCoalesce(_optionalChain([details, 'optionalAccess', _40 => _40.prompts]), () => ( []))] : [],
+          tools: (listed ? tools : []).map((tool) => {
+            const schemas = _optionalChain([details, 'optionalAccess', _41 => _41.schemas, 'optionalAccess', _42 => _42[tool.name]]);
+            const hints = Object.fromEntries(
+              ["readOnlyHint", "destructiveHint", "idempotentHint", "openWorldHint"].filter((hint) => typeof tool[hint] === "boolean").map((hint) => [hint, tool[hint]])
+            );
+            return {
+              name: tool.name,
+              ...tool.title ? { title: tool.title } : {},
+              ...tool.description ? { description: tool.description } : {},
+              source: SOURCES[tool.kind],
+              // MCP clients never see the route behind a tool; only Infra's view names it.
+              ...full && tool.kind === "endpoint" ? { method: tool.method, path: tool.path } : {},
+              ...hints,
+              ...schemas ? { inputSchema: schemas.input } : {},
+              ..._optionalChain([schemas, 'optionalAccess', _43 => _43.output]) ? { outputSchema: schemas.output } : {}
+            };
+          })
+        };
+      })
     },
     webmcp: input.webmcp,
     integrations: input.integrations,
     agent: input.agent,
     plugins: input.plugins
   };
+  manifest.mcp.servers.push(...listDefaultServer(input));
+  return manifest;
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, createFarmAppManifest, "createFarmAppManifest");
+function listDefaultServer(input) {
+  const server = _optionalChain([input, 'access', _44 => _44.defaultMCP, 'optionalCall', _45 => _45()]);
+  if (!server) return [];
+  return [
+    {
+      name: server.name,
+      version: server.version,
+      path: server.path,
+      authorization: "none",
+      resources: [],
+      prompts: [],
+      tools: _chunkPTZ2TVNEcjs.FARM_DEFAULT_MCP_TOOLS.map((tool) => ({
+        name: tool.name,
+        title: tool.title,
+        description: tool.description,
+        // Standalone tools with no endpoint behind them, like defineTool's.
+        source: "defineTool",
+        ...tool.annotations,
+        inputSchema: tool.inputSchema,
+        ..."outputSchema" in tool ? { outputSchema: tool.outputSchema } : {}
+      }))
+    }
+  ];
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, listDefaultServer, "listDefaultServer");
 var encoder = new TextEncoder();
 var hex = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (bytes) => [...new Uint8Array(bytes)].map((byte) => byte.toString(16).padStart(2, "0")).join(""), "hex");
 async function sha256Hex(value) {
@@ -972,7 +1011,7 @@ async function verifyFarmInfraManifestSignature(header, key, now = Date.now()) {
   if (!header || header.length > 2048) return false;
   const parts = header.split(",").map((part) => part.trim());
   const timestamp = Number(
-    _optionalChain([/^t=(\d{1,12})$/, 'access', _42 => _42.exec, 'call', _43 => _43(_nullishCoalesce(parts.find((part) => part.startsWith("t=")), () => ( ""))), 'optionalAccess', _44 => _44[1]])
+    _optionalChain([/^t=(\d{1,12})$/, 'access', _46 => _46.exec, 'call', _47 => _47(_nullishCoalesce(parts.find((part) => part.startsWith("t=")), () => ( ""))), 'optionalAccess', _48 => _48[1]])
   );
   if (!Number.isSafeInteger(timestamp)) return false;
   if (Math.abs(now / 1e3 - timestamp) > SIGNATURE_WINDOW_SECONDS) return false;
@@ -984,25 +1023,44 @@ ${timestamp}`);
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, verifyFarmInfraManifestSignature, "verifyFarmInfraManifestSignature");
 function processEnv() {
-  return _nullishCoalesce(_optionalChain([globalThis, 'access', _45 => _45.process, 'optionalAccess', _46 => _46.env]), () => ( {}));
+  return _nullishCoalesce(_optionalChain([globalThis, 'access', _49 => _49.process, 'optionalAccess', _50 => _50.env]), () => ( {}));
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, processEnv, "processEnv");
-async function createFarmAppManifestResponse(request, input, options) {
-  if (request.method !== "GET" && request.method !== "HEAD") return null;
-  if (!options.development) {
-    const key = _optionalChain([(_nullishCoalesce(options.env, () => ( processEnv()))), 'access', _47 => _47.FARMJS_API_KEY, 'optionalAccess', _48 => _48.trim, 'call', _49 => _49()]);
-    if (!input.analytics || !key) return null;
-    const signed = await verifyFarmInfraManifestSignature(
-      request.headers.get(FARM_INFRA_SIGNATURE_HEADER),
-      key
-    );
-    if (!signed)
-      return new Response(null, { status: 404, headers: { "cache-control": "no-store" } });
+var CORS_HEADERS = {
+  "access-control-allow-origin": "*",
+  "access-control-allow-methods": "GET, HEAD, OPTIONS",
+  "access-control-allow-headers": `If-None-Match, ${FARM_INFRA_SIGNATURE_HEADER}`,
+  "access-control-expose-headers": "ETag"
+};
+async function createFarmAppManifestResponse(request, input, options = {}) {
+  const method = request.method.toUpperCase();
+  if (method === "OPTIONS") return new Response(null, { status: 204, headers: CORS_HEADERS });
+  if (method !== "GET" && method !== "HEAD") {
+    return new Response("Method Not Allowed", {
+      status: 405,
+      headers: { ...CORS_HEADERS, allow: "GET, HEAD, OPTIONS", "content-type": "text/plain" }
+    });
   }
-  const body = JSON.stringify(createFarmAppManifest(input));
-  return new Response(request.method === "HEAD" ? null : body, {
-    headers: { "content-type": "application/json", "cache-control": "private, no-store" }
-  });
+  const signature = request.headers.get(FARM_INFRA_SIGNATURE_HEADER);
+  const key = input.analytics ? _optionalChain([(_nullishCoalesce(options.env, () => ( processEnv()))), 'access', _51 => _51.FARMJS_API_KEY, 'optionalAccess', _52 => _52.trim, 'call', _53 => _53()]) : void 0;
+  const full = Boolean(
+    signature && key && await verifyFarmInfraManifestSignature(signature, key)
+  );
+  const body = JSON.stringify(createFarmAppManifest(input, { full }));
+  const etag = _chunkKIIMAWOJcjs.createFarmWeakETag.call(void 0, body);
+  const headers = {
+    ...CORS_HEADERS,
+    "content-type": "application/json; charset=utf-8",
+    // The full view is for Infra alone; shared caches keep the two views apart.
+    "cache-control": full ? "private, no-store" : "public, max-age=0, must-revalidate",
+    vary: FARM_INFRA_SIGNATURE_HEADER,
+    etag,
+    "x-content-type-options": "nosniff"
+  };
+  if (!full && _chunkKIIMAWOJcjs.matchesFarmIfNoneMatch.call(void 0, request.headers.get("if-none-match"), etag)) {
+    return new Response(null, { status: 304, headers });
+  }
+  return new Response(method === "HEAD" ? null : body, { status: 200, headers });
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, createFarmAppManifestResponse, "createFarmAppManifestResponse");
 
@@ -1037,4 +1095,7 @@ _chunkS3JO3N4Hcjs.__name.call(void 0, createFarmAppManifestResponse, "createFarm
 
 
 
-exports.formatRouteSegment = formatRouteSegment; exports.createRouteDirectoryPattern = createRouteDirectoryPattern; exports.stripRouteGroups = stripRouteGroups; exports.getRouteGroupScope = getRouteGroupScope; exports.isInRouteGroupScope = isInRouteGroupScope; exports.getRouteDirectoryDepth = getRouteDirectoryDepth; exports.routeBoundaryCoversDirectory = routeBoundaryCoversDirectory; exports.HOISTED_HEAD_ELEMENT = HOISTED_HEAD_ELEMENT; exports.extractFarmFullDocument = extractFarmFullDocument; exports.classifyFarmDocumentPrefix = classifyFarmDocumentPrefix; exports.removeFarmDocumentTitles = removeFarmDocumentTitles; exports.ensureFarmDocumentMeta = ensureFarmDocumentMeta; exports.composeFarmFullDocument = composeFarmFullDocument; exports.renderFarmLocaleAlternateLinks = renderFarmLocaleAlternateLinks; exports.createLateRedirectRecovery = createLateRedirectRecovery; exports.createLateNotFoundRecovery = createLateNotFoundRecovery; exports.createFarmMetadataRouteResponse = createFarmMetadataRouteResponse; exports.listFarmMCPLlmsTxtLinks = listFarmMCPLlmsTxtLinks; exports.createFarmAiCatalogResponse = createFarmAiCatalogResponse; exports.resolveDefaultErrorStatus = resolveDefaultErrorStatus; exports.getDefaultErrorStatusText = getDefaultErrorStatusText; exports.createDefaultErrorMarkup = createDefaultErrorMarkup; exports.createFarmThemeDocumentParts = createFarmThemeDocumentParts; exports.applyFarmThemeDocument = applyFarmThemeDocument; exports.FARM_API_CATALOG_PATH = FARM_API_CATALOG_PATH; exports.resolveFarmApiCatalogInput = resolveFarmApiCatalogInput; exports.createFarmApiCatalogResponse = createFarmApiCatalogResponse; exports.FARM_APP_MANIFEST_PATH = FARM_APP_MANIFEST_PATH; exports.resolveFarmAppManifestInput = resolveFarmAppManifestInput; exports.createFarmAppManifestResponse = createFarmAppManifestResponse;
+
+
+
+exports.formatRouteSegment = formatRouteSegment; exports.createRouteDirectoryPattern = createRouteDirectoryPattern; exports.stripRouteGroups = stripRouteGroups; exports.getRouteGroupScope = getRouteGroupScope; exports.isInRouteGroupScope = isInRouteGroupScope; exports.getRouteDirectoryDepth = getRouteDirectoryDepth; exports.routeBoundaryCoversDirectory = routeBoundaryCoversDirectory; exports.HOISTED_HEAD_ELEMENT = HOISTED_HEAD_ELEMENT; exports.extractFarmFullDocument = extractFarmFullDocument; exports.classifyFarmDocumentPrefix = classifyFarmDocumentPrefix; exports.removeFarmDocumentTitles = removeFarmDocumentTitles; exports.ensureFarmDocumentMeta = ensureFarmDocumentMeta; exports.composeFarmFullDocument = composeFarmFullDocument; exports.renderFarmLocaleAlternateLinks = renderFarmLocaleAlternateLinks; exports.createLateRedirectRecovery = createLateRedirectRecovery; exports.createLateNotFoundRecovery = createLateNotFoundRecovery; exports.createFarmMetadataRouteResponse = createFarmMetadataRouteResponse; exports.listFarmMCPLlmsTxtLinks = listFarmMCPLlmsTxtLinks; exports.createFarmAiCatalogResponse = createFarmAiCatalogResponse; exports.resolveDefaultErrorStatus = resolveDefaultErrorStatus; exports.getDefaultErrorStatusText = getDefaultErrorStatusText; exports.createDefaultErrorMarkup = createDefaultErrorMarkup; exports.createFarmThemeDocumentParts = createFarmThemeDocumentParts; exports.applyFarmThemeDocument = applyFarmThemeDocument; exports.FARM_API_CATALOG_PATH = FARM_API_CATALOG_PATH; exports.resolveFarmApiCatalogInput = resolveFarmApiCatalogInput; exports.createFarmApiCatalogResponse = createFarmApiCatalogResponse; exports.FARM_APP_MANIFEST_PATH = FARM_APP_MANIFEST_PATH; exports.FARM_APP_MANIFEST_LEGACY_PATH = FARM_APP_MANIFEST_LEGACY_PATH; exports.isFarmAppManifestPath = isFarmAppManifestPath; exports.FARM_INFRA_SIGNATURE_HEADER = FARM_INFRA_SIGNATURE_HEADER; exports.resolveFarmAppManifestInput = resolveFarmAppManifestInput; exports.createFarmAppManifestResponse = createFarmAppManifestResponse;

package/dist/{chunk-ULAWS2PA.cjs → chunk-LPFV45AY.cjs}

@@ -7,40 +7,41 @@ var _chunkM7MKQXAFcjs = require('./chunk-M7MKQXAF.cjs');
 
 
 
-var _chunk3BU22U3Mcjs = require('./chunk-3BU22U3M.cjs');
+var _chunkG2TEB74Scjs = require('./chunk-G2TEB74S.cjs');
 
 
 
 
 
-var _chunkZ2HLU4IXcjs = require('./chunk-Z2HLU4IX.cjs');
+
+var _chunk4GWRFP22cjs = require('./chunk-4GWRFP22.cjs');
 
 
 var _chunkM2L4MYDQcjs = require('./chunk-M2L4MYDQ.cjs');
 
 
 
-var _chunkBMWDEBXOcjs = require('./chunk-BMWDEBXO.cjs');
+var _chunkSHLXACIOcjs = require('./chunk-SHLXACIO.cjs');
 
 
 var _chunk5QIKR7RRcjs = require('./chunk-5QIKR7RR.cjs');
 
 
-var _chunkKNBBQHO2cjs = require('./chunk-KNBBQHO2.cjs');
-
-
 var _chunkE3UK5IIBcjs = require('./chunk-E3UK5IIB.cjs');
 
 
 var _chunkUQZ4AYTHcjs = require('./chunk-UQZ4AYTH.cjs');
 
 
+var _chunkKNBBQHO2cjs = require('./chunk-KNBBQHO2.cjs');
+
+
 
 
 var _chunkOX6O6WVAcjs = require('./chunk-OX6O6WVA.cjs');
 
 
-var _chunkUXFQ3UDAcjs = require('./chunk-UXFQ3UDA.cjs');
+var _chunkNICDYKBScjs = require('./chunk-NICDYKBS.cjs');
 
 
 var _chunkBIDYX3SLcjs = require('./chunk-BIDYX3SL.cjs');
@@ -56,7 +57,7 @@ var _CookieJarImpl = class _CookieJarImpl {
   constructor(req, res) {
     this.req = req;
     this.res = res;
-    this.cookies = _chunk3BU22U3Mcjs.parseMiddlewareCookieHeader.call(void 0, req.headers.cookie);
+    this.cookies = _chunkG2TEB74Scjs.parseMiddlewareCookieHeader.call(void 0, req.headers.cookie);
     const existing = res.getHeader("Set-Cookie");
     this.setCookies = Array.isArray(existing) ? existing.map(String) : existing === void 0 ? [] : [String(existing)];
   }
@@ -65,13 +66,13 @@ var _CookieJarImpl = class _CookieJarImpl {
   }
   set(name, value, options = {}) {
     this.cookies[name] = value;
-    const cookieString = _chunk3BU22U3Mcjs.serializeMiddlewareCookie.call(void 0, name, value, options);
+    const cookieString = _chunkG2TEB74Scjs.serializeMiddlewareCookie.call(void 0, name, value, options);
     this.setCookies.push(cookieString);
     this.res.setHeader("Set-Cookie", this.setCookies);
   }
   delete(name, options = {}) {
     delete this.cookies[name];
-    this.setCookies.push(_chunk3BU22U3Mcjs.serializeMiddlewareCookieDeletion.call(void 0, name, options));
+    this.setCookies.push(_chunkG2TEB74Scjs.serializeMiddlewareCookieDeletion.call(void 0, name, options));
     this.res.setHeader("Set-Cookie", this.setCookies);
   }
   getAll() {
@@ -80,8 +81,8 @@ var _CookieJarImpl = class _CookieJarImpl {
 };
 _chunkS3JO3N4Hcjs.__name.call(void 0, _CookieJarImpl, "CookieJarImpl");
 var CookieJarImpl = _CookieJarImpl;
-function createContext(req, res, viteServer, parent, server) {
-  const url = _chunkUXFQ3UDAcjs.resolveFarmRequestURL.call(void 0, req, { trustProxy: _optionalChain([server, 'optionalAccess', _ => _.trustProxy]) });
+function createContext(req, res, viteServer, parent, server, toRoutePathname) {
+  const url = _chunkNICDYKBScjs.resolveFarmRequestURL.call(void 0, req, { trustProxy: _optionalChain([server, 'optionalAccess', _ => _.trustProxy]) });
   const headers = /* @__PURE__ */ new Map();
   const data = _optionalChain([parent, 'optionalAccess', _2 => _2.data]) ? new Map(parent.data) : /* @__PURE__ */ new Map();
   const locals = _optionalChain([parent, 'optionalAccess', _3 => _3.locals]) ? new Map(parent.locals) : /* @__PURE__ */ new Map();
@@ -105,6 +106,7 @@ function createContext(req, res, viteServer, parent, server) {
     response: res,
     url,
     pathname: url.pathname,
+    routePathname: _chunk4GWRFP22cjs.toMiddlewareRoutePathname.call(void 0, url.pathname, toRoutePathname),
     searchParams: url.searchParams,
     method: req.method || "GET",
     params: {},
@@ -140,6 +142,7 @@ function createContext(req, res, viteServer, parent, server) {
       const newUrl = new URL(rewriteUrl, ctx.url);
       ctx.url = newUrl;
       ctx.pathname = newUrl.pathname;
+      ctx.routePathname = _chunk4GWRFP22cjs.toMiddlewareRoutePathname.call(void 0, newUrl.pathname, toRoutePathname);
       ctx.searchParams = newUrl.searchParams;
       ctx.route = newUrl.pathname;
       req.url = rewriteUrl;
@@ -246,7 +249,7 @@ var _MiddlewareManager = class _MiddlewareManager {
     for (const [index, entry] of entries.entries()) {
       const handlers = this.getConfigHandlers(entry);
       const middlewareConfig = this.toMiddlewareConfig(entry);
-      _chunkZ2HLU4IXcjs.compileMiddlewareConfig.call(void 0, middlewareConfig);
+      _chunk4GWRFP22cjs.compileMiddlewareConfig.call(void 0, middlewareConfig);
       if (handlers.length === 0) {
         this.globalConfig = middlewareConfig;
         continue;
@@ -269,7 +272,7 @@ var _MiddlewareManager = class _MiddlewareManager {
       const discovered = [];
       await this.discoverInDirectory(appDir, "/", "", discovered);
       for (const entry of discovered) {
-        _chunkZ2HLU4IXcjs.compileMiddlewareRoute.call(void 0, entry.middleware);
+        _chunk4GWRFP22cjs.compileMiddlewareRoute.call(void 0, entry.middleware);
         middlewareByDirectory.set(entry.location.directory, entry);
       }
     }
@@ -327,19 +330,19 @@ var _MiddlewareManager = class _MiddlewareManager {
     try {
       let module;
       if (this.viteServer) {
-        module = await _chunkBMWDEBXOcjs.loadFarmDevModule.call(void 0, this.viteServer, filePath);
+        module = await _chunkSHLXACIOcjs.loadFarmDevModule.call(void 0, this.viteServer, filePath);
       } else {
         module = await import(
           /* @vite-ignore */
-          _chunkBMWDEBXOcjs.toFileModuleUrl.call(void 0, filePath)
+          _chunkSHLXACIOcjs.toFileModuleUrl.call(void 0, filePath)
         );
       }
-      const normalized = _chunk3BU22U3Mcjs.normalizeMiddlewareModule.call(void 0, module, routePath);
+      const normalized = _chunkG2TEB74Scjs.normalizeMiddlewareModule.call(void 0, module, routePath);
       if (!normalized) {
         throw new Error("must export a default handler or a named middleware handler");
       }
       if (normalized.config) {
-        _chunkZ2HLU4IXcjs.compileMiddlewareConfig.call(void 0, normalized.config);
+        _chunk4GWRFP22cjs.compileMiddlewareConfig.call(void 0, normalized.config);
       }
       return {
         path: routePath,
@@ -356,7 +359,7 @@ var _MiddlewareManager = class _MiddlewareManager {
    * Execute middleware for a request
    */
   async execute(req, res) {
-    const url = _chunkUXFQ3UDAcjs.resolveFarmRequestURL.call(void 0, req, { trustProxy: _optionalChain([this, 'access', _6 => _6.server, 'optionalAccess', _7 => _7.trustProxy]) });
+    const url = _chunkNICDYKBScjs.resolveFarmRequestURL.call(void 0, req, { trustProxy: _optionalChain([this, 'access', _6 => _6.server, 'optionalAccess', _7 => _7.trustProxy]) });
     const pathname = url.pathname;
     const toRoutePathname = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (value) => _optionalChain([this, 'access', _8 => _8.i18n, 'optionalAccess', _9 => _9.enabled]) ? _chunkBIDYX3SLcjs.stripFarmLocaleFromPathname.call(void 0, value, this.i18n) : _chunkI57LW5VZcjs.stripFarmBasePath.call(void 0, value, _nullishCoalesce(_optionalChain([this, 'access', _10 => _10.i18n, 'optionalAccess', _11 => _11.basePath]), () => ( "/"))), "toRoutePathname");
     const routePathname = toRoutePathname(pathname);
@@ -364,7 +367,7 @@ var _MiddlewareManager = class _MiddlewareManager {
     const method = req.method || "GET";
     const startTime = Date.now();
     let parentData;
-    let ctx = createContext(req, res, this.viteServer, void 0, this.server);
+    let ctx = createContext(req, res, this.viteServer, void 0, this.server, toRoutePathname);
     if (this.globalConfig) {
       const globalMatch = this.matchesConfig(routePathname, this.globalConfig, ctx);
       if (!globalMatch.matched) {
@@ -378,7 +381,7 @@ var _MiddlewareManager = class _MiddlewareManager {
       ...this.configMiddleware.map((mw) => ({ mw, routeMatch: { matched: true } })),
       ...this.middleware.map((mw) => ({
         mw,
-        routeMatch: _chunkZ2HLU4IXcjs.matchesMiddlewareRouteAt.call(void 0, toMiddlewarePathnames(routePathname), mw)
+        routeMatch: _chunk4GWRFP22cjs.matchesMiddlewareRouteAt.call(void 0, toMiddlewarePathnames(routePathname), mw)
       })).filter((entry) => entry.routeMatch.matched)
     ];
     if (applicable.length === 0) {
@@ -404,17 +407,17 @@ var _MiddlewareManager = class _MiddlewareManager {
       for (; ; ) {
         for (const entry of pass) yield { ...entry, pathname: passPathname };
         const rewrittenPathname = toRoutePathname(
-          _chunkUXFQ3UDAcjs.resolveFarmRequestURL.call(void 0, req, { trustProxy }).pathname
+          _chunkNICDYKBScjs.resolveFarmRequestURL.call(void 0, req, { trustProxy }).pathname
         );
         if (rewrittenPathname === passPathname) return;
         passPathname = rewrittenPathname;
         const passPathnames = toMiddlewarePathnames(passPathname);
-        if (globalConfig && !_chunkZ2HLU4IXcjs.matchesMiddlewareConfigAt.call(void 0, passPathnames, globalConfig, ctx).matched) {
+        if (globalConfig && !_chunk4GWRFP22cjs.matchesMiddlewareConfigAt.call(void 0, passPathnames, globalConfig, ctx).matched) {
           return;
         }
         pass = allMiddleware.filter((mw) => !ran.has(mw)).map((mw) => ({
           mw,
-          routeMatch: mw.source === "config" ? { matched: true } : _chunkZ2HLU4IXcjs.matchesMiddlewareRouteAt.call(void 0, passPathnames, mw)
+          routeMatch: mw.source === "config" ? { matched: true } : _chunk4GWRFP22cjs.matchesMiddlewareRouteAt.call(void 0, passPathnames, mw)
         })).filter((entry) => entry.routeMatch.matched);
       }
     }
@@ -432,7 +435,7 @@ var _MiddlewareManager = class _MiddlewareManager {
         ctx.params = { ...ctx.params, ...configMatch.params };
       }
       if (parentData) {
-        ctx = createContext(req, res, this.viteServer, parentData, this.server);
+        ctx = createContext(req, res, this.viteServer, parentData, this.server, toRoutePathname);
         if (routeMatch.params) {
           ctx.params = { ...ctx.params, ...routeMatch.params };
         }
@@ -525,7 +528,7 @@ var _MiddlewareManager = class _MiddlewareManager {
    * Check if pathname matches middleware config
    */
   matchesConfig(pathname, config, ctx) {
-    return _chunkZ2HLU4IXcjs.matchesMiddlewareConfigAt.call(void 0, this.toMiddlewarePathnames(pathname), config, ctx);
+    return _chunk4GWRFP22cjs.matchesMiddlewareConfigAt.call(void 0, this.toMiddlewarePathnames(pathname), config, ctx);
   }
   /**
    * Reload middleware (for HMR)

package/dist/{chunk-3KZS4SUS.mjs → chunk-MCIZVNOQ.mjs}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-FUZEBRP3.mjs";
 import {
   getCurrentRequestOrNull
-} from "./chunk-FDR64H6B.mjs";
+} from "./chunk-3KGDJLJK.mjs";
 import {
   __name
 } from "./chunk-LPEX4YW6.mjs";