@better-auth/cli 1.4.0-beta.6 → 1.4.0-beta.7

package/dist/index.mjs

@@ -4,8 +4,10 @@ import { parse } from 'dotenv';
 import semver from 'semver';
 import prettier, { format } from 'prettier';
 import * as z from 'zod/v4';
-import fs, { existsSync, readFileSync } from 'fs';
-import path from 'path';
+import * as fs from 'fs';
+import fs__default, { existsSync, readFileSync } from 'fs';
+import * as path from 'path';
+import path__default from 'path';
 import fs$1 from 'fs/promises';
 import chalk from 'chalk';
 import { intro, log, outro, confirm, isCancel, cancel, spinner, text, select, multiselect } from '@clack/prompts';
@@ -22,12 +24,14 @@ import { produceSchema } from '@mrleebo/prisma-ast';
 import { createAuthClient } from 'better-auth/client';
 import { deviceAuthorizationClient } from 'better-auth/client/plugins';
 import open from 'open';
-import os from 'os';
+import * as os from 'os';
+import os__default from 'os';
+import { base64 } from '@better-auth/utils/base64';
 import 'dotenv/config';
 
 function getPackageInfo(cwd) {
-  const packageJsonPath = cwd ? path.join(cwd, "package.json") : path.join("package.json");
-  return JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
+  const packageJsonPath = cwd ? path__default.join(cwd, "package.json") : path__default.join("package.json");
+  return JSON.parse(fs__default.readFileSync(packageJsonPath, "utf-8"));
 }
 
 function installDependencies({
@@ -678,10 +682,10 @@ function getTsconfigInfo(cwd, flatPath) {
   if (flatPath) {
     tsConfigPath = flatPath;
   } else {
-    tsConfigPath = cwd ? path.join(cwd, "tsconfig.json") : path.join("tsconfig.json");
+    tsConfigPath = cwd ? path__default.join(cwd, "tsconfig.json") : path__default.join("tsconfig.json");
   }
   try {
-    const text = fs.readFileSync(tsConfigPath, "utf-8");
+    const text = fs__default.readFileSync(tsConfigPath, "utf-8");
     return JSON.parse(stripJsonComments(text));
   } catch (error) {
     throw error;
@@ -965,7 +969,7 @@ async function initAction(opts) {
   console.log();
   intro("\u{1F44B} Initializing Better Auth");
   const options = optionsSchema.parse(opts);
-  const cwd = path.resolve(options.cwd);
+  const cwd = path__default.resolve(options.cwd);
   let packageManagerPreference = void 0;
   let config_path = "";
   let framework = "vanilla";
@@ -995,7 +999,7 @@ async function initAction(opts) {
   else targetEnvFile = "none";
   let tsconfigInfo;
   try {
-    const tsconfigPath = options.tsconfig !== void 0 ? path.resolve(cwd, options.tsconfig) : path.join(cwd, "tsconfig.json");
+    const tsconfigPath = options.tsconfig !== void 0 ? path__default.resolve(cwd, options.tsconfig) : path__default.join(cwd, "tsconfig.json");
     tsconfigInfo = await getTsconfigInfo(cwd, tsconfigPath);
   } catch (error) {
     log.error(`\u274C Couldn't read your tsconfig.json file. (dir: ${cwd})`);
@@ -1018,7 +1022,7 @@ async function initAction(opts) {
     if (shouldAdd) {
       try {
         await fs$1.writeFile(
-          path.join(cwd, "tsconfig.json"),
+          path__default.join(cwd, "tsconfig.json"),
           await format(
             JSON.stringify(
               Object.assign(tsconfigInfo, {
@@ -1157,12 +1161,12 @@ async function initAction(opts) {
     ...possiblePaths.map((it) => `app/${it}`)
   ];
   if (options.config) {
-    config_path = path.join(cwd, options.config);
+    config_path = path__default.join(cwd, options.config);
   } else {
     for (const possiblePath of possiblePaths) {
-      const doesExist = existsSync(path.join(cwd, possiblePath));
+      const doesExist = existsSync(path__default.join(cwd, possiblePath));
       if (doesExist) {
-        config_path = path.join(cwd, possiblePath);
+        config_path = path__default.join(cwd, possiblePath);
         break;
       }
     }
@@ -1232,7 +1236,7 @@ async function initAction(opts) {
             ".next/server/next.config.mjs"
           ];
           for (const possible_next_config_path of possible_next_config_paths) {
-            if (existsSync(path.join(cwd, possible_next_config_path))) {
+            if (existsSync(path__default.join(cwd, possible_next_config_path))) {
               framework = "nextjs";
               break;
             }
@@ -1255,7 +1259,7 @@ async function initAction(opts) {
           }
         }
       }
-      const filePath = path.join(cwd, "auth.ts");
+      const filePath = path__default.join(cwd, "auth.ts");
       config_path = filePath;
       log.info(`Creating auth config file: ${filePath}`);
       try {
@@ -1289,7 +1293,7 @@ async function initAction(opts) {
             const filesToUpdate = await multiselect({
               message: "Select the .env files you want to update",
               options: envFiles.map((x) => ({
-                value: path.join(cwd, x),
+                value: path__default.join(cwd, x),
                 label: x
               })),
               required: false
@@ -1397,9 +1401,9 @@ async function initAction(opts) {
   ];
   let authClientConfigPath = null;
   for (const possiblePath of possibleClientPaths) {
-    const doesExist = existsSync(path.join(cwd, possiblePath));
+    const doesExist = existsSync(path__default.join(cwd, possiblePath));
     if (doesExist) {
-      authClientConfigPath = path.join(cwd, possiblePath);
+      authClientConfigPath = path__default.join(cwd, possiblePath);
       break;
     }
   }
@@ -1416,11 +1420,11 @@ async function initAction(opts) {
       process.exit(0);
     }
     if (choice === "yes") {
-      authClientConfigPath = path.join(cwd, "auth-client.ts");
+      authClientConfigPath = path__default.join(cwd, "auth-client.ts");
       log.info(`Creating auth client config file: ${authClientConfigPath}`);
       try {
         let contents = await getDefaultAuthClientConfig({
-          auth_config_path: ("./" + path.join(config_path.replace(cwd, ""))).replace(".//", "./"),
+          auth_config_path: ("./" + path__default.join(config_path.replace(cwd, ""))).replace(".//", "./"),
           clientPlugins: add_plugins.filter((x) => x.clientName).map((plugin) => {
             let contents2 = "";
             if (plugin.id === "one-tap") {
@@ -1462,7 +1466,7 @@ async function initAction(opts) {
   if (targetEnvFile !== "none") {
     try {
       const fileContents = await fs$1.readFile(
-        path.join(cwd, targetEnvFile),
+        path__default.join(cwd, targetEnvFile),
         "utf8"
       );
       const parsed = parse(fileContents);
@@ -1501,7 +1505,7 @@ async function initAction(opts) {
         if (shouldAdd === "yes") {
           try {
             await updateEnvs({
-              files: [path.join(cwd, targetEnvFile)],
+              files: [path__default.join(cwd, targetEnvFile)],
               envs,
               isCommented: false
             });
@@ -1526,7 +1530,7 @@ async function initAction(opts) {
           const envFilesToUpdate = await multiselect({
             message: "Select the .env files you want to update",
             options: envFiles.map((x) => ({
-              value: path.join(cwd, x),
+              value: path__default.join(cwd, x),
               label: x
             })),
             required: false
@@ -1678,13 +1682,13 @@ function addSvelteKitEnvModules(aliases, cwd) {
 }
 function getSvelteKitPathAliases(cwd) {
   const aliases = {};
-  const packageJsonPath = path.join(cwd, "package.json");
-  const svelteConfigPath = path.join(cwd, "svelte.config.js");
-  const svelteConfigTsPath = path.join(cwd, "svelte.config.ts");
+  const packageJsonPath = path__default.join(cwd, "package.json");
+  const svelteConfigPath = path__default.join(cwd, "svelte.config.js");
+  const svelteConfigTsPath = path__default.join(cwd, "svelte.config.ts");
   let isSvelteKitProject = false;
-  if (fs.existsSync(packageJsonPath)) {
+  if (fs__default.existsSync(packageJsonPath)) {
     try {
-      const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
+      const packageJson = JSON.parse(fs__default.readFileSync(packageJsonPath, "utf-8"));
       const deps = {
         ...packageJson.dependencies,
         ...packageJson.devDependencies
@@ -1694,19 +1698,19 @@ function getSvelteKitPathAliases(cwd) {
     }
   }
   if (!isSvelteKitProject) {
-    isSvelteKitProject = fs.existsSync(svelteConfigPath) || fs.existsSync(svelteConfigTsPath);
+    isSvelteKitProject = fs__default.existsSync(svelteConfigPath) || fs__default.existsSync(svelteConfigTsPath);
   }
   if (!isSvelteKitProject) {
     return aliases;
   }
-  const libPaths = [path.join(cwd, "src", "lib"), path.join(cwd, "lib")];
+  const libPaths = [path__default.join(cwd, "src", "lib"), path__default.join(cwd, "lib")];
   for (const libPath of libPaths) {
-    if (fs.existsSync(libPath)) {
+    if (fs__default.existsSync(libPath)) {
       aliases["$lib"] = libPath;
       const commonSubPaths = ["server", "utils", "components", "stores"];
       for (const subPath of commonSubPaths) {
-        const subDir = path.join(libPath, subPath);
-        if (fs.existsSync(subDir)) {
+        const subDir = path__default.join(libPath, subPath);
+        if (fs__default.existsSync(subDir)) {
           aliases[`$lib/${subPath}`] = subDir;
         }
       }
@@ -1721,13 +1725,13 @@ function getSvelteKitPathAliases(cwd) {
 function getSvelteConfigAliases(cwd) {
   const aliases = {};
   const configPaths = [
-    path.join(cwd, "svelte.config.js"),
-    path.join(cwd, "svelte.config.ts")
+    path__default.join(cwd, "svelte.config.js"),
+    path__default.join(cwd, "svelte.config.ts")
   ];
   for (const configPath of configPaths) {
-    if (fs.existsSync(configPath)) {
+    if (fs__default.existsSync(configPath)) {
       try {
-        const content = fs.readFileSync(configPath, "utf-8");
+        const content = fs__default.readFileSync(configPath, "utf-8");
         const aliasMatch = content.match(/alias\s*:\s*\{([^}]+)\}/);
         if (aliasMatch && aliasMatch[1]) {
           const aliasContent = aliasMatch[1];
@@ -1737,8 +1741,8 @@ function getSvelteConfigAliases(cwd) {
           for (const match of aliasMatches) {
             const [, alias, target] = match;
             if (alias && target) {
-              aliases[alias + "/*"] = path.resolve(cwd, target) + "/*";
-              aliases[alias] = path.resolve(cwd, target);
+              aliases[alias + "/*"] = path__default.resolve(cwd, target) + "/*";
+              aliases[alias] = path__default.resolve(cwd, target);
             }
           }
         }
@@ -1859,27 +1863,27 @@ possiblePaths = [
   ...possiblePaths.map((it) => `app/${it}`)
 ];
 function resolveReferencePath(configDir, refPath) {
-  const resolvedPath = path.resolve(configDir, refPath);
+  const resolvedPath = path__default.resolve(configDir, refPath);
   if (refPath.endsWith(".json")) {
     return resolvedPath;
   }
-  if (fs.existsSync(resolvedPath)) {
+  if (fs__default.existsSync(resolvedPath)) {
     try {
-      const stats = fs.statSync(resolvedPath);
+      const stats = fs__default.statSync(resolvedPath);
       if (stats.isFile()) {
         return resolvedPath;
       }
     } catch {
     }
   }
-  return path.resolve(configDir, refPath, "tsconfig.json");
+  return path__default.resolve(configDir, refPath, "tsconfig.json");
 }
 function getPathAliasesRecursive(tsconfigPath, visited = /* @__PURE__ */ new Set()) {
   if (visited.has(tsconfigPath)) {
     return {};
   }
   visited.add(tsconfigPath);
-  if (!fs.existsSync(tsconfigPath)) {
+  if (!fs__default.existsSync(tsconfigPath)) {
     logger.warn(`Referenced tsconfig not found: ${tsconfigPath}`);
     return {};
   }
@@ -1887,14 +1891,14 @@ function getPathAliasesRecursive(tsconfigPath, visited = /* @__PURE__ */ new Set
     const tsConfig = getTsconfigInfo(void 0, tsconfigPath);
     const { paths = {}, baseUrl = "." } = tsConfig.compilerOptions || {};
     const result = {};
-    const configDir = path.dirname(tsconfigPath);
+    const configDir = path__default.dirname(tsconfigPath);
     const obj = Object.entries(paths);
     for (const [alias, aliasPaths] of obj) {
       for (const aliasedPath of aliasPaths) {
-        const resolvedBaseUrl = path.resolve(configDir, baseUrl);
+        const resolvedBaseUrl = path__default.resolve(configDir, baseUrl);
         const finalAlias = alias.slice(-1) === "*" ? alias.slice(0, -1) : alias;
         const finalAliasedPath = aliasedPath.slice(-1) === "*" ? aliasedPath.slice(0, -1) : aliasedPath;
-        result[finalAlias || ""] = path.join(resolvedBaseUrl, finalAliasedPath);
+        result[finalAlias || ""] = path__default.join(resolvedBaseUrl, finalAliasedPath);
       }
     }
     if (tsConfig.references) {
@@ -1915,8 +1919,8 @@ function getPathAliasesRecursive(tsconfigPath, visited = /* @__PURE__ */ new Set
   }
 }
 function getPathAliases(cwd) {
-  const tsConfigPath = path.join(cwd, "tsconfig.json");
-  if (!fs.existsSync(tsConfigPath)) {
+  const tsConfigPath = path__default.join(cwd, "tsconfig.json");
+  if (!fs__default.existsSync(tsConfigPath)) {
     return null;
   }
   try {
@@ -1960,7 +1964,7 @@ async function getConfig({
   try {
     let configFile = null;
     if (configPath) {
-      let resolvedPath = path.join(cwd, configPath);
+      let resolvedPath = path__default.join(cwd, configPath);
       if (existsSync(configPath)) resolvedPath = configPath;
       const { config } = await loadConfig({
         configFile: resolvedPath,
@@ -2057,7 +2061,7 @@ async function migrateAction(opts) {
     y: z.boolean().optional(),
     yes: z.boolean().optional()
   }).parse(opts);
-  const cwd = path.resolve(options.cwd);
+  const cwd = path__default.resolve(options.cwd);
   if (!existsSync(cwd)) {
     logger.error(`The directory "${cwd}" does not exist.`);
     process.exit(1);
@@ -2452,11 +2456,11 @@ const generatePrismaSchema = async ({
   const provider = adapter.options?.provider || "postgresql";
   const tables = getAuthTables(options);
   const filePath = file || "./prisma/schema.prisma";
-  const schemaPrismaExist = existsSync(path.join(process.cwd(), filePath));
+  const schemaPrismaExist = existsSync(path__default.join(process.cwd(), filePath));
   let schemaPrisma = "";
   if (schemaPrismaExist) {
     schemaPrisma = await fs$1.readFile(
-      path.join(process.cwd(), filePath),
+      path__default.join(process.cwd(), filePath),
       "utf-8"
     );
   } else {
@@ -2693,7 +2697,7 @@ async function generateAction(opts) {
     y: z.boolean().optional(),
     yes: z.boolean().optional()
   }).parse(opts);
-  const cwd = path.resolve(options.cwd);
+  const cwd = path__default.resolve(options.cwd);
   if (!existsSync(cwd)) {
     logger.error(`The directory "${cwd}" does not exist.`);
     process.exit(1);
@@ -2750,16 +2754,16 @@ async function generateAction(opts) {
       confirm2 = response.confirm;
     }
     if (confirm2) {
-      const exist = existsSync(path.join(cwd, schema.fileName));
+      const exist = existsSync(path__default.join(cwd, schema.fileName));
       if (!exist) {
-        await fs$1.mkdir(path.dirname(path.join(cwd, schema.fileName)), {
+        await fs$1.mkdir(path__default.dirname(path__default.join(cwd, schema.fileName)), {
           recursive: true
         });
       }
       if (schema.overwrite) {
-        await fs$1.writeFile(path.join(cwd, schema.fileName), schema.code);
+        await fs$1.writeFile(path__default.join(cwd, schema.fileName), schema.code);
       } else {
-        await fs$1.appendFile(path.join(cwd, schema.fileName), schema.code);
+        await fs$1.appendFile(path__default.join(cwd, schema.fileName), schema.code);
       }
       logger.success(
         `\u{1F680} Schema was ${schema.overwrite ? "overwritten" : "appended"} successfully!`
@@ -2820,15 +2824,15 @@ async function generateAction(opts) {
     process.exit(1);
   }
   if (!options.output) {
-    const dirExist = existsSync(path.dirname(path.join(cwd, schema.fileName)));
+    const dirExist = existsSync(path__default.dirname(path__default.join(cwd, schema.fileName)));
     if (!dirExist) {
-      await fs$1.mkdir(path.dirname(path.join(cwd, schema.fileName)), {
+      await fs$1.mkdir(path__default.dirname(path__default.join(cwd, schema.fileName)), {
         recursive: true
       });
     }
   }
   await fs$1.writeFile(
-    options.output || path.join(cwd, schema.fileName),
+    options.output || path__default.join(cwd, schema.fileName),
     schema.code
   );
   logger.success(`\u{1F680} Schema was generated successfully!`);
@@ -2853,8 +2857,8 @@ const generate = new Command("generate").option(
 
 const DEMO_URL = "https://demo.better-auth.com";
 const CLIENT_ID = "better-auth-cli";
-const CONFIG_DIR = path.join(os.homedir(), ".better-auth");
-const TOKEN_FILE = path.join(CONFIG_DIR, "token.json");
+const CONFIG_DIR = path__default.join(os__default.homedir(), ".better-auth");
+const TOKEN_FILE = path__default.join(CONFIG_DIR, "token.json");
 async function loginAction(opts) {
   const options = z.object({
     serverUrl: z.string().optional(),
@@ -3059,13 +3063,13 @@ const login = new Command("login").description(
 ).option("--server-url <url>", "The Better Auth server URL", DEMO_URL).option("--client-id <id>", "The OAuth client ID", CLIENT_ID).action(loginAction);
 
 function getSystemInfo() {
-  const platform = os.platform();
-  const arch = os.arch();
-  const version = os.version();
-  const release = os.release();
-  const cpus = os.cpus();
-  const memory = os.totalmem();
-  const freeMemory = os.freemem();
+  const platform = os__default.platform();
+  const arch = os__default.arch();
+  const version = os__default.version();
+  const release = os__default.release();
+  const cpus = os__default.cpus();
+  const memory = os__default.totalmem();
+  const freeMemory = os__default.freemem();
   return {
     platform,
     arch,
@@ -3105,7 +3109,7 @@ function getVersion(command) {
   }
 }
 function getFrameworkInfo(projectRoot) {
-  const packageJsonPath = path.join(projectRoot, "package.json");
+  const packageJsonPath = path__default.join(projectRoot, "package.json");
   if (!existsSync(packageJsonPath)) {
     return null;
   }
@@ -3137,7 +3141,7 @@ function getFrameworkInfo(projectRoot) {
   }
 }
 function getDatabaseInfo(projectRoot) {
-  const packageJsonPath = path.join(projectRoot, "package.json");
+  const packageJsonPath = path__default.join(projectRoot, "package.json");
   if (!existsSync(packageJsonPath)) {
     return null;
   }
@@ -3362,7 +3366,7 @@ ${formatOutput(value, indent + 2)}`;
   return `${spaces}${JSON.stringify(data)}`;
 }
 const info = new Command("info").description("Display system and Better Auth configuration information").option("--cwd <cwd>", "The working directory", process.cwd()).option("--config <config>", "Path to the Better Auth configuration file").option("-j, --json", "Output as JSON").option("-c, --copy", "Copy output to clipboard (requires pbcopy/xclip)").action(async (options) => {
-  const projectRoot = path.resolve(options.cwd || process.cwd());
+  const projectRoot = path__default.resolve(options.cwd || process.cwd());
   const systemInfo = getSystemInfo();
   const nodeInfo = getNodeInfo();
   const packageManager = getPackageManager();
@@ -3386,7 +3390,7 @@ const info = new Command("info").description("Display system and Better Auth con
     console.log(jsonOutput);
     if (options.copy) {
       try {
-        const platform = os.platform();
+        const platform = os__default.platform();
         if (platform === "darwin") {
           execSync("pbcopy", { input: jsonOutput });
           console.log(chalk.green("\n\u2713 Copied to clipboard"));
@@ -3459,7 +3463,7 @@ Better Auth:
 ${JSON.stringify(betterAuthInfo, null, 2)}
 `;
     try {
-      const platform = os.platform();
+      const platform = os__default.platform();
       if (platform === "darwin") {
         execSync("pbcopy", { input: textOutput });
         console.log(chalk.green("\u2713 Copied to clipboard"));
@@ -3476,6 +3480,197 @@ ${JSON.stringify(betterAuthInfo, null, 2)}
   }
 });
 
+async function mcpAction(options) {
+  const mcpUrl = "https://mcp.chonkie.ai/better-auth/better-auth-builder/mcp";
+  const mcpName = "Better Auth";
+  if (options.cursor) {
+    await handleCursorAction(mcpUrl, mcpName);
+  } else if (options.claudeCode) {
+    handleClaudeCodeAction(mcpUrl);
+  } else if (options.openCode) {
+    handleOpenCodeAction(mcpUrl);
+  } else if (options.manual) {
+    handleManualAction(mcpUrl, mcpName);
+  } else {
+    showAllOptions();
+  }
+}
+async function handleCursorAction(mcpUrl, mcpName) {
+  const mcpConfig = {
+    url: mcpUrl
+  };
+  const encodedConfig = base64.encode(
+    new TextEncoder().encode(JSON.stringify(mcpConfig))
+  );
+  const deeplinkUrl = `cursor://anysphere.cursor-deeplink/mcp/install?name=${encodeURIComponent(mcpName)}&config=${encodedConfig}`;
+  console.log(chalk.bold.blue("\u{1F680} Adding Better Auth MCP to Cursor..."));
+  try {
+    const platform = os.platform();
+    let command;
+    switch (platform) {
+      case "darwin":
+        command = `open "${deeplinkUrl}"`;
+        break;
+      case "win32":
+        command = `start "" "${deeplinkUrl}"`;
+        break;
+      case "linux":
+        command = `xdg-open "${deeplinkUrl}"`;
+        break;
+      default:
+        throw new Error(`Unsupported platform: ${platform}`);
+    }
+    execSync(command, { stdio: "inherit" });
+    console.log(chalk.green("\n\u2713 Cursor MCP installed successfully!"));
+  } catch (error) {
+    console.log(
+      chalk.yellow(
+        "\n\u26A0 Could not automatically open Cursor. Please copy the deeplink URL above and open it manually."
+      )
+    );
+    console.log(
+      chalk.gray(
+        "\nYou can also manually add this configuration to your Cursor MCP settings:"
+      )
+    );
+    console.log(chalk.gray(JSON.stringify(mcpConfig, null, 2)));
+  }
+  console.log(chalk.bold.white("\n\u2728 Next Steps:"));
+  console.log(
+    chalk.gray("\u2022 The MCP server will be added to your Cursor configuration")
+  );
+  console.log(
+    chalk.gray("\u2022 You can now use Better Auth features directly in Cursor")
+  );
+}
+function handleClaudeCodeAction(mcpUrl) {
+  console.log(chalk.bold.blue("\u{1F916} Adding Better Auth MCP to Claude Code..."));
+  const command = `claude mcp add --transport http better-auth ${mcpUrl}`;
+  try {
+    execSync(command, { stdio: "inherit" });
+    console.log(chalk.green("\n\u2713 Claude Code MCP installed successfully!"));
+  } catch (error) {
+    console.log(
+      chalk.yellow(
+        "\n\u26A0 Could not automatically add to Claude Code. Please run this command manually:"
+      )
+    );
+    console.log(chalk.cyan(command));
+  }
+  console.log(chalk.bold.white("\n\u2728 Next Steps:"));
+  console.log(
+    chalk.gray(
+      "\u2022 The MCP server will be added to your Claude Code configuration"
+    )
+  );
+  console.log(
+    chalk.gray(
+      "\u2022 You can now use Better Auth features directly in Claude Code"
+    )
+  );
+}
+function handleOpenCodeAction(mcpUrl) {
+  console.log(chalk.bold.blue("\u{1F527} Adding Better Auth MCP to Open Code..."));
+  const openCodeConfig = {
+    $schema: "https://opencode.ai/config.json",
+    mcp: {
+      "Better Auth": {
+        type: "remote",
+        url: mcpUrl,
+        enabled: true
+      }
+    }
+  };
+  const configPath = path.join(process.cwd(), "opencode.json");
+  try {
+    let existingConfig = {};
+    if (fs.existsSync(configPath)) {
+      const existingContent = fs.readFileSync(configPath, "utf8");
+      existingConfig = JSON.parse(existingContent);
+    }
+    const mergedConfig = {
+      ...existingConfig,
+      ...openCodeConfig,
+      mcp: {
+        ...existingConfig.mcp,
+        ...openCodeConfig.mcp
+      }
+    };
+    fs.writeFileSync(configPath, JSON.stringify(mergedConfig, null, 2));
+    console.log(
+      chalk.green(`
+\u2713 Open Code configuration written to ${configPath}`)
+    );
+    console.log(chalk.green("\u2713 Better Auth MCP added successfully!"));
+  } catch (error) {
+    console.log(
+      chalk.yellow(
+        "\n\u26A0 Could not automatically write opencode.json. Please add this configuration manually:"
+      )
+    );
+    console.log(chalk.cyan(JSON.stringify(openCodeConfig, null, 2)));
+  }
+  console.log(chalk.bold.white("\n\u2728 Next Steps:"));
+  console.log(chalk.gray("\u2022 Restart Open Code to load the new MCP server"));
+  console.log(
+    chalk.gray("\u2022 You can now use Better Auth features directly in Open Code")
+  );
+}
+function handleManualAction(mcpUrl, mcpName) {
+  console.log(chalk.bold.blue("\u{1F4DD} Adding Better Auth MCP Configuration..."));
+  const manualConfig = {
+    [mcpName]: {
+      url: mcpUrl
+    }
+  };
+  const configPath = path.join(process.cwd(), "mcp.json");
+  try {
+    let existingConfig = {};
+    if (fs.existsSync(configPath)) {
+      const existingContent = fs.readFileSync(configPath, "utf8");
+      existingConfig = JSON.parse(existingContent);
+    }
+    const mergedConfig = {
+      ...existingConfig,
+      ...manualConfig
+    };
+    fs.writeFileSync(configPath, JSON.stringify(mergedConfig, null, 2));
+    console.log(chalk.green(`
+\u2713 MCP configuration written to ${configPath}`));
+    console.log(chalk.green("\u2713 Better Auth MCP added successfully!"));
+  } catch (error) {
+    console.log(
+      chalk.yellow(
+        "\n\u26A0 Could not automatically write mcp.json. Please add this configuration manually:"
+      )
+    );
+    console.log(chalk.cyan(JSON.stringify(manualConfig, null, 2)));
+  }
+  console.log(chalk.bold.white("\n\u2728 Next Steps:"));
+  console.log(chalk.gray("\u2022 Restart your MCP client to load the new server"));
+  console.log(
+    chalk.gray(
+      "\u2022 You can now use Better Auth features directly in your MCP client"
+    )
+  );
+}
+function showAllOptions(mcpUrl, mcpName) {
+  console.log(chalk.bold.blue("\u{1F50C} Better Auth MCP Server"));
+  console.log(chalk.gray("Choose your MCP client to get started:"));
+  console.log();
+  console.log(chalk.bold.white("Available Commands:"));
+  console.log(chalk.cyan("  --cursor      ") + chalk.gray("Add to Cursor"));
+  console.log(
+    chalk.cyan("  --claude-code ") + chalk.gray("Add to Claude Code")
+  );
+  console.log(chalk.cyan("  --open-code   ") + chalk.gray("Add to Open Code"));
+  console.log(
+    chalk.cyan("  --manual      ") + chalk.gray("Manual configuration")
+  );
+  console.log();
+}
+const mcp = new Command("mcp").description("Add Better Auth MCP server to MCP Clients").option("--cursor", "Automatically open Cursor with the MCP configuration").option("--claude-code", "Show Claude Code MCP configuration command").option("--open-code", "Show Open Code MCP configuration").option("--manual", "Show manual MCP configuration for mcp.json").action(mcpAction);
+
 process.on("SIGINT", () => process.exit(0));
 process.on("SIGTERM", () => process.exit(0));
 async function main() {
@@ -3485,7 +3680,7 @@ async function main() {
     packageInfo = await getPackageInfo();
   } catch (error) {
   }
-  program.addCommand(init).addCommand(migrate).addCommand(generate).addCommand(generateSecret).addCommand(info).addCommand(login).version(packageInfo.version || "1.1.2").description("Better Auth CLI").action(() => program.help());
+  program.addCommand(init).addCommand(migrate).addCommand(generate).addCommand(generateSecret).addCommand(info).addCommand(login).addCommand(mcp).version(packageInfo.version || "1.1.2").description("Better Auth CLI").action(() => program.help());
   program.parse();
 }
 main().catch((error) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-auth/cli",
-  "version": "1.4.0-beta.6",
+  "version": "1.4.0-beta.7",
   "description": "The CLI for Better Auth",
   "module": "dist/index.mjs",
   "repository": {
@@ -35,6 +35,7 @@
     "@babel/core": "^7.28.4",
     "@babel/preset-react": "^7.27.1",
     "@babel/preset-typescript": "^7.27.1",
+    "@better-auth/utils": "0.3.0",
     "@clack/prompts": "^0.11.0",
     "@mrleebo/prisma-ast": "^0.13.0",
     "@prisma/client": "^5.22.0",
@@ -56,7 +57,7 @@
     "tinyexec": "^0.3.2",
     "yocto-spinner": "^0.2.3",
     "zod": "^4.1.5",
-    "better-auth": "1.4.0-beta.6"
+    "better-auth": "1.4.0-beta.7"
   },
   "files": [
     "dist"