appflare 0.0.24 → 0.0.26

package/cli/core/build.ts

@@ -32,7 +32,7 @@ export async function buildFromConfig(params: {
 
 	await assertDirExists(
 		projectDirAbs,
-		`Project dir not found: ${projectDirAbs}`
+		`Project dir not found: ${projectDirAbs}`,
 	);
 	await assertFileExists(schemaPathAbs, `Schema not found: ${schemaPathAbs}`);
 
@@ -42,7 +42,7 @@ export async function buildFromConfig(params: {
 	// Re-export the user schema inside the generated output so downstream code can import it from the build directory.
 	const schemaImportPathForGeneratedSrc = toImportPathFromGeneratedSrc(
 		outDirAbs,
-		schemaPathAbs
+		schemaPathAbs,
 	);
 	const schemaReexport = `import schema from ${JSON.stringify(schemaImportPathForGeneratedSrc)};
 export type AppflareGeneratedSchema = typeof schema;
@@ -57,7 +57,7 @@ export default schema;
 	});
 	await fs.writeFile(
 		path.join(outDirAbs, "src", "schema-types.ts"),
-		schemaTypesTs
+		schemaTypesTs,
 	);
 
 	// (Re)generate built-in DB handlers based on the schema tables.
@@ -78,6 +78,8 @@ export default schema;
 			config.auth && config.auth.enabled === false
 				? undefined
 				: (config.auth?.basePath ?? "/auth"),
+		authEnabled: config.auth?.enabled !== false,
+		configPathAbs,
 	});
 	await fs.writeFile(path.join(outDirAbs, "src", "api.ts"), apiTs);
 
@@ -99,7 +101,7 @@ export default schema;
 	});
 	await fs.writeFile(
 		path.join(outDirAbs, "server", "websocket-hibernation-server.ts"),
-		websocketDoTs
+		websocketDoTs,
 	);
 
 	const schedulerTs = generateSchedulerHandlers({
@@ -110,7 +112,7 @@ export default schema;
 	});
 	await fs.writeFile(
 		path.join(outDirAbs, "server", "scheduler.ts"),
-		schedulerTs
+		schedulerTs,
 	);
 
 	const { code: cronTs } = generateCronHandlers({
@@ -144,7 +146,7 @@ async function writeEmitTsconfig(params: {
 		"./_generated";
 	const tsconfigPathAbs = path.join(
 		params.configDirAbs,
-		".appflare.tsconfig.emit.json"
+		".appflare.tsconfig.emit.json",
 	);
 	const content = {
 		compilerOptions: {

package/cli/core/config.ts

@@ -4,7 +4,7 @@ import { pathToFileURL } from "node:url";
 import { AppflareConfig, assertFileExists } from "../utils/utils";
 
 export async function loadConfig(
-	configPathAbs: string
+	configPathAbs: string,
 ): Promise<{ config: AppflareConfig; configDirAbs: string }> {
 	await assertFileExists(configPathAbs, `Config not found: ${configPathAbs}`);
 	const configDirAbs = path.dirname(configPathAbs);
@@ -13,7 +13,7 @@ export async function loadConfig(
 	const config = (mod?.default ?? mod) as Partial<AppflareConfig>;
 	if (!config || typeof config !== "object") {
 		throw new Error(
-			`Invalid config export in ${configPathAbs} (expected default export object)`
+			`Invalid config export in ${configPathAbs} (expected default export object)`,
 		);
 	}
 	if (typeof config.dir !== "string" || !config.dir) {
@@ -40,6 +40,12 @@ export async function loadConfig(
 		if (auth.options !== undefined && typeof auth.options !== "object") {
 			throw new Error(`Invalid config.auth.options in ${configPathAbs}`);
 		}
+		if (
+			auth.clientOptions !== undefined &&
+			typeof auth.clientOptions !== "object"
+		) {
+			throw new Error(`Invalid config.auth.clientOptions in ${configPathAbs}`);
+		}
 	}
 
 	const storage = (config as AppflareConfig).storage;
@@ -61,7 +67,7 @@ export async function loadConfig(
 			typeof storage.bucketBinding !== "string"
 		) {
 			throw new Error(
-				`Invalid config.storage.bucketBinding in ${configPathAbs}`
+				`Invalid config.storage.bucketBinding in ${configPathAbs}`,
 			);
 		}
 		if (
@@ -69,9 +75,18 @@ export async function loadConfig(
 			typeof storage.defaultCacheControl !== "string"
 		) {
 			throw new Error(
-				`Invalid config.storage.defaultCacheControl in ${configPathAbs}`
+				`Invalid config.storage.defaultCacheControl in ${configPathAbs}`,
 			);
 		}
+		if (
+			storage.kvBinding !== undefined &&
+			typeof storage.kvBinding !== "string"
+		) {
+			throw new Error(`Invalid config.storage.kvBinding in ${configPathAbs}`);
+		}
+		if (storage.kvId !== undefined && typeof storage.kvId !== "string") {
+			throw new Error(`Invalid config.storage.kvId in ${configPathAbs}`);
+		}
 	}
 	return { config: config as AppflareConfig, configDirAbs };
 }

package/cli/core/index.ts

@@ -27,6 +27,7 @@ type AppflareConfig = {
 	auth?: {
 		enabled?: boolean;
 		basePath?: string;
+		clientOptions?: Record<string, unknown>;
 	};
 };
 
@@ -37,12 +38,12 @@ program.name("appflare").description("Appflare CLI").version("0.0.0");
 program
 	.command("build")
 	.description(
-		"Generate typed schema + query/mutation client/server into outDir"
+		"Generate typed schema + query/mutation client/server into outDir",
 	)
 	.option(
 		"-c, --config <path>",
 		"Path to appflare.config.ts",
-		"appflare.config.ts"
+		"appflare.config.ts",
 	)
 	.option("--emit", "Also run tsc to emit JS + .d.ts into outDir/dist")
 	.action(async (options: { config: string; emit?: boolean }) => {
@@ -69,7 +70,7 @@ async function main(): Promise<void> {
 }
 
 async function loadConfig(
-	configPathAbs: string
+	configPathAbs: string,
 ): Promise<{ config: AppflareConfig; configDirAbs: string }> {
 	await assertFileExists(configPathAbs, `Config not found: ${configPathAbs}`);
 	const configDirAbs = path.dirname(configPathAbs);
@@ -78,7 +79,7 @@ async function loadConfig(
 	const config = (mod?.default ?? mod) as Partial<AppflareConfig>;
 	if (!config || typeof config !== "object") {
 		throw new Error(
-			`Invalid config export in ${configPathAbs} (expected default export object)`
+			`Invalid config export in ${configPathAbs} (expected default export object)`,
 		);
 	}
 	if (typeof config.dir !== "string" || !config.dir) {
@@ -107,7 +108,7 @@ async function buildFromConfig(params: {
 
 	await assertDirExists(
 		projectDirAbs,
-		`Project dir not found: ${projectDirAbs}`
+		`Project dir not found: ${projectDirAbs}`,
 	);
 	await assertFileExists(schemaPathAbs, `Schema not found: ${schemaPathAbs}`);
 
@@ -116,7 +117,7 @@ async function buildFromConfig(params: {
 
 	const schemaImportPathForGeneratedSrc = toImportPathFromGeneratedSrc(
 		outDirAbs,
-		schemaPathAbs
+		schemaPathAbs,
 	);
 	const schemaReexport = `import schema from ${JSON.stringify(schemaImportPathForGeneratedSrc)};
 export type AppflareGeneratedSchema = typeof schema;
@@ -131,7 +132,7 @@ export default schema;
 	});
 	await fs.writeFile(
 		path.join(outDirAbs, "src", "schema-types.ts"),
-		schemaTypesTs
+		schemaTypesTs,
 	);
 
 	// (Re)generate built-in DB handlers based on the schema tables.
@@ -152,6 +153,8 @@ export default schema;
 			config.auth && config.auth.enabled === false
 				? undefined
 				: (config.auth?.basePath ?? "/auth"),
+		authEnabled: config.auth?.enabled !== false,
+		configPathAbs,
 	});
 	await fs.writeFile(path.join(outDirAbs, "src", "api.ts"), apiTs);
 
@@ -173,7 +176,7 @@ export default schema;
 	});
 	await fs.writeFile(
 		path.join(outDirAbs, "server", "websocket-hibernation-server.ts"),
-		websocketDoTs
+		websocketDoTs,
 	);
 
 	const schedulerTs = generateSchedulerHandlers({
@@ -184,7 +187,7 @@ export default schema;
 	});
 	await fs.writeFile(
 		path.join(outDirAbs, "server", "scheduler.ts"),
-		schedulerTs
+		schedulerTs,
 	);
 
 	if (emit) {

package/cli/generators/generate-api-client/index.ts

@@ -38,7 +38,7 @@ import type {
 	InternalQueryContext,
 	InternalQueryDefinition,
 } from "./schema-types";
-
+{{configImport}}
 `;
 
 const TYPE_DEFINITIONS_TEMPLATE = `
@@ -286,11 +286,13 @@ export type QueriesClient = {{queriesTypeDef}};
 
 export type MutationsClient = {{mutationsTypeDef}};
 
+{{authClientTypeDefinitions}}
+
 export type AppflareApiClient = {
 	queries: QueriesClient;
 	mutations: MutationsClient;
 	storage: StorageManagerClient;
-	auth?: ReturnType<typeof createAuthClient>;
+	auth?: AppflareAuthClient;
 };
 
 export type AppflareApiOptions = {
@@ -298,10 +300,10 @@ export type AppflareApiOptions = {
 	fetcher?: RequestExecutor;
 	realtime?: RealtimeConfig;
 	storage?: StorageManagerOptions;
-	auth?: false | (BetterAuthClientOptions & { baseURL?: string });
+	auth?: (BetterAuthClientOptions & { baseURL?: string });
 };
 
-export function createAppflareApi(options: AppflareApiOptions = {}): AppflareApiClient {
+export function createAppflareApi(options: AppflareApiOptions = {}) {
 	const baseUrl = normalizeBaseUrl(options.baseUrl);
 	const request = options.fetcher ?? defaultFetcher;
 	const realtime = resolveRealtimeConfig(baseUrl, options.realtime);
@@ -309,14 +311,7 @@ export function createAppflareApi(options: AppflareApiOptions = {}): AppflareApi
 	const mutations: MutationsClient = {{mutationsInit}};
 	const storage = createStorageManagerClient(baseUrl, request, options.storage);
 	const authBasePath = normalizeAuthBasePath({{authBasePath}}) ?? "/auth";
-	const auth = options.auth === false
-		? undefined
-		: createAuthClient({
-			...(options.auth ?? {}),
-			baseURL:
-				(options.auth as any)?.baseURL ??
-				buildUrl(baseUrl, authBasePath),
-		});
+{{authClientInit}}
 	return { queries, mutations, storage, auth };
 }
 
@@ -675,7 +670,7 @@ function generateImports(params: {
 }): { importLines: string[]; importAliasBySource: Map<string, string> } {
 	const handlerImportsGrouped = groupBy(
 		params.handlers,
-		(h) => h.sourceFileAbs
+		(h) => h.sourceFileAbs,
 	);
 
 	const importLines: string[] = [];
@@ -685,7 +680,7 @@ function generateImports(params: {
 		importAliasBySource.set(fileAbs, alias);
 		const importPath = toImportPathFromGeneratedSrc(params.outDirAbs, fileAbs);
 		importLines.push(
-			`import * as ${alias} from ${JSON.stringify(importPath)};`
+			`import * as ${alias} from ${JSON.stringify(importPath)};`,
 		);
 	}
 	return { importLines, importAliasBySource };
@@ -701,7 +696,7 @@ function generateGroupedHandlers(handlers: DiscoveredHandler[]): {
 	const mutations = handlers.filter((h) => h.kind === "mutation");
 	const internalQueries = handlers.filter((h) => h.kind === "internalQuery");
 	const internalMutations = handlers.filter(
-		(h) => h.kind === "internalMutation"
+		(h) => h.kind === "internalMutation",
 	);
 
 	const queriesByFile = groupBy(queries, (h) => h.routePath);
@@ -709,7 +704,7 @@ function generateGroupedHandlers(handlers: DiscoveredHandler[]): {
 	const internalQueriesByFile = groupBy(internalQueries, (h) => h.routePath);
 	const internalMutationsByFile = groupBy(
 		internalMutations,
-		(h) => h.routePath
+		(h) => h.routePath,
 	);
 
 	return {
@@ -725,7 +720,7 @@ function generateTypeDefs(
 	mutationsByFile: Map<string, DiscoveredHandler[]>,
 	internalQueriesByFile: Map<string, DiscoveredHandler[]>,
 	internalMutationsByFile: Map<string, DiscoveredHandler[]>,
-	importAliasBySource: Map<string, string>
+	importAliasBySource: Map<string, string>,
 ): {
 	queriesTypeDef: string;
 	mutationsTypeDef: string;
@@ -736,11 +731,11 @@ function generateTypeDefs(
 	const mutationsTypeLines = generateMutationsTypeLines(mutationsByFile);
 	const internalQueriesTypeLines = generateInternalTypeLines(
 		internalQueriesByFile,
-		importAliasBySource
+		importAliasBySource,
 	);
 	const internalMutationsTypeLines = generateInternalTypeLines(
 		internalMutationsByFile,
-		importAliasBySource
+		importAliasBySource,
 	);
 
 	const queriesTypeDef =
@@ -767,15 +762,15 @@ function generateTypeDefs(
 function generateClientInits(
 	queriesByFile: Map<string, DiscoveredHandler[]>,
 	mutationsByFile: Map<string, DiscoveredHandler[]>,
-	importAliasBySource: Map<string, string>
+	importAliasBySource: Map<string, string>,
 ): { queriesInit: string; mutationsInit: string } {
 	const queriesClientLines = generateQueriesClientLines(
 		queriesByFile,
-		importAliasBySource
+		importAliasBySource,
 	);
 	const mutationsClientLines = generateMutationsClientLines(
 		mutationsByFile,
-		importAliasBySource
+		importAliasBySource,
 	);
 
 	const queriesInit =
@@ -788,12 +783,12 @@ function generateClientInits(
 
 function generateInternalInit(
 	internalByFile: Map<string, DiscoveredHandler[]>,
-	importAliasBySource: Map<string, string>
+	importAliasBySource: Map<string, string>,
 ): string {
 	if (internalByFile.size === 0) return "{}";
 	const lines: string[] = [];
 	for (const [fileName, list] of Array.from(internalByFile.entries()).sort(
-		(a, b) => a[0].localeCompare(b[0])
+		(a, b) => a[0].localeCompare(b[0]),
 	)) {
 		const fileKey = renderObjectKey(fileName);
 		const inner = list
@@ -813,19 +808,19 @@ ${lines.join("\n")}
 
 function generateInternalMeta(
 	internalByFile: Map<string, DiscoveredHandler[]>,
-	importAliasBySource: Map<string, string>
+	importAliasBySource: Map<string, string>,
 ): string {
 	if (internalByFile.size === 0) return "";
 	const lines: string[] = [];
 	for (const [fileName, list] of Array.from(internalByFile.entries()).sort(
-		(a, b) => a[0].localeCompare(b[0])
+		(a, b) => a[0].localeCompare(b[0]),
 	)) {
 		for (const h of list.slice().sort((a, b) => a.name.localeCompare(b.name))) {
 			const alias = importAliasBySource.get(h.sourceFileAbs)!;
 			lines.push(
 				`{ file: ${JSON.stringify(fileName)}, name: ${JSON.stringify(
-					h.name
-				)}, handler: ${alias}.${h.name} },`
+					h.name,
+				)}, handler: ${alias}.${h.name} },`,
 			);
 		}
 	}
@@ -836,6 +831,8 @@ export function generateApiClient(params: {
 	handlers: DiscoveredHandler[];
 	outDirAbs: string;
 	authBasePath?: string;
+	authEnabled?: boolean;
+	configPathAbs?: string;
 }): string {
 	const { importLines, importAliasBySource } = generateImports(params);
 	const {
@@ -854,12 +851,12 @@ export function generateApiClient(params: {
 		mutationsByFile,
 		internalQueriesByFile,
 		internalMutationsByFile,
-		importAliasBySource
+		importAliasBySource,
 	);
 	const { queriesInit, mutationsInit } = generateClientInits(
 		queriesByFile,
 		mutationsByFile,
-		importAliasBySource
+		importAliasBySource,
 	);
 	const internalHandlersCombined = new Map<string, DiscoveredHandler[]>();
 	for (const [file, list] of Array.from(internalQueriesByFile.entries())) {
@@ -871,29 +868,65 @@ export function generateApiClient(params: {
 	}
 	const internalInit = generateInternalInit(
 		internalHandlersCombined,
-		importAliasBySource
+		importAliasBySource,
 	);
 	const internalQueriesMeta = generateInternalMeta(
 		internalQueriesByFile,
-		importAliasBySource
+		importAliasBySource,
 	);
 	const internalMutationsMeta = generateInternalMeta(
 		internalMutationsByFile,
-		importAliasBySource
+		importAliasBySource,
 	);
 
 	const authBasePathLiteral = JSON.stringify(params.authBasePath ?? "/auth");
 
+	// Generate config import and auth client options handling
+	let configImport = "";
+	let authClientTypeDefinitions =
+		"type AppflareAuthClient = ReturnType<typeof createAuthClient>;";
+	let authClientInit = `	const auth = createAuthClient({
+			...(options.auth ?? {}),
+			baseURL:
+				(options.auth as any)?.baseURL ??
+				buildUrl(baseUrl, authBasePath),
+		});`;
+
+	if (params.authEnabled && params.configPathAbs) {
+		const configImportPath = toImportPathFromGeneratedSrc(
+			params.outDirAbs,
+			params.configPathAbs,
+		);
+		configImport = `\nimport __appflareConfig from ${JSON.stringify(configImportPath)};`;
+
+		// Use a factory function pattern to properly infer the client type from clientOptions
+		authClientTypeDefinitions = `const __getAppflareAuthClientOptions = () => (__appflareConfig.auth?.clientOptions ?? {}) as const;
+type AppflareAuthClientOptions = ReturnType<typeof __getAppflareAuthClientOptions>;
+const __createTypedAuthClient = (baseURL: string) => createAuthClient({
+	...__getAppflareAuthClientOptions(),
+	baseURL,
+});
+type AppflareAuthClient = ReturnType<typeof __createTypedAuthClient>;`;
+
+		authClientInit = `	const auth =  createAuthClient({
+			...__getAppflareAuthClientOptions(),
+			...(options.auth ?? {}),
+			baseURL:
+				(options.auth as any)?.baseURL ??
+				buildUrl(baseUrl, authBasePath),
+		});`;
+	}
+
 	const typeBlocks = generateTypeBlocks(params.handlers, importAliasBySource);
 
 	return (
-		HEADER_TEMPLATE +
+		HEADER_TEMPLATE.replace("{{configImport}}", configImport) +
 		importLines.join("\n") +
 		TYPE_DEFINITIONS_TEMPLATE +
 		typeBlocks.join("\n\n") +
 		INTERNAL_TEMPLATE.replace(
 			"{{internalQueriesTypeDef}}",
-			internalQueriesTypeDef
+			internalQueriesTypeDef,
 		)
 			.replace("{{internalMutationsTypeDef}}", internalMutationsTypeDef)
 			.replace("{{internalInit}}", internalInit)
@@ -903,7 +936,9 @@ export function generateApiClient(params: {
 			.replace("{{mutationsTypeDef}}", mutationsTypeDef)
 			.replace("{{queriesInit}}", queriesInit)
 			.replace("{{mutationsInit}}", mutationsInit)
-			.replace("{{authBasePath}}", authBasePathLiteral) +
+			.replace("{{authBasePath}}", authBasePathLiteral)
+			.replace("{{authClientTypeDefinitions}}", authClientTypeDefinitions)
+			.replace("{{authClientInit}}", authClientInit) +
 		UTILITY_FUNCTIONS_TEMPLATE
 	);
 }

package/cli/generators/generate-cloudflare-worker/wrangler.ts

@@ -89,6 +89,15 @@ export function generateWranglerJson(params: {
 		};
 	}
 
+	if (params.config.storage?.kvBinding) {
+		wrangler.kv_namespaces = [
+			{
+				binding: params.config.storage.kvBinding,
+				id: params.config.storage.kvId ?? "",
+			},
+		];
+	}
+
 	if (params.cronTriggers && params.cronTriggers.length > 0) {
 		wrangler.triggers = {
 			crons: Array.from(new Set(params.cronTriggers)),

package/cli/generators/generate-hono-server/auth.ts

@@ -24,11 +24,13 @@ export function buildAuthSection(config: AppflareConfig): AuthSection {
 		? [
 				`const __appflareAuthConfig = (appflareConfig as any).auth;`,
 				`const __appflareAuthBasePath = __appflareAuthConfig?.basePath ?? "/auth";`,
+				`const __appflareStorageConfig = (appflareConfig as any).storage;`,
+				`const __appflareKvBinding = __appflareStorageConfig?.kvBinding;`,
 				`const __appflareAuth =`,
 				`\t__appflareAuthConfig &&`,
 				`\t__appflareAuthConfig.enabled !== false &&`,
 				`\t__appflareAuthConfig.options`,
-				`\t\t? initBetterAuth(__appflareAuthConfig.options as any)`,
+				`\t\t? initBetterAuth(__appflareAuthConfig.options as any, __appflareKvBinding)`,
 				`\t\t: undefined;`,
 				`const __appflareAuthRouter = __appflareAuth`,
 				`\t? createBetterAuthRouter({`,

package/cli/index.ts

@@ -39,12 +39,12 @@ program.name("appflare").description("Appflare CLI").version("0.0.0");
 program
 	.command("build")
 	.description(
-		"Generate typed schema + query/mutation client/server into outDir"
+		"Generate typed schema + query/mutation client/server into outDir",
 	)
 	.option(
 		"-c, --config <path>",
 		"Path to appflare.config.ts",
-		"appflare.config.ts"
+		"appflare.config.ts",
 	)
 	.option("--emit", "Also run tsc to emit JS + .d.ts into outDir/dist")
 	.option("-w, --watch", "Watch for changes and rebuild")
@@ -73,7 +73,7 @@ program
 				console.error(message);
 				process.exitCode = 1;
 			}
-		}
+		},
 	);
 
 void main();
@@ -83,7 +83,7 @@ async function main(): Promise<void> {
 }
 
 async function loadConfig(
-	configPathAbs: string
+	configPathAbs: string,
 ): Promise<{ config: AppflareConfig; configDirAbs: string }> {
 	await assertFileExists(configPathAbs, `Config not found: ${configPathAbs}`);
 	const configDirAbs = path.dirname(configPathAbs);
@@ -92,7 +92,7 @@ async function loadConfig(
 	const config = (mod?.default ?? mod) as Partial<AppflareConfig>;
 	if (!config || typeof config !== "object") {
 		throw new Error(
-			`Invalid config export in ${configPathAbs} (expected default export object)`
+			`Invalid config export in ${configPathAbs} (expected default export object)`,
 		);
 	}
 	if (typeof config.dir !== "string" || !config.dir) {
@@ -133,7 +133,7 @@ async function buildFromConfig(params: {
 
 	await assertDirExists(
 		projectDirAbs,
-		`Project dir not found: ${projectDirAbs}`
+		`Project dir not found: ${projectDirAbs}`,
 	);
 	await assertFileExists(schemaPathAbs, `Schema not found: ${schemaPathAbs}`);
 
@@ -143,7 +143,7 @@ async function buildFromConfig(params: {
 	// Re-export the user schema inside the generated output so downstream code can import it from the build directory.
 	const schemaImportPathForGeneratedSrc = toImportPathFromGeneratedSrc(
 		outDirAbs,
-		schemaPathAbs
+		schemaPathAbs,
 	);
 	const schemaReexport = `import schema from ${JSON.stringify(schemaImportPathForGeneratedSrc)};
 export type AppflareGeneratedSchema = typeof schema;
@@ -158,7 +158,7 @@ export default schema;
 	});
 	await fs.writeFile(
 		path.join(outDirAbs, "src", "schema-types.ts"),
-		schemaTypesTs
+		schemaTypesTs,
 	);
 
 	// (Re)generate built-in DB handlers based on the schema tables.
@@ -179,6 +179,8 @@ export default schema;
 			config.auth && config.auth.enabled === false
 				? undefined
 				: (config.auth?.basePath ?? "/auth"),
+		authEnabled: config.auth?.enabled !== false,
+		configPathAbs,
 	});
 	await fs.writeFile(path.join(outDirAbs, "src", "api.ts"), apiTs);
 
@@ -200,7 +202,7 @@ export default schema;
 	});
 	await fs.writeFile(
 		path.join(outDirAbs, "server", "websocket-hibernation-server.ts"),
-		websocketDoTs
+		websocketDoTs,
 	);
 
 	const schedulerTs = generateSchedulerHandlers({
@@ -211,11 +213,11 @@ export default schema;
 	});
 	await fs.writeFile(
 		path.join(outDirAbs, "server", "scheduler.ts"),
-		schedulerTs
+		schedulerTs,
 	);
 
 	const cronHandlersPresent = handlers.some(
-		(handler) => handler.kind === "cron"
+		(handler) => handler.kind === "cron",
 	);
 	const { code: cronTs, cronTriggers } = generateCronHandlers({
 		handlers,
@@ -228,7 +230,7 @@ export default schema;
 	const allowedOrigins = normalizeAllowedOrigins(
 		process.env.APPFLARE_ALLOWED_ORIGINS ??
 			config.corsOrigin ??
-			"http://localhost:3000"
+			"http://localhost:3000",
 	);
 	const workerIndexTs = generateCloudflareWorkerIndex({
 		allowedOrigins,
@@ -297,7 +299,7 @@ async function watchAndBuild(params: {
 
 		lastWatchConfig = normalized;
 		console.log(
-			`[appflare] watching ${normalized.targets.length} path(s) (ignoring ${normalized.ignored.length})`
+			`[appflare] watching ${normalized.targets.length} path(s) (ignoring ${normalized.ignored.length})`,
 		);
 	};
 
@@ -319,7 +321,7 @@ async function watchAndBuild(params: {
 					config,
 					configDirAbs,
 					configPathAbs: params.configPathAbs,
-				})
+				}),
 			);
 			console.log("[appflare] build started");
 			await buildFromConfig({
@@ -384,7 +386,7 @@ function normalizeWatchConfig(config: WatchConfig): WatchConfig {
 	const normalizeList = (list: string[]): string[] =>
 		[
 			...new Set(
-				list.map((item) => (hasGlob(item) ? item : path.resolve(item)))
+				list.map((item) => (hasGlob(item) ? item : path.resolve(item))),
 			),
 		].sort();
 

package/cli/utils/utils.ts

@@ -1,20 +1,29 @@
 import { promises as fs } from "node:fs";
 import path from "node:path";
 import type { BetterAuthOptions } from "better-auth";
+import type { BetterAuthClientOptions } from "better-auth/client";
 import type { StorageManagerOptions } from "../../server/storage/types";
 
 export type AppflareAuthConfig<
-	Options extends BetterAuthOptions = BetterAuthOptions,
+	Options extends BetterAuthOptions,
+	ClientOptions extends BetterAuthClientOptions,
 > = {
 	enabled?: boolean;
 	basePath?: string;
+	/** Server-side Better Auth options. */
 	options?: Options;
+	/** Client-side Better Auth options used in the generated API client. */
+	clientOptions?: ClientOptions;
 };
-
 export type AppflareStorageConfig<
 	Env = unknown,
 	Principal = unknown,
-> = StorageManagerOptions<Env, Principal>;
+> = StorageManagerOptions<Env, Principal> & {
+	/** Optional KV binding name created in the generated worker. */
+	kvBinding?: string;
+	/** Optional KV namespace ID used in wrangler.json. */
+	kvId?: string;
+};
 
 export type AppflareSchedulerConfig = {
 	/** Set to false to disable scheduler generation. */
@@ -27,6 +36,7 @@ export type AppflareSchedulerConfig = {
 
 export type AppflareConfig<
 	Options extends BetterAuthOptions = BetterAuthOptions,
+	ClientOptions extends BetterAuthClientOptions = BetterAuthClientOptions,
 > = {
 	dir: string;
 	schema: string;
@@ -46,7 +56,7 @@ export type AppflareConfig<
 		compatibilityDate?: string;
 		[key: string]: unknown;
 	};
-	auth?: AppflareAuthConfig<Options>;
+	auth?: AppflareAuthConfig<Options, ClientOptions>;
 	storage?: AppflareStorageConfig;
 	scheduler?: AppflareSchedulerConfig;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "appflare",
-	"version": "0.0.24",
+	"version": "0.0.26",
 	"bin": {
 		"appflare": "./cli/index.ts"
 	},
@@ -25,12 +25,12 @@
 		"react": "^18.3.1"
 	},
 	"dependencies": {
-		"better-auth": "^1.4.9",
+		"@hono/standard-validator": "^0.2.1",
+		"better-auth": "^1.4.18",
 		"better-fetch": "^1.1.2",
 		"chokidar": "^5.0.0",
-		"commander": "^14.0.1",
-		"@hono/standard-validator": "^0.2.1",
 		"cloudflare-do-mongo": "^0.1.2",
+		"commander": "^14.0.1",
 		"hono": "^4.6.8",
 		"mongodb": "^7.0.0",
 		"zod": "^4.1.13"

package/server/auth.ts

@@ -41,11 +41,32 @@ export function createBetterAuthRouter<
 
 export function initBetterAuth<Options extends BetterAuthOptions>(
 	options: Options,
+	kvBinding?: string,
 ): Auth<Options> {
-	return betterAuth({
+	const authConfig: BetterAuthOptions = {
 		...options,
 		database: mongodbAdapter(getDatabase((env as any).MONGO_DB) as any),
-	});
+	};
+
+	// Add secondary storage if KV binding is provided
+	if (kvBinding && (env as any)[kvBinding]) {
+		(authConfig as any).secondaryStorage = {
+			get: async (key: string) => {
+				const kv = (env as any)[kvBinding];
+				return await kv.get(key);
+			},
+			set: async (key: string, value: string, ttl?: number) => {
+				const kv = (env as any)[kvBinding];
+				await kv.put(key, value, ttl ? { expirationTtl: ttl } : undefined);
+			},
+			delete: async (key: string) => {
+				const kv = (env as any)[kvBinding];
+				await kv.delete(key);
+			},
+		};
+	}
+
+	return betterAuth(authConfig as Options);
 }
 export const getHeaders = (headers: Headers) => {
 	const newHeaders = Object.fromEntries(headers as any);