@farm.js/core 0.1.0-beta.96 → 0.1.0-beta.97

package/dist/{route-Y8lfz1wF.d.ts → route-4pd-EVtw.d.ts}

@@ -48,27 +48,56 @@ declare function isJSONStreamResponse(response: {
 declare function readJSONStream<TItem>(response: Response): FarmAPIStream<TItem>;
 declare function isFarmAPIStream(value: unknown): value is FarmAPIStream<unknown>;
 
-type AnySchema = {
-    _output?: any;
-    _input?: any;
-    parse?: (data: unknown) => any;
-};
+/** Server-only schema contract shared by declarative routes and the API runtime. */
+interface RouteSchema {
+    readonly _input?: unknown;
+    readonly _output?: unknown;
+    parse?: (value: unknown) => unknown;
+    parseAsync?: (value: unknown) => Promise<unknown>;
+    readonly "~standard"?: {
+        readonly types?: {
+            input: unknown;
+            output: unknown;
+        };
+        validate(value: unknown): unknown;
+    };
+}
+type RouteSchemaInput<T> = T extends {
+    _input: infer I;
+} ? I : T extends {
+    "~standard": {
+        types?: {
+            input: infer I;
+        };
+    };
+} ? I : unknown;
+type RouteSchemaOutput<T> = T extends {
+    _output: infer O;
+} ? O : T extends {
+    "~standard": {
+        types?: {
+            output: infer O;
+        };
+    };
+} ? O : T extends {
+    parse: (...args: any[]) => infer O;
+} ? Awaited<O> : unknown;
+
+type AnySchema = RouteSchema;
 type MaybePromise<T> = T | Promise<T>;
 type Simplify<T> = {
     [TKey in keyof T]: T[TKey];
 } & {};
 type UnionToIntersection$1<T> = (T extends unknown ? (value: T) => void : never) extends (value: infer TIntersection) => void ? TIntersection : never;
-type InferOutput<T> = T extends {
-    _output: infer O;
-} ? O : T extends {
-    parse: (data: unknown) => infer R;
-} ? R : unknown;
+type InferOutput<T> = RouteSchemaOutput<T>;
 type InferInput<T> = T extends {
     _input: infer I;
 } ? I : T extends {
+    "~standard": unknown;
+} ? RouteSchemaInput<T> : T extends {
     parse: (data: infer I) => unknown;
 } ? I : unknown;
-type InferBodyInput<T> = T extends MultipartSchema<AnySchema> ? TypedFormData<InferOutput<T>> : InferOutput<T>;
+type InferBodyInput<T> = T extends MultipartSchema<AnySchema> ? TypedFormData<InferInput<T>> : InferInput<T>;
 type InferHeadersOutput<T> = [T] extends [never] ? Record<string, string> : T extends AnySchema ? InferOutput<T> : Record<string, string>;
 type EndpointErrorSchema = AnySchema & {
     parse: (data: unknown) => unknown;
@@ -165,11 +194,12 @@ type EndpointHandler<TBody extends AnySchema = never, TQuery extends AnySchema =
     /** @deprecated Use `error`. */
     fail: EndpointFail<TErrors>;
 }) => Promise<TResponse> | TResponse;
-type TypedEndpoint<TBody = never, TQuery = never, TResponse = any, THeaders = Record<string, string>, TErrors = never, TBodyInput = TBody> = {
+type TypedEndpoint<TBody = never, TQuery = never, TResponse = any, THeaders = Record<string, string>, TErrors = never, TBodyInput = TBody, TQueryInput = TQuery> = {
     __types: {
         body: TBody;
         inputBody: TBodyInput;
         query: TQuery;
+        inputQuery: TQueryInput;
         headers: THeaders;
         response: TResponse;
         errors: TErrors;
@@ -177,10 +207,10 @@ type TypedEndpoint<TBody = never, TQuery = never, TResponse = any, THeaders = Re
     __path?: string;
     __method?: string;
 } & ((options?: {
-    body?: TBody;
-    query?: TQuery;
+    body?: TBodyInput;
+    query?: TQueryInput;
 }) => Promise<TResponse>);
-type CreatedEndpoint<TBody extends AnySchema, TQuery extends AnySchema, THeaders extends AnySchema, TResponse, TErrors extends EndpointErrorDefinitions = {}> = TypedEndpoint<InferOutput<TBody>, InferOutput<TQuery>, Awaited<TResponse>, InferHeadersOutput<THeaders>, EndpointErrorContracts<TErrors>, InferBodyInput<TBody>>;
+type CreatedEndpoint<TBody extends AnySchema, TQuery extends AnySchema, THeaders extends AnySchema, TResponse, TErrors extends EndpointErrorDefinitions = {}> = TypedEndpoint<InferOutput<TBody>, InferOutput<TQuery>, Awaited<TResponse>, InferHeadersOutput<THeaders>, EndpointErrorContracts<TErrors>, InferBodyInput<TBody>, InferInput<TQuery>>;
 type AnyEndpointOptions = EndpointOptions<AnySchema, AnySchema, AnySchema, readonly AnyEndpointMiddleware[], EndpointErrorDefinitions>;
 type EndpointBodyFromOptions<TOptions> = TOptions extends {
     body: infer TBody extends AnySchema;
@@ -265,41 +295,6 @@ declare function OPTIONS<T = any>(handler: EndpointHandler<never, never, never,
 declare function OPTIONS<const TOptions extends MethodlessEndpointOptions, TResponse = any>(options: TOptions, handler: ValidatedEndpointHandlerFromOptions<TOptions, TResponse>): CreatedEndpointFromOptions<TOptions, TResponse>;
 declare function OPTIONS<TBody extends AnySchema = never, TQuery extends AnySchema = never, THeaders extends AnySchema = never, TResponse = any>(options: Omit<EndpointOptions<TBody, TQuery, THeaders, readonly []>, "method">, handler: EndpointHandler<TBody, TQuery, THeaders, TResponse>): CreatedEndpoint<TBody, TQuery, THeaders, TResponse>;
 
-/** Server-only schema contract shared by declarative routes and the API runtime. */
-interface RouteSchema {
-    readonly _input?: unknown;
-    readonly _output?: unknown;
-    parse?: (value: unknown) => unknown;
-    parseAsync?: (value: unknown) => Promise<unknown>;
-    readonly "~standard"?: {
-        readonly types?: {
-            input: unknown;
-            output: unknown;
-        };
-        validate(value: unknown): unknown;
-    };
-}
-type RouteSchemaInput<T> = T extends {
-    _input: infer I;
-} ? I : T extends {
-    "~standard": {
-        types?: {
-            input: infer I;
-        };
-    };
-} ? I : unknown;
-type RouteSchemaOutput<T> = T extends {
-    _output: infer O;
-} ? O : T extends {
-    "~standard": {
-        types?: {
-            output: infer O;
-        };
-    };
-} ? O : T extends {
-    parse: (...args: any[]) => infer O;
-} ? Awaited<O> : unknown;
-
 type RouteMethod = "GET" | "HEAD" | "QUERY" | "POST" | "PUT" | "PATCH" | "DELETE" | "OPTIONS";
 type RoutePathParams<Path extends string> = Path extends `${infer Head}/${infer Tail}` ? RoutePathParams<Head> & RoutePathParams<Tail> : Path extends `[[...${infer Name}]]` ? {
     [K in Name]?: string[];

package/dist/{route-Cq3aObmj.d.mts → route-CvEr4Uc9.d.mts}

@@ -48,27 +48,56 @@ declare function isJSONStreamResponse(response: {
 declare function readJSONStream<TItem>(response: Response): FarmAPIStream<TItem>;
 declare function isFarmAPIStream(value: unknown): value is FarmAPIStream<unknown>;
 
-type AnySchema = {
-    _output?: any;
-    _input?: any;
-    parse?: (data: unknown) => any;
-};
+/** Server-only schema contract shared by declarative routes and the API runtime. */
+interface RouteSchema {
+    readonly _input?: unknown;
+    readonly _output?: unknown;
+    parse?: (value: unknown) => unknown;
+    parseAsync?: (value: unknown) => Promise<unknown>;
+    readonly "~standard"?: {
+        readonly types?: {
+            input: unknown;
+            output: unknown;
+        };
+        validate(value: unknown): unknown;
+    };
+}
+type RouteSchemaInput<T> = T extends {
+    _input: infer I;
+} ? I : T extends {
+    "~standard": {
+        types?: {
+            input: infer I;
+        };
+    };
+} ? I : unknown;
+type RouteSchemaOutput<T> = T extends {
+    _output: infer O;
+} ? O : T extends {
+    "~standard": {
+        types?: {
+            output: infer O;
+        };
+    };
+} ? O : T extends {
+    parse: (...args: any[]) => infer O;
+} ? Awaited<O> : unknown;
+
+type AnySchema = RouteSchema;
 type MaybePromise<T> = T | Promise<T>;
 type Simplify<T> = {
     [TKey in keyof T]: T[TKey];
 } & {};
 type UnionToIntersection$1<T> = (T extends unknown ? (value: T) => void : never) extends (value: infer TIntersection) => void ? TIntersection : never;
-type InferOutput<T> = T extends {
-    _output: infer O;
-} ? O : T extends {
-    parse: (data: unknown) => infer R;
-} ? R : unknown;
+type InferOutput<T> = RouteSchemaOutput<T>;
 type InferInput<T> = T extends {
     _input: infer I;
 } ? I : T extends {
+    "~standard": unknown;
+} ? RouteSchemaInput<T> : T extends {
     parse: (data: infer I) => unknown;
 } ? I : unknown;
-type InferBodyInput<T> = T extends MultipartSchema<AnySchema> ? TypedFormData<InferOutput<T>> : InferOutput<T>;
+type InferBodyInput<T> = T extends MultipartSchema<AnySchema> ? TypedFormData<InferInput<T>> : InferInput<T>;
 type InferHeadersOutput<T> = [T] extends [never] ? Record<string, string> : T extends AnySchema ? InferOutput<T> : Record<string, string>;
 type EndpointErrorSchema = AnySchema & {
     parse: (data: unknown) => unknown;
@@ -165,11 +194,12 @@ type EndpointHandler<TBody extends AnySchema = never, TQuery extends AnySchema =
     /** @deprecated Use `error`. */
     fail: EndpointFail<TErrors>;
 }) => Promise<TResponse> | TResponse;
-type TypedEndpoint<TBody = never, TQuery = never, TResponse = any, THeaders = Record<string, string>, TErrors = never, TBodyInput = TBody> = {
+type TypedEndpoint<TBody = never, TQuery = never, TResponse = any, THeaders = Record<string, string>, TErrors = never, TBodyInput = TBody, TQueryInput = TQuery> = {
     __types: {
         body: TBody;
         inputBody: TBodyInput;
         query: TQuery;
+        inputQuery: TQueryInput;
         headers: THeaders;
         response: TResponse;
         errors: TErrors;
@@ -177,10 +207,10 @@ type TypedEndpoint<TBody = never, TQuery = never, TResponse = any, THeaders = Re
     __path?: string;
     __method?: string;
 } & ((options?: {
-    body?: TBody;
-    query?: TQuery;
+    body?: TBodyInput;
+    query?: TQueryInput;
 }) => Promise<TResponse>);
-type CreatedEndpoint<TBody extends AnySchema, TQuery extends AnySchema, THeaders extends AnySchema, TResponse, TErrors extends EndpointErrorDefinitions = {}> = TypedEndpoint<InferOutput<TBody>, InferOutput<TQuery>, Awaited<TResponse>, InferHeadersOutput<THeaders>, EndpointErrorContracts<TErrors>, InferBodyInput<TBody>>;
+type CreatedEndpoint<TBody extends AnySchema, TQuery extends AnySchema, THeaders extends AnySchema, TResponse, TErrors extends EndpointErrorDefinitions = {}> = TypedEndpoint<InferOutput<TBody>, InferOutput<TQuery>, Awaited<TResponse>, InferHeadersOutput<THeaders>, EndpointErrorContracts<TErrors>, InferBodyInput<TBody>, InferInput<TQuery>>;
 type AnyEndpointOptions = EndpointOptions<AnySchema, AnySchema, AnySchema, readonly AnyEndpointMiddleware[], EndpointErrorDefinitions>;
 type EndpointBodyFromOptions<TOptions> = TOptions extends {
     body: infer TBody extends AnySchema;
@@ -265,41 +295,6 @@ declare function OPTIONS<T = any>(handler: EndpointHandler<never, never, never,
 declare function OPTIONS<const TOptions extends MethodlessEndpointOptions, TResponse = any>(options: TOptions, handler: ValidatedEndpointHandlerFromOptions<TOptions, TResponse>): CreatedEndpointFromOptions<TOptions, TResponse>;
 declare function OPTIONS<TBody extends AnySchema = never, TQuery extends AnySchema = never, THeaders extends AnySchema = never, TResponse = any>(options: Omit<EndpointOptions<TBody, TQuery, THeaders, readonly []>, "method">, handler: EndpointHandler<TBody, TQuery, THeaders, TResponse>): CreatedEndpoint<TBody, TQuery, THeaders, TResponse>;
 
-/** Server-only schema contract shared by declarative routes and the API runtime. */
-interface RouteSchema {
-    readonly _input?: unknown;
-    readonly _output?: unknown;
-    parse?: (value: unknown) => unknown;
-    parseAsync?: (value: unknown) => Promise<unknown>;
-    readonly "~standard"?: {
-        readonly types?: {
-            input: unknown;
-            output: unknown;
-        };
-        validate(value: unknown): unknown;
-    };
-}
-type RouteSchemaInput<T> = T extends {
-    _input: infer I;
-} ? I : T extends {
-    "~standard": {
-        types?: {
-            input: infer I;
-        };
-    };
-} ? I : unknown;
-type RouteSchemaOutput<T> = T extends {
-    _output: infer O;
-} ? O : T extends {
-    "~standard": {
-        types?: {
-            output: infer O;
-        };
-    };
-} ? O : T extends {
-    parse: (...args: any[]) => infer O;
-} ? Awaited<O> : unknown;
-
 type RouteMethod = "GET" | "HEAD" | "QUERY" | "POST" | "PUT" | "PATCH" | "DELETE" | "OPTIONS";
 type RoutePathParams<Path extends string> = Path extends `${infer Head}/${infer Tail}` ? RoutePathParams<Head> & RoutePathParams<Tail> : Path extends `[[...${infer Name}]]` ? {
     [K in Name]?: string[];

package/dist/routes.cjs

@@ -113,7 +113,13 @@ function recordFarmEventTrace(event) {
       activeSpan.addEvent(event.type, toEventAttributes(event), event.timestamp);
     }
     const error = event.type === "request.error" ? void 0 : getEventError(event);
-    if (error !== void 0) recordSpanError(activeSpan, error);
+    if (error !== void 0) {
+      if (event.type === "render.error") {
+        recordSpanException(activeSpan, error);
+      } else {
+        recordSpanError(activeSpan, error);
+      }
+    }
   }
   const completedTraceContext = recordCompletedEventSpan(event, activeContext);
   return traceContext ?? completedTraceContext;
@@ -210,12 +216,26 @@ function getCompletedSpanDescriptor(event) {
   }
 }
 __name(getCompletedSpanDescriptor, "getCompletedSpanDescriptor");
+function hashFarmCacheKey(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(hashFarmCacheKey, "hashFarmCacheKey");
 function toEventAttributes(event) {
   const attributes = {};
+  const redactKey = typeof event.type === "string" && event.type.startsWith("cache.");
   for (const [key, value] of Object.entries(event)) {
     if (key === "timestamp" || key === "level" || key === "error" || key === "traceId" || key === "spanId" || key === "traceSampled" || value === void 0) {
       continue;
     }
+    if (redactKey && key === "key" && typeof value === "string") {
+      attributes["farm.key_hash"] = hashFarmCacheKey(value);
+      continue;
+    }
     if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
       attributes[`farm.${key}`] = value;
     } else if (Array.isArray(value)) {
@@ -235,9 +255,14 @@ function getEventError(event) {
   return "error" in event ? event.error : void 0;
 }
 __name(getEventError, "getEventError");
-function recordSpanError(span, error) {
+function recordSpanException(span, error) {
   const normalized = error instanceof Error ? error : new Error(String(error));
   span.recordException(normalized);
+  return normalized;
+}
+__name(recordSpanException, "recordSpanException");
+function recordSpanError(span, error) {
+  const normalized = recordSpanException(span, error);
   span.setStatus({ code: import_api.SpanStatusCode.ERROR, message: normalized.message });
 }
 __name(recordSpanError, "recordSpanError");

package/dist/routes.d.mts

@@ -1,14 +1,15 @@
-import { F as FarmRouteRuntimeConfig, L as LayoutProps, M as Metadata, b as FarmRouteRuntime, c as FarmRouteRegions, d as FarmRouteMaxDuration, e as FarmAppContext, f as PageProps, g as PluginContextProps, h as RouteModule, P as ParsedRoute } from './client-plugins-BvClItiL.mjs';
+import { F as FarmRouteRuntimeConfig, L as LayoutProps, M as Metadata, b as FarmRouteRuntime, c as FarmRouteRegions, d as FarmRouteMaxDuration, e as FarmAppContext, f as PageProps, g as PluginContextProps, h as RouteModule, P as ParsedRoute } from './client-plugins-B6-07YmP.mjs';
 import { ComponentType } from 'react';
 import { RouteDataCacheKey } from './cache.mjs';
 import { ServerFn } from './server-fn.mjs';
 import { FarmServerRendererRuntime } from './renderer.mjs';
 import './lifecycle-De0vQG45.mjs';
-import './route-Cq3aObmj.mjs';
+import './route-CvEr4Uc9.mjs';
 import 'http';
 import './types-Cc8l9IqS.mjs';
 import 'db0';
 import 'unstorage';
+import './integration-api-BT024nuJ.mjs';
 import '@farming-labs/orm';
 import './types-CKwggz9n.mjs';
 import '@farming-labs/docs';

package/dist/routes.d.ts

@@ -1,14 +1,15 @@
-import { F as FarmRouteRuntimeConfig, L as LayoutProps, M as Metadata, b as FarmRouteRuntime, c as FarmRouteRegions, d as FarmRouteMaxDuration, e as FarmAppContext, f as PageProps, g as PluginContextProps, h as RouteModule, P as ParsedRoute } from './client-plugins-B9Sq-iMg.js';
+import { F as FarmRouteRuntimeConfig, L as LayoutProps, M as Metadata, b as FarmRouteRuntime, c as FarmRouteRegions, d as FarmRouteMaxDuration, e as FarmAppContext, f as PageProps, g as PluginContextProps, h as RouteModule, P as ParsedRoute } from './client-plugins-By6MVUX-.js';
 import { ComponentType } from 'react';
 import { RouteDataCacheKey } from './cache.js';
 import { ServerFn } from './server-fn.js';
 import { FarmServerRendererRuntime } from './renderer.js';
 import './lifecycle-De0vQG45.js';
-import './route-Y8lfz1wF.js';
+import './route-4pd-EVtw.js';
 import 'http';
 import './types-Cc8l9IqS.js';
 import 'db0';
 import 'unstorage';
+import './integration-api-BT024nuJ.js';
 import '@farming-labs/orm';
 import './types-CKwggz9n.js';
 import '@farming-labs/docs';

package/dist/routes.mjs

@@ -19,14 +19,14 @@ import {
   redirect,
   routesBuilder,
   scanProgrammaticPagePaths
-} from "./chunk-Q3OX763A.mjs";
+} from "./chunk-LXDASSTE.mjs";
 import "./chunk-QKVUNGAH.mjs";
 import "./chunk-XNWHZQ6A.mjs";
 import "./chunk-SXWF4QRU.mjs";
-import "./chunk-AXVJCMVF.mjs";
-import "./chunk-RBRLLZL5.mjs";
+import "./chunk-2HDOV47R.mjs";
+import "./chunk-34IAPZBG.mjs";
 import "./chunk-WZ5QFROO.mjs";
-import "./chunk-ZRBCBOEX.mjs";
+import "./chunk-N2FY2QZ7.mjs";
 import "./chunk-DZU3EKQP.mjs";
 import "./chunk-CGILA3WO.mjs";
 export {

package/dist/{runtime-j1S3sDTh.d.ts → runtime-BgDQzBiu.d.ts}

@@ -20,6 +20,7 @@ declare class FarmI18nRuntime {
     hasMessage(locale: string, key: string): boolean;
     getClientSnapshot(resolution: FarmLocaleResolution): FarmI18nClientSnapshot;
     private formatMessage;
+    private readOwnMessage;
     private resolveMessage;
 }
 declare function createFarmI18nRuntime(config: ResolvedFarmI18nConfig, catalogs?: FarmI18nCatalogs): FarmI18nRuntime;

package/dist/{runtime-DDwvDtS4.d.mts → runtime-CV2UCV-5.d.mts}

@@ -20,6 +20,7 @@ declare class FarmI18nRuntime {
     hasMessage(locale: string, key: string): boolean;
     getClientSnapshot(resolution: FarmLocaleResolution): FarmI18nClientSnapshot;
     private formatMessage;
+    private readOwnMessage;
     private resolveMessage;
 }
 declare function createFarmI18nRuntime(config: ResolvedFarmI18nConfig, catalogs?: FarmI18nCatalogs): FarmI18nRuntime;

package/dist/server-action-security.mjs

@@ -10,9 +10,9 @@ import {
   runWithServerActionRequest,
   sanitizeServerActionError,
   validateServerActionRequest
-} from "./chunk-VV24CC42.mjs";
+} from "./chunk-35NPLKQJ.mjs";
 import "./chunk-ZHQMHJAV.mjs";
-import "./chunk-RBRLLZL5.mjs";
+import "./chunk-34IAPZBG.mjs";
 import "./chunk-DZU3EKQP.mjs";
 import "./chunk-CGILA3WO.mjs";
 export {

package/dist/server-fn-client.cjs

@@ -55,6 +55,26 @@ function notifyClientObserver(observer, args, label = "Client lifecycle") {
 }
 __name(notifyClientObserver, "notifyClientObserver");
 
+// src/mutation-retry.ts
+async function invokeMutationWithRetry(invoke, retry, shouldContinue) {
+  const maxRetries = Math.max(0, retry?.count ?? 0);
+  let attempt = 0;
+  while (true) {
+    try {
+      return await invoke();
+    } catch (error) {
+      if (attempt >= maxRetries || !shouldContinue()) throw error;
+      attempt += 1;
+      const delay = typeof retry?.delay === "function" ? retry.delay(attempt) : retry?.delay ?? 0;
+      if (delay > 0) {
+        await new Promise((resolve) => setTimeout(resolve, delay));
+        if (!shouldContinue()) throw error;
+      }
+    }
+  }
+}
+__name(invokeMutationWithRetry, "invokeMutationWithRetry");
+
 // src/server-fn-client.ts
 function useServerFn(serverFn, options = {}) {
   const { initialResult = null, resetOnSubmit = true } = options;
@@ -106,7 +126,12 @@ function useServerFn(serverFn, options = {}) {
         };
       });
       try {
-        const result = await serverFn(input);
+        const result = await invokeMutationWithRetry(
+          () => serverFn(input),
+          options.retry,
+          // A reset disowns this submission; stop scheduling retries then.
+          () => requestId >= lastResetIdRef.current
+        );
         const isLatestRequest = requestId === requestIdRef.current;
         setActionState((current) => {
           if (requestId < lastResetIdRef.current) return current;
@@ -163,7 +188,14 @@ function useServerFn(serverFn, options = {}) {
         throw error;
       }
     },
-    [options.optimistic, options.rollbackOnError, resetOnSubmit, serverFn, setActionState]
+    [
+      options.optimistic,
+      options.retry,
+      options.rollbackOnError,
+      resetOnSubmit,
+      serverFn,
+      setActionState
+    ]
   );
   const formAction = (0, import_react.useCallback)(
     async (formData) => {

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

@@ -1,7 +1,11 @@
 import { FormHTMLAttributes, ComponentType } from 'react';
 import { ServerFn } from './server-fn.mjs';
+import { R as RetryOptions } from './client-DWoLZ3QU.mjs';
 import './cache.mjs';
 import './server-fn-error-DDh14a0V.mjs';
+import './integration-api-BT024nuJ.mjs';
+import './client-cache-CCK-fCe0.mjs';
+import './route-CvEr4Uc9.mjs';
 
 type ServerFnActionStatus = "idle" | "pending" | "success" | "error";
 type ServerFnSubmit<TInput, TResult> = [unknown] extends [TInput] ? (input?: TInput | FormData) => Promise<TResult> : (input: TInput | FormData) => Promise<TResult>;
@@ -16,6 +20,8 @@ type UseServerFnOptions<TResult, TError extends Error = Error, TInput = unknown>
     throwOnFormError?: boolean;
     optimistic?: (context: ServerFnOptimisticContext<TInput, TResult>) => TResult | null | undefined;
     rollbackOnError?: boolean;
+    /** Retry failed submissions with the API client's retry shape. Defaults to no retries. */
+    retry?: RetryOptions;
     onSuccess?: (result: TResult) => void;
     onError?: (error: TError) => void;
     onSettled?: (result: TResult | null, error: TError | null) => void;

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

@@ -1,7 +1,11 @@
 import { FormHTMLAttributes, ComponentType } from 'react';
 import { ServerFn } from './server-fn.js';
+import { R as RetryOptions } from './client-DuQuQC1h.js';
 import './cache.js';
 import './server-fn-error-DDh14a0V.js';
+import './integration-api-BT024nuJ.js';
+import './client-cache-BMxuFqwH.js';
+import './route-4pd-EVtw.js';
 
 type ServerFnActionStatus = "idle" | "pending" | "success" | "error";
 type ServerFnSubmit<TInput, TResult> = [unknown] extends [TInput] ? (input?: TInput | FormData) => Promise<TResult> : (input: TInput | FormData) => Promise<TResult>;
@@ -16,6 +20,8 @@ type UseServerFnOptions<TResult, TError extends Error = Error, TInput = unknown>
     throwOnFormError?: boolean;
     optimistic?: (context: ServerFnOptimisticContext<TInput, TResult>) => TResult | null | undefined;
     rollbackOnError?: boolean;
+    /** Retry failed submissions with the API client's retry shape. Defaults to no retries. */
+    retry?: RetryOptions;
     onSuccess?: (result: TResult) => void;
     onError?: (error: TError) => void;
     onSettled?: (result: TResult | null, error: TError | null) => void;

package/dist/server-fn-client.mjs

@@ -2,7 +2,7 @@
 import {
   useAction,
   useServerFn
-} from "./chunk-RAGSHKDC.mjs";
+} from "./chunk-6EJHNHH4.mjs";
 import "./chunk-DU3PKDVQ.mjs";
 import "./chunk-CGILA3WO.mjs";
 export {

package/dist/server-fn.cjs

@@ -46,16 +46,29 @@ function getFarmCacheInvalidationState() {
   });
 }
 __name(getFarmCacheInvalidationState, "getFarmCacheInvalidationState");
+function warnFarmCacheListenerError(scope, error) {
+  const detail = error instanceof Error ? error.stack ?? error.message : String(error);
+  console.warn(`[farm:cache] ${scope} listener failed: ${detail}`);
+}
+__name(warnFarmCacheListenerError, "warnFarmCacheListenerError");
 function notifyFarmCacheInvalidation(key) {
   if (typeof key !== "string" || key.length === 0) return;
   for (const listener of getFarmCacheInvalidationState().listeners) {
-    listener(key);
+    try {
+      listener(key);
+    } catch (error) {
+      warnFarmCacheListenerError("invalidation", error);
+    }
   }
 }
 __name(notifyFarmCacheInvalidation, "notifyFarmCacheInvalidation");
 function notifyFarmCacheTask(task) {
   for (const listener of getFarmCacheInvalidationState().taskListeners) {
-    listener(task);
+    try {
+      listener(task);
+    } catch (error) {
+      warnFarmCacheListenerError("task", error);
+    }
   }
 }
 __name(notifyFarmCacheTask, "notifyFarmCacheTask");
@@ -235,7 +248,13 @@ function recordFarmEventTrace(event) {
       activeSpan.addEvent(event.type, toEventAttributes(event), event.timestamp);
     }
     const error = event.type === "request.error" ? void 0 : getEventError(event);
-    if (error !== void 0) recordSpanError(activeSpan, error);
+    if (error !== void 0) {
+      if (event.type === "render.error") {
+        recordSpanException(activeSpan, error);
+      } else {
+        recordSpanError(activeSpan, error);
+      }
+    }
   }
   const completedTraceContext = recordCompletedEventSpan(event, activeContext);
   return traceContext ?? completedTraceContext;
@@ -332,12 +351,26 @@ function getCompletedSpanDescriptor(event) {
   }
 }
 __name(getCompletedSpanDescriptor, "getCompletedSpanDescriptor");
+function hashFarmCacheKey(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(hashFarmCacheKey, "hashFarmCacheKey");
 function toEventAttributes(event) {
   const attributes = {};
+  const redactKey = typeof event.type === "string" && event.type.startsWith("cache.");
   for (const [key, value] of Object.entries(event)) {
     if (key === "timestamp" || key === "level" || key === "error" || key === "traceId" || key === "spanId" || key === "traceSampled" || value === void 0) {
       continue;
     }
+    if (redactKey && key === "key" && typeof value === "string") {
+      attributes["farm.key_hash"] = hashFarmCacheKey(value);
+      continue;
+    }
     if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
       attributes[`farm.${key}`] = value;
     } else if (Array.isArray(value)) {
@@ -357,9 +390,14 @@ function getEventError(event) {
   return "error" in event ? event.error : void 0;
 }
 __name(getEventError, "getEventError");
-function recordSpanError(span, error) {
+function recordSpanException(span, error) {
   const normalized = error instanceof Error ? error : new Error(String(error));
   span.recordException(normalized);
+  return normalized;
+}
+__name(recordSpanException, "recordSpanException");
+function recordSpanError(span, error) {
+  const normalized = recordSpanException(span, error);
   span.setStatus({ code: import_api.SpanStatusCode.ERROR, message: normalized.message });
 }
 __name(recordSpanError, "recordSpanError");

package/dist/server-fn.mjs

@@ -3,19 +3,19 @@ import {
   _parseServerFnSchema,
   createServerFn,
   createServerMiddleware
-} from "./chunk-RLGUZ3HS.mjs";
+} from "./chunk-I3OOUWO5.mjs";
 import {
   FARM_SERVER_FN_FAILURE_SYMBOL,
   ServerActionError,
   ServerFnFailure,
   createServerFnTransportError,
   isServerFnFailure
-} from "./chunk-VV24CC42.mjs";
+} from "./chunk-35NPLKQJ.mjs";
 import "./chunk-ZHQMHJAV.mjs";
-import "./chunk-AXVJCMVF.mjs";
-import "./chunk-RBRLLZL5.mjs";
+import "./chunk-2HDOV47R.mjs";
+import "./chunk-34IAPZBG.mjs";
 import "./chunk-WZ5QFROO.mjs";
-import "./chunk-ZRBCBOEX.mjs";
+import "./chunk-N2FY2QZ7.mjs";
 import "./chunk-LM2YNO4U.mjs";
 import "./chunk-DZU3EKQP.mjs";
 import "./chunk-CGILA3WO.mjs";