Merge main, resolve conflicts

- Use DBAdapterDebugLogOption/DBFieldAttribute from better-auth
- Use filemakerConfig property instead of helper function
- Keep normalizeBetterAuthFieldType for array type handling

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: eluce2

.beads/.gitignore

@@ -32,6 +32,11 @@ beads.left.meta.json
 beads.right.jsonl
 beads.right.meta.json
 
+# Sync state (local-only, per-machine)
+# These files are machine-specific and should not be shared across clones
+.sync.lock
+sync_base.jsonl
+
 # NOTE: Do NOT add negation patterns (e.g., !issues.jsonl) here.
 # They would override fork protection in .git/info/exclude, allowing
 # contributors to accidentally commit upstream issue databases.

packages/better-auth/src/adapter.ts

@@ -1,6 +1,6 @@
 /** biome-ignore-all lint/suspicious/noExplicitAny: library code */
 import { logger } from "better-auth";
-import { type CleanedWhere, createAdapter } from "better-auth/adapters";
+import { type CleanedWhere, createAdapter, type DBAdapterDebugLogOption } from "better-auth/adapters";
 import buildQuery from "odata-query";
 import { prettifyError, z } from "zod/v4";
 import { createRawFetch, type FmOdataConfig } from "./odata";
@@ -15,11 +15,11 @@ const configSchema = z.object({
   }),
 });
 
-interface FileMakerAdapterConfig {
+export interface FileMakerAdapterConfig {
   /**
    * Helps you debug issues with the adapter.
    */
-  debugLogs?: boolean | { isRunningAdapterTests?: boolean };
+  debugLogs?: DBAdapterDebugLogOption;
   /**
    * If the table names in the schema are plural.
    */
@@ -168,7 +168,7 @@ export const FileMakerAdapter = (_config: FileMakerAdapterConfig = defaultConfig
     logging: config.debugLogs ? "verbose" : "none",
   });
 
-  return createAdapter({
+  const adapterFactory = createAdapter({
     config: {
       adapterId: "filemaker",
       adapterName: "FileMaker",
@@ -382,4 +382,8 @@ export const FileMakerAdapter = (_config: FileMakerAdapterConfig = defaultConfig
       };
     },
   });
+
+  // Expose the FileMaker config for CLI access
+  (adapterFactory as any).filemakerConfig = config as FileMakerAdapterConfig;
+  return adapterFactory;
 };

packages/better-auth/src/cli/index.ts

@@ -1,43 +1,16 @@
 #!/usr/bin/env node --no-warnings
 import { Command } from "@commander-js/extra-typings";
 import { logger } from "better-auth";
-import { getAdapter, getAuthTables } from "better-auth/db";
+import { getAdapter, getSchema } from "better-auth/db";
 import chalk from "chalk";
 import fs from "fs-extra";
 import prompts from "prompts";
-import type { AdapterOptions } from "../adapter";
+import type { FileMakerAdapterConfig } from "../adapter";
 import { getConfig } from "../better-auth-cli/utils/get-config";
 import { executeMigration, planMigration, prettyPrintMigrationPlan } from "../migrate";
 import { createRawFetch } from "../odata";
 import "dotenv/config";
 
-function getFileMakerAdapterConfigFromAdapterOptions(
-  options: unknown,
-): AdapterOptions["config"] {
-  if (!options || typeof options !== "object") {
-    throw new Error("FileMaker adapter options were missing.");
-  }
-
-  const opts = options as Record<string, unknown>;
-
-  // Our adapter returns: { options: { config: FileMakerAdapterConfig } }
-  if (opts.config && typeof opts.config === "object") {
-    return opts.config as AdapterOptions["config"];
-  }
-
-  // Some Better Auth versions wrap adapter options under `adapterConfig`.
-  if (opts.adapterConfig && typeof opts.adapterConfig === "object") {
-    const adapterConfig = opts.adapterConfig as Record<string, unknown>;
-    if (adapterConfig.config && typeof adapterConfig.config === "object") {
-      return adapterConfig.config as AdapterOptions["config"];
-    }
-  }
-
-  throw new Error(
-    "Could not locate FileMaker adapter configuration from Better Auth adapter options.",
-  );
-}
-
 async function main() {
   const program = new Command();
 
@@ -77,11 +50,9 @@ async function main() {
         return;
       }
 
-      const betterAuthSchema = getAuthTables(config);
+      const betterAuthSchema = getSchema(config);
 
-      const adapterConfig = getFileMakerAdapterConfigFromAdapterOptions(
-        adapter.options,
-      );
+      const adapterConfig = (adapter as unknown as { filemakerConfig: FileMakerAdapterConfig }).filemakerConfig;
       const { fetch } = createRawFetch({
         ...adapterConfig.odata,
         auth:

packages/better-auth/src/migrate.ts

@@ -1,20 +1,11 @@
+import type { DBFieldAttribute } from "better-auth/db";
 import chalk from "chalk";
 import type { Metadata } from "fm-odata-client";
 import z from "zod/v4";
 import type { createRawFetch } from "./odata";
 
-type BetterAuthTableField = {
-  fieldName?: string;
-  type: unknown;
-};
-
-type BetterAuthTableDef = {
-  modelName: string;
-  fields: Record<string, BetterAuthTableField>;
-  order?: number;
-};
-
-export type BetterAuthAuthTables = Record<string, BetterAuthTableDef>;
+/** Schema type returned by better-auth's getSchema function */
+type BetterAuthSchema = Record<string, { fields: Record<string, DBFieldAttribute>; order: number }>;
 
 function normalizeBetterAuthFieldType(fieldType: unknown): string {
   if (typeof fieldType === "string") return fieldType;
@@ -46,7 +37,7 @@ export async function getMetadata(fetch: ReturnType<typeof createRawFetch>["fetc
 
 export async function planMigration(
   fetch: ReturnType<typeof createRawFetch>["fetch"],
-  betterAuthSchema: BetterAuthAuthTables,
+  betterAuthSchema: BetterAuthSchema,
   databaseName: string,
 ): Promise<MigrationPlan> {
   const metadata = await getMetadata(fetch, databaseName);
@@ -104,7 +95,7 @@ export async function planMigration(
     .sort((a, b) => (a[1].order ?? 0) - (b[1].order ?? 0))
     .map(([key, value]) => ({
       ...value,
-      keyName: key,
+      modelName: key, // Use the key as modelName since getSchema uses table names as keys
     }));
 
   const migrationPlan: MigrationPlan = [];