kitcn 0.33.0 → 0.33.2

package/dist/react/index.d.ts

@@ -487,8 +487,8 @@ type ConvexQueryHookOptions = {
   /** Skip query silently when unauthenticated (default: false, calls onQueryUnauthorized) */skipUnauth?: boolean; /** Set to false to fetch once without subscribing (default: true) */
   subscribe?: boolean;
 };
-/** Extract input args without cursor/limit (user's filter args only) */
-type InfiniteQueryInput<TInput> = Omit<TInput, 'cursor' | 'limit'>;
+/** Extract user args without hook-owned pagination transport fields */
+type InfiniteQueryInput<TInput> = Omit<TInput, 'cursor' | 'endCursor' | 'limit'>;
 /** Extract item type from PaginationResult<T> */
 type ExtractPaginatedItem<TOutput> = TOutput extends {
   page: (infer T)[];
@@ -946,7 +946,7 @@ declare const getConvexQueryClientSingleton: ({
  * Pagination state persisted in queryClient.
  * Enables scroll restoration when navigating back to a paginated list.
  *
- * Uses flat { cursor, limit } structure like tRPC.
+ * Uses flat { cursor, endCursor, limit } structure like tRPC.
  */
 type PaginationState = {
   id: number;
@@ -955,13 +955,12 @@ type PaginationState = {
   queries: Record<number, {
     /** Flat pagination args - tRPC style */args: Record<string, unknown> & {
       cursor: string | null;
+      endCursor?: string | null;
       limit?: number; /** Internal pagination ID for subscription management */
       __paginationId?: number;
     };
-    endCursor?: string | null;
   }>;
-  version: number; /** Recovery key to prevent infinite recovery loops */
-  autoRecoveryAttempted?: string;
+  version: number;
 };
 type PaginationStatus = 'CanLoadMore' | 'Exhausted' | 'LoadingFirstPage' | 'LoadingMore';
 /** Fields we override or omit from TanStack Query's UseQueryResult */

package/dist/react/index.js

@@ -2432,6 +2432,12 @@ const getConvexQueryClientSingleton = ({ authStore, convex, queryClient, symbolK
 //#endregion
 //#region src/internal/pagination.ts
 const shouldSplitPaginationPage = (page, initialNumItems) => Boolean(page.splitCursor) && (page.pageStatus === "SplitRecommended" || page.pageStatus === "SplitRequired" || initialNumItems !== void 0 && page.page.length > initialNumItems * 2);
+const isInvalidPaginationCursor = (error) => {
+	if (error instanceof Error && error.message.includes("InvalidCursor")) return true;
+	if (!error || typeof error !== "object" || !("data" in error)) return false;
+	const data = error.data;
+	return Boolean(data && typeof data === "object" && "isConvexSystemError" in data && data.isConvexSystemError === true && "paginationError" in data && data.paginationError === "InvalidCursor");
+};
 
 //#endregion
 //#region src/react/use-infinite-query.ts
@@ -2439,76 +2445,22 @@ const shouldSplitPaginationPage = (page, initialNumItems) => Boolean(page.splitC
 const PAGINATION_KEY_PREFIX = "__pagination__";
 let paginationIdCounter = 0;
 const createPaginationId = () => ++paginationIdCounter;
-/** Build a unique key for recovery attempt detection */
-const buildRecoveryKey = (pageKeys, page0Cursor, page0UpdatedAt) => JSON.stringify({
-	pageKeys,
-	page0Cursor,
-	page0UpdatedAt
-});
 /**
 * Hook for auto-recovering from stale cursors after WebSocket reconnection.
 *
 * When Convex WebSocket reconnects, page 0 (cursor: null) resubscribes and
 * gets fresh data. However, pages 1+ may have stale cursors that fail.
 *
-* This hook detects this pattern and creates a recovery page that fetches
-* enough items to cover the lost pages, preserving the user's scroll position.
+* This hook discards the invalid cursor chain and restarts from page one.
 */
-const useStaleCursorRecovery = ({ argsObject, combined, limit, setState, state }) => {
+const useStaleCursorRecovery = ({ combined, resetPagination }) => {
 	useEffect(() => {
 		if (!combined.isFetchNextPageError) return;
-		const page0Result = combined._rawResults[0];
-		const page0Data = page0Result?.data;
-		const page0UpdatedAt = page0Result?.dataUpdatedAt ?? 0;
-		const hasPage0Data = page0Data !== void 0 && !page0Result?.isError;
-		const hasSubsequentErrors = combined._rawResults.slice(1).some((q) => q?.isError && !q?.isFetching);
-		if (!hasPage0Data || !hasSubsequentErrors || !page0Data?.continueCursor) return;
-		const recoveryKey = buildRecoveryKey(state.pageKeys, page0Data.continueCursor, page0UpdatedAt);
-		if (state.autoRecoveryAttempted === recoveryKey) return;
-		const erroredPageKeys = state.pageKeys.filter((_, i) => i > 0 && combined._rawResults[i]?.isError);
-		const itemsToRecover = erroredPageKeys.reduce((sum, key) => {
-			return sum + (state.queries[key]?.args?.limit ?? limit ?? 20);
-		}, 0);
-		console.warn("[Pagination] Auto-recovering from stale cursors", {
-			erroredPages: erroredPageKeys.length,
-			itemsToRecover
-		});
-		setState((prev) => ({
-			...prev,
-			id: prev.id,
-			nextPageKey: 2,
-			pageKeys: [prev.pageKeys[0], 1],
-			queries: {
-				[prev.pageKeys[0]]: prev.queries[prev.pageKeys[0]],
-				1: { args: {
-					...argsObject,
-					cursor: page0Data.continueCursor,
-					limit: Math.min(itemsToRecover + (limit ?? 20), 500),
-					__paginationId: prev.id
-				} }
-			},
-			version: prev.version + 1,
-			autoRecoveryAttempted: recoveryKey
-		}));
+		if (combined._rawResults.slice(1).some((result) => result?.isError && !result.isFetching && isInvalidPaginationCursor(result.error))) resetPagination();
 	}, [
 		combined.isFetchNextPageError,
 		combined._rawResults,
-		state.pageKeys,
-		state.queries,
-		state.autoRecoveryAttempted,
-		argsObject,
-		limit,
-		setState
-	]);
-	useEffect(() => {
-		if ((combined.status === "CanLoadMore" || combined.status === "Exhausted") && state.autoRecoveryAttempted) setState((prev) => ({
-			...prev,
-			autoRecoveryAttempted: void 0
-		}));
-	}, [
-		combined.status,
-		state.autoRecoveryAttempted,
-		setState
+		resetPagination
 	]);
 };
 /**
@@ -2706,7 +2658,7 @@ const useInfiniteQueryInternal = (query, args, options) => {
 				error: results.find((r) => r.isError)?.error ?? null,
 				isError: results.some((r) => r.isError),
 				isFetching,
-				isFetchNextPageError: results.length > 1 && (results.at(-1)?.isError ?? false),
+				isFetchNextPageError: results.slice(1).some((result) => result.isError),
 				isPlaceholderData,
 				isRefetching: isFetching && allItems.length > 0 && !isPlaceholderData,
 				_rawResults: results
@@ -2714,11 +2666,8 @@ const useInfiniteQueryInternal = (query, args, options) => {
 		}, [placeholderData])
 	});
 	useStaleCursorRecovery({
-		argsObject,
 		combined,
-		limit,
-		setState,
-		state
+		resetPagination: useCallback(() => setState(createInitialState()), [createInitialState, setState])
 	});
 	useEffect(() => {
 		for (let i = 0; i < combined._rawResults.length; i++) {
@@ -2727,15 +2676,17 @@ const useInfiniteQueryInternal = (query, args, options) => {
 				const page = pageQuery.data;
 				const pageKey = state.pageKeys[i];
 				const pageState = state.queries[pageKey];
-				if (shouldSplitPaginationPage(page, limit) && pageState && !pageState.endCursor) {
+				if (shouldSplitPaginationPage(page, limit) && pageState && pageState.args.endCursor !== page.splitCursor) {
 					setState((prev) => {
 						const currentPageState = prev.queries[pageKey];
-						if (!currentPageState || currentPageState.endCursor) return prev;
+						if (!currentPageState || currentPageState.args.endCursor === page.splitCursor) return prev;
 						const newKey = prev.nextPageKey;
 						const splitCursor = page.splitCursor;
+						const endCursor = currentPageState.args.endCursor ?? page.continueCursor;
 						const splitPageArgs = {
 							...argsObject,
 							cursor: splitCursor,
+							endCursor,
 							limit: currentPageState.args.limit,
 							__paginationId: prev.id
 						};
@@ -2750,7 +2701,10 @@ const useInfiniteQueryInternal = (query, args, options) => {
 								...prev.queries,
 								[pageKey]: {
 									...currentPageState,
-									endCursor: splitCursor
+									args: {
+										...currentPageState.args,
+										endCursor: splitCursor
+									}
 								},
 								[newKey]: { args: splitPageArgs }
 							}

package/dist/rsc/index.d.ts

@@ -1,7 +1,7 @@
 import { n as DeepPartial, o as Simplify, r as DistributiveOmit } from "../types-Bqi_ivSd.js";
 import { L as DataTransformerOptions, _ as CRPCHttpRouter, c as HttpQueryKey, k as HttpProcedure, o as HttpMutationKey, y as HttpRouterRecord } from "../http-types-BhhPZtwa.js";
 import { g as UnsetMarker } from "../types-Bkeicpo6.js";
-import { A as HttpInputArgs, C as ReservedMutationOptions$1, S as ReservedInfiniteQueryOptions, T as StaticQueryOptsParam, _ as IsPaginated, b as PaginatedFnMeta, c as ConvexMutationKey, d as ConvexQueryMeta, f as EmptyObject, g as InfiniteQueryInput, l as ConvexQueryHookOptions, m as FUNC_REF_SYMBOL, o as ConvexActionKey, p as ExtractPaginatedItem, s as ConvexInfiniteQueryMeta, u as ConvexQueryKey, w as ReservedQueryOptions$1, y as MutationVariables } from "../types-BXpu7xIU.js";
+import { A as HttpInputArgs, C as ReservedMutationOptions$1, S as ReservedInfiniteQueryOptions, T as StaticQueryOptsParam, _ as IsPaginated, b as PaginatedFnMeta, c as ConvexMutationKey, d as ConvexQueryMeta, f as EmptyObject, g as InfiniteQueryInput, l as ConvexQueryHookOptions, m as FUNC_REF_SYMBOL, o as ConvexActionKey, p as ExtractPaginatedItem, s as ConvexInfiniteQueryMeta, u as ConvexQueryKey, w as ReservedQueryOptions$1, y as MutationVariables } from "../types-C7JkpfeY.js";
 import { FunctionArgs, FunctionReference, FunctionReturnType } from "convex/server";
 import { z } from "zod";
 import { DefaultError, QueryFilters, SkipToken, UseMutationOptions, UseQueryOptions } from "@tanstack/react-query";

package/dist/server/index.d.ts

@@ -1,4 +1,4 @@
-import { $ as ActionProcedureBuilder, A as CRPCError, B as RuntimeEnv, C as createProcedureHandlerFactory, Ct as zCustomQuery, D as WithHttpRouter, Dt as zodToConvex, E as typedProcedureResolver, Et as zodOutputToConvexFields, F as getCRPCErrorFromUnknown, G as createLazyCaller, H as ConvexContext, I as getHTTPStatusCodeFromError, J as ServerCaller, K as CallerMeta, L as isCRPCError, M as CRPCErrorData, N as CRPC_ERROR_CODES_BY_KEY, O as inferApiInputs, Ot as zodToConvexFields, P as CRPC_ERROR_CODE_TO_HTTP, Q as getGeneratedValue, R as toCRPCError, S as createProcedureCallerFactory, St as zCustomMutation, T as getGeneratedFunctionReference, Tt as zodOutputToConvex, U as createCallerFactory, V as createEnv, W as LazyCaller, X as createApiLeaf, Y as createServerCaller, Z as createGeneratedFunctionReference, _ as ProcedureSchedulableCallerFromRegistry, _t as ZodValidatorFromConvex, a as CreateProcedureCallerFactoryOptions, at as initCRPC, b as createGenericCallerFactory, bt as withSystemFields, c as GeneratedRegistryCallerFactory, ct as extractPathParams, d as GeneratedRegistryHandlerForContext, dt as ConvexValidatorFromZod, et as CRPCFunctionTypeHint, f as ProcedureActionCallerFromRegistry, ft as ConvexValidatorFromZodOutput, g as ProcedureFromFunctionReference, gt as ZodFromValidatorBase, h as ProcedureDefinition, ht as Zid, i as registerProcedureNameLookup, it as createMiddlewareFactory, j as CRPCErrorCode, k as inferApiOutputs, l as GeneratedRegistryCallerForContext, lt as handleHttpError, m as ProcedureCallerFromRegistry, mt as ZCustomCtx, n as ProcedureNameLookup, nt as ProcedureBuilder, o as GeneratedProcedureRegistry, ot as HttpProcedureBuilder, p as ProcedureCaller, pt as CustomBuilder, q as CallerOpts, r as inferProcedureNameFromCallsite, rt as QueryProcedureBuilder, s as GeneratedProcedureRegistryEntry, st as createHttpProcedureBuilder, t as ProcedureNameEntry, tt as MutationProcedureBuilder, u as GeneratedRegistryHandlerFactory, ut as matchPathParams, v as ProcedureScheduleCallerFromRegistry, vt as convexToZod, w as defineProcedure, wt as zid, x as createGenericHandlerFactory, xt as zCustomAction, y as createGeneratedRegistryRuntime, yt as convexToZodFields, z as CreateEnvOptions } from "../procedure-name-DPYyLiVS.js";
+import { $ as ActionProcedureBuilder, A as CRPCError, B as RuntimeEnv, C as createProcedureHandlerFactory, Ct as zCustomQuery, D as WithHttpRouter, Dt as zodToConvex, E as typedProcedureResolver, Et as zodOutputToConvexFields, F as getCRPCErrorFromUnknown, G as createLazyCaller, H as ConvexContext, I as getHTTPStatusCodeFromError, J as ServerCaller, K as CallerMeta, L as isCRPCError, M as CRPCErrorData, N as CRPC_ERROR_CODES_BY_KEY, O as inferApiInputs, Ot as zodToConvexFields, P as CRPC_ERROR_CODE_TO_HTTP, Q as getGeneratedValue, R as toCRPCError, S as createProcedureCallerFactory, St as zCustomMutation, T as getGeneratedFunctionReference, Tt as zodOutputToConvex, U as createCallerFactory, V as createEnv, W as LazyCaller, X as createApiLeaf, Y as createServerCaller, Z as createGeneratedFunctionReference, _ as ProcedureSchedulableCallerFromRegistry, _t as ZodValidatorFromConvex, a as CreateProcedureCallerFactoryOptions, at as initCRPC, b as createGenericCallerFactory, bt as withSystemFields, c as GeneratedRegistryCallerFactory, ct as extractPathParams, d as GeneratedRegistryHandlerForContext, dt as ConvexValidatorFromZod, et as CRPCFunctionTypeHint, f as ProcedureActionCallerFromRegistry, ft as ConvexValidatorFromZodOutput, g as ProcedureFromFunctionReference, gt as ZodFromValidatorBase, h as ProcedureDefinition, ht as Zid, i as registerProcedureNameLookup, it as createMiddlewareFactory, j as CRPCErrorCode, k as inferApiOutputs, l as GeneratedRegistryCallerForContext, lt as handleHttpError, m as ProcedureCallerFromRegistry, mt as ZCustomCtx, n as ProcedureNameLookup, nt as ProcedureBuilder, o as GeneratedProcedureRegistry, ot as HttpProcedureBuilder, p as ProcedureCaller, pt as CustomBuilder, q as CallerOpts, r as inferProcedureNameFromCallsite, rt as QueryProcedureBuilder, s as GeneratedProcedureRegistryEntry, st as createHttpProcedureBuilder, t as ProcedureNameEntry, tt as MutationProcedureBuilder, u as GeneratedRegistryHandlerFactory, ut as matchPathParams, v as ProcedureScheduleCallerFromRegistry, vt as convexToZod, w as defineProcedure, wt as zid, x as createGenericHandlerFactory, xt as zCustomAction, y as createGeneratedRegistryRuntime, yt as convexToZodFields, z as CreateEnvOptions } from "../procedure-name-DRSOwAJY.js";
 import { A as HttpProcedureBuilderDef, C as extractRouteMap, D as HttpHandlerOpts, E as HttpActionHandler, M as InferHttpInput, N as ProcedureMeta, O as HttpMethod, S as createHttpRouterFactory, T as HttpActionConstructor, _ as CRPCHttpRouter, b as HttpRouterWithHono, j as HttpRouteDefinition, k as HttpProcedure, v as HttpRouterDef, w as CRPCHonoHandler, x as createHttpRouter, y as HttpRouterRecord } from "../http-types-BhhPZtwa.js";
 import { a as MergeZodObjects, c as MiddlewareMarker, d as MiddlewareProcedureType, f as MiddlewareResult, g as UnsetMarker, h as Simplify, i as IntersectIfDefined, l as MiddlewareNext, m as ResolveIfSet, n as AnyMiddlewareBuilder, o as MiddlewareBuilder, p as Overwrite, r as GetRawInputFn, s as MiddlewareFunction, t as AnyMiddleware, u as MiddlewareProcedureInfo } from "../types-Bkeicpo6.js";
 import { a as isMutationCtx, c as isSchedulerCtx, d as requireQueryCtx, f as requireRunMutationCtx, i as isActionCtx, l as requireActionCtx, n as RunMutationCtx, o as isQueryCtx, p as requireSchedulerCtx, r as SchedulerCtx, s as isRunMutationCtx, t as GenericCtx, u as requireMutationCtx } from "../context-utils-Cbv4r0AA.js";

package/dist/server/index.js

@@ -1,6 +1,6 @@
 import { a as isMutationCtx, c as isSchedulerCtx, d as requireQueryCtx, f as requireRunMutationCtx, i as isActionCtx, l as requireActionCtx, n as createGeneratedFunctionReference, o as isQueryCtx, p as requireSchedulerCtx, r as getGeneratedValue, s as isRunMutationCtx, t as createApiLeaf, u as requireMutationCtx } from "../api-entry-Buvjl9hn.js";
 import { n as createLazyCaller, r as createServerCaller, t as createCallerFactory } from "../caller-factory-C-N540BC.js";
-import { A as zid, C as toCRPCError, D as zCustomAction, E as withSystemFields, M as zodOutputToConvexFields, N as zodToConvex, O as zCustomMutation, P as zodToConvexFields, S as isCRPCError, T as convexToZodFields, _ as CRPCError, a as createMiddlewareFactory, b as getCRPCErrorFromUnknown, c as registerProcedureNameLookup, d as createHttpRouterFactory, f as extractRouteMap, g as matchPathParams, h as handleHttpError, i as QueryProcedureBuilder, j as zodOutputToConvex, k as zCustomQuery, l as HttpRouterWithHono, m as extractPathParams, n as MutationProcedureBuilder, o as initCRPC, p as createHttpProcedureBuilder, r as ProcedureBuilder, s as inferProcedureNameFromCallsite, t as ActionProcedureBuilder, u as createHttpRouter, v as CRPC_ERROR_CODES_BY_KEY, w as convexToZod, x as getHTTPStatusCodeFromError, y as CRPC_ERROR_CODE_TO_HTTP } from "../builder-Cyd5nCxZ.js";
-import { a as createProcedureHandlerFactory, c as typedProcedureResolver, i as createProcedureCallerFactory, l as createEnv, n as createGenericCallerFactory, o as defineProcedure, r as createGenericHandlerFactory, s as getGeneratedFunctionReference, t as createGeneratedRegistryRuntime } from "../procedure-caller-DgMiD0-a.js";
+import { A as zid, C as toCRPCError, D as zCustomAction, E as withSystemFields, M as zodOutputToConvexFields, N as zodToConvex, O as zCustomMutation, P as zodToConvexFields, S as isCRPCError, T as convexToZodFields, _ as CRPCError, a as createMiddlewareFactory, b as getCRPCErrorFromUnknown, c as registerProcedureNameLookup, d as createHttpRouterFactory, f as extractRouteMap, g as matchPathParams, h as handleHttpError, i as QueryProcedureBuilder, j as zodOutputToConvex, k as zCustomQuery, l as HttpRouterWithHono, m as extractPathParams, n as MutationProcedureBuilder, o as initCRPC, p as createHttpProcedureBuilder, r as ProcedureBuilder, s as inferProcedureNameFromCallsite, t as ActionProcedureBuilder, u as createHttpRouter, v as CRPC_ERROR_CODES_BY_KEY, w as convexToZod, x as getHTTPStatusCodeFromError, y as CRPC_ERROR_CODE_TO_HTTP } from "../builder-DDYTlmTB.js";
+import { a as createProcedureHandlerFactory, c as typedProcedureResolver, i as createProcedureCallerFactory, l as createEnv, n as createGenericCallerFactory, o as defineProcedure, r as createGenericHandlerFactory, s as getGeneratedFunctionReference, t as createGeneratedRegistryRuntime } from "../procedure-caller-DgGF_hA8.js";
 
 export { ActionProcedureBuilder, CRPCError, CRPC_ERROR_CODES_BY_KEY, CRPC_ERROR_CODE_TO_HTTP, HttpRouterWithHono, MutationProcedureBuilder, ProcedureBuilder, QueryProcedureBuilder, convexToZod, convexToZodFields, createApiLeaf, createCallerFactory, createEnv, createGeneratedFunctionReference, createGeneratedRegistryRuntime, createGenericCallerFactory, createGenericHandlerFactory, createHttpProcedureBuilder, createHttpRouter, createHttpRouterFactory, createLazyCaller, createMiddlewareFactory, createProcedureCallerFactory, createProcedureHandlerFactory, createServerCaller, defineProcedure, extractPathParams, extractRouteMap, getCRPCErrorFromUnknown, getGeneratedFunctionReference, getGeneratedValue, getHTTPStatusCodeFromError, handleHttpError, inferProcedureNameFromCallsite, initCRPC, isActionCtx, isCRPCError, isMutationCtx, isQueryCtx, isRunMutationCtx, isSchedulerCtx, matchPathParams, registerProcedureNameLookup, requireActionCtx, requireMutationCtx, requireQueryCtx, requireRunMutationCtx, requireSchedulerCtx, toCRPCError, typedProcedureResolver, withSystemFields, zCustomAction, zCustomMutation, zCustomQuery, zid, zodOutputToConvex, zodOutputToConvexFields, zodToConvex, zodToConvexFields };

package/dist/solid/index.d.ts

@@ -60,8 +60,8 @@ type ConvexQueryHookOptions = {
   /** Skip query silently when unauthenticated (default: false, calls onQueryUnauthorized) */skipUnauth?: boolean; /** Set to false to fetch once without subscribing (default: true) */
   subscribe?: boolean;
 };
-/** Extract input args without cursor/limit (user's filter args only) */
-type InfiniteQueryInput<TInput> = Omit<TInput, 'cursor' | 'limit'>;
+/** Extract user args without hook-owned pagination transport fields */
+type InfiniteQueryInput<TInput> = Omit<TInput, 'cursor' | 'endCursor' | 'limit'>;
 /** Extract item type from PaginationResult<T> */
 type ExtractPaginatedItem<TOutput> = TOutput extends {
   page: (infer T)[];
@@ -1429,7 +1429,7 @@ declare const getConvexQueryClientSingleton: ({
  * Pagination state persisted in queryClient.
  * Enables scroll restoration when navigating back to a paginated list.
  *
- * Uses flat { cursor, limit } structure like tRPC.
+ * Uses flat { cursor, endCursor, limit } structure like tRPC.
  */
 type PaginationState = {
   id: number;
@@ -1438,13 +1438,12 @@ type PaginationState = {
   queries: Record<number, {
     /** Flat pagination args - tRPC style */args: Record<string, unknown> & {
       cursor: string | null;
+      endCursor?: string | null;
       limit?: number; /** Internal pagination ID for subscription management */
       __paginationId?: number;
     };
-    endCursor?: string | null;
   }>;
-  version: number; /** Recovery key to prevent infinite recovery loops */
-  autoRecoveryAttempted?: string;
+  version: number;
 };
 type PaginationStatus = 'CanLoadMore' | 'Exhausted' | 'LoadingFirstPage' | 'LoadingMore';
 /** Return type for infinite query hooks */

package/dist/solid/index.js

@@ -2935,6 +2935,12 @@ const getConvexQueryClientSingleton = ({ authStore, convex, queryClient, symbolK
 //#endregion
 //#region src/internal/pagination.ts
 const shouldSplitPaginationPage = (page, initialNumItems) => Boolean(page.splitCursor) && (page.pageStatus === "SplitRecommended" || page.pageStatus === "SplitRequired" || initialNumItems !== void 0 && page.page.length > initialNumItems * 2);
+const isInvalidPaginationCursor = (error) => {
+	if (error instanceof Error && error.message.includes("InvalidCursor")) return true;
+	if (!error || typeof error !== "object" || !("data" in error)) return false;
+	const data = error.data;
+	return Boolean(data && typeof data === "object" && "isConvexSystemError" in data && data.isConvexSystemError === true && "paginationError" in data && data.paginationError === "InvalidCursor");
+};
 
 //#endregion
 //#region src/solid/create-queries-results.ts
@@ -3020,7 +3026,7 @@ const aggregatePages = (results, hasPlaceholderData) => {
 		error,
 		failureReason: error,
 		isError: results.some((r) => r.isError),
-		isFetchNextPageError: results.length > 1 && (results.at(-1)?.isError ?? false),
+		isFetchNextPageError: results.slice(1).some((result) => result.isError),
 		isFetching,
 		isLoading: status === "LoadingFirstPage",
 		isPlaceholderData,
@@ -3030,72 +3036,18 @@ const aggregatePages = (results, hasPlaceholderData) => {
 		status
 	};
 };
-/** Build a unique key for recovery attempt detection */
-const buildRecoveryKey = (pageKeys, page0Cursor, page0UpdatedAt) => JSON.stringify({
-	pageKeys,
-	page0Cursor,
-	page0UpdatedAt
-});
 /**
 * Hook for auto-recovering from stale cursors after WebSocket reconnection.
 *
 * When Convex WebSocket reconnects, page 0 (cursor: null) resubscribes and
 * gets fresh data. However, pages 1+ may have stale cursors that fail.
 *
-* This hook detects this pattern and creates a recovery page that fetches
-* enough items to cover the lost pages, preserving the user's scroll position.
+* This hook discards the invalid cursor chain and restarts from page one.
 */
-const useStaleCursorRecovery = ({ argsObject, combined, limit, pageResults, setState, state }) => {
-	createEffect(on([
-		() => combined.isFetchNextPageError,
-		pageResults,
-		() => state().pageKeys,
-		() => state().queries,
-		() => state().autoRecoveryAttempted,
-		argsObject
-	], () => {
+const useStaleCursorRecovery = ({ combined, pageResults, resetPagination }) => {
+	createEffect(on([() => combined.isFetchNextPageError, pageResults], () => {
 		if (!combined.isFetchNextPageError) return;
-		const results = pageResults();
-		const page0Result = results[0];
-		const page0Data = page0Result?.data;
-		const page0UpdatedAt = page0Result?.dataUpdatedAt ?? 0;
-		const hasPage0Data = page0Data !== void 0 && !page0Result?.isError;
-		const hasSubsequentErrors = results.slice(1).some((q) => q?.isError && !q?.isFetching);
-		if (!hasPage0Data || !hasSubsequentErrors || !page0Data?.continueCursor) return;
-		const currentState = state();
-		const recoveryKey = buildRecoveryKey(currentState.pageKeys, page0Data.continueCursor, page0UpdatedAt);
-		if (currentState.autoRecoveryAttempted === recoveryKey) return;
-		const erroredPageKeys = currentState.pageKeys.filter((_, i) => i > 0 && results[i]?.isError);
-		const itemsToRecover = erroredPageKeys.reduce((sum, key) => {
-			return sum + (currentState.queries[key]?.args?.limit ?? limit ?? 20);
-		}, 0);
-		console.warn("[Pagination] Auto-recovering from stale cursors", {
-			erroredPages: erroredPageKeys.length,
-			itemsToRecover
-		});
-		setState((prev) => ({
-			...prev,
-			id: prev.id,
-			nextPageKey: 2,
-			pageKeys: [prev.pageKeys[0], 1],
-			queries: {
-				[prev.pageKeys[0]]: prev.queries[prev.pageKeys[0]],
-				1: { args: {
-					...argsObject(),
-					cursor: page0Data.continueCursor,
-					limit: Math.min(itemsToRecover + (limit ?? 20), 500),
-					__paginationId: prev.id
-				} }
-			},
-			version: prev.version + 1,
-			autoRecoveryAttempted: recoveryKey
-		}));
-	}));
-	createEffect(on([() => combined.status, () => state().autoRecoveryAttempted], () => {
-		if ((combined.status === "CanLoadMore" || combined.status === "Exhausted") && state().autoRecoveryAttempted) setState((prev) => ({
-			...prev,
-			autoRecoveryAttempted: void 0
-		}));
+		if (pageResults().slice(1).some((result) => result?.isError && !result.isFetching && isInvalidPaginationCursor(result.error))) resetPagination();
 	}));
 };
 /**
@@ -3232,12 +3184,9 @@ const useInfiniteQueryInternal = (query, args, options) => {
 	const [combined, setCombined] = createStore(derive());
 	createRenderEffect(() => setCombined(derive()));
 	useStaleCursorRecovery({
-		argsObject,
 		combined,
-		limit,
 		pageResults,
-		setState,
-		state
+		resetPagination: () => setState(createInitialState())
 	});
 	createEffect(on([
 		pageResults,
@@ -3252,15 +3201,17 @@ const useInfiniteQueryInternal = (query, args, options) => {
 				const page = pageQuery.data;
 				const pageKey = state().pageKeys[i];
 				const pageState = state().queries[pageKey];
-				if (shouldSplitPaginationPage(page, limit) && pageState && !pageState.endCursor) {
+				if (shouldSplitPaginationPage(page, limit) && pageState && pageState.args.endCursor !== page.splitCursor) {
 					setState((prev) => {
 						const currentPageState = prev.queries[pageKey];
-						if (!currentPageState || currentPageState.endCursor) return prev;
+						if (!currentPageState || currentPageState.args.endCursor === page.splitCursor) return prev;
 						const newKey = prev.nextPageKey;
 						const splitCursor = page.splitCursor;
+						const endCursor = currentPageState.args.endCursor ?? page.continueCursor;
 						const splitPageArgs = {
 							...argsObject(),
 							cursor: splitCursor,
+							endCursor,
 							limit: currentPageState.args.limit,
 							__paginationId: prev.id
 						};
@@ -3275,7 +3226,10 @@ const useInfiniteQueryInternal = (query, args, options) => {
 								...prev.queries,
 								[pageKey]: {
 									...currentPageState,
-									endCursor: splitCursor
+									args: {
+										...currentPageState.args,
+										endCursor: splitCursor
+									}
 								},
 								[newKey]: { args: splitPageArgs }
 							}

package/dist/{types-BXpu7xIU.d.ts → types-C7JkpfeY.d.ts}

@@ -148,8 +148,8 @@ type PaginationOpts = {
   maximumRowsRead?: number;
   maximumBytesRead?: number;
 };
-/** Extract input args without cursor/limit (user's filter args only) */
-type InfiniteQueryInput<TInput> = Omit<TInput, 'cursor' | 'limit'>;
+/** Extract user args without hook-owned pagination transport fields */
+type InfiniteQueryInput<TInput> = Omit<TInput, 'cursor' | 'endCursor' | 'limit'>;
 /** Extract item type from PaginationResult<T> */
 type ExtractPaginatedItem<TOutput> = TOutput extends {
   page: (infer T)[];