@farm.js/core 0.1.35 → 0.1.36

package/dist/{chunk-43FMW62B.mjs → chunk-KMTGADN3.mjs}

@@ -34,6 +34,33 @@ async function loadFarmDevModule(server, id, environmentName = "ssr") {
   }
 }
 __name(loadFarmDevModule, "loadFarmDevModule");
+function invalidateFarmDevDependents(server, file, targets, environmentName = "ssr") {
+  const environment = server.environments[environmentName];
+  const graph = environment?.moduleGraph;
+  if (!graph || targets.size === 0) return [];
+  const posix = /* @__PURE__ */ __name((filePath) => filePath.replace(/\\/g, "/"), "posix");
+  const byFile = new Map([...targets].map((target) => [posix(target), target]));
+  const reached = /* @__PURE__ */ new Set();
+  const seen = /* @__PURE__ */ new Set();
+  const queue = [...graph.getModulesByFile(posix(file)) ?? []];
+  while (queue.length > 0) {
+    const node = queue.pop();
+    if (seen.has(node)) continue;
+    seen.add(node);
+    const target = node.file ? byFile.get(posix(node.file)) : void 0;
+    if (target) reached.add(target);
+    queue.push(...node.importers);
+  }
+  if (reached.size === 0) return [];
+  const evaluatedModules = environment.runner?.evaluatedModules;
+  for (const node of seen) {
+    graph.invalidateModule(node);
+    const evaluated = node.id ? evaluatedModules?.getModuleById(node.id) : void 0;
+    if (evaluated) evaluatedModules.invalidateModule(evaluated);
+  }
+  return [...reached];
+}
+__name(invalidateFarmDevDependents, "invalidateFarmDevDependents");
 function invalidateFailedFarmDevModules(server) {
   for (const entry of Object.values(server.environments)) {
     const environment = entry;
@@ -62,6 +89,7 @@ __name(toFileModuleUrl, "toFileModuleUrl");
 export {
   FarmDevEnvironmentError,
   loadFarmDevModule,
+  invalidateFarmDevDependents,
   invalidateFailedFarmDevModules,
   toFileModuleUrl
 };

package/dist/{chunk-6ETPZTJI.mjs → chunk-LSZAVSGY.mjs}

@@ -1,9 +1,12 @@
+import {
+  FARM_DEFAULT_MCP_TOOLS
+} from "./chunk-UH6QN5NL.mjs";
 import {
   DEFAULT_ERROR_STYLES
 } from "./chunk-XAXTTBUT.mjs";
 import {
   serializeFarmLlmsTxt
-} from "./chunk-UJD4PHYB.mjs";
+} from "./chunk-DTSROJ5J.mjs";
 import {
   emitFarmAgentRead
 } from "./chunk-MVL2RAJW.mjs";
@@ -18,15 +21,16 @@ import {
   _listFarmRegisteredMCPServers
 } from "./chunk-ZLAT2CWY.mjs";
 import {
+  createFarmWeakETag,
   matchesFarmIfNoneMatch
-} from "./chunk-Y7RKTKYI.mjs";
+} from "./chunk-ZMMBIVQM.mjs";
 import {
   resolveFarmAPIServerBasePath,
   resolveFarmAPIServerRoutePath
 } from "./chunk-BTHHUD7Q.mjs";
 import {
   FARM_VERSION
-} from "./chunk-3PXS2MHU.mjs";
+} from "./chunk-OO7GXVSR.mjs";
 import {
   localizeFarmPathname
 } from "./chunk-L3KT7IXV.mjs";
@@ -153,7 +157,7 @@ function ensureFarmDocumentHead(markup) {
 }
 __name(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">`
@@ -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 = applyFarmBasePath(server.path, input.basePath);
+      sources.set(endpoint, { ...server, endpoint, local: true });
+    }
+  }
   return [...sources.values()];
 }
 __name(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 = createFarmWeakETag(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`,
@@ -565,15 +576,6 @@ function truncate(text) {
   return text.length <= CARD_DESCRIPTION_MAX ? text : `${text.slice(0, CARD_DESCRIPTION_MAX - 1).trimEnd()}\u2026`;
 }
 __name(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");
-}
-__name(fnv1a, "fnv1a");
 
 // src/components/error-page.ts
 var ERROR_STATUS_TEXT = {
@@ -868,7 +870,12 @@ function createFarmApiCatalogResponse(method, input, request) {
 __name(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;
+}
+__name(isFarmAppManifestPath, "isFarmAppManifestPath");
 var FARM_INFRA_SIGNATURE_HEADER = "farmjs-infra-signature";
 var SIGNED_PURPOSE = "farmjs-manifest-v1";
 var SIGNATURE_WINDOW_SECONDS = 300;
@@ -901,8 +908,8 @@ var SOURCES = {
   standalone: "defineTool",
   serverFunction: "serverFunction"
 };
-function createFarmAppManifest(input) {
-  return {
+function createFarmAppManifest(input, { full = false } = {}) {
+  const manifest = {
     schemaVersion: 1,
     app: {
       farm: FARM_VERSION,
@@ -912,37 +919,69 @@ function createFarmAppManifest(input) {
     },
     packages: input.packages,
     mcp: {
-      servers: _listFarmMCPCatalogs().map(({ server, tools, details }) => ({
-        name: server.name,
-        version: server.version,
-        path: server.path,
-        resources: [...details?.resources ?? []],
-        prompts: [...details?.prompts ?? []],
-        tools: tools.map((tool) => {
-          const schemas = details?.schemas?.[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 } : {},
-            ...schemas?.output ? { outputSchema: schemas.output } : {}
-          };
-        })
-      }))
+      servers: _listFarmMCPCatalogs().map(({ server, tools, details }) => {
+        const listed = full || details?.public === true;
+        return {
+          name: server.name,
+          version: server.version,
+          path: server.path,
+          authorization: details?.public === true ? "none" : "required",
+          resources: listed ? [...details?.resources ?? []] : [],
+          prompts: listed ? [...details?.prompts ?? []] : [],
+          tools: (listed ? tools : []).map((tool) => {
+            const schemas = details?.schemas?.[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 } : {},
+              ...schemas?.output ? { outputSchema: schemas.output } : {}
+            };
+          })
+        };
+      })
     },
     webmcp: input.webmcp,
     integrations: input.integrations,
     agent: input.agent,
     plugins: input.plugins
   };
+  manifest.mcp.servers.push(...listDefaultServer(input));
+  return manifest;
 }
 __name(createFarmAppManifest, "createFarmAppManifest");
+function listDefaultServer(input) {
+  const server = input.defaultMCP?.();
+  if (!server) return [];
+  return [
+    {
+      name: server.name,
+      version: server.version,
+      path: server.path,
+      authorization: "none",
+      resources: [],
+      prompts: [],
+      tools: 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 } : {}
+      }))
+    }
+  ];
+}
+__name(listDefaultServer, "listDefaultServer");
 var encoder = new TextEncoder();
 var hex = /* @__PURE__ */ __name((bytes) => [...new Uint8Array(bytes)].map((byte) => byte.toString(16).padStart(2, "0")).join(""), "hex");
 async function sha256Hex(value) {
@@ -987,22 +1026,41 @@ function processEnv() {
   return globalThis.process?.env ?? {};
 }
 __name(processEnv, "processEnv");
-async function createFarmAppManifestResponse(request, input, options) {
-  if (request.method !== "GET" && request.method !== "HEAD") return null;
-  if (!options.development) {
-    const key = (options.env ?? processEnv()).FARMJS_API_KEY?.trim();
-    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 ? (options.env ?? processEnv()).FARMJS_API_KEY?.trim() : void 0;
+  const full = Boolean(
+    signature && key && await verifyFarmInfraManifestSignature(signature, key)
+  );
+  const body = JSON.stringify(createFarmAppManifest(input, { full }));
+  const etag = createFarmWeakETag(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 && matchesFarmIfNoneMatch(request.headers.get("if-none-match"), etag)) {
+    return new Response(null, { status: 304, headers });
+  }
+  return new Response(method === "HEAD" ? null : body, { status: 200, headers });
 }
 __name(createFarmAppManifestResponse, "createFarmAppManifestResponse");
 
@@ -1035,6 +1093,9 @@ export {
   resolveFarmApiCatalogInput,
   createFarmApiCatalogResponse,
   FARM_APP_MANIFEST_PATH,
+  FARM_APP_MANIFEST_LEGACY_PATH,
+  isFarmAppManifestPath,
+  FARM_INFRA_SIGNATURE_HEADER,
   resolveFarmAppManifestInput,
   createFarmAppManifestResponse
 };

package/dist/{chunk-HMIJDL7S.mjs → chunk-MKYBIIAQ.mjs}

@@ -16,11 +16,15 @@ import {
   readNodeRequestBody,
   resolveFarmServerConfig,
   setRequestContext
-} from "./chunk-Y7RKTKYI.mjs";
+} from "./chunk-ZMMBIVQM.mjs";
 import {
   applyWebResponseHeaders,
   sendWebResponse
 } from "./chunk-Z2RZJZIZ.mjs";
+import {
+  createFarmAPIMiddlewarePathnames,
+  resolveFarmAPIServerBasePath
+} from "./chunk-BTHHUD7Q.mjs";
 import {
   api,
   defineIntegrationAPIOperation
@@ -1577,10 +1581,12 @@ async function dispatchIntegrationRequest(runtime, request, options = {}) {
   const middleware = [...integration.middleware || []];
   const forwardedSetCookies = [];
   for (const entry of middleware) {
+    if (options.ranMiddleware?.has(entry)) continue;
     const params = resolveIntegrationMiddlewareParams(entry, pathname, runtime.config);
     if (!params) {
       continue;
     }
+    options.ranMiddleware?.add(entry);
     const handlerContext = createServerIntegrationHandlerContext({
       runtime,
       route: {
@@ -1845,6 +1851,7 @@ async function dispatchIntegrationRequests(integrations, runtime, request, optio
       request.clone(),
       {
         currentRequest: options.currentRequest,
+        ranMiddleware: options.ranMiddleware,
         onForwardedCookies: /* @__PURE__ */ __name((cookies) => setCookies.push(...cookies), "onForwardedCookies")
       }
     );
@@ -2006,8 +2013,10 @@ function resolveIntegrationMiddlewareParams(entry, pathname, config) {
   const params = resolveMatcherParams(entry.matcher, pathname);
   if (params || !entry.matcher) return params;
   const routePathname = resolveIntegrationRoutePathname(pathname, config);
-  if (routePathname !== pathname) {
-    const routeParams = resolveMatcherParams(entry.matcher, routePathname);
+  const candidates = [.../* @__PURE__ */ new Set([pathname, ...getIntegrationAPIPathnames(config)(routePathname)])];
+  for (const candidate of candidates) {
+    if (candidate === pathname) continue;
+    const routeParams = resolveMatcherParams(entry.matcher, candidate);
     if (routeParams) return routeParams;
   }
   let compiled = compiledIntegrationGuards.get(entry);
@@ -2017,13 +2026,28 @@ function resolveIntegrationMiddlewareParams(entry, pathname, config) {
     });
     compiledIntegrationGuards.set(entry, compiled);
   }
-  for (const candidate of routePathname === pathname ? [pathname] : [pathname, routePathname]) {
+  for (const candidate of candidates) {
     const result = matchesCompiledMiddlewareConfig(candidate, compiled, noMiddlewareContext);
     if (result.matched) return result.params ?? {};
   }
   return null;
 }
 __name(resolveIntegrationMiddlewareParams, "resolveIntegrationMiddlewareParams");
+var FARM_INTEGRATION_API_BASE_PATH_KEY = "__farmAPIServerBasePath";
+var integrationAPIPathnames = /* @__PURE__ */ new WeakMap();
+function getIntegrationAPIPathnames(config) {
+  if (!config) return (pathname) => [pathname];
+  let toPathnames = integrationAPIPathnames.get(config);
+  if (!toPathnames) {
+    const recorded = config[FARM_INTEGRATION_API_BASE_PATH_KEY];
+    const api2 = config.api;
+    const serverBasePath = typeof recorded === "string" ? recorded : typeof api2?.baseURL === "string" && typeof api2.basePath === "string" ? resolveFarmAPIServerBasePath(api2) : void 0;
+    toPathnames = createFarmAPIMiddlewarePathnames(serverBasePath);
+    integrationAPIPathnames.set(config, toPathnames);
+  }
+  return toPathnames;
+}
+__name(getIntegrationAPIPathnames, "getIntegrationAPIPathnames");
 function resolveIntegrationRoutePathname(pathname, config) {
   const basePath = typeof config?.basePath === "string" ? config.basePath : void 0;
   let routePathname = basePath ? stripFarmBasePath(pathname, basePath) : pathname;
@@ -2158,5 +2182,6 @@ export {
   matchRegisteredIntegrationRoute,
   getRegisteredIntegrationAPIManifest,
   dispatchIntegrationRequest,
-  dispatchIntegrationRequests
+  dispatchIntegrationRequests,
+  FARM_INTEGRATION_API_BASE_PATH_KEY
 };