better-convex 0.0.3 → 0.0.5

package/dist/auth/index.d.ts

@@ -1,7 +1,7 @@
 import * as better_auth_adapters1 from "better-auth/adapters";
 import { DBAdapterDebugLogOption } from "better-auth/adapters";
 import { BetterAuthDBSchema } from "better-auth/db";
-import * as convex_server23 from "convex/server";
+import * as convex_server24 from "convex/server";
 import { DocumentByName, FunctionReference, GenericDataModel, GenericMutationCtx, GenericQueryCtx, GenericSchema, HttpRouter, IdField, PaginationOptions, PaginationResult, SchemaDefinition, SystemFields, TableNamesInDataModel, internalMutationGeneric } from "convex/server";
 import * as convex_values0 from "convex/values";
 import { Infer } from "convex/values";
@@ -47,28 +47,28 @@ declare const createClient: <DataModel extends GenericDataModel, Schema$1 extend
   adapter: (ctx: GenericCtx<DataModel>, createAuthOptions: (ctx: any) => BetterAuthOptions) => better_auth_adapters1.AdapterFactory;
   httpAdapter: (ctx: GenericCtx<DataModel>) => better_auth_adapters1.AdapterFactory;
   triggersApi: () => {
-    beforeCreate: convex_server23.RegisteredMutation<"internal", {
+    beforeCreate: convex_server24.RegisteredMutation<"internal", {
       data: any;
       model: string;
     }, Promise<any>>;
-    beforeDelete: convex_server23.RegisteredMutation<"internal", {
+    beforeDelete: convex_server24.RegisteredMutation<"internal", {
       model: string;
       doc: any;
     }, Promise<any>>;
-    beforeUpdate: convex_server23.RegisteredMutation<"internal", {
+    beforeUpdate: convex_server24.RegisteredMutation<"internal", {
       update: any;
       model: string;
       doc: any;
     }, Promise<any>>;
-    onCreate: convex_server23.RegisteredMutation<"internal", {
+    onCreate: convex_server24.RegisteredMutation<"internal", {
       model: string;
       doc: any;
     }, Promise<void>>;
-    onDelete: convex_server23.RegisteredMutation<"internal", {
+    onDelete: convex_server24.RegisteredMutation<"internal", {
       model: string;
       doc: any;
     }, Promise<void>>;
-    onUpdate: convex_server23.RegisteredMutation<"internal", {
+    onUpdate: convex_server24.RegisteredMutation<"internal", {
       model: string;
       newDoc: any;
       oldDoc: any;
@@ -163,20 +163,20 @@ declare const dbAdapter: <DataModel extends GenericDataModel, Schema$1 extends S
 //#endregion
 //#region src/auth/adapter-utils.d.ts
 declare const adapterWhereValidator: convex_values0.VObject<{
-  operator?: "in" | "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
+  operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
   connector?: "AND" | "OR" | undefined;
   value: string | number | boolean | string[] | number[] | null;
   field: string;
 }, {
   connector: convex_values0.VUnion<"AND" | "OR" | undefined, [convex_values0.VLiteral<"AND", "required">, convex_values0.VLiteral<"OR", "required">], "optional", never>;
   field: convex_values0.VString<string, "required">;
-  operator: convex_values0.VUnion<"in" | "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined, [convex_values0.VLiteral<"lt", "required">, convex_values0.VLiteral<"lte", "required">, convex_values0.VLiteral<"gt", "required">, convex_values0.VLiteral<"gte", "required">, convex_values0.VLiteral<"eq", "required">, convex_values0.VLiteral<"in", "required">, convex_values0.VLiteral<"not_in", "required">, convex_values0.VLiteral<"ne", "required">, convex_values0.VLiteral<"contains", "required">, convex_values0.VLiteral<"starts_with", "required">, convex_values0.VLiteral<"ends_with", "required">], "optional", never>;
+  operator: convex_values0.VUnion<"eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined, [convex_values0.VLiteral<"lt", "required">, convex_values0.VLiteral<"lte", "required">, convex_values0.VLiteral<"gt", "required">, convex_values0.VLiteral<"gte", "required">, convex_values0.VLiteral<"eq", "required">, convex_values0.VLiteral<"in", "required">, convex_values0.VLiteral<"not_in", "required">, convex_values0.VLiteral<"ne", "required">, convex_values0.VLiteral<"contains", "required">, convex_values0.VLiteral<"starts_with", "required">, convex_values0.VLiteral<"ends_with", "required">], "optional", never>;
   value: convex_values0.VUnion<string | number | boolean | string[] | number[] | null, [convex_values0.VString<string, "required">, convex_values0.VFloat64<number, "required">, convex_values0.VBoolean<boolean, "required">, convex_values0.VArray<string[], convex_values0.VString<string, "required">, "required">, convex_values0.VArray<number[], convex_values0.VFloat64<number, "required">, "required">, convex_values0.VNull<null, "required">], "required", never>;
-}, "required", "value" | "operator" | "field" | "connector">;
+}, "required", "operator" | "value" | "field" | "connector">;
 declare const adapterArgsValidator: convex_values0.VObject<{
   limit?: number | undefined;
   where?: {
-    operator?: "in" | "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
+    operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
     connector?: "AND" | "OR" | undefined;
     value: string | number | boolean | string[] | number[] | null;
     field: string;
@@ -201,21 +201,21 @@ declare const adapterArgsValidator: convex_values0.VObject<{
     field: convex_values0.VString<string, "required">;
   }, "optional", "field" | "direction">;
   where: convex_values0.VArray<{
-    operator?: "in" | "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
+    operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
     connector?: "AND" | "OR" | undefined;
     value: string | number | boolean | string[] | number[] | null;
     field: string;
   }[] | undefined, convex_values0.VObject<{
-    operator?: "in" | "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
+    operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
     connector?: "AND" | "OR" | undefined;
     value: string | number | boolean | string[] | number[] | null;
     field: string;
   }, {
     connector: convex_values0.VUnion<"AND" | "OR" | undefined, [convex_values0.VLiteral<"AND", "required">, convex_values0.VLiteral<"OR", "required">], "optional", never>;
     field: convex_values0.VString<string, "required">;
-    operator: convex_values0.VUnion<"in" | "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined, [convex_values0.VLiteral<"lt", "required">, convex_values0.VLiteral<"lte", "required">, convex_values0.VLiteral<"gt", "required">, convex_values0.VLiteral<"gte", "required">, convex_values0.VLiteral<"eq", "required">, convex_values0.VLiteral<"in", "required">, convex_values0.VLiteral<"not_in", "required">, convex_values0.VLiteral<"ne", "required">, convex_values0.VLiteral<"contains", "required">, convex_values0.VLiteral<"starts_with", "required">, convex_values0.VLiteral<"ends_with", "required">], "optional", never>;
+    operator: convex_values0.VUnion<"eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined, [convex_values0.VLiteral<"lt", "required">, convex_values0.VLiteral<"lte", "required">, convex_values0.VLiteral<"gt", "required">, convex_values0.VLiteral<"gte", "required">, convex_values0.VLiteral<"eq", "required">, convex_values0.VLiteral<"in", "required">, convex_values0.VLiteral<"not_in", "required">, convex_values0.VLiteral<"ne", "required">, convex_values0.VLiteral<"contains", "required">, convex_values0.VLiteral<"starts_with", "required">, convex_values0.VLiteral<"ends_with", "required">], "optional", never>;
     value: convex_values0.VUnion<string | number | boolean | string[] | number[] | null, [convex_values0.VString<string, "required">, convex_values0.VFloat64<number, "required">, convex_values0.VBoolean<boolean, "required">, convex_values0.VArray<string[], convex_values0.VString<string, "required">, "required">, convex_values0.VArray<number[], convex_values0.VFloat64<number, "required">, "required">, convex_values0.VNull<null, "required">], "required", never>;
-  }, "required", "value" | "operator" | "field" | "connector">, "optional">;
+  }, "required", "operator" | "value" | "field" | "connector">, "optional">;
 }, "required", "limit" | "where" | "model" | "select" | "offset" | "sortBy" | "sortBy.field" | "sortBy.direction">;
 declare const hasUniqueFields: (betterAuthSchema: BetterAuthDBSchema, model: string, input: Record<string, any>) => boolean;
 declare const checkUniqueFields: <Schema$1 extends SchemaDefinition<any, any>>(ctx: GenericQueryCtx<GenericDataModel>, schema: Schema$1, betterAuthSchema: BetterAuthDBSchema, table: string, input: Record<string, any>, doc?: Record<string, any>) => Promise<void>;
@@ -244,7 +244,7 @@ declare const findOneHandler: (ctx: any, args: {
   model: string;
   select?: string[];
   where?: any[];
-}, schema: Schema, betterAuthSchema: any) => Promise<convex_server23.GenericDocument | null>;
+}, schema: Schema, betterAuthSchema: any) => Promise<convex_server24.GenericDocument | null>;
 declare const findManyHandler: (ctx: any, args: {
   model: string;
   paginationOpts: any;
@@ -255,7 +255,7 @@ declare const findManyHandler: (ctx: any, args: {
     field: string;
   };
   where?: any[];
-}, schema: Schema, betterAuthSchema: any) => Promise<convex_server23.PaginationResult<convex_server23.GenericDocument>>;
+}, schema: Schema, betterAuthSchema: any) => Promise<convex_server24.PaginationResult<convex_server24.GenericDocument>>;
 declare const updateOneHandler: (ctx: any, args: {
   input: {
     model: string;
@@ -278,8 +278,8 @@ declare const updateManyHandler: (ctx: any, args: {
   count: number;
   ids: any[];
   isDone: boolean;
-  continueCursor: convex_server23.Cursor;
-  splitCursor?: convex_server23.Cursor | null;
+  continueCursor: convex_server24.Cursor;
+  splitCursor?: convex_server24.Cursor | null;
   pageStatus?: "SplitRecommended" | "SplitRequired" | null;
 }>;
 declare const deleteOneHandler: (ctx: any, args: {
@@ -290,7 +290,7 @@ declare const deleteOneHandler: (ctx: any, args: {
   beforeDeleteHandle?: string;
   skipBeforeHooks?: boolean;
   onDeleteHandle?: string;
-}, schema: Schema, betterAuthSchema: any) => Promise<convex_server23.GenericDocument | undefined>;
+}, schema: Schema, betterAuthSchema: any) => Promise<convex_server24.GenericDocument | undefined>;
 declare const deleteManyHandler: (ctx: any, args: {
   input: {
     model: string;
@@ -304,8 +304,8 @@ declare const deleteManyHandler: (ctx: any, args: {
   count: number;
   ids: any[];
   isDone: boolean;
-  continueCursor: convex_server23.Cursor;
-  splitCursor?: convex_server23.Cursor | null;
+  continueCursor: convex_server24.Cursor;
+  splitCursor?: convex_server24.Cursor | null;
   pageStatus?: "SplitRecommended" | "SplitRequired" | null;
 }>;
 declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: Schema$1, createAuth: CreateAuth, options?: {
@@ -313,7 +313,7 @@ declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: S
   /** Skip input validation for smaller generated types. Since these are internal functions, validation is optional. */
   skipValidation?: boolean;
 }) => {
-  create: convex_server23.RegisteredMutation<"internal", {
+  create: convex_server24.RegisteredMutation<"internal", {
     select?: string[] | undefined;
     beforeCreateHandle?: string | undefined;
     onCreateHandle?: string | undefined;
@@ -329,38 +329,38 @@ declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: S
       model: string;
     };
   }, Promise<any>>;
-  deleteMany: convex_server23.RegisteredMutation<"internal", {
+  deleteMany: convex_server24.RegisteredMutation<"internal", {
     beforeDeleteHandle?: string | undefined;
     onDeleteHandle?: string | undefined;
+    paginationOpts: {
+      id?: number;
+      endCursor?: string | null;
+      maximumRowsRead?: number;
+      maximumBytesRead?: number;
+      numItems: number;
+      cursor: string | null;
+    };
     input: {
       where?: any[] | undefined;
       model: string;
     } | {
       where?: {
-        operator?: "in" | "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
+        operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
         connector?: "AND" | "OR" | undefined;
         value: string | number | boolean | string[] | number[] | null;
         field: string;
       }[] | undefined;
       model: string;
     };
-    paginationOpts: {
-      id?: number;
-      endCursor?: string | null;
-      maximumRowsRead?: number;
-      maximumBytesRead?: number;
-      numItems: number;
-      cursor: string | null;
-    };
   }, Promise<{
     count: number;
     ids: any[];
     isDone: boolean;
-    continueCursor: convex_server23.Cursor;
-    splitCursor?: convex_server23.Cursor | null;
+    continueCursor: convex_server24.Cursor;
+    splitCursor?: convex_server24.Cursor | null;
     pageStatus?: "SplitRecommended" | "SplitRequired" | null;
   }>>;
-  deleteOne: convex_server23.RegisteredMutation<"internal", {
+  deleteOne: convex_server24.RegisteredMutation<"internal", {
     beforeDeleteHandle?: string | undefined;
     onDeleteHandle?: string | undefined;
     input: {
@@ -368,19 +368,19 @@ declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: S
       model: string;
     } | {
       where?: {
-        operator?: "in" | "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
+        operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
         connector?: "AND" | "OR" | undefined;
         value: string | number | boolean | string[] | number[] | null;
         field: string;
       }[] | undefined;
       model: string;
     };
-  }, Promise<convex_server23.GenericDocument | undefined>>;
-  findMany: convex_server23.RegisteredQuery<"internal", {
+  }, Promise<convex_server24.GenericDocument | undefined>>;
+  findMany: convex_server24.RegisteredQuery<"internal", {
     limit?: number | undefined;
     join?: any;
     where?: {
-      operator?: "in" | "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
+      operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
       connector?: "AND" | "OR" | undefined;
       value: string | number | boolean | string[] | number[] | null;
       field: string;
@@ -399,28 +399,36 @@ declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: S
       cursor: string | null;
     };
     model: string;
-  }, Promise<convex_server23.PaginationResult<convex_server23.GenericDocument>>>;
-  findOne: convex_server23.RegisteredQuery<"internal", {
+  }, Promise<convex_server24.PaginationResult<convex_server24.GenericDocument>>>;
+  findOne: convex_server24.RegisteredQuery<"internal", {
     join?: any;
     where?: {
-      operator?: "in" | "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
+      operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
       connector?: "AND" | "OR" | undefined;
       value: string | number | boolean | string[] | number[] | null;
       field: string;
     }[] | undefined;
     select?: string[] | undefined;
     model: string;
-  }, Promise<convex_server23.GenericDocument | null>>;
-  updateMany: convex_server23.RegisteredMutation<"internal", {
+  }, Promise<convex_server24.GenericDocument | null>>;
+  updateMany: convex_server24.RegisteredMutation<"internal", {
     beforeUpdateHandle?: string | undefined;
     onUpdateHandle?: string | undefined;
+    paginationOpts: {
+      id?: number;
+      endCursor?: string | null;
+      maximumRowsRead?: number;
+      maximumBytesRead?: number;
+      numItems: number;
+      cursor: string | null;
+    };
     input: {
       where?: any[] | undefined;
       update: any;
       model: string;
     } | {
       where?: {
-        operator?: "in" | "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
+        operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
         connector?: "AND" | "OR" | undefined;
         value: string | number | boolean | string[] | number[] | null;
         field: string;
@@ -432,23 +440,15 @@ declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: S
       };
       model: string;
     };
-    paginationOpts: {
-      id?: number;
-      endCursor?: string | null;
-      maximumRowsRead?: number;
-      maximumBytesRead?: number;
-      numItems: number;
-      cursor: string | null;
-    };
   }, Promise<{
     count: number;
     ids: any[];
     isDone: boolean;
-    continueCursor: convex_server23.Cursor;
-    splitCursor?: convex_server23.Cursor | null;
+    continueCursor: convex_server24.Cursor;
+    splitCursor?: convex_server24.Cursor | null;
     pageStatus?: "SplitRecommended" | "SplitRequired" | null;
   }>>;
-  updateOne: convex_server23.RegisteredMutation<"internal", {
+  updateOne: convex_server24.RegisteredMutation<"internal", {
     beforeUpdateHandle?: string | undefined;
     onUpdateHandle?: string | undefined;
     input: {
@@ -457,7 +457,7 @@ declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: S
       model: string;
     } | {
       where?: {
-        operator?: "in" | "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
+        operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
         connector?: "AND" | "OR" | undefined;
         value: string | number | boolean | string[] | number[] | null;
         field: string;
@@ -470,8 +470,8 @@ declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: S
       model: string;
     };
   }, Promise<any>>;
-  getLatestJwks: convex_server23.RegisteredAction<"internal", {}, Promise<any>>;
-  rotateKeys: convex_server23.RegisteredAction<"internal", {}, Promise<any>>;
+  getLatestJwks: convex_server24.RegisteredAction<"internal", {}, Promise<any>>;
+  rotateKeys: convex_server24.RegisteredAction<"internal", {}, Promise<any>>;
 };
 //#endregion
 //#region src/auth/helpers.d.ts

package/dist/auth/index.js

@@ -630,7 +630,7 @@ const httpAdapter = (ctx, { authFunctions, debugLogs, triggers }) => {
 					});
 				},
 				createSchema: async ({ file, tables }) => {
-					const { createSchema } = await import("../create-schema-CiLdn4rr.js");
+					const { createSchema } = await import("../create-schema-DzQEFNJW.js");
 					return createSchema({
 						file,
 						tables
@@ -766,7 +766,7 @@ const dbAdapter = (ctx, createAuthOptions, { authFunctions, debugLogs, schema, t
 					}, schema, betterAuthSchema);
 				},
 				createSchema: async ({ file, tables }) => {
-					const { createSchema } = await import("../create-schema-CiLdn4rr.js");
+					const { createSchema } = await import("../create-schema-DzQEFNJW.js");
 					return createSchema({
 						file,
 						tables

package/dist/auth-client/index.d.ts

@@ -1,8 +1,8 @@
 'use client';
-import { AuthClient } from "@convex-dev/better-auth/react";
 import { ConvexReactClient } from "convex/react";
 import { ReactNode } from "react";
 import * as react_jsx_runtime0 from "react/jsx-runtime";
+import { AuthClient, AuthClient as AuthClient$1 } from "@convex-dev/better-auth/react";
 
 //#region src/auth-client/convex-auth-provider.d.ts
 type ConvexAuthProviderProps = {
@@ -10,7 +10,7 @@ type ConvexAuthProviderProps = {
   /** Convex client instance */
   client: ConvexReactClient;
   /** Better Auth client instance */
-  authClient: AuthClient;
+  authClient: AuthClient$1;
   /** Initial session token (from SSR) */
   initialToken?: string;
   /** Callback when mutation called while unauthorized */
@@ -19,10 +19,12 @@ type ConvexAuthProviderProps = {
   onQueryUnauthorized?: (info: {
     queryName: string;
   }) => void;
+  /** Custom function to detect UNAUTHORIZED errors. Default checks code property. */
+  isUnauthorized?: (error: unknown) => boolean;
 };
 /**
- * Combined auth provider merging ConvexBetterAuthProvider + AuthProvider.
- * Single provider for consumers to configure all auth behavior.
+ * Unified auth provider for Convex + Better Auth.
+ * Handles token sync, HMR persistence, and auth callbacks.
  */
 declare function ConvexAuthProvider({
   children,
@@ -30,7 +32,8 @@ declare function ConvexAuthProvider({
   authClient,
   initialToken,
   onMutationUnauthorized,
-  onQueryUnauthorized
+  onQueryUnauthorized,
+  isUnauthorized
 }: ConvexAuthProviderProps): react_jsx_runtime0.JSX.Element;
 //#endregion
-export { ConvexAuthProvider, ConvexAuthProviderProps };
+export { type AuthClient, ConvexAuthProvider, ConvexAuthProviderProps };

package/dist/auth-client/index.js

@@ -1,10 +1,14 @@
 'use client';
-import { a as getPersistedToken, m as CRPCClientError, o as persistToken, t as AuthProvider } from "../auth-store-DPj6Z0Xl.js";
+import { _ as defaultIsUnauthorized, c as persistToken, f as useAuthStore, g as CRPCClientError, p as useAuthValue, s as getPersistedToken, t as AuthProvider } from "../auth-store-DANFmEdk.js";
 import { c } from "react/compiler-runtime";
-import { ConvexBetterAuthProvider } from "@convex-dev/better-auth/react";
-import { jsx } from "react/jsx-runtime";
+import { ConvexProviderWithAuth } from "convex/react";
+import { useCallback, useEffect, useMemo } from "react";
+import { jsx, jsxs } from "react/jsx-runtime";
 
 //#region src/auth-client/convex-auth-provider.tsx
+/**
+* Unified Convex + Better Auth provider
+*/
 const defaultMutationHandler = () => {
 	throw new CRPCClientError({
 		code: "UNAUTHORIZED",
@@ -12,12 +16,12 @@ const defaultMutationHandler = () => {
 	});
 };
 /**
-* Combined auth provider merging ConvexBetterAuthProvider + AuthProvider.
-* Single provider for consumers to configure all auth behavior.
+* Unified auth provider for Convex + Better Auth.
+* Handles token sync, HMR persistence, and auth callbacks.
 */
 function ConvexAuthProvider(t0) {
-	const $ = c(14);
-	const { children, client, authClient, initialToken, onMutationUnauthorized, onQueryUnauthorized } = t0;
+	const $ = c(17);
+	const { children, client, authClient, initialToken, onMutationUnauthorized, onQueryUnauthorized, isUnauthorized } = t0;
 	let t1;
 	if ($[0] !== initialToken) {
 		t1 = initialToken ?? getPersistedToken();
@@ -26,55 +30,145 @@ function ConvexAuthProvider(t0) {
 	} else t1 = $[1];
 	const effectiveToken = t1;
 	if (effectiveToken) persistToken(effectiveToken);
-	console.log("[auth ConvexAuthProvider] render:", {
-		initialToken: initialToken ? "exists" : "undefined",
-		persistedToken: getPersistedToken() ? "exists" : "null",
-		effectiveToken: effectiveToken ? "exists" : "null",
-		timestamp: (/* @__PURE__ */ new Date()).toISOString()
-	});
-	const t2 = effectiveToken ?? null;
-	let t3;
-	if ($[2] !== t2) {
-		t3 = {
+	const useAuth = useCreateConvexAuth(authClient);
+	useOTTHandler(authClient);
+	const t2 = client;
+	const t3 = effectiveToken ?? null;
+	let t4;
+	if ($[2] !== t3) {
+		t4 = {
 			isLoading: true,
-			token: t2
+			token: t3
 		};
-		$[2] = t2;
-		$[3] = t3;
-	} else t3 = $[3];
-	const t4 = onMutationUnauthorized ?? defaultMutationHandler;
-	const t5 = onQueryUnauthorized ?? _temp;
-	let t6;
-	if ($[4] !== children || $[5] !== t3 || $[6] !== t4 || $[7] !== t5) {
-		t6 = /* @__PURE__ */ jsx(AuthProvider, {
-			initialValues: t3,
-			onMutationUnauthorized: t4,
-			onQueryUnauthorized: t5,
-			children
+		$[2] = t3;
+		$[3] = t4;
+	} else t4 = $[3];
+	const t5 = isUnauthorized ?? defaultIsUnauthorized;
+	const t6 = onMutationUnauthorized ?? defaultMutationHandler;
+	const t7 = onQueryUnauthorized ?? _temp;
+	let t8;
+	if ($[4] !== authClient) {
+		t8 = /* @__PURE__ */ jsx(AuthSyncEffect, { authClient });
+		$[4] = authClient;
+		$[5] = t8;
+	} else t8 = $[5];
+	let t9;
+	if ($[6] !== children || $[7] !== t4 || $[8] !== t5 || $[9] !== t6 || $[10] !== t7 || $[11] !== t8) {
+		t9 = /* @__PURE__ */ jsxs(AuthProvider, {
+			initialValues: t4,
+			isUnauthorized: t5,
+			onMutationUnauthorized: t6,
+			onQueryUnauthorized: t7,
+			children: [t8, children]
 		});
-		$[4] = children;
-		$[5] = t3;
-		$[6] = t4;
-		$[7] = t5;
-		$[8] = t6;
-	} else t6 = $[8];
-	let t7;
-	if ($[9] !== authClient || $[10] !== client || $[11] !== effectiveToken || $[12] !== t6) {
-		t7 = /* @__PURE__ */ jsx(ConvexBetterAuthProvider, {
-			authClient,
-			client,
-			initialToken: effectiveToken,
-			children: t6
+		$[6] = children;
+		$[7] = t4;
+		$[8] = t5;
+		$[9] = t6;
+		$[10] = t7;
+		$[11] = t8;
+		$[12] = t9;
+	} else t9 = $[12];
+	let t10;
+	if ($[13] !== t2 || $[14] !== t9 || $[15] !== useAuth) {
+		t10 = /* @__PURE__ */ jsx(ConvexProviderWithAuth, {
+			client: t2,
+			useAuth,
+			children: t9
 		});
-		$[9] = authClient;
-		$[10] = client;
-		$[11] = effectiveToken;
-		$[12] = t6;
-		$[13] = t7;
-	} else t7 = $[13];
-	return t7;
+		$[13] = t2;
+		$[14] = t9;
+		$[15] = useAuth;
+		$[16] = t10;
+	} else t10 = $[16];
+	return t10;
 }
+/**
+* Syncs Better Auth session to auth-store.
+* Automatically handles login/logout token updates.
+*/
 function _temp() {}
+function AuthSyncEffect({ authClient }) {
+	const session = authClient.useSession();
+	const authStore = useAuthStore();
+	useEffect(() => {
+		if (!session.isPending) {
+			const token = session.data?.session.token ?? null;
+			if (token !== authStore.get("token")) {
+				authStore.set("token", token);
+				persistToken(token);
+			}
+		}
+	}, [
+		session.data,
+		session.isPending,
+		authStore
+	]);
+	return null;
+}
+/**
+* Creates useAuth hook for ConvexProviderWithAuth.
+* Uses auth-store token as single source of truth.
+*/
+function useCreateConvexAuth(authClient) {
+	return useMemo(() => function useConvexAuth$1() {
+		const { data: session, isPending: isSessionPending } = authClient.useSession();
+		const token = useAuthValue("token");
+		const sessionId = session?.session?.id;
+		const fetchAccessToken = useCallback(async ({ forceRefreshToken = false } = {}) => {
+			if (token && !forceRefreshToken) return token;
+			try {
+				const { data } = await authClient.convex.token();
+				return data?.token || null;
+			} catch {
+				return null;
+			}
+		}, [sessionId, token]);
+		return useMemo(() => ({
+			isLoading: isSessionPending,
+			isAuthenticated: session !== null,
+			fetchAccessToken
+		}), [
+			isSessionPending,
+			sessionId,
+			fetchAccessToken
+		]);
+	}, [authClient]);
+}
+/**
+* Handles cross-domain one-time token (OTT) verification.
+*/
+function useOTTHandler(authClient) {
+	const $ = c(3);
+	let t0;
+	let t1;
+	if ($[0] !== authClient) {
+		t0 = () => {
+			(async () => {
+				const url = new URL(window.location?.href);
+				const token = url.searchParams.get("ott");
+				if (token) {
+					const authClientWithCrossDomain = authClient;
+					url.searchParams.delete("ott");
+					const session = (await authClientWithCrossDomain.crossDomain.oneTimeToken.verify({ token })).data?.session;
+					if (session) {
+						await authClient.getSession({ fetchOptions: { headers: { Authorization: `Bearer ${session.token}` } } });
+						authClientWithCrossDomain.updateSession();
+					}
+					window.history.replaceState({}, "", url);
+				}
+			})();
+		};
+		t1 = [authClient];
+		$[0] = authClient;
+		$[1] = t0;
+		$[2] = t1;
+	} else {
+		t0 = $[1];
+		t1 = $[2];
+	}
+	useEffect(t0, t1);
+}
 
 //#endregion
 export { ConvexAuthProvider };

package/dist/auth-nextjs/index.d.ts

@@ -3,20 +3,20 @@ import { GetTokenOptions } from "@convex-dev/better-auth/utils";
 
 //#region src/auth-nextjs/index.d.ts
 
-/** JWT cache options with optional isAuthError (has built-in default). */
-type JwtCacheOptions = {
-  /** Enable JWT caching with automatic refresh on auth errors. */
-  enabled: boolean;
+/** Auth options for server-side calls. */
+type AuthOptions = {
+  /** Enable/disable JWT caching. Default: true */
+  jwtCache?: boolean;
+  /** Custom function to detect UNAUTHORIZED errors. Default checks code property. */
+  isUnauthorized?: (error: unknown) => boolean;
   /** Expiration tolerance in seconds. */
   expirationToleranceSeconds?: number;
-  /** Custom function to detect auth errors. Default checks for "auth" in error message. */
-  isAuthError?: (error: unknown) => boolean;
 };
 type ConvexBetterAuthOptions<TApi> = Omit<GetTokenOptions, 'jwtCache'> & {
   api: TApi;
   convexSiteUrl: string;
-  /** JWT caching options for automatic token refresh. */
-  jwtCache?: JwtCacheOptions;
+  /** Auth options. JWT caching is enabled by default (set `auth.jwtCache: false` to disable). */
+  auth?: AuthOptions;
   meta: CallerMeta;
 };
 /**
@@ -28,8 +28,8 @@ type ConvexBetterAuthOptions<TApi> = Omit<GetTokenOptions, 'jwtCache'> & {
  * export const { createContext, createCaller, handler } = convexBetterAuth({
  *   api,
  *   convexSiteUrl: env.NEXT_PUBLIC_CONVEX_SITE_URL,
- *   jwtCache: { enabled: true, isAuthError },
- * });
+ *   meta,
+ * }); // JWT caching enabled by default
  *
  * // rsc.tsx
  * const createRSCContext = cache(async () => {