kitcn 0.12.9 → 0.12.10

package/dist/aggregate/index.d.ts

@@ -1,4 +1,4 @@
-import { C as ConvexNumberBuilderInitial, E as ConvexIdBuilderInitial, N as ConvexCustomBuilderInitial, dn as ConvexTableWithColumns, tr as ConvexTextBuilderInitial } from "../where-clause-compiler-Dw3EVdi6.js";
+import { C as ConvexNumberBuilderInitial, E as ConvexIdBuilderInitial, N as ConvexCustomBuilderInitial, dn as ConvexTableWithColumns, tr as ConvexTextBuilderInitial } from "../where-clause-compiler-DdjN63Io.js";
 import * as convex_values0 from "convex/values";
 import { GenericId, Infer, Value } from "convex/values";
 import { DocumentByName, GenericDataModel, GenericDatabaseReader, GenericDatabaseWriter, TableNamesInDataModel } from "convex/server";

package/dist/auth/client/index.js

@@ -52,6 +52,13 @@ function ConvexAuthProviderInner({ children, client, authClient }) {
 	const pendingTokenRef = useRef(null);
 	sessionRef.current = session;
 	isPendingRef.current = isPending;
+	const getCachedJwt = useCallback((minTimeRemainingMs = 0) => {
+		const cachedToken = authStore.get("token");
+		if (!cachedToken) return null;
+		const expiresAt = decodeJwtExp(cachedToken);
+		if (expiresAt === null || expiresAt <= Date.now() + minTimeRemainingMs) return null;
+		return cachedToken;
+	}, [authStore]);
 	useEffect(() => {
 		if (hasActiveSessionData(session)) {
 			authStore.set("sessionSyncGraceUntil", null);
@@ -86,11 +93,23 @@ function ConvexAuthProviderInner({ children, client, authClient }) {
 					authStore.set("sessionSyncGraceUntil", null);
 					return jwt;
 				}
+				const cachedJwt = getCachedJwt();
+				if (cachedJwt) {
+					authStore.set("expiresAt", decodeJwtExp(cachedJwt));
+					authStore.set("sessionSyncGraceUntil", null);
+					return cachedJwt;
+				}
 				authStore.set("token", null);
 				authStore.set("expiresAt", null);
 				authStore.set("sessionSyncGraceUntil", null);
 				return null;
 			}).catch((error) => {
+				const cachedJwt = getCachedJwt();
+				if (cachedJwt) {
+					authStore.set("expiresAt", decodeJwtExp(cachedJwt));
+					authStore.set("sessionSyncGraceUntil", null);
+					return cachedJwt;
+				}
 				authStore.set("token", null);
 				authStore.set("expiresAt", null);
 				authStore.set("sessionSyncGraceUntil", null);
@@ -102,9 +121,10 @@ function ConvexAuthProviderInner({ children, client, authClient }) {
 			return pendingTokenRef.current;
 		};
 		const fetchFreshTokenForced = async () => {
+			const cachedJwt = getCachedJwt();
 			if (pendingTokenRef.current) {
 				const token = await pendingTokenRef.current;
-				if (token) return token;
+				if (token && (!cachedJwt || token !== cachedJwt)) return token;
 			}
 			return fetchFreshToken();
 		};
@@ -114,16 +134,16 @@ function ConvexAuthProviderInner({ children, client, authClient }) {
 		const hasSessionSyncGrace = isSessionSyncGraceActive(authStore.get("sessionSyncGraceUntil"));
 		if (!hasSession) {
 			if (currentIsPending || hasSessionSyncGrace) {
-				const cachedToken = authStore.get("token");
+				const cachedJwt = getCachedJwt();
 				if (!forceRefreshToken) {
-					if (cachedToken && decodeJwtExp(cachedToken) !== null) return cachedToken;
+					if (cachedJwt) return cachedJwt;
 					return fetchFreshToken();
 				}
 				const freshToken = await fetchFreshTokenForced();
-				if (!freshToken && cachedToken && decodeJwtExp(cachedToken) !== null) {
-					authStore.set("token", cachedToken);
-					authStore.set("expiresAt", decodeJwtExp(cachedToken));
-					return cachedToken;
+				if (!freshToken && cachedJwt) {
+					authStore.set("token", cachedJwt);
+					authStore.set("expiresAt", decodeJwtExp(cachedJwt));
+					return cachedJwt;
 				}
 				return freshToken;
 			}
@@ -139,7 +159,11 @@ function ConvexAuthProviderInner({ children, client, authClient }) {
 		if (!forceRefreshToken && pendingTokenRef.current) return pendingTokenRef.current;
 		if (forceRefreshToken) return fetchFreshTokenForced();
 		return fetchFreshToken();
-	}, [authStore, authClient]);
+	}, [
+		authStore,
+		authClient,
+		getCachedJwt
+	]);
 	const useAuth = useCallback(function useConvexAuthHook() {
 		const token = authStore.get("token");
 		const hasSession = hasActiveSessionData(sessionRef.current);

package/dist/orm/index.d.ts

@@ -1,4 +1,4 @@
-import { $ as GenericOrmCtx$1, $n as unique, $r as endsWith, $t as ManyConfig, A as ConvexDateMode, An as ConvexRankIndexBuilder, Ar as ReturningResult, At as MigrationManifestEntry, B as ConvexBytesBuilderInitial, Bn as rankIndex, Br as OrmSchemaRelations, Bt as defineMigration, C as ConvexNumberBuilderInitial, Ci as ColumnBuilderWithTableName, Cn as RlsRole, Cr as MutationReturning, Ct as MigrationStatusArgs, D as id, Di as IsPrimaryKey, Dn as ConvexAggregateIndexBuilderOn, Dr as PaginatedResult, Dt as MigrationDoc, E as ConvexIdBuilderInitial, Ei as HasDefault, En as ConvexAggregateIndexBuilder, Er as OrderDirection, Et as MigrationDirection, F as custom, Fn as ConvexVectorIndexBuilder, Fr as unsetToken, Ft as MigrationStateMap, G as ConvexBigIntBuilder, Gn as ConvexCheckConfig, Gr as ExpressionVisitor, Gt as OrmReader$1, H as ConvexBooleanBuilder, Hn as uniqueIndex, Hr as TableName, Ht as detectMigrationDrift, I as json, In as ConvexVectorIndexBuilderOn, Ir as Brand, It as MigrationStep, J as CountBackfillChunkArgs, Jn as ConvexUniqueConstraintBuilder, Jr as LogicalExpression, Jt as RlsMode, K as ConvexBigIntBuilderInitial, Kn as ConvexForeignKeyBuilder, Kr as FieldReference, Kt as OrmWriter$1, L as objectOf, Ln as ConvexVectorIndexConfig, Lr as Columns, Lt as MigrationTableName, M as ConvexCustomBuilder, Mn as ConvexSearchIndexBuilder, Mr as UpdateSet, Mt as MigrationPlan, N as ConvexCustomBuilderInitial, Nn as ConvexSearchIndexBuilderOn, Nr as VectorQueryConfig, Nt as MigrationRunStatus, O as ConvexDateBuilder, Oi as IsUnique, On as ConvexIndexBuilder, Or as PredicateWhereIndexConfig, Ot as MigrationDocContext, P as arrayOf, Pn as ConvexSearchIndexConfig, Pr as VectorSearchProvider, Pt as MigrationSet, Q as GenericOrm$1, Qn as foreignKey, Qr as contains, Qt as ExtractTablesWithRelations, R as unionOf, Rn as aggregateIndex, Rr as OrmSchemaExtensionTables, Rt as MigrationWriteMode, S as ConvexNumberBuilder, Si as ColumnBuilderTypeConfig, Sn as rlsPolicy, Sr as MutationResult, St as MigrationRunChunkArgs, T as ConvexIdBuilder, Ti as DrizzleEntity, Tn as rlsRole, Tr as OrderByClause, Tt as MigrationDefinition, U as ConvexBooleanBuilderInitial, Un as vectorIndex, Ur as SystemFields, Ut as DatabaseWithMutations, V as bytes, Vn as searchIndex, Vr as OrmSchemaTriggers, Vt as defineMigrationSet, W as boolean, Wn as ConvexCheckBuilder, Wr as BinaryExpression, Wt as DatabaseWithQuery, X as CountBackfillStatusArgs, Xn as ConvexUniqueConstraintConfig, Xr as and, Xt as extractRelationsConfig, Y as CountBackfillKickoffArgs, Yn as ConvexUniqueConstraintBuilderOn, Yr as UnaryExpression, Yt as EdgeMetadata, Z as CreateOrmOptions, Zn as check, Zr as between, Zt as ExtractTablesFromSchema, _ as ConvexTimestampMode, _i as startsWith, _n as deletion, _r as MutationExecuteConfig, _t as OrmTriggerContext, a as requireSchemaRelations, ai as inArray, an as TablesRelationalConfig, ar as AggregateResult, at as OrmWriterCtx, b as ConvexTextEnumBuilderInitial, bi as ColumnBuilderBaseConfig, bn as RlsPolicyConfig, br as MutationPaginateConfig, bt as MigrationCancelArgs, c as TableConfigResult, ci as isNull, cn as ConvexDeletionBuilder, cr as CountConfig, ct as ScheduledMutationBatchArgs, d as OrmNotFoundError, di as lte, dn as ConvexTableWithColumns, dr as FilterOperators, dt as scheduledDeleteFactory, ei as eq, en as OneConfig, er as ConvexTextBuilder, et as OrmApiResult, f as ConvexVectorBuilder, fi as ne, fn as DiscriminatorBuilderConfig, fr as GetColumnData, ft as SchemaExtension, g as ConvexTimestampBuilderInitial, gi as or, gn as convexTable, gr as InsertValue, gt as OrmTriggerChange, h as ConvexTimestampBuilder, hi as notInArray, hn as TableConfig, hr as InferSelectModel, ht as OrmTableTriggers, i as getSchemaTriggers, ii as ilike, in as TableRelationalConfig, ir as AggregateFieldValue, it as OrmReaderCtx, j as date, jn as ConvexRankIndexBuilderOn, jr as ReturningSelection, jt as MigrationMigrateOne, k as ConvexDateBuilderInitial, ki as NotNull, kn as ConvexIndexBuilderOn, kr as ReturningAll, kt as MigrationDriftIssue, l as getTableColumns, li as like, ln as ConvexDeletionConfig, lr as CountResult, lt as scheduledMutationBatchFactory, m as vector, mi as notBetween, mn as OrmLifecycleOperation, mr as InferModelFromColumns, mt as OrmBeforeResult, n as defineSchema, ni as gt, nn as RelationsBuilderColumnBase, nr as text, nt as OrmClientWithApi$1, o as asc, oi as isFieldReference, on as defineRelations, or as BuildQueryResult, ot as ResolveOrmSchema, p as ConvexVectorBuilderInitial, pi as not, pn as OrmLifecycleChange, pr as InferInsertModel, pt as defineSchemaExtension, q as bigint, qn as ConvexForeignKeyConfig, qr as FilterExpression, qt as RlsContext, r as getSchemaRelations, ri as gte, rn as RelationsBuilderColumnConfig, rr as AggregateConfig, rt as OrmFunctions, s as desc, si as isNotNull, sn as defineRelationsPart, sr as BuildRelationResult, st as createOrm, t as WhereClauseResult, ti as fieldRef, tn as RelationsBuilder, tr as ConvexTextBuilderInitial, tt as OrmClientBase$1, u as getTableConfig, ui as lt, un as ConvexTable, ur as DBQueryConfig, ut as ScheduledDeleteArgs, v as timestamp, vi as AnyColumn, vn as discriminator, vr as MutationExecuteResult, vt as OrmTriggers, w as integer, wi as ColumnDataType, wn as RlsRoleConfig, wr as MutationRunMode, wt as MigrationAppliedState, x as textEnum, xi as ColumnBuilderRuntimeConfig, xn as RlsPolicyToOption, xr as MutationPaginatedResult, xt as MigrationRunArgs, y as ConvexTextEnumBuilder, yi as ColumnBuilder, yn as RlsPolicy, yr as MutationExecutionMode, yt as defineTriggers, z as ConvexBytesBuilder, zn as index, zr as OrmSchemaExtensions, zt as buildMigrationPlan } from "../where-clause-compiler-Dw3EVdi6.js";
+import { $ as GenericOrmCtx$1, $n as unique, $r as endsWith, $t as ManyConfig, A as ConvexDateMode, An as ConvexRankIndexBuilder, Ar as ReturningResult, At as MigrationManifestEntry, B as ConvexBytesBuilderInitial, Bn as rankIndex, Br as OrmSchemaRelations, Bt as defineMigration, C as ConvexNumberBuilderInitial, Ci as ColumnBuilderWithTableName, Cn as RlsRole, Cr as MutationReturning, Ct as MigrationStatusArgs, D as id, Di as IsPrimaryKey, Dn as ConvexAggregateIndexBuilderOn, Dr as PaginatedResult, Dt as MigrationDoc, E as ConvexIdBuilderInitial, Ei as HasDefault, En as ConvexAggregateIndexBuilder, Er as OrderDirection, Et as MigrationDirection, F as custom, Fn as ConvexVectorIndexBuilder, Fr as unsetToken, Ft as MigrationStateMap, G as ConvexBigIntBuilder, Gn as ConvexCheckConfig, Gr as ExpressionVisitor, Gt as OrmReader$1, H as ConvexBooleanBuilder, Hn as uniqueIndex, Hr as TableName, Ht as detectMigrationDrift, I as json, In as ConvexVectorIndexBuilderOn, Ir as Brand, It as MigrationStep, J as CountBackfillChunkArgs, Jn as ConvexUniqueConstraintBuilder, Jr as LogicalExpression, Jt as RlsMode, K as ConvexBigIntBuilderInitial, Kn as ConvexForeignKeyBuilder, Kr as FieldReference, Kt as OrmWriter$1, L as objectOf, Ln as ConvexVectorIndexConfig, Lr as Columns, Lt as MigrationTableName, M as ConvexCustomBuilder, Mn as ConvexSearchIndexBuilder, Mr as UpdateSet, Mt as MigrationPlan, N as ConvexCustomBuilderInitial, Nn as ConvexSearchIndexBuilderOn, Nr as VectorQueryConfig, Nt as MigrationRunStatus, O as ConvexDateBuilder, Oi as IsUnique, On as ConvexIndexBuilder, Or as PredicateWhereIndexConfig, Ot as MigrationDocContext, P as arrayOf, Pn as ConvexSearchIndexConfig, Pr as VectorSearchProvider, Pt as MigrationSet, Q as GenericOrm$1, Qn as foreignKey, Qr as contains, Qt as ExtractTablesWithRelations, R as unionOf, Rn as aggregateIndex, Rr as OrmSchemaExtensionTables, Rt as MigrationWriteMode, S as ConvexNumberBuilder, Si as ColumnBuilderTypeConfig, Sn as rlsPolicy, Sr as MutationResult, St as MigrationRunChunkArgs, T as ConvexIdBuilder, Ti as DrizzleEntity, Tn as rlsRole, Tr as OrderByClause, Tt as MigrationDefinition, U as ConvexBooleanBuilderInitial, Un as vectorIndex, Ur as SystemFields, Ut as DatabaseWithMutations, V as bytes, Vn as searchIndex, Vr as OrmSchemaTriggers, Vt as defineMigrationSet, W as boolean, Wn as ConvexCheckBuilder, Wr as BinaryExpression, Wt as DatabaseWithQuery, X as CountBackfillStatusArgs, Xn as ConvexUniqueConstraintConfig, Xr as and, Xt as extractRelationsConfig, Y as CountBackfillKickoffArgs, Yn as ConvexUniqueConstraintBuilderOn, Yr as UnaryExpression, Yt as EdgeMetadata, Z as CreateOrmOptions, Zn as check, Zr as between, Zt as ExtractTablesFromSchema, _ as ConvexTimestampMode, _i as startsWith, _n as deletion, _r as MutationExecuteConfig, _t as OrmTriggerContext, a as requireSchemaRelations, ai as inArray, an as TablesRelationalConfig, ar as AggregateResult, at as OrmWriterCtx, b as ConvexTextEnumBuilderInitial, bi as ColumnBuilderBaseConfig, bn as RlsPolicyConfig, br as MutationPaginateConfig, bt as MigrationCancelArgs, c as TableConfigResult, ci as isNull, cn as ConvexDeletionBuilder, cr as CountConfig, ct as ScheduledMutationBatchArgs, d as OrmNotFoundError, di as lte, dn as ConvexTableWithColumns, dr as FilterOperators, dt as scheduledDeleteFactory, ei as eq, en as OneConfig, er as ConvexTextBuilder, et as OrmApiResult, f as ConvexVectorBuilder, fi as ne, fn as DiscriminatorBuilderConfig, fr as GetColumnData, ft as SchemaExtension, g as ConvexTimestampBuilderInitial, gi as or, gn as convexTable, gr as InsertValue, gt as OrmTriggerChange, h as ConvexTimestampBuilder, hi as notInArray, hn as TableConfig, hr as InferSelectModel, ht as OrmTableTriggers, i as getSchemaTriggers, ii as ilike, in as TableRelationalConfig, ir as AggregateFieldValue, it as OrmReaderCtx, j as date, jn as ConvexRankIndexBuilderOn, jr as ReturningSelection, jt as MigrationMigrateOne, k as ConvexDateBuilderInitial, ki as NotNull, kn as ConvexIndexBuilderOn, kr as ReturningAll, kt as MigrationDriftIssue, l as getTableColumns, li as like, ln as ConvexDeletionConfig, lr as CountResult, lt as scheduledMutationBatchFactory, m as vector, mi as notBetween, mn as OrmLifecycleOperation, mr as InferModelFromColumns, mt as OrmBeforeResult, n as defineSchema, ni as gt, nn as RelationsBuilderColumnBase, nr as text, nt as OrmClientWithApi$1, o as asc, oi as isFieldReference, on as defineRelations, or as BuildQueryResult, ot as ResolveOrmSchema, p as ConvexVectorBuilderInitial, pi as not, pn as OrmLifecycleChange, pr as InferInsertModel, pt as defineSchemaExtension, q as bigint, qn as ConvexForeignKeyConfig, qr as FilterExpression, qt as RlsContext, r as getSchemaRelations, ri as gte, rn as RelationsBuilderColumnConfig, rr as AggregateConfig, rt as OrmFunctions, s as desc, si as isNotNull, sn as defineRelationsPart, sr as BuildRelationResult, st as createOrm, t as WhereClauseResult, ti as fieldRef, tn as RelationsBuilder, tr as ConvexTextBuilderInitial, tt as OrmClientBase$1, u as getTableConfig, ui as lt, un as ConvexTable, ur as DBQueryConfig, ut as ScheduledDeleteArgs, v as timestamp, vi as AnyColumn, vn as discriminator, vr as MutationExecuteResult, vt as OrmTriggers, w as integer, wi as ColumnDataType, wn as RlsRoleConfig, wr as MutationRunMode, wt as MigrationAppliedState, x as textEnum, xi as ColumnBuilderRuntimeConfig, xn as RlsPolicyToOption, xr as MutationPaginatedResult, xt as MigrationRunArgs, y as ConvexTextEnumBuilder, yi as ColumnBuilder, yn as RlsPolicy, yr as MutationExecutionMode, yt as defineTriggers, z as ConvexBytesBuilder, zn as index, zr as OrmSchemaExtensions, zt as buildMigrationPlan } from "../where-clause-compiler-DdjN63Io.js";
 import { i as pretendRequired, n as deprecated, r as pretend } from "../validators-vzRKjBJC.js";
 import { a as QueryCtxWithPreferredOrmQueryTable, i as QueryCtxWithOrmQueryTable, n as LookupByIdResultByCtx, o as getByIdWithOrmQueryFallback, r as QueryCtxWithOptionalOrmQueryTable, t as DocByCtx } from "../query-context-CFZqIvD7.js";
 import { DefineSchemaOptions, GenericDatabaseReader, GenericDatabaseWriter, GenericSchema, SchemaDefinition } from "convex/server";

package/dist/react/index.d.ts

@@ -350,7 +350,7 @@ declare class ConvexQueryClient {
   subscriptions: Record<string, {
     watch: Watch<unknown>;
     unsubscribe: () => void;
-    queryKey: ['convexQuery', string, Record<string, unknown>];
+    queryKey: QueryKey;
   }>;
   /** Cleanup function for QueryCache subscription */
   unsubscribe: (() => void) | undefined;
@@ -377,6 +377,9 @@ declare class ConvexQueryClient {
   private cancelPendingUnsubscribe;
   /** Unsubscribe a live Convex watch (if present) and remove it from the subscription map. */
   private unsubscribeQueryByHash;
+  private isAuthBoundQuery;
+  private isQueryDisabled;
+  private subscribeQuery;
   /** Update auth store (for HMR where jotai store may reset) */
   updateAuthStore(authStore?: AuthStore): void;
   /** Get current auth state from store */
@@ -411,6 +414,7 @@ declare class ConvexQueryClient {
    * Call before logout to prevent UNAUTHORIZED errors during session invalidation.
    */
   unsubscribeAuthQueries(): void;
+  resetAuthQueries(): Promise<void>;
   /**
    * Batch update all subscriptions.
    * Called internally when Convex client reconnects.

package/dist/react/index.js

@@ -1185,7 +1185,24 @@ function createCRPCContext(options) {
 	/** Inner provider */
 	function CRPCProviderInner({ children, convexClient, convexQueryClient }) {
 		const authStore = useAuthStore();
+		const token = useAuthValue("token");
+		const isAuthenticated = useAuthValue("isAuthenticated");
+		const previousAuthRef = useRef(null);
 		const fetchAccessToken = useFetchAccessToken();
+		useEffect(() => {
+			const previous = previousAuthRef.current;
+			const tokenReady = token === null || decodeJwtExp(token) !== null;
+			previousAuthRef.current = {
+				isAuthenticated,
+				token
+			};
+			if (!previous) return;
+			if (tokenReady && (previous.token !== token || previous.isAuthenticated !== isAuthenticated)) convexQueryClient.resetAuthQueries();
+		}, [
+			convexQueryClient,
+			isAuthenticated,
+			token
+		]);
 		const httpProxy = useMemo(() => {
 			if (!httpOptions.convexSiteUrl || !meta._http) return;
 			return createHttpProxy({
@@ -1438,12 +1455,14 @@ function createAuthMutations(authClient) {
 				authStoreApi.set("token", null);
 				authStoreApi.set("expiresAt", null);
 				authStoreApi.set("sessionSyncGraceUntil", null);
+				await convexQueryClient?.resetAuthQueries();
 				return res;
 			}
 		};
 	});
 	const useSignInSocialMutationOptions = ((options) => {
 		const authStoreApi = useAuthStore();
+		const convexQueryClient = useConvexQueryClient();
 		return {
 			...options,
 			mutationFn: async (args) => {
@@ -1452,12 +1471,15 @@ function createAuthMutations(authClient) {
 				seedReturnedToken(authStoreApi, res);
 				await hydrateReturnedSession(authClient, res);
 				await ensureAuth(authStoreApi);
+				authStoreApi.set("isAuthenticated", true);
+				await convexQueryClient?.resetAuthQueries();
 				return res;
 			}
 		};
 	});
 	const useSignInMutationOptions = ((options) => {
 		const authStoreApi = useAuthStore();
+		const convexQueryClient = useConvexQueryClient();
 		return {
 			...options,
 			mutationFn: async (args) => {
@@ -1466,12 +1488,15 @@ function createAuthMutations(authClient) {
 				seedReturnedToken(authStoreApi, res);
 				await hydrateReturnedSession(authClient, res);
 				await ensureAuth(authStoreApi);
+				authStoreApi.set("isAuthenticated", true);
+				await convexQueryClient?.resetAuthQueries();
 				return res;
 			}
 		};
 	});
 	const useSignUpMutationOptions = ((options) => {
 		const authStoreApi = useAuthStore();
+		const convexQueryClient = useConvexQueryClient();
 		return {
 			...options,
 			mutationFn: async (args) => {
@@ -1480,6 +1505,8 @@ function createAuthMutations(authClient) {
 				seedReturnedToken(authStoreApi, res);
 				await hydrateReturnedSession(authClient, res);
 				await ensureAuth(authStoreApi);
+				authStoreApi.set("isAuthenticated", true);
+				await convexQueryClient?.resetAuthQueries();
 				return res;
 			}
 		};
@@ -1701,6 +1728,31 @@ var ConvexQueryClient = class {
 		sub.unsubscribe();
 		delete this.subscriptions[queryHash];
 	}
+	isAuthBoundQuery(query) {
+		const meta = query.meta;
+		return meta?.authType === "required" || meta?.authType === "optional";
+	}
+	isQueryDisabled(query) {
+		return query.isDisabled();
+	}
+	subscribeQuery(query) {
+		if (this.subscriptions[query.queryHash]) return;
+		const meta = query.meta;
+		if (meta?.subscribe === false) return;
+		if (query.getObserversCount() === 0) return;
+		if (this.isQueryDisabled(query)) return;
+		if (this.shouldSkipSubscription(meta?.authType)) return;
+		const [, funcName, args] = query.queryKey;
+		const watch = this.convexClient.watchQuery(funcName, this.transformer.input.serialize(args));
+		const unsubscribe = watch.onUpdate(() => {
+			this.onUpdateQueryKeyHash(query.queryHash);
+		});
+		this.subscriptions[query.queryHash] = {
+			queryKey: query.queryKey,
+			watch,
+			unsubscribe
+		};
+	}
 	/** Update auth store (for HMR where jotai store may reset) */
 	updateAuthStore(authStore) {
 		this.authStore = authStore;
@@ -1783,6 +1835,15 @@ var ConvexQueryClient = class {
 			this.unsubscribeQueryByHash(queryHash);
 		}
 	}
+	async resetAuthQueries() {
+		const authQueries = this.queryClient.getQueryCache().getAll().filter((query) => this.isAuthBoundQuery(query));
+		for (const query of authQueries) {
+			this.cancelPendingUnsubscribe(query.queryHash);
+			this.unsubscribeQueryByHash(query.queryHash);
+		}
+		await this.queryClient.resetQueries({ predicate: (query) => this.isAuthBoundQuery(query) });
+		for (const query of this.queryClient.getQueryCache().getAll()) if (this.isAuthBoundQuery(query)) this.subscribeQuery(query);
+	}
 	/**
 	* Batch update all subscriptions.
 	* Called internally when Convex client reconnects.
@@ -1860,42 +1921,13 @@ var ConvexQueryClient = class {
 					this.cancelPendingUnsubscribe(event.query.queryHash);
 					this.unsubscribeQueryByHash(event.query.queryHash);
 					break;
-				case "added": {
-					const meta = event.query.meta;
-					if (meta?.subscribe === false) break;
-					const [, funcName, args] = event.query.queryKey;
-					if (event.query.getObserversCount() === 0) break;
-					if (this.shouldSkipSubscription(meta?.authType)) break;
-					const watch = this.convexClient.watchQuery(funcName, this.transformer.input.serialize(args));
-					const unsubscribe = watch.onUpdate(() => {
-						this.onUpdateQueryKeyHash(event.query.queryHash);
-					});
-					this.subscriptions[event.query.queryHash] = {
-						queryKey: event.query.queryKey,
-						watch,
-						unsubscribe
-					};
+				case "added":
+					this.subscribeQuery(event.query);
 					break;
-				}
-				case "observerAdded": {
+				case "observerAdded":
 					this.cancelPendingUnsubscribe(event.query.queryHash);
-					if (this.subscriptions[event.query.queryHash]) break;
-					if (event.query.options.enabled === false) break;
-					const meta = event.query.meta;
-					if (meta?.subscribe === false) break;
-					const [, funcName, args] = event.query.queryKey;
-					if (this.shouldSkipSubscription(meta?.authType)) break;
-					const watch = this.convexClient.watchQuery(funcName, this.transformer.input.serialize(args));
-					const unsubscribe = watch.onUpdate(() => {
-						this.onUpdateQueryKeyHash(event.query.queryHash);
-					});
-					this.subscriptions[event.query.queryHash] = {
-						queryKey: event.query.queryKey,
-						watch,
-						unsubscribe
-					};
+					this.subscribeQuery(event.query);
 					break;
-				}
 				case "observerRemoved":
 					if (event.query.getObserversCount() === 0 && this.subscriptions[event.query.queryHash]) {
 						const queryHash = event.query.queryHash;
@@ -1911,7 +1943,7 @@ var ConvexQueryClient = class {
 					if (event.action.type === "setState" && event.action.setStateOptions?.meta === "set by ConvexQueryClient") break;
 					break;
 				case "observerOptionsUpdated": {
-					const isDisabled = event.query.options.enabled === false;
+					const isDisabled = this.isQueryDisabled(event.query);
 					const isSubscribed = !!this.subscriptions[event.query.queryHash];
 					if (isDisabled && isSubscribed) {
 						this.cancelPendingUnsubscribe(event.query.queryHash);
@@ -1919,19 +1951,7 @@ var ConvexQueryClient = class {
 						break;
 					}
 					if (isSubscribed || isDisabled) break;
-					const meta = event.query.meta;
-					if (meta?.subscribe === false) break;
-					const [, funcName, args] = event.query.queryKey;
-					if (this.shouldSkipSubscription(meta?.authType)) break;
-					const watch = this.convexClient.watchQuery(funcName, this.transformer.input.serialize(args));
-					const unsubscribe = watch.onUpdate(() => {
-						this.onUpdateQueryKeyHash(event.query.queryHash);
-					});
-					this.subscriptions[event.query.queryHash] = {
-						queryKey: event.query.queryKey,
-						watch,
-						unsubscribe
-					};
+					this.subscribeQuery(event.query);
 					break;
 				}
 			}

package/dist/{where-clause-compiler-Dw3EVdi6.d.ts → where-clause-compiler-DdjN63Io.d.ts}

@@ -3717,6 +3717,19 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
   readonly aggregate_bucket: ConvexTableWithColumns<{
     name: "aggregate_bucket";
     columns: {
+      count: ConvexNumberBuilderInitial<""> & {
+        _: {
+          notNull: true;
+        };
+      } & {
+        _: {
+          tableName: "aggregate_bucket";
+        };
+      } & {
+        _: {
+          fieldName: "count";
+        };
+      };
       tableKey: ConvexTextBuilderInitial<""> & {
         _: {
           notNull: true;
@@ -3786,19 +3799,6 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
           fieldName: "keyParts";
         };
       };
-      count: ConvexNumberBuilderInitial<""> & {
-        _: {
-          notNull: true;
-        };
-      } & {
-        _: {
-          tableName: "aggregate_bucket";
-        };
-      } & {
-        _: {
-          fieldName: "count";
-        };
-      };
       sumValues: (NotNull<$Type<ConvexCustomBuilderInitial<"", convex_values0.VRecord<Record<string, any>, convex_values0.VString<string, "required">, convex_values0.VId<any, any> | convex_values0.VString<any, any> | convex_values0.VFloat64<any, any> | convex_values0.VInt64<any, any> | convex_values0.VBoolean<any, any> | convex_values0.VNull<any, any> | convex_values0.VAny<any, any, string> | convex_values0.VLiteral<any, any> | convex_values0.VBytes<any, any> | convex_values0.VObject<any, Record<string, convex_values0.Validator<any, convex_values0.OptionalProperty, any>>, any, any> | convex_values0.VArray<any, convex_values0.Validator<any, "required", any>, any> | convex_values0.VRecord<any, convex_values0.Validator<string, "required", any>, convex_values0.Validator<any, "required", any>, any, any> | convex_values0.VUnion<any, convex_values0.Validator<any, "required", any>[], any, any>, "required", string>>, Record<string, number>>> | NotNull<$Type<ConvexCustomBuilderInitial<"", convex_values0.VId<any, any> | convex_values0.VString<any, any> | convex_values0.VFloat64<any, any> | convex_values0.VInt64<any, any> | convex_values0.VBoolean<any, any> | convex_values0.VNull<any, any> | convex_values0.VAny<any, any, string> | convex_values0.VLiteral<any, any> | convex_values0.VBytes<any, any> | convex_values0.VObject<any, Record<string, convex_values0.Validator<any, convex_values0.OptionalProperty, any>>, any, any> | convex_values0.VArray<any, convex_values0.Validator<any, "required", any>, any> | convex_values0.VRecord<any, convex_values0.Validator<string, "required", any>, convex_values0.Validator<any, "required", any>, any, any> | convex_values0.VUnion<any, convex_values0.Validator<any, "required", any>[], any, any>>, Record<string, number>>>) & {
         _: {
           tableName: "aggregate_bucket";
@@ -4009,7 +4009,7 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
           fieldName: "value";
         };
       };
-      tableKey: ConvexTextBuilderInitial<""> & {
+      count: ConvexNumberBuilderInitial<""> & {
         _: {
           notNull: true;
         };
@@ -4019,10 +4019,10 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
         };
       } & {
         _: {
-          fieldName: "tableKey";
+          fieldName: "count";
         };
       };
-      indexName: ConvexTextBuilderInitial<""> & {
+      tableKey: ConvexTextBuilderInitial<""> & {
         _: {
           notNull: true;
         };
@@ -4032,10 +4032,10 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
         };
       } & {
         _: {
-          fieldName: "indexName";
+          fieldName: "tableKey";
         };
       };
-      updatedAt: ConvexNumberBuilderInitial<""> & {
+      indexName: ConvexTextBuilderInitial<""> & {
         _: {
           notNull: true;
         };
@@ -4045,10 +4045,10 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
         };
       } & {
         _: {
-          fieldName: "updatedAt";
+          fieldName: "indexName";
         };
       };
-      keyHash: ConvexTextBuilderInitial<""> & {
+      updatedAt: ConvexNumberBuilderInitial<""> & {
         _: {
           notNull: true;
         };
@@ -4058,10 +4058,10 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
         };
       } & {
         _: {
-          fieldName: "keyHash";
+          fieldName: "updatedAt";
         };
       };
-      count: ConvexNumberBuilderInitial<""> & {
+      keyHash: ConvexTextBuilderInitial<""> & {
         _: {
           notNull: true;
         };
@@ -4071,7 +4071,7 @@ declare const BUILTIN_SCHEMA_EXTENSIONS: readonly [SchemaExtension<{
         };
       } & {
         _: {
-          fieldName: "count";
+          fieldName: "keyHash";
         };
       };
       fieldName: ConvexTextBuilderInitial<""> & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitcn",
-  "version": "0.12.9",
+  "version": "0.12.10",
   "description": "kitcn - React Query integration and CLI tools for Convex",
   "keywords": [
     "convex",