@farm.js/core 0.1.15 → 0.1.17

package/dist/server-fn.mjs

@@ -1,9 +1,14 @@
 import {
   FARM_SERVER_FN_SYMBOL,
+  _attachServerFunctionDescriptor,
+  _describeServerFunction,
+  _invokeServerFunction,
   _parseServerFnSchema,
+  _runServerFunctionForCaller,
   createServerFn,
+  createServerFunctionDescriptor,
   createServerMiddleware
-} from "./chunk-S3QW3BIS.mjs";
+} from "./chunk-WD4YXVLV.mjs";
 import {
   FARM_SERVER_FN_FAILURE_SYMBOL,
   ServerActionError,
@@ -13,10 +18,11 @@ import {
 } from "./chunk-QCFFHV5H.mjs";
 import "./chunk-FP2INE7H.mjs";
 import "./chunk-XF7Q24PF.mjs";
-import "./chunk-IGO2HEV7.mjs";
+import "./chunk-F6SJAKFJ.mjs";
 import "./chunk-4SIYUGRY.mjs";
 import "./chunk-C4NCTZLM.mjs";
 import "./chunk-FUZEBRP3.mjs";
+import "./chunk-CBBLJMR5.mjs";
 import "./chunk-IZY3V5XW.mjs";
 import "./chunk-55YI3RRB.mjs";
 import "./chunk-LPEX4YW6.mjs";
@@ -25,9 +31,14 @@ export {
   FARM_SERVER_FN_SYMBOL,
   ServerActionError,
   ServerFnFailure,
+  _attachServerFunctionDescriptor,
+  _describeServerFunction,
+  _invokeServerFunction,
   _parseServerFnSchema,
+  _runServerFunctionForCaller,
   createServerFn,
   createServerFnTransportError,
+  createServerFunctionDescriptor,
   createServerMiddleware,
   isServerFnFailure
 };

package/dist/server-plugins.d.mts

@@ -1,9 +1,10 @@
-import { cg as RedirectConfig, b as FarmRequest, c as FarmResponse, d as FarmPluginContext, a as FarmPlugin, ch as HeaderConfig, ci as RewriteConfig } from './client-plugins-C1EgdoJM.mjs';
-export { bE as FarmPluginLifecycle, bN as FarmPluginRuntimeEndpoint, bO as FarmPluginRuntimeEndpointEvent, bF as FarmRequestPluginContext, bG as FarmRequestStore } from './client-plugins-C1EgdoJM.mjs';
+import { ch as RedirectConfig, b as FarmRequest, c as FarmResponse, d as FarmPluginContext, a as FarmPlugin, ci as HeaderConfig, cj as RewriteConfig } from './client-plugins-JXXmZliS.mjs';
+export { bF as FarmPluginLifecycle, bO as FarmPluginRuntimeEndpoint, bP as FarmPluginRuntimeEndpointEvent, bG as FarmRequestPluginContext, bH as FarmRequestStore } from './client-plugins-JXXmZliS.mjs';
 import { R as ResolvedFarmI18nConfig } from './types-Z0aotQ8w.mjs';
 export { createCompressionPlugin } from './internal/compression-runtime.mjs';
 import './lifecycle-DK06VuKP.mjs';
-import './route-C6UClI1z.mjs';
+import './route-B0XrsrFk.mjs';
+import './endpoint-DAc96i93.mjs';
 import './cache.mjs';
 import './renderer.mjs';
 import './deployment.mjs';
@@ -29,6 +30,8 @@ import './server-action-security.mjs';
 import './server-fn-error-DDh14a0V.mjs';
 import 'esbuild';
 import './image-config-Duob7wER.mjs';
+import './server-fn.mjs';
+import './server-query.mjs';
 import './types-DQnyD3VD.mjs';
 import './font.mjs';
 import './after.mjs';

package/dist/server-plugins.d.ts

@@ -1,9 +1,10 @@
-import { cg as RedirectConfig, b as FarmRequest, c as FarmResponse, d as FarmPluginContext, a as FarmPlugin, ch as HeaderConfig, ci as RewriteConfig } from './client-plugins-CslwYp3E.js';
-export { bE as FarmPluginLifecycle, bN as FarmPluginRuntimeEndpoint, bO as FarmPluginRuntimeEndpointEvent, bF as FarmRequestPluginContext, bG as FarmRequestStore } from './client-plugins-CslwYp3E.js';
+import { ch as RedirectConfig, b as FarmRequest, c as FarmResponse, d as FarmPluginContext, a as FarmPlugin, ci as HeaderConfig, cj as RewriteConfig } from './client-plugins-C089bQhN.js';
+export { bF as FarmPluginLifecycle, bO as FarmPluginRuntimeEndpoint, bP as FarmPluginRuntimeEndpointEvent, bG as FarmRequestPluginContext, bH as FarmRequestStore } from './client-plugins-C089bQhN.js';
 import { R as ResolvedFarmI18nConfig } from './types-Z0aotQ8w.js';
 export { createCompressionPlugin } from './internal/compression-runtime.js';
 import './lifecycle-DK06VuKP.js';
-import './route-CHBaW55F.js';
+import './route-DOEpbyWZ.js';
+import './endpoint-1zA994xL.js';
 import './cache.js';
 import './renderer.js';
 import './deployment.js';
@@ -29,6 +30,8 @@ import './server-action-security.js';
 import './server-fn-error-DDh14a0V.js';
 import 'esbuild';
 import './image-config-Duob7wER.js';
+import './server-fn.js';
+import './server-query.js';
 import './types-DQnyD3VD.js';
 import './font.js';
 import './after.js';

package/dist/server-query-client.cjs

@@ -433,6 +433,8 @@ var _FarmDataCache = class _FarmDataCache {
   constructor(config = {}) {
     this.entries = /* @__PURE__ */ new Map();
     this.inflight = /* @__PURE__ */ new Map();
+    /** Local entries by tag, so tag counts and pruning never scan unrelated entries. */
+    this.entriesByTag = /* @__PURE__ */ new Map();
     this.invalidatedTagVersions = /* @__PURE__ */ new Map();
     this.activeGenerations = /* @__PURE__ */ new Set();
     this.version = 0;
@@ -451,6 +453,7 @@ var _FarmDataCache = class _FarmDataCache {
   configure(config = {}) {
     this.generation++;
     this.entries.clear();
+    this.entriesByTag.clear();
     this.inflight.clear();
     this.invalidatedTagVersions.clear();
     this.activeGenerations.clear();
@@ -617,14 +620,12 @@ var _FarmDataCache = class _FarmDataCache {
     return entry;
   }
   delete(key) {
-    const deleted = this.entries.delete(key);
-    if (deleted) this.pruneInvalidatedTagVersions();
+    const deleted = this.deleteLocalEntry(key);
     emitFarmEvent({ type: "cache.delete", key, deleted });
     return deleted;
   }
   async deleteAsync(key) {
-    const deleted = this.entries.delete(key);
-    if (deleted) this.pruneInvalidatedTagVersions();
+    const deleted = this.deleteLocalEntry(key);
     if (this.adapter) {
       await this.adapter.delete(this.createAdapterKey(key));
     }
@@ -635,6 +636,7 @@ var _FarmDataCache = class _FarmDataCache {
     const count = this.entries.size;
     this.generation++;
     this.entries.clear();
+    this.entriesByTag.clear();
     this.inflight.clear();
     this.invalidatedTagVersions.clear();
     this.activeGenerations.clear();
@@ -720,23 +722,32 @@ var _FarmDataCache = class _FarmDataCache {
       return cached.value;
     }
     const inflight = this.inflight.get(key);
-    if (inflight) {
+    if (inflight && !this.wasInvalidatedSince(inflight.tags, inflight.startVersion)) {
       emitFarmEvent({ type: "cache.dedupe", key });
-      return inflight;
+      return inflight.promise;
     }
     const tags = Array.from(normalizeCacheOptionsTags(options));
     const generation = this.generation;
+    const startVersion = this.version;
     const promise = this.fillCacheEntry(key, producer, options, tags, generation).catch((error) => {
       emitFarmEvent({ type: "cache.error", key, operation: "set", error });
       throw error;
     }).finally(() => {
-      if (this.inflight.get(key) === promise) {
+      if (this.inflight.get(key)?.promise === promise) {
         this.inflight.delete(key);
       }
     });
-    this.inflight.set(key, promise);
+    this.inflight.set(key, { promise, tags, startVersion });
     return promise;
   }
+  /** A fill that started before one of its tags was invalidated cannot satisfy later readers. */
+  wasInvalidatedSince(tags, version) {
+    for (const tag of tags) {
+      const invalidatedVersion = this.invalidatedTagVersions.get(tag);
+      if (invalidatedVersion !== void 0 && invalidatedVersion > version) return true;
+    }
+    return false;
+  }
   async fillCacheEntry(key, producer, options, tags, generation) {
     const adapter = this.adapter;
     const namespace = this.namespace;
@@ -777,7 +788,7 @@ var _FarmDataCache = class _FarmDataCache {
       return value;
     } finally {
       this.activeGenerations.delete(activeGeneration);
-      this.pruneInvalidatedTagVersions();
+      this.pruneInvalidatedTagVersions(activeGeneration.tags);
       if (leaseToken && adapter?.releaseLease) {
         try {
           await adapter.releaseLease(leaseKey, leaseToken);
@@ -822,18 +833,9 @@ var _FarmDataCache = class _FarmDataCache {
     }
     return void 0;
   }
-  countEntriesForTag(tag) {
-    let count = 0;
-    for (const entry of this.entries.values()) {
-      if (entry.tags.has(tag)) {
-        count++;
-      }
-    }
-    return count;
-  }
   countEntriesForTags(tags) {
     let count = 0;
-    for (const entry of this.entries.values()) {
+    for (const entry of this.entriesByTag.get(tags[0]) ?? []) {
       if (tags.every((tag) => entry.tags.has(tag))) {
         count++;
       }
@@ -841,10 +843,10 @@ var _FarmDataCache = class _FarmDataCache {
     return count;
   }
   invalidateTag(normalizedTag) {
-    const count = this.countEntriesForTag(normalizedTag);
+    const count = this.entriesByTag.get(normalizedTag)?.size ?? 0;
     this.invalidatedTagVersions.delete(normalizedTag);
     this.invalidatedTagVersions.set(normalizedTag, ++this.version);
-    this.pruneInvalidatedTagVersions();
+    this.pruneInvalidatedTagVersions([normalizedTag]);
     return count;
   }
   toPublicEntry(entry) {
@@ -874,19 +876,51 @@ var _FarmDataCache = class _FarmDataCache {
     this.entries.set(key, entry);
   }
   storeLocalEntry(entry) {
-    this.entries.delete(entry.key);
+    const removed = [];
+    const replaced = this.detachLocalEntry(entry.key);
+    if (replaced) removed.push(replaced);
     this.entries.set(entry.key, entry);
+    for (const tag of entry.tags) {
+      let tagged = this.entriesByTag.get(tag);
+      if (!tagged) this.entriesByTag.set(tag, tagged = /* @__PURE__ */ new Set());
+      tagged.add(entry);
+    }
     while (this.entries.size > this.maxEntries) {
       const oldestKey = this.entries.keys().next().value;
       if (oldestKey === void 0) break;
-      this.entries.delete(oldestKey);
+      removed.push(this.detachLocalEntry(oldestKey));
     }
-    this.pruneInvalidatedTagVersions();
+    for (const removedEntry of removed) this.pruneInvalidatedTagVersions(removedEntry.tags);
   }
-  pruneInvalidatedTagVersions() {
-    tags: for (const [tag, invalidatedVersion] of this.invalidatedTagVersions) {
-      for (const entry of this.entries.values()) {
-        if (entry.tags.has(tag) && entry.createdVersion < invalidatedVersion) continue tags;
+  deleteLocalEntry(key) {
+    const entry = this.detachLocalEntry(key);
+    if (!entry) return false;
+    this.pruneInvalidatedTagVersions(entry.tags);
+    return true;
+  }
+  detachLocalEntry(key) {
+    const entry = this.entries.get(key);
+    if (!entry) return void 0;
+    this.entries.delete(key);
+    for (const tag of entry.tags) {
+      const tagged = this.entriesByTag.get(tag);
+      if (!tagged) continue;
+      tagged.delete(entry);
+      if (tagged.size === 0) this.entriesByTag.delete(tag);
+    }
+    return entry;
+  }
+  /**
+   * Drop invalidation versions that no local entry or active fill can be stale against.
+   * Callers pass only the tags whose dependents just changed, so the cost is bounded by
+   * the entries sharing those tags rather than by the whole cache.
+   */
+  pruneInvalidatedTagVersions(tags) {
+    tags: for (const tag of tags) {
+      const invalidatedVersion = this.invalidatedTagVersions.get(tag);
+      if (invalidatedVersion === void 0) continue;
+      for (const entry of this.entriesByTag.get(tag) ?? []) {
+        if (entry.createdVersion < invalidatedVersion) continue tags;
       }
       for (const generation of this.activeGenerations) {
         if (generation.tags.has(tag) && generation.createdVersion < invalidatedVersion)

package/dist/server-query-client.d.mts

@@ -5,6 +5,7 @@ export { F as FarmServerQueryActionInvocation, b as beginFarmServerQueryAction,
 import './cache.mjs';
 import './server-fn.mjs';
 import './server-fn-error-DDh14a0V.mjs';
+import './endpoint-DAc96i93.mjs';
 
 type UseServerQueryOptions = ServerQueryFetchOptions & {
     enabled?: boolean;

package/dist/server-query-client.d.ts

@@ -5,6 +5,7 @@ export { F as FarmServerQueryActionInvocation, b as beginFarmServerQueryAction,
 import './cache.js';
 import './server-fn.js';
 import './server-fn-error-DDh14a0V.js';
+import './endpoint-1zA994xL.js';
 
 type UseServerQueryOptions = ServerQueryFetchOptions & {
     enabled?: boolean;

package/dist/server-query-client.mjs

@@ -1,17 +1,17 @@
 "use client";
 import {
   useServerQuery
-} from "./chunk-GSDIZACQ.mjs";
+} from "./chunk-FG5H2VCJ.mjs";
 import {
   beginFarmServerQueryAction,
   completeFarmServerQueryAction,
   fetchServerQuery,
   prefetchServerQuery,
   shouldApplyFarmServerQueryActionResult
-} from "./chunk-76MNRHTS.mjs";
-import "./chunk-HKLRP3BN.mjs";
+} from "./chunk-UUYF3CHN.mjs";
+import "./chunk-5SPPCN5J.mjs";
 import "./chunk-KGB5UXJJ.mjs";
-import "./chunk-IGO2HEV7.mjs";
+import "./chunk-F6SJAKFJ.mjs";
 import "./chunk-4SIYUGRY.mjs";
 import "./chunk-C4NCTZLM.mjs";
 import "./chunk-FUZEBRP3.mjs";

package/dist/server-query.cjs

@@ -459,6 +459,8 @@ var _FarmDataCache = class _FarmDataCache {
   constructor(config = {}) {
     this.entries = /* @__PURE__ */ new Map();
     this.inflight = /* @__PURE__ */ new Map();
+    /** Local entries by tag, so tag counts and pruning never scan unrelated entries. */
+    this.entriesByTag = /* @__PURE__ */ new Map();
     this.invalidatedTagVersions = /* @__PURE__ */ new Map();
     this.activeGenerations = /* @__PURE__ */ new Set();
     this.version = 0;
@@ -477,6 +479,7 @@ var _FarmDataCache = class _FarmDataCache {
   configure(config = {}) {
     this.generation++;
     this.entries.clear();
+    this.entriesByTag.clear();
     this.inflight.clear();
     this.invalidatedTagVersions.clear();
     this.activeGenerations.clear();
@@ -643,14 +646,12 @@ var _FarmDataCache = class _FarmDataCache {
     return entry;
   }
   delete(key) {
-    const deleted = this.entries.delete(key);
-    if (deleted) this.pruneInvalidatedTagVersions();
+    const deleted = this.deleteLocalEntry(key);
     emitFarmEvent({ type: "cache.delete", key, deleted });
     return deleted;
   }
   async deleteAsync(key) {
-    const deleted = this.entries.delete(key);
-    if (deleted) this.pruneInvalidatedTagVersions();
+    const deleted = this.deleteLocalEntry(key);
     if (this.adapter) {
       await this.adapter.delete(this.createAdapterKey(key));
     }
@@ -661,6 +662,7 @@ var _FarmDataCache = class _FarmDataCache {
     const count = this.entries.size;
     this.generation++;
     this.entries.clear();
+    this.entriesByTag.clear();
     this.inflight.clear();
     this.invalidatedTagVersions.clear();
     this.activeGenerations.clear();
@@ -746,23 +748,32 @@ var _FarmDataCache = class _FarmDataCache {
       return cached.value;
     }
     const inflight = this.inflight.get(key);
-    if (inflight) {
+    if (inflight && !this.wasInvalidatedSince(inflight.tags, inflight.startVersion)) {
       emitFarmEvent({ type: "cache.dedupe", key });
-      return inflight;
+      return inflight.promise;
     }
     const tags = Array.from(normalizeCacheOptionsTags(options));
     const generation = this.generation;
+    const startVersion = this.version;
     const promise = this.fillCacheEntry(key, producer, options, tags, generation).catch((error) => {
       emitFarmEvent({ type: "cache.error", key, operation: "set", error });
       throw error;
     }).finally(() => {
-      if (this.inflight.get(key) === promise) {
+      if (this.inflight.get(key)?.promise === promise) {
         this.inflight.delete(key);
       }
     });
-    this.inflight.set(key, promise);
+    this.inflight.set(key, { promise, tags, startVersion });
     return promise;
   }
+  /** A fill that started before one of its tags was invalidated cannot satisfy later readers. */
+  wasInvalidatedSince(tags, version) {
+    for (const tag of tags) {
+      const invalidatedVersion = this.invalidatedTagVersions.get(tag);
+      if (invalidatedVersion !== void 0 && invalidatedVersion > version) return true;
+    }
+    return false;
+  }
   async fillCacheEntry(key, producer, options, tags, generation) {
     const adapter = this.adapter;
     const namespace = this.namespace;
@@ -803,7 +814,7 @@ var _FarmDataCache = class _FarmDataCache {
       return value;
     } finally {
       this.activeGenerations.delete(activeGeneration);
-      this.pruneInvalidatedTagVersions();
+      this.pruneInvalidatedTagVersions(activeGeneration.tags);
       if (leaseToken && adapter?.releaseLease) {
         try {
           await adapter.releaseLease(leaseKey, leaseToken);
@@ -848,18 +859,9 @@ var _FarmDataCache = class _FarmDataCache {
     }
     return void 0;
   }
-  countEntriesForTag(tag) {
-    let count = 0;
-    for (const entry of this.entries.values()) {
-      if (entry.tags.has(tag)) {
-        count++;
-      }
-    }
-    return count;
-  }
   countEntriesForTags(tags) {
     let count = 0;
-    for (const entry of this.entries.values()) {
+    for (const entry of this.entriesByTag.get(tags[0]) ?? []) {
       if (tags.every((tag) => entry.tags.has(tag))) {
         count++;
       }
@@ -867,10 +869,10 @@ var _FarmDataCache = class _FarmDataCache {
     return count;
   }
   invalidateTag(normalizedTag) {
-    const count = this.countEntriesForTag(normalizedTag);
+    const count = this.entriesByTag.get(normalizedTag)?.size ?? 0;
     this.invalidatedTagVersions.delete(normalizedTag);
     this.invalidatedTagVersions.set(normalizedTag, ++this.version);
-    this.pruneInvalidatedTagVersions();
+    this.pruneInvalidatedTagVersions([normalizedTag]);
     return count;
   }
   toPublicEntry(entry) {
@@ -900,19 +902,51 @@ var _FarmDataCache = class _FarmDataCache {
     this.entries.set(key, entry);
   }
   storeLocalEntry(entry) {
-    this.entries.delete(entry.key);
+    const removed = [];
+    const replaced = this.detachLocalEntry(entry.key);
+    if (replaced) removed.push(replaced);
     this.entries.set(entry.key, entry);
+    for (const tag of entry.tags) {
+      let tagged = this.entriesByTag.get(tag);
+      if (!tagged) this.entriesByTag.set(tag, tagged = /* @__PURE__ */ new Set());
+      tagged.add(entry);
+    }
     while (this.entries.size > this.maxEntries) {
       const oldestKey = this.entries.keys().next().value;
       if (oldestKey === void 0) break;
-      this.entries.delete(oldestKey);
+      removed.push(this.detachLocalEntry(oldestKey));
+    }
+    for (const removedEntry of removed) this.pruneInvalidatedTagVersions(removedEntry.tags);
+  }
+  deleteLocalEntry(key) {
+    const entry = this.detachLocalEntry(key);
+    if (!entry) return false;
+    this.pruneInvalidatedTagVersions(entry.tags);
+    return true;
+  }
+  detachLocalEntry(key) {
+    const entry = this.entries.get(key);
+    if (!entry) return void 0;
+    this.entries.delete(key);
+    for (const tag of entry.tags) {
+      const tagged = this.entriesByTag.get(tag);
+      if (!tagged) continue;
+      tagged.delete(entry);
+      if (tagged.size === 0) this.entriesByTag.delete(tag);
     }
-    this.pruneInvalidatedTagVersions();
+    return entry;
   }
-  pruneInvalidatedTagVersions() {
-    tags: for (const [tag, invalidatedVersion] of this.invalidatedTagVersions) {
-      for (const entry of this.entries.values()) {
-        if (entry.tags.has(tag) && entry.createdVersion < invalidatedVersion) continue tags;
+  /**
+   * Drop invalidation versions that no local entry or active fill can be stale against.
+   * Callers pass only the tags whose dependents just changed, so the cost is bounded by
+   * the entries sharing those tags rather than by the whole cache.
+   */
+  pruneInvalidatedTagVersions(tags) {
+    tags: for (const tag of tags) {
+      const invalidatedVersion = this.invalidatedTagVersions.get(tag);
+      if (invalidatedVersion === void 0) continue;
+      for (const entry of this.entriesByTag.get(tag) ?? []) {
+        if (entry.createdVersion < invalidatedVersion) continue tags;
       }
       for (const generation of this.activeGenerations) {
         if (generation.tags.has(tag) && generation.createdVersion < invalidatedVersion)
@@ -1343,6 +1377,43 @@ __name(_resolveCurrentRequest, "_resolveCurrentRequest");
 
 // src/server-fn.ts
 var FARM_SERVER_FN_SYMBOL = /* @__PURE__ */ Symbol.for("farm.server-fn");
+var FARM_SERVER_FUNCTION_DESCRIPTOR = /* @__PURE__ */ Symbol.for("farm.server-function.descriptor");
+var _ServerFnInputError = class _ServerFnInputError extends Error {
+  constructor(cause) {
+    super("Server function input is invalid");
+    this.cause = cause;
+  }
+};
+__name(_ServerFnInputError, "ServerFnInputError");
+var ServerFnInputError = _ServerFnInputError;
+function createServerFunctionDescriptor(kind, options, run) {
+  return Object.freeze({
+    kind,
+    input: options.input,
+    output: options.output,
+    mcp: options.mcp === void 0 ? void 0 : Object.freeze({ ...options.mcp }),
+    run
+  });
+}
+__name(createServerFunctionDescriptor, "createServerFunctionDescriptor");
+function _attachServerFunctionDescriptor(target, descriptor) {
+  Object.defineProperty(target, FARM_SERVER_FUNCTION_DESCRIPTOR, {
+    value: descriptor,
+    enumerable: false
+  });
+}
+__name(_attachServerFunctionDescriptor, "_attachServerFunctionDescriptor");
+function getServerFunctionRunner(value) {
+  if (typeof value !== "function") return void 0;
+  return value[FARM_SERVER_FUNCTION_DESCRIPTOR];
+}
+__name(getServerFunctionRunner, "getServerFunctionRunner");
+function _runServerFunctionForCaller(value, input) {
+  const runner = getServerFunctionRunner(value);
+  if (!runner) throw new TypeError("Expected a function created with createServerFn");
+  return runner.run(input);
+}
+__name(_runServerFunctionForCaller, "_runServerFunctionForCaller");
 var UNSAFE_FORM_KEYS = /* @__PURE__ */ new Set(["__proto__", "constructor", "prototype"]);
 function createServerFn(options) {
   if (!options || typeof options.handler !== "function") {
@@ -1351,10 +1422,15 @@ function createServerFn(options) {
   const middleware = resolveServerFnMiddleware(options.middleware);
   const errors = normalizeServerFnErrors(options.errors);
   const error = createServerFnErrorHandler(errors);
-  const serverFn = /* @__PURE__ */ __name(async (value) => {
+  const run = /* @__PURE__ */ __name(async (value, labelInputErrors) => {
     const formData = isFormData(value) ? value : void 0;
     const rawInput = formData ? formDataToObject(formData) : value;
-    const input = await _parseServerFnSchema(options.input, rawInput, "input");
+    let input;
+    try {
+      input = await _parseServerFnSchema(options.input, rawInput, "input");
+    } catch (cause) {
+      throw labelInputErrors && isSchemaValidationFailure(cause) ? new ServerFnInputError(cause) : cause;
+    }
     const executionContext = getServerActionExecutionContext();
     const request = executionContext?.request ?? _resolveCurrentRequest();
     const signal = executionContext?.signal ?? request?.signal ?? getServerActionSignal();
@@ -1380,7 +1456,8 @@ function createServerFn(options) {
       await applyFarmCacheInvalidationTargets(declaration);
     }
     return parsedResult;
-  }, "serverFn");
+  }, "run");
+  const serverFn = /* @__PURE__ */ __name((value) => run(value, false), "serverFn");
   Object.defineProperties(serverFn, {
     [FARM_SERVER_FN_SYMBOL]: {
       value: true,
@@ -1411,6 +1488,10 @@ function createServerFn(options) {
       enumerable: false
     }
   });
+  _attachServerFunctionDescriptor(
+    serverFn,
+    createServerFunctionDescriptor("action", options, (value) => run(value, true))
+  );
   return serverFn;
 }
 __name(createServerFn, "createServerFn");
@@ -1568,9 +1649,17 @@ async function _parseServerFnSchema(schema, value, contract, owner = "createServ
   throw new TypeError(`${owner} ${contract} must provide parse, parseAsync, or safeParse`);
 }
 __name(_parseServerFnSchema, "_parseServerFnSchema");
+var schemaValidationFailures = /* @__PURE__ */ new WeakSet();
+function isSchemaValidationFailure(error) {
+  if (!error || typeof error !== "object") return false;
+  return schemaValidationFailures.has(error) || Array.isArray(error.issues);
+}
+__name(isSchemaValidationFailure, "isSchemaValidationFailure");
 function unwrapSafeParseResult(result) {
   if (result && typeof result === "object" && "success" in result && result.success === false) {
-    throw result.error;
+    const error = result.error;
+    if (error && typeof error === "object") schemaValidationFailures.add(error);
+    throw error;
   }
   if (result && typeof result === "object" && "success" in result && result.success === true) {
     return result.data;
@@ -1687,6 +1776,16 @@ function createServerQuery(options) {
       enumerable: false
     }
   });
+  _attachServerFunctionDescriptor(
+    query,
+    createServerFunctionDescriptor("query", options, async (value) => {
+      const result = await _runServerFunctionForCaller(
+        execute,
+        value
+      );
+      return result.data;
+    })
+  );
   return query;
 }
 __name(createServerQuery, "createServerQuery");

package/dist/server-query.d.mts

@@ -1,6 +1,7 @@
 import { RouteDataCacheKey } from './cache.mjs';
-import { ServerFnContext, ServerFnSchema, AnyServerFnMiddleware, InferServerFnSchemaOutput, ServerFnMiddlewareContext, ServerFnHandler, InferServerFnSchemaInput } from './server-fn.mjs';
+import { ServerFnContext, ServerFnSchema, AnyServerFnMiddleware, InferServerFnSchemaOutput, ServerFnMiddlewareContext, ServerFnMCPMetadata, ServerFnHandler, InferServerFnSchemaInput } from './server-fn.mjs';
 import './server-fn-error-DDh14a0V.mjs';
+import './endpoint-DAc96i93.mjs';
 
 type MaybePromise<T> = T | Promise<T>;
 type ServerQueryStaleTime = number | false | `${number}${"ms" | "s" | "m" | "h"}`;
@@ -14,6 +15,8 @@ type ServerQueryOptions<TSchema extends ServerFnSchema | undefined, TResult, TMi
     staleTime?: ServerQueryStaleTime;
     /** Allow the configured client cache persistence adapter to store results on the device. */
     persist?: boolean;
+    /** Expose this query as a read-only MCP tool when it is listed in `mcp.tools`. `name` is required. */
+    mcp?: ServerFnMCPMetadata;
     handler: ServerFnHandler<TSchema extends ServerFnSchema ? InferServerFnSchemaOutput<TSchema> : unknown, TResult, ServerFnMiddlewareContext<TMiddlewares>>;
 };
 type ServerQueryOutputOptions<TInputSchema extends ServerFnSchema | undefined, TOutputSchema extends ServerFnSchema, TMiddlewares extends readonly AnyServerFnMiddleware[] = readonly []> = {
@@ -25,6 +28,8 @@ type ServerQueryOutputOptions<TInputSchema extends ServerFnSchema | undefined, T
     staleTime?: ServerQueryStaleTime;
     /** Allow the configured client cache persistence adapter to store results on the device. */
     persist?: boolean;
+    /** Expose this query as a read-only MCP tool when it is listed in `mcp.tools`. `name` is required. */
+    mcp?: ServerFnMCPMetadata;
     handler: ServerFnHandler<TInputSchema extends ServerFnSchema ? InferServerFnSchemaOutput<TInputSchema> : unknown, unknown, ServerFnMiddlewareContext<TMiddlewares>>;
 };
 type ServerQuery<TInput, TResult> = ([unknown] extends [TInput] ? (input?: TInput) => Promise<TResult> : (input: TInput) => Promise<TResult>) & {

package/dist/server-query.d.ts

@@ -1,6 +1,7 @@
 import { RouteDataCacheKey } from './cache.js';
-import { ServerFnContext, ServerFnSchema, AnyServerFnMiddleware, InferServerFnSchemaOutput, ServerFnMiddlewareContext, ServerFnHandler, InferServerFnSchemaInput } from './server-fn.js';
+import { ServerFnContext, ServerFnSchema, AnyServerFnMiddleware, InferServerFnSchemaOutput, ServerFnMiddlewareContext, ServerFnMCPMetadata, ServerFnHandler, InferServerFnSchemaInput } from './server-fn.js';
 import './server-fn-error-DDh14a0V.js';
+import './endpoint-1zA994xL.js';
 
 type MaybePromise<T> = T | Promise<T>;
 type ServerQueryStaleTime = number | false | `${number}${"ms" | "s" | "m" | "h"}`;
@@ -14,6 +15,8 @@ type ServerQueryOptions<TSchema extends ServerFnSchema | undefined, TResult, TMi
     staleTime?: ServerQueryStaleTime;
     /** Allow the configured client cache persistence adapter to store results on the device. */
     persist?: boolean;
+    /** Expose this query as a read-only MCP tool when it is listed in `mcp.tools`. `name` is required. */
+    mcp?: ServerFnMCPMetadata;
     handler: ServerFnHandler<TSchema extends ServerFnSchema ? InferServerFnSchemaOutput<TSchema> : unknown, TResult, ServerFnMiddlewareContext<TMiddlewares>>;
 };
 type ServerQueryOutputOptions<TInputSchema extends ServerFnSchema | undefined, TOutputSchema extends ServerFnSchema, TMiddlewares extends readonly AnyServerFnMiddleware[] = readonly []> = {
@@ -25,6 +28,8 @@ type ServerQueryOutputOptions<TInputSchema extends ServerFnSchema | undefined, T
     staleTime?: ServerQueryStaleTime;
     /** Allow the configured client cache persistence adapter to store results on the device. */
     persist?: boolean;
+    /** Expose this query as a read-only MCP tool when it is listed in `mcp.tools`. `name` is required. */
+    mcp?: ServerFnMCPMetadata;
     handler: ServerFnHandler<TInputSchema extends ServerFnSchema ? InferServerFnSchemaOutput<TInputSchema> : unknown, unknown, ServerFnMiddlewareContext<TMiddlewares>>;
 };
 type ServerQuery<TInput, TResult> = ([unknown] extends [TInput] ? (input?: TInput) => Promise<TResult> : (input: TInput) => Promise<TResult>) & {