kofi-stack-template-generator 2.0.18 → 2.0.21

package/.turbo/turbo-build.log

@@ -1,20 +1,20 @@
 
-> kofi-stack-template-generator@2.0.18 build /Users/theodenanyoh/Documents/Krumalabs/create-kofi-stack-v2/packages/template-generator
+> kofi-stack-template-generator@2.0.21 build /Users/theodenanyoh/Documents/Krumalabs/create-kofi-stack-v2/packages/template-generator
 > pnpm run prebuild && tsup src/index.ts --format esm --dts
 
 
-> kofi-stack-template-generator@2.0.18 prebuild /Users/theodenanyoh/Documents/Krumalabs/create-kofi-stack-v2/packages/template-generator
+> kofi-stack-template-generator@2.0.21 prebuild /Users/theodenanyoh/Documents/Krumalabs/create-kofi-stack-v2/packages/template-generator
 > node scripts/generate-templates.js
 
 Generating templates.generated.ts...
-Generated templates.generated.ts with 86 templates
+Generated templates.generated.ts with 89 templates
 CLI Building entry: src/index.ts
 CLI Using tsconfig: tsconfig.json
 CLI tsup v8.5.1
 CLI Target: es2022
 ESM Build start
-ESM dist/index.js 99.28 KB
-ESM ⚡️ Build success in 13ms
+ESM dist/index.js 99.07 KB
+ESM ⚡️ Build success in 12ms
 DTS Build start
-DTS ⚡️ Build success in 421ms
+DTS ⚡️ Build success in 424ms
 DTS dist/index.d.ts 2.96 KB

package/dist/index.js

@@ -243,11 +243,12 @@ function shouldIncludeFile(templatePath, config) {
 var EMBEDDED_TEMPLATES = {
   "base/_gitignore.hbs": "# Dependencies\nnode_modules\n.pnpm-store\n\n# Build outputs\n.next\ndist\n.turbo\nout\n\n# Testing\ncoverage\nplaywright-report\ntest-results\n\n# Environment\n.env\n.env.local\n.env.*.local\n\n# IDE\n.idea\n.vscode\n*.swp\n*.swo\n.DS_Store\n\n# Convex\n.convex\n\n# Vercel\n.vercel\n\n# Debug\nnpm-debug.log*\nyarn-debug.log*\nyarn-error.log*\n.pnpm-debug.log*\n\n# TypeScript\n*.tsbuildinfo\n\n# Misc\n*.pem\n.cache\n",
   "base/biome.json.hbs": '{\n  "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",\n  "organizeImports": {\n    "enabled": true\n  },\n  "linter": {\n    "enabled": true,\n    "rules": {\n      "recommended": true\n    }\n  },\n  "formatter": {\n    "enabled": true,\n    "indentStyle": "space",\n    "indentWidth": 2\n  },\n  "javascript": {\n    "formatter": {\n      "quoteStyle": "single",\n      "semicolons": "asNeeded"\n    }\n  },\n  "files": {\n    "ignore": [\n      "node_modules",\n      ".next",\n      "dist",\n      ".turbo",\n      "coverage",\n      ".vercel",\n      "_generated"\n    ]\n  }\n}\n',
-  "convex/_env.local.hbs": "# Convex\nCONVEX_DEPLOYMENT=\nNEXT_PUBLIC_CONVEX_URL=\n\n# Auth - GitHub OAuth\nAUTH_GITHUB_ID=\nAUTH_GITHUB_SECRET=\n\n# Auth - Google OAuth\nAUTH_GOOGLE_ID=\nAUTH_GOOGLE_SECRET=\n\n# Better Auth Secret (generate with: openssl rand -base64 32)\nBETTER_AUTH_SECRET=\n\n# Email (Resend) - https://resend.com\nRESEND_API_KEY=\nRESEND_FROM_EMAIL=\n{{#if (eq integrations.analytics 'posthog')}}\n\n# PostHog\nNEXT_PUBLIC_POSTHOG_KEY=\nNEXT_PUBLIC_POSTHOG_HOST=https://app.posthog.com\n{{/if}}\n{{#if (eq integrations.uploads 'convex-fs')}}\n\n# Convex FS - Built-in file storage (no additional config needed)\n{{/if}}\n{{#if (eq integrations.uploads 'r2')}}\n\n# Cloudflare R2\nR2_ACCESS_KEY_ID=\nR2_SECRET_ACCESS_KEY=\nR2_BUCKET=\nR2_ENDPOINT=\n{{/if}}\n{{#if (eq integrations.uploads 'uploadthing')}}\n\n# UploadThing\nUPLOADTHING_TOKEN=\n{{/if}}\n{{#if (eq integrations.uploads 's3')}}\n\n# AWS S3\nAWS_ACCESS_KEY_ID=\nAWS_SECRET_ACCESS_KEY=\nAWS_REGION=\nAWS_S3_BUCKET=\n{{/if}}\n{{#if (eq integrations.uploads 'vercel-blob')}}\n\n# Vercel Blob\nBLOB_READ_WRITE_TOKEN=\n{{/if}}\n{{#if (eq integrations.payments 'stripe')}}\n\n# Stripe\nSTRIPE_SECRET_KEY=\nSTRIPE_WEBHOOK_SECRET=\nNEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=\n{{/if}}\n{{#if (eq integrations.payments 'polar')}}\n\n# Polar\nPOLAR_ACCESS_TOKEN=\nPOLAR_WEBHOOK_SECRET=\nPOLAR_ORGANIZATION_ID=\n{{/if}}\n{{#if (includes addons 'rate-limiting')}}\n\n# Convex Rate Limiter - No additional config needed (uses Convex backend)\n{{/if}}\n{{#if (includes addons 'monitoring')}}\n\n# Sentry\nSENTRY_DSN=\nSENTRY_AUTH_TOKEN=\n{{/if}}\n",
-  "convex/convex/auth.ts.hbs": "import GitHub from '@auth/core/providers/github'\nimport Google from '@auth/core/providers/google'\nimport { Password } from '@convex-dev/auth/providers/Password'\nimport { convexAuth } from '@convex-dev/auth/server'\n\nexport const { auth, signIn, signOut, store, isAuthenticated } = convexAuth({\n  providers: [\n    GitHub,\n    Google,\n    Password,\n  ],\n})\n\n// Email Verification Setup (Optional)\n// ------------------------------------\n// By default, email/password auth works without email verification.\n// To require email verification, configure the Password provider with ResendOTP:\n//\n// 1. Install the Resend component: npm install @convex-dev/resend\n// 2. Update the Password provider:\n//\n// import { ResendOTP } from '@convex-dev/auth/providers/ResendOTP'\n// import { Resend } from '@convex-dev/resend'\n//\n// const resend = new Resend()\n//\n// Password({\n//   verify: ResendOTP({\n//     resend,\n//     from: process.env.RESEND_FROM_EMAIL!,\n//   }),\n// })\n//\n// See: https://labs.convex.dev/auth/config/passwords\n",
-  "convex/convex/http.ts.hbs": "import { httpRouter } from 'convex/server'\nimport { auth } from './auth'\n\nconst http = httpRouter()\n\nauth.addHttpRoutes(http)\n\nexport default http\n",
-  "convex/convex/schema.ts.hbs": "import { defineSchema, defineTable } from 'convex/server'\nimport { authTables } from '@convex-dev/auth/server'\nimport { v } from 'convex/values'\n\nexport default defineSchema({\n  ...authTables,\n  // Add your custom tables here\n  // Example:\n  // posts: defineTable({\n  //   title: v.string(),\n  //   content: v.string(),\n  //   authorId: v.id('users'),\n  //   createdAt: v.number(),\n  // }).index('by_author', ['authorId']),\n})\n",
-  "convex/convex/users.ts.hbs": "import { query } from './_generated/server'\nimport { auth } from './auth'\n\nexport const current = query({\n  args: {},\n  handler: async (ctx) => {\n    const userId = await auth.getUserId(ctx)\n    if (!userId) return null\n\n    const user = await ctx.db.get(userId)\n    return user\n  },\n})\n\n// Alias for current user - used by dashboard components\nexport const viewer = query({\n  args: {},\n  handler: async (ctx) => {\n    const userId = await auth.getUserId(ctx)\n    if (!userId) return null\n\n    const user = await ctx.db.get(userId)\n    return user\n  },\n})\n",
+  "convex/_env.local.hbs": "# Convex\nCONVEX_DEPLOYMENT=\nNEXT_PUBLIC_CONVEX_URL=\nNEXT_PUBLIC_CONVEX_SITE_URL=\n\n# Site URL (used for auth redirects)\nSITE_URL=http://localhost:3000\nNEXT_PUBLIC_SITE_URL=http://localhost:3000\n\n# Better Auth Secret (generate with: openssl rand -base64 32)\nBETTER_AUTH_SECRET=\n\n# Auth - GitHub OAuth\nGITHUB_CLIENT_ID=\nGITHUB_CLIENT_SECRET=\n\n# Auth - Google OAuth\nGOOGLE_CLIENT_ID=\nGOOGLE_CLIENT_SECRET=\n\n# Email (Resend) - https://resend.com\nRESEND_API_KEY=\nRESEND_FROM_EMAIL=\n{{#if (eq integrations.analytics 'posthog')}}\n\n# PostHog\nNEXT_PUBLIC_POSTHOG_KEY=\nNEXT_PUBLIC_POSTHOG_HOST=https://app.posthog.com\n{{/if}}\n{{#if (eq integrations.uploads 'convex-fs')}}\n\n# Convex FS - Built-in file storage (no additional config needed)\n{{/if}}\n{{#if (eq integrations.uploads 'r2')}}\n\n# Cloudflare R2\nR2_ACCESS_KEY_ID=\nR2_SECRET_ACCESS_KEY=\nR2_BUCKET=\nR2_ENDPOINT=\n{{/if}}\n{{#if (eq integrations.uploads 'uploadthing')}}\n\n# UploadThing\nUPLOADTHING_TOKEN=\n{{/if}}\n{{#if (eq integrations.uploads 's3')}}\n\n# AWS S3\nAWS_ACCESS_KEY_ID=\nAWS_SECRET_ACCESS_KEY=\nAWS_REGION=\nAWS_S3_BUCKET=\n{{/if}}\n{{#if (eq integrations.uploads 'vercel-blob')}}\n\n# Vercel Blob\nBLOB_READ_WRITE_TOKEN=\n{{/if}}\n{{#if (eq integrations.payments 'stripe')}}\n\n# Stripe\nSTRIPE_SECRET_KEY=\nSTRIPE_WEBHOOK_SECRET=\nNEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=\n{{/if}}\n{{#if (eq integrations.payments 'polar')}}\n\n# Polar\nPOLAR_ACCESS_TOKEN=\nPOLAR_WEBHOOK_SECRET=\nPOLAR_ORGANIZATION_ID=\n{{/if}}\n{{#if (includes addons 'rate-limiting')}}\n\n# Convex Rate Limiter - No additional config needed (uses Convex backend)\n{{/if}}\n{{#if (includes addons 'monitoring')}}\n\n# Sentry\nSENTRY_DSN=\nSENTRY_AUTH_TOKEN=\n{{/if}}\n",
+  "convex/convex/auth.ts.hbs": "import { BetterAuth } from '@convex-dev/better-auth'\nimport { betterAuth } from 'better-auth'\nimport { components } from './_generated/api'\n\nconst auth = new BetterAuth(components.betterAuth, {\n  trustedOrigins: [process.env.SITE_URL!],\n})\n\nexport const { signIn, signUp, signOut, isAuthenticated, getSession } = auth.create(\n  betterAuth({\n    emailAndPassword: {\n      enabled: true,\n    },\n    socialProviders: {\n      github: {\n        clientId: process.env.GITHUB_CLIENT_ID!,\n        clientSecret: process.env.GITHUB_CLIENT_SECRET!,\n      },\n      google: {\n        clientId: process.env.GOOGLE_CLIENT_ID!,\n        clientSecret: process.env.GOOGLE_CLIENT_SECRET!,\n      },\n    },\n  })\n)\n\nexport { auth }\n",
+  "convex/convex/convex.config.ts.hbs": "import { defineApp } from 'convex/server'\nimport betterAuth from '@convex-dev/better-auth/convex.config'\n\nconst app = defineApp()\napp.use(betterAuth)\n\nexport default app\n",
+  "convex/convex/http.ts.hbs": "import { httpRouter } from 'convex/server'\nimport { auth } from './auth'\n\nconst http = httpRouter()\n\n// Register Better Auth routes\nauth.registerRoutes(http)\n\nexport default http\n",
+  "convex/convex/schema.ts.hbs": "import { defineSchema, defineTable } from 'convex/server'\nimport { v } from 'convex/values'\n\n// Better Auth manages its own tables via the betterAuth component\n// Add your custom application tables here\nexport default defineSchema({\n  // Example:\n  // posts: defineTable({\n  //   title: v.string(),\n  //   content: v.string(),\n  //   userId: v.string(), // Better Auth user ID\n  //   createdAt: v.number(),\n  // }).index('by_user', ['userId']),\n})\n",
+  "convex/convex/users.ts.hbs": "import { query } from './_generated/server'\nimport { auth } from './auth'\n\n// Get current user from Better Auth session\nexport const current = query({\n  args: {},\n  handler: async (ctx) => {\n    const session = await auth.getSession(ctx)\n    if (!session) return null\n    return session.user\n  },\n})\n\n// Alias for current user - used by dashboard components\nexport const viewer = query({\n  args: {},\n  handler: async (ctx) => {\n    const session = await auth.getSession(ctx)\n    if (!session) return null\n    return session.user\n  },\n})\n",
   "convex/package.json.hbs": `{{#if (eq structure 'monorepo')}}{
   "name": "@repo/backend",
   "version": "0.1.0",
@@ -268,8 +269,8 @@ var EMBEDDED_TEMPLATES = {
   },
   "dependencies": {
     "convex": "^1.25.0",
-    "@convex-dev/auth": "^0.0.90",
-    "@auth/core": "^0.37.0",
+    "@convex-dev/better-auth": "^0.3.0",
+    "better-auth": "1.4.9",
     "@convex-dev/resend": "^0.2.0"{{#if (eq integrations.uploads 'convex-fs')}},
     "convex-fs": "^0.2.0"{{/if}}{{#if (eq integrations.uploads 'r2')}},
     "@convex-dev/r2": "^0.8.0"{{/if}}{{#if (eq integrations.payments 'stripe')}},
@@ -610,8 +611,8 @@ export default function RootLayout({
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "convex": "^1.25.0",
-    "@convex-dev/auth": "^0.0.90",
-    "@auth/core": "^0.37.0",
+    "@convex-dev/better-auth": "^0.3.0",
+    "better-auth": "1.4.9",
     "@hugeicons/react": "^0.3.0",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.0",
@@ -654,6 +655,7 @@ export default function RootLayout({
   "web/src/app/(auth)/layout.tsx.hbs": 'export default function AuthLayout({\n  children,\n}: {\n  children: React.ReactNode\n}) {\n  return (\n    <div className="min-h-screen flex items-center justify-center bg-muted/50 p-4">\n      <div className="w-full max-w-md">\n        {children}\n      </div>\n    </div>\n  )\n}\n',
   "web/src/app/(auth)/sign-in/page.tsx.hbs": "import { SignInForm } from '@/components/auth/sign-in-form'\n\nexport default function SignInPage() {\n  return <SignInForm />\n}\n",
   "web/src/app/(auth)/sign-up/page.tsx.hbs": "import { SignUpForm } from '@/components/auth/sign-up-form'\n\nexport default function SignUpPage() {\n  return <SignUpForm />\n}\n",
+  "web/src/app/api/auth/[...all]/route.ts.hbs": "import { auth } from '@/lib/auth-server'\n\nexport const { GET, POST } = auth.handlers\n",
   "web/src/app/globals.css.hbs": '@import "tailwindcss";\n@import "tw-animate-css";\n\n@custom-variant dark (&:is(.dark *));\n\n@theme inline {\n  --color-background: var(--background);\n  --color-foreground: var(--foreground);\n  --font-sans: var(--font-geist-sans);\n  --font-mono: var(--font-geist-mono);\n  --color-sidebar-ring: var(--sidebar-ring);\n  --color-sidebar-border: var(--sidebar-border);\n  --color-sidebar-accent-foreground: var(--sidebar-accent-foreground);\n  --color-sidebar-accent: var(--sidebar-accent);\n  --color-sidebar-primary-foreground: var(--sidebar-primary-foreground);\n  --color-sidebar-primary: var(--sidebar-primary);\n  --color-sidebar-foreground: var(--sidebar-foreground);\n  --color-sidebar: var(--sidebar);\n  --color-chart-5: var(--chart-5);\n  --color-chart-4: var(--chart-4);\n  --color-chart-3: var(--chart-3);\n  --color-chart-2: var(--chart-2);\n  --color-chart-1: var(--chart-1);\n  --color-ring: var(--ring);\n  --color-input: var(--input);\n  --color-border: var(--border);\n  --color-destructive: var(--destructive);\n  --color-accent-foreground: var(--accent-foreground);\n  --color-accent: var(--accent);\n  --color-muted-foreground: var(--muted-foreground);\n  --color-muted: var(--muted);\n  --color-secondary-foreground: var(--secondary-foreground);\n  --color-secondary: var(--secondary);\n  --color-primary-foreground: var(--primary-foreground);\n  --color-primary: var(--primary);\n  --color-popover-foreground: var(--popover-foreground);\n  --color-popover: var(--popover);\n  --color-card-foreground: var(--card-foreground);\n  --color-card: var(--card);\n  --radius-sm: calc(var(--radius) - 4px);\n  --radius-md: calc(var(--radius) - 2px);\n  --radius-lg: var(--radius);\n  --radius-xl: calc(var(--radius) + 4px);\n}\n\n:root {\n  --radius: 0.625rem;\n  --background: oklch(1 0 0);\n  --foreground: oklch(0.145 0 0);\n  --card: oklch(1 0 0);\n  --card-foreground: oklch(0.145 0 0);\n  --popover: oklch(1 0 0);\n  --popover-foreground: oklch(0.145 0 0);\n  --primary: oklch(0.205 0 0);\n  --primary-foreground: oklch(0.985 0 0);\n  --secondary: oklch(0.97 0 0);\n  --secondary-foreground: oklch(0.205 0 0);\n  --muted: oklch(0.97 0 0);\n  --muted-foreground: oklch(0.556 0 0);\n  --accent: oklch(0.97 0 0);\n  --accent-foreground: oklch(0.205 0 0);\n  --destructive: oklch(0.577 0.245 27.325);\n  --border: oklch(0.922 0 0);\n  --input: oklch(0.922 0 0);\n  --ring: oklch(0.708 0 0);\n  --chart-1: oklch(0.646 0.222 41.116);\n  --chart-2: oklch(0.6 0.118 184.704);\n  --chart-3: oklch(0.398 0.07 227.392);\n  --chart-4: oklch(0.828 0.189 84.429);\n  --chart-5: oklch(0.769 0.188 70.08);\n  --sidebar: oklch(0.985 0 0);\n  --sidebar-foreground: oklch(0.145 0 0);\n  --sidebar-primary: oklch(0.205 0 0);\n  --sidebar-primary-foreground: oklch(0.985 0 0);\n  --sidebar-accent: oklch(0.97 0 0);\n  --sidebar-accent-foreground: oklch(0.205 0 0);\n  --sidebar-border: oklch(0.922 0 0);\n  --sidebar-ring: oklch(0.708 0 0);\n}\n\n.dark {\n  --background: oklch(0.145 0 0);\n  --foreground: oklch(0.985 0 0);\n  --card: oklch(0.205 0 0);\n  --card-foreground: oklch(0.985 0 0);\n  --popover: oklch(0.205 0 0);\n  --popover-foreground: oklch(0.985 0 0);\n  --primary: oklch(0.922 0 0);\n  --primary-foreground: oklch(0.205 0 0);\n  --secondary: oklch(0.269 0 0);\n  --secondary-foreground: oklch(0.985 0 0);\n  --muted: oklch(0.269 0 0);\n  --muted-foreground: oklch(0.708 0 0);\n  --accent: oklch(0.269 0 0);\n  --accent-foreground: oklch(0.985 0 0);\n  --destructive: oklch(0.704 0.191 22.216);\n  --border: oklch(1 0 0 / 10%);\n  --input: oklch(1 0 0 / 15%);\n  --ring: oklch(0.556 0 0);\n  --chart-1: oklch(0.488 0.243 264.376);\n  --chart-2: oklch(0.696 0.17 162.48);\n  --chart-3: oklch(0.769 0.188 70.08);\n  --chart-4: oklch(0.627 0.265 303.9);\n  --chart-5: oklch(0.645 0.246 16.439);\n  --sidebar: oklch(0.205 0 0);\n  --sidebar-foreground: oklch(0.985 0 0);\n  --sidebar-primary: oklch(0.488 0.243 264.376);\n  --sidebar-primary-foreground: oklch(0.985 0 0);\n  --sidebar-accent: oklch(0.269 0 0);\n  --sidebar-accent-foreground: oklch(0.985 0 0);\n  --sidebar-border: oklch(1 0 0 / 10%);\n  --sidebar-ring: oklch(0.556 0 0);\n}\n\n@layer base {\n  * {\n    @apply border-border outline-ring/50;\n  }\n  body {\n    @apply bg-background text-foreground;\n  }\n}\n',
   "web/src/app/layout.tsx.hbs": "import type { Metadata } from 'next'\nimport { Geist, Geist_Mono } from 'next/font/google'\nimport { ConvexAuthNextjsServerProvider } from '@convex-dev/auth/nextjs/server'\nimport { ConvexClientProvider } from '@/components/providers/convex-provider'\n{{#if (eq integrations.analytics 'posthog')}}\nimport { PostHogProvider } from '@/components/providers/posthog-provider'\n{{/if}}\n{{#if (eq integrations.analytics 'vercel')}}\nimport { Analytics } from '@vercel/analytics/react'\nimport { SpeedInsights } from '@vercel/speed-insights/next'\n{{/if}}\nimport './globals.css'\n\nconst geistSans = Geist({\n  variable: '--font-geist-sans',\n  subsets: ['latin'],\n})\n\nconst geistMono = Geist_Mono({\n  variable: '--font-geist-mono',\n  subsets: ['latin'],\n})\n\nexport const metadata: Metadata = {\n  title: '{{projectName}}',\n  description: 'Built with create-kofi-stack',\n}\n\nexport default function RootLayout({\n  children,\n}: {\n  children: React.ReactNode\n}) {\n  return (\n    <ConvexAuthNextjsServerProvider>\n      <html lang=\"en\" suppressHydrationWarning>\n        <body className={`${geistSans.variable} ${geistMono.variable} antialiased`}>\n          <ConvexClientProvider>\n            {{#if (eq integrations.analytics 'posthog')}}\n            <PostHogProvider>\n              {children}\n            </PostHogProvider>\n            {{else}}\n            {children}\n            {{/if}}\n          </ConvexClientProvider>\n          {{#if (eq integrations.analytics 'vercel')}}\n          <Analytics />\n          <SpeedInsights />\n          {{/if}}\n        </body>\n      </html>\n    </ConvexAuthNextjsServerProvider>\n  )\n}\n",
   "web/src/app/page.tsx.hbs": `'use client'
@@ -790,7 +792,7 @@ export default function HomePage() {
 import { useState } from 'react'
 import { useRouter } from 'next/navigation'
 import Link from 'next/link'
-import { useAuthActions } from '@convex-dev/auth/react'
+import { signIn } from '@/lib/auth'
 import { Button } from '@/components/ui/button'
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'
 import { Input } from '@/components/ui/input'
@@ -799,7 +801,6 @@ import { Separator } from '@/components/ui/separator'
 
 export function SignInForm() {
   const router = useRouter()
-  const { signIn } = useAuthActions()
   const [email, setEmail] = useState('')
   const [password, setPassword] = useState('')
   const [isLoading, setIsLoading] = useState(false)
@@ -811,13 +812,16 @@ export function SignInForm() {
     setError(null)
 
     try {
-      const formData = new FormData()
-      formData.append('email', email)
-      formData.append('password', password)
-      formData.append('flow', 'signIn')
+      const result = await signIn.email({
+        email,
+        password,
+      })
 
-      await signIn('password', formData)
-      router.push('/')
+      if (result.error) {
+        setError(result.error.message || 'Invalid email or password')
+      } else {
+        router.push('/')
+      }
     } catch (err) {
       setError('Invalid email or password')
     } finally {
@@ -825,8 +829,11 @@ export function SignInForm() {
     }
   }
 
-  const handleSocialSignIn = (provider: 'github' | 'google') => {
-    void signIn(provider)
+  const handleSocialSignIn = async (provider: 'github' | 'google') => {
+    await signIn.social({
+      provider,
+      callbackURL: '/',
+    })
   }
 
   return (
@@ -912,7 +919,7 @@ export function SignInForm() {
 import { useState } from 'react'
 import { useRouter } from 'next/navigation'
 import Link from 'next/link'
-import { useAuthActions } from '@convex-dev/auth/react'
+import { signUp, signIn } from '@/lib/auth'
 import { Button } from '@/components/ui/button'
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'
 import { Input } from '@/components/ui/input'
@@ -921,7 +928,6 @@ import { Separator } from '@/components/ui/separator'
 
 export function SignUpForm() {
   const router = useRouter()
-  const { signIn } = useAuthActions()
   const [name, setName] = useState('')
   const [email, setEmail] = useState('')
   const [password, setPassword] = useState('')
@@ -940,14 +946,17 @@ export function SignUpForm() {
     }
 
     try {
-      const formData = new FormData()
-      formData.append('name', name)
-      formData.append('email', email)
-      formData.append('password', password)
-      formData.append('flow', 'signUp')
-
-      await signIn('password', formData)
-      router.push('/')
+      const result = await signUp.email({
+        email,
+        password,
+        name,
+      })
+
+      if (result.error) {
+        setError(result.error.message || 'Failed to create account')
+      } else {
+        router.push('/')
+      }
     } catch (err) {
       setError('Failed to create account. Email may already be in use.')
     } finally {
@@ -955,8 +964,11 @@ export function SignUpForm() {
     }
   }
 
-  const handleSocialSignIn = (provider: 'github' | 'google') => {
-    void signIn(provider)
+  const handleSocialSignIn = async (provider: 'github' | 'google') => {
+    await signIn.social({
+      provider,
+      callbackURL: '/',
+    })
   }
 
   return (
@@ -1052,8 +1064,6 @@ export function SignUpForm() {
   "web/src/components/dashboard/app-sidebar.tsx.hbs": `'use client'
 
 import {
-  AudioWaveform,
-  Command,
   GalleryVerticalEnd,
   Home,
   Settings,
@@ -1062,9 +1072,7 @@ import {
   User,
 } from 'lucide-react'
 import { useRouter } from 'next/navigation'
-import { useAuthActions } from '@convex-dev/auth/react'
-import { useQuery } from 'convex/react'
-import { api } from '{{#if (eq structure 'monorepo')}}@repo/backend/convex/_generated/api{{else}}../../convex/_generated/api{{/if}}'
+import { signOut, useSession } from '@/lib/auth'
 import {
   Sidebar,
   SidebarContent,
@@ -1101,8 +1109,8 @@ const navigation = [
 
 export function AppSidebar() {
   const router = useRouter()
-  const { signOut } = useAuthActions()
-  const user = useQuery(api.users.viewer)
+  const { data: session } = useSession()
+  const user = session?.user
 
   const handleSignOut = async () => {
     await signOut()
@@ -1252,10 +1260,11 @@ export function DashboardLayout({ children, title = 'Dashboard' }: DashboardLayo
   )
 }
 `,
-  "web/src/components/providers/convex-provider.tsx.hbs": "'use client'\n\nimport { ConvexAuthNextjsProvider } from '@convex-dev/auth/nextjs'\nimport { ConvexReactClient } from 'convex/react'\n\nconst convex = new ConvexReactClient(process.env.NEXT_PUBLIC_CONVEX_URL!)\n\nexport function ConvexClientProvider({\n  children,\n}: {\n  children: React.ReactNode\n}) {\n  return (\n    <ConvexAuthNextjsProvider client={convex}>\n      {children}\n    </ConvexAuthNextjsProvider>\n  )\n}\n",
-  "web/src/lib/auth.ts.hbs": "'use client'\n\nimport { useConvexAuth, useQuery } from 'convex/react'\nimport { useAuthActions } from '@convex-dev/auth/react'\nimport { api } from '{{#if (eq structure 'monorepo')}}@repo/backend/convex/_generated/api{{else}}../../convex/_generated/api{{/if}}'\n\nexport function useAuth() {\n  const { isAuthenticated, isLoading } = useConvexAuth()\n  const { signIn, signOut } = useAuthActions()\n  const user = useQuery(api.users.viewer)\n\n  return {\n    isAuthenticated,\n    isLoading,\n    user,\n    signIn: (provider: 'github' | 'google') => {\n      void signIn(provider)\n    },\n    signInWithPassword: async (email: string, password: string, flow: 'signIn' | 'signUp' = 'signIn', name?: string) => {\n      const formData = new FormData()\n      formData.append('email', email)\n      formData.append('password', password)\n      formData.append('flow', flow)\n      if (name) {\n        formData.append('name', name)\n      }\n      await signIn('password', formData)\n    },\n    signOut: () => {\n      void signOut()\n    },\n  }\n}\n",
+  "web/src/components/providers/convex-provider.tsx.hbs": "'use client'\n\nimport { ConvexBetterAuthProvider } from '@convex-dev/better-auth/react'\nimport { ConvexReactClient } from 'convex/react'\n\nconst convex = new ConvexReactClient(process.env.NEXT_PUBLIC_CONVEX_URL!)\n\nexport function ConvexClientProvider({\n  children,\n}: {\n  children: React.ReactNode\n}) {\n  return (\n    <ConvexBetterAuthProvider client={convex}>\n      {children}\n    </ConvexBetterAuthProvider>\n  )\n}\n",
+  "web/src/lib/auth-server.ts.hbs": "import { convexBetterAuthNextJs } from '@convex-dev/better-auth/nextjs'\n\nexport const { auth, getSession, signIn, signOut } = convexBetterAuthNextJs({\n  convexUrl: process.env.NEXT_PUBLIC_CONVEX_URL!,\n  siteUrl: process.env.NEXT_PUBLIC_SITE_URL!,\n})\n",
+  "web/src/lib/auth.ts.hbs": "'use client'\n\nimport { createAuthClient } from 'better-auth/react'\nimport { convexClient } from '@convex-dev/better-auth/client'\n\nexport const authClient = createAuthClient({\n  baseURL: process.env.NEXT_PUBLIC_SITE_URL,\n  plugins: [convexClient()],\n})\n\nexport const {\n  signIn,\n  signUp,\n  signOut,\n  useSession,\n  getSession,\n} = authClient\n",
   "web/src/lib/utils.ts.hbs": "import { clsx, type ClassValue } from 'clsx'\nimport { twMerge } from 'tailwind-merge'\n\nexport function cn(...inputs: ClassValue[]) {\n  return twMerge(clsx(inputs))\n}\n",
-  "web/src/proxy.ts.hbs": "import {\n  convexAuthNextjsProxy,\n  createRouteMatcher,\n  nextjsProxyRedirect,\n} from '@convex-dev/auth/nextjs/server'\n\nconst isPublicRoute = createRouteMatcher(['/sign-in', '/sign-up'])\n\nexport default convexAuthNextjsProxy(async (request, { convexAuth }) => {\n  const isAuthenticated = await convexAuth.isAuthenticated()\n\n  // Redirect unauthenticated users to /sign-up\n  if (!isPublicRoute(request) && !isAuthenticated) {\n    return nextjsProxyRedirect(request, '/sign-up')\n  }\n\n  // Redirect authenticated users from auth pages to / (dashboard)\n  if (isPublicRoute(request) && isAuthenticated) {\n    return nextjsProxyRedirect(request, '/')\n  }\n})\n",
+  "web/src/proxy.ts.hbs": "import { NextResponse } from 'next/server'\nimport type { NextRequest } from 'next/server'\nimport { auth } from '@/lib/auth-server'\n\nconst publicRoutes = ['/sign-in', '/sign-up', '/api/auth']\n\nfunction isPublicRoute(pathname: string) {\n  return publicRoutes.some(route => pathname.startsWith(route))\n}\n\nexport async function proxy(request: NextRequest) {\n  const { pathname } = request.nextUrl\n\n  // Allow public routes\n  if (isPublicRoute(pathname)) {\n    return NextResponse.next()\n  }\n\n  // Check authentication\n  const session = await auth.getSession()\n\n  // Redirect unauthenticated users to /sign-up\n  if (!session) {\n    return NextResponse.redirect(new URL('/sign-up', request.url))\n  }\n\n  return NextResponse.next()\n}\n\nexport const config = {\n  matcher: ['/((?!.*\\\\..*|_next).*)', '/', '/(api|trpc)(.*)'],\n}\n",
   "web/tsconfig.json.hbs": '{\n  "compilerOptions": {\n    "target": "ES2017",\n    "lib": ["dom", "dom.iterable", "esnext"],\n    "allowJs": true,\n    "skipLibCheck": true,\n    "strict": true,\n    "noEmit": true,\n    "esModuleInterop": true,\n    "module": "esnext",\n    "moduleResolution": "bundler",\n    "resolveJsonModule": true,\n    "isolatedModules": true,\n    "jsx": "react-jsx",\n    "incremental": true,\n    "plugins": [{ "name": "next" }],\n    "paths": {\n      "@/*": ["./src/*"]\n    }\n  },\n  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts", ".next/dev/types/**/*.ts"],\n  "exclude": ["node_modules"]\n}\n'
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kofi-stack-template-generator",
-  "version": "2.0.18",
+  "version": "2.0.21",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -10,20 +10,20 @@
       "types": "./dist/index.d.ts"
     }
   },
-  "scripts": {
-    "build": "pnpm run prebuild && tsup src/index.ts --format esm --dts",
-    "dev": "tsup src/index.ts --format esm --dts --watch",
-    "prebuild": "node scripts/generate-templates.js",
-    "typecheck": "tsc --noEmit"
-  },
   "dependencies": {
-    "kofi-stack-types": "^2.0.3",
     "handlebars": "^4.7.8",
-    "memfs": "^4.9.0"
+    "memfs": "^4.9.0",
+    "kofi-stack-types": "^2.0.21"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",
     "tsup": "^8.0.0",
     "typescript": "^5.0.0"
+  },
+  "scripts": {
+    "build": "pnpm run prebuild && tsup src/index.ts --format esm --dts",
+    "dev": "tsup src/index.ts --format esm --dts --watch",
+    "prebuild": "node scripts/generate-templates.js",
+    "typecheck": "tsc --noEmit"
   }
-}
+}

package/src/templates.generated.ts

@@ -1,17 +1,18 @@
 // Auto-generated file. Do not edit manually.
 // Run 'pnpm prebuild' to regenerate.
-// Generated: 2026-01-14T01:50:50.982Z
-// Template count: 86
+// Generated: 2026-01-14T02:26:03.517Z
+// Template count: 89
 
 export const EMBEDDED_TEMPLATES: Record<string, string> = {
   "base/_gitignore.hbs": "# Dependencies\nnode_modules\n.pnpm-store\n\n# Build outputs\n.next\ndist\n.turbo\nout\n\n# Testing\ncoverage\nplaywright-report\ntest-results\n\n# Environment\n.env\n.env.local\n.env.*.local\n\n# IDE\n.idea\n.vscode\n*.swp\n*.swo\n.DS_Store\n\n# Convex\n.convex\n\n# Vercel\n.vercel\n\n# Debug\nnpm-debug.log*\nyarn-debug.log*\nyarn-error.log*\n.pnpm-debug.log*\n\n# TypeScript\n*.tsbuildinfo\n\n# Misc\n*.pem\n.cache\n",
   "base/biome.json.hbs": "{\n  \"$schema\": \"https://biomejs.dev/schemas/1.9.4/schema.json\",\n  \"organizeImports\": {\n    \"enabled\": true\n  },\n  \"linter\": {\n    \"enabled\": true,\n    \"rules\": {\n      \"recommended\": true\n    }\n  },\n  \"formatter\": {\n    \"enabled\": true,\n    \"indentStyle\": \"space\",\n    \"indentWidth\": 2\n  },\n  \"javascript\": {\n    \"formatter\": {\n      \"quoteStyle\": \"single\",\n      \"semicolons\": \"asNeeded\"\n    }\n  },\n  \"files\": {\n    \"ignore\": [\n      \"node_modules\",\n      \".next\",\n      \"dist\",\n      \".turbo\",\n      \"coverage\",\n      \".vercel\",\n      \"_generated\"\n    ]\n  }\n}\n",
-  "convex/_env.local.hbs": "# Convex\nCONVEX_DEPLOYMENT=\nNEXT_PUBLIC_CONVEX_URL=\n\n# Auth - GitHub OAuth\nAUTH_GITHUB_ID=\nAUTH_GITHUB_SECRET=\n\n# Auth - Google OAuth\nAUTH_GOOGLE_ID=\nAUTH_GOOGLE_SECRET=\n\n# Better Auth Secret (generate with: openssl rand -base64 32)\nBETTER_AUTH_SECRET=\n\n# Email (Resend) - https://resend.com\nRESEND_API_KEY=\nRESEND_FROM_EMAIL=\n{{#if (eq integrations.analytics 'posthog')}}\n\n# PostHog\nNEXT_PUBLIC_POSTHOG_KEY=\nNEXT_PUBLIC_POSTHOG_HOST=https://app.posthog.com\n{{/if}}\n{{#if (eq integrations.uploads 'convex-fs')}}\n\n# Convex FS - Built-in file storage (no additional config needed)\n{{/if}}\n{{#if (eq integrations.uploads 'r2')}}\n\n# Cloudflare R2\nR2_ACCESS_KEY_ID=\nR2_SECRET_ACCESS_KEY=\nR2_BUCKET=\nR2_ENDPOINT=\n{{/if}}\n{{#if (eq integrations.uploads 'uploadthing')}}\n\n# UploadThing\nUPLOADTHING_TOKEN=\n{{/if}}\n{{#if (eq integrations.uploads 's3')}}\n\n# AWS S3\nAWS_ACCESS_KEY_ID=\nAWS_SECRET_ACCESS_KEY=\nAWS_REGION=\nAWS_S3_BUCKET=\n{{/if}}\n{{#if (eq integrations.uploads 'vercel-blob')}}\n\n# Vercel Blob\nBLOB_READ_WRITE_TOKEN=\n{{/if}}\n{{#if (eq integrations.payments 'stripe')}}\n\n# Stripe\nSTRIPE_SECRET_KEY=\nSTRIPE_WEBHOOK_SECRET=\nNEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=\n{{/if}}\n{{#if (eq integrations.payments 'polar')}}\n\n# Polar\nPOLAR_ACCESS_TOKEN=\nPOLAR_WEBHOOK_SECRET=\nPOLAR_ORGANIZATION_ID=\n{{/if}}\n{{#if (includes addons 'rate-limiting')}}\n\n# Convex Rate Limiter - No additional config needed (uses Convex backend)\n{{/if}}\n{{#if (includes addons 'monitoring')}}\n\n# Sentry\nSENTRY_DSN=\nSENTRY_AUTH_TOKEN=\n{{/if}}\n",
-  "convex/convex/auth.ts.hbs": "import GitHub from '@auth/core/providers/github'\nimport Google from '@auth/core/providers/google'\nimport { Password } from '@convex-dev/auth/providers/Password'\nimport { convexAuth } from '@convex-dev/auth/server'\n\nexport const { auth, signIn, signOut, store, isAuthenticated } = convexAuth({\n  providers: [\n    GitHub,\n    Google,\n    Password,\n  ],\n})\n\n// Email Verification Setup (Optional)\n// ------------------------------------\n// By default, email/password auth works without email verification.\n// To require email verification, configure the Password provider with ResendOTP:\n//\n// 1. Install the Resend component: npm install @convex-dev/resend\n// 2. Update the Password provider:\n//\n// import { ResendOTP } from '@convex-dev/auth/providers/ResendOTP'\n// import { Resend } from '@convex-dev/resend'\n//\n// const resend = new Resend()\n//\n// Password({\n//   verify: ResendOTP({\n//     resend,\n//     from: process.env.RESEND_FROM_EMAIL!,\n//   }),\n// })\n//\n// See: https://labs.convex.dev/auth/config/passwords\n",
-  "convex/convex/http.ts.hbs": "import { httpRouter } from 'convex/server'\nimport { auth } from './auth'\n\nconst http = httpRouter()\n\nauth.addHttpRoutes(http)\n\nexport default http\n",
-  "convex/convex/schema.ts.hbs": "import { defineSchema, defineTable } from 'convex/server'\nimport { authTables } from '@convex-dev/auth/server'\nimport { v } from 'convex/values'\n\nexport default defineSchema({\n  ...authTables,\n  // Add your custom tables here\n  // Example:\n  // posts: defineTable({\n  //   title: v.string(),\n  //   content: v.string(),\n  //   authorId: v.id('users'),\n  //   createdAt: v.number(),\n  // }).index('by_author', ['authorId']),\n})\n",
-  "convex/convex/users.ts.hbs": "import { query } from './_generated/server'\nimport { auth } from './auth'\n\nexport const current = query({\n  args: {},\n  handler: async (ctx) => {\n    const userId = await auth.getUserId(ctx)\n    if (!userId) return null\n\n    const user = await ctx.db.get(userId)\n    return user\n  },\n})\n\n// Alias for current user - used by dashboard components\nexport const viewer = query({\n  args: {},\n  handler: async (ctx) => {\n    const userId = await auth.getUserId(ctx)\n    if (!userId) return null\n\n    const user = await ctx.db.get(userId)\n    return user\n  },\n})\n",
-  "convex/package.json.hbs": "{{#if (eq structure 'monorepo')}}{\n  \"name\": \"@repo/backend\",\n  \"version\": \"0.1.0\",\n  \"private\": true,\n  \"type\": \"module\",\n  \"main\": \"./convex/_generated/api.js\",\n  \"types\": \"./convex/_generated/api.d.ts\",\n  \"exports\": {\n    \".\": {\n      \"import\": \"./convex/_generated/api.js\",\n      \"types\": \"./convex/_generated/api.d.ts\"\n    }\n  },\n  \"scripts\": {\n    \"dev\": \"convex dev\",\n    \"dev:setup\": \"convex dev --configure --until-success\",\n    \"deploy\": \"convex deploy\"\n  },\n  \"dependencies\": {\n    \"convex\": \"^1.25.0\",\n    \"@convex-dev/auth\": \"^0.0.90\",\n    \"@auth/core\": \"^0.37.0\",\n    \"@convex-dev/resend\": \"^0.2.0\"{{#if (eq integrations.uploads 'convex-fs')}},\n    \"convex-fs\": \"^0.2.0\"{{/if}}{{#if (eq integrations.uploads 'r2')}},\n    \"@convex-dev/r2\": \"^0.8.0\"{{/if}}{{#if (eq integrations.payments 'stripe')}},\n    \"@convex-dev/stripe\": \"^0.1.0\"{{/if}}{{#if (eq integrations.payments 'polar')}},\n    \"@convex-dev/polar\": \"^0.7.0\"{{/if}}{{#if (includes addons 'rate-limiting')}},\n    \"@convex-dev/rate-limiter\": \"^0.3.0\"{{/if}}\n  },\n  \"devDependencies\": {\n    \"typescript\": \"^5.0.0\"\n  }\n}{{/if}}\n",
+  "convex/_env.local.hbs": "# Convex\nCONVEX_DEPLOYMENT=\nNEXT_PUBLIC_CONVEX_URL=\nNEXT_PUBLIC_CONVEX_SITE_URL=\n\n# Site URL (used for auth redirects)\nSITE_URL=http://localhost:3000\nNEXT_PUBLIC_SITE_URL=http://localhost:3000\n\n# Better Auth Secret (generate with: openssl rand -base64 32)\nBETTER_AUTH_SECRET=\n\n# Auth - GitHub OAuth\nGITHUB_CLIENT_ID=\nGITHUB_CLIENT_SECRET=\n\n# Auth - Google OAuth\nGOOGLE_CLIENT_ID=\nGOOGLE_CLIENT_SECRET=\n\n# Email (Resend) - https://resend.com\nRESEND_API_KEY=\nRESEND_FROM_EMAIL=\n{{#if (eq integrations.analytics 'posthog')}}\n\n# PostHog\nNEXT_PUBLIC_POSTHOG_KEY=\nNEXT_PUBLIC_POSTHOG_HOST=https://app.posthog.com\n{{/if}}\n{{#if (eq integrations.uploads 'convex-fs')}}\n\n# Convex FS - Built-in file storage (no additional config needed)\n{{/if}}\n{{#if (eq integrations.uploads 'r2')}}\n\n# Cloudflare R2\nR2_ACCESS_KEY_ID=\nR2_SECRET_ACCESS_KEY=\nR2_BUCKET=\nR2_ENDPOINT=\n{{/if}}\n{{#if (eq integrations.uploads 'uploadthing')}}\n\n# UploadThing\nUPLOADTHING_TOKEN=\n{{/if}}\n{{#if (eq integrations.uploads 's3')}}\n\n# AWS S3\nAWS_ACCESS_KEY_ID=\nAWS_SECRET_ACCESS_KEY=\nAWS_REGION=\nAWS_S3_BUCKET=\n{{/if}}\n{{#if (eq integrations.uploads 'vercel-blob')}}\n\n# Vercel Blob\nBLOB_READ_WRITE_TOKEN=\n{{/if}}\n{{#if (eq integrations.payments 'stripe')}}\n\n# Stripe\nSTRIPE_SECRET_KEY=\nSTRIPE_WEBHOOK_SECRET=\nNEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=\n{{/if}}\n{{#if (eq integrations.payments 'polar')}}\n\n# Polar\nPOLAR_ACCESS_TOKEN=\nPOLAR_WEBHOOK_SECRET=\nPOLAR_ORGANIZATION_ID=\n{{/if}}\n{{#if (includes addons 'rate-limiting')}}\n\n# Convex Rate Limiter - No additional config needed (uses Convex backend)\n{{/if}}\n{{#if (includes addons 'monitoring')}}\n\n# Sentry\nSENTRY_DSN=\nSENTRY_AUTH_TOKEN=\n{{/if}}\n",
+  "convex/convex/auth.ts.hbs": "import { BetterAuth } from '@convex-dev/better-auth'\nimport { betterAuth } from 'better-auth'\nimport { components } from './_generated/api'\n\nconst auth = new BetterAuth(components.betterAuth, {\n  trustedOrigins: [process.env.SITE_URL!],\n})\n\nexport const { signIn, signUp, signOut, isAuthenticated, getSession } = auth.create(\n  betterAuth({\n    emailAndPassword: {\n      enabled: true,\n    },\n    socialProviders: {\n      github: {\n        clientId: process.env.GITHUB_CLIENT_ID!,\n        clientSecret: process.env.GITHUB_CLIENT_SECRET!,\n      },\n      google: {\n        clientId: process.env.GOOGLE_CLIENT_ID!,\n        clientSecret: process.env.GOOGLE_CLIENT_SECRET!,\n      },\n    },\n  })\n)\n\nexport { auth }\n",
+  "convex/convex/convex.config.ts.hbs": "import { defineApp } from 'convex/server'\nimport betterAuth from '@convex-dev/better-auth/convex.config'\n\nconst app = defineApp()\napp.use(betterAuth)\n\nexport default app\n",
+  "convex/convex/http.ts.hbs": "import { httpRouter } from 'convex/server'\nimport { auth } from './auth'\n\nconst http = httpRouter()\n\n// Register Better Auth routes\nauth.registerRoutes(http)\n\nexport default http\n",
+  "convex/convex/schema.ts.hbs": "import { defineSchema, defineTable } from 'convex/server'\nimport { v } from 'convex/values'\n\n// Better Auth manages its own tables via the betterAuth component\n// Add your custom application tables here\nexport default defineSchema({\n  // Example:\n  // posts: defineTable({\n  //   title: v.string(),\n  //   content: v.string(),\n  //   userId: v.string(), // Better Auth user ID\n  //   createdAt: v.number(),\n  // }).index('by_user', ['userId']),\n})\n",
+  "convex/convex/users.ts.hbs": "import { query } from './_generated/server'\nimport { auth } from './auth'\n\n// Get current user from Better Auth session\nexport const current = query({\n  args: {},\n  handler: async (ctx) => {\n    const session = await auth.getSession(ctx)\n    if (!session) return null\n    return session.user\n  },\n})\n\n// Alias for current user - used by dashboard components\nexport const viewer = query({\n  args: {},\n  handler: async (ctx) => {\n    const session = await auth.getSession(ctx)\n    if (!session) return null\n    return session.user\n  },\n})\n",
+  "convex/package.json.hbs": "{{#if (eq structure 'monorepo')}}{\n  \"name\": \"@repo/backend\",\n  \"version\": \"0.1.0\",\n  \"private\": true,\n  \"type\": \"module\",\n  \"main\": \"./convex/_generated/api.js\",\n  \"types\": \"./convex/_generated/api.d.ts\",\n  \"exports\": {\n    \".\": {\n      \"import\": \"./convex/_generated/api.js\",\n      \"types\": \"./convex/_generated/api.d.ts\"\n    }\n  },\n  \"scripts\": {\n    \"dev\": \"convex dev\",\n    \"dev:setup\": \"convex dev --configure --until-success\",\n    \"deploy\": \"convex deploy\"\n  },\n  \"dependencies\": {\n    \"convex\": \"^1.25.0\",\n    \"@convex-dev/better-auth\": \"^0.3.0\",\n    \"better-auth\": \"1.4.9\",\n    \"@convex-dev/resend\": \"^0.2.0\"{{#if (eq integrations.uploads 'convex-fs')}},\n    \"convex-fs\": \"^0.2.0\"{{/if}}{{#if (eq integrations.uploads 'r2')}},\n    \"@convex-dev/r2\": \"^0.8.0\"{{/if}}{{#if (eq integrations.payments 'stripe')}},\n    \"@convex-dev/stripe\": \"^0.1.0\"{{/if}}{{#if (eq integrations.payments 'polar')}},\n    \"@convex-dev/polar\": \"^0.7.0\"{{/if}}{{#if (includes addons 'rate-limiting')}},\n    \"@convex-dev/rate-limiter\": \"^0.3.0\"{{/if}}\n  },\n  \"devDependencies\": {\n    \"typescript\": \"^5.0.0\"\n  }\n}{{/if}}\n",
   "convex/tsconfig.json.hbs": "{{#if (eq structure 'monorepo')}}{\n  \"compilerOptions\": {\n    \"target\": \"ESNext\",\n    \"module\": \"ESNext\",\n    \"moduleResolution\": \"bundler\",\n    \"strict\": true,\n    \"esModuleInterop\": true,\n    \"skipLibCheck\": true,\n    \"noEmit\": true,\n    \"outDir\": \"dist\"\n  },\n  \"include\": [\"convex/**/*.ts\"],\n  \"exclude\": [\"node_modules\"]\n}{{/if}}\n",
   "integrations/posthog/src/components/providers/posthog-provider.tsx.hbs": "'use client'\n\nimport posthog from 'posthog-js'\nimport { PostHogProvider as PHProvider } from 'posthog-js/react'\nimport { useEffect } from 'react'\n\nexport function PostHogProvider({ children }: { children: React.ReactNode }) {\n  useEffect(() => {\n    posthog.init(process.env.NEXT_PUBLIC_POSTHOG_KEY!, {\n      api_host: process.env.NEXT_PUBLIC_POSTHOG_HOST || 'https://app.posthog.com',\n      person_profiles: 'identified_only',\n      capture_pageview: false, // We capture pageviews manually\n    })\n  }, [])\n\n  return <PHProvider client={posthog}>{children}</PHProvider>\n}\n",
   "marketing/nextjs/next.config.ts.hbs": "import type { NextConfig } from 'next'\n\nconst nextConfig: NextConfig = {\n  transpilePackages: ['@repo/ui'],\n}\n\nexport default nextConfig\n",
@@ -73,21 +74,23 @@ export const EMBEDDED_TEMPLATES: Record<string, string> = {
   "packages/ui/tsconfig.json.hbs": "{\n  \"compilerOptions\": {\n    \"target\": \"ES2020\",\n    \"lib\": [\"dom\", \"dom.iterable\", \"esnext\"],\n    \"allowJs\": true,\n    \"skipLibCheck\": true,\n    \"strict\": true,\n    \"noEmit\": true,\n    \"esModuleInterop\": true,\n    \"module\": \"esnext\",\n    \"moduleResolution\": \"bundler\",\n    \"resolveJsonModule\": true,\n    \"isolatedModules\": true,\n    \"jsx\": \"react-jsx\",\n    \"incremental\": true,\n    \"paths\": {\n      \"@/*\": [\"./src/*\"]\n    }\n  },\n  \"include\": [\"src/**/*\"],\n  \"exclude\": [\"node_modules\"]\n}\n",
   "web/components.json.hbs": "{\n  \"$schema\": \"https://ui.shadcn.com/schema.json\",\n  \"style\": \"new-york\",\n  \"rsc\": true,\n  \"tsx\": true,\n  \"tailwind\": {\n    \"config\": \"\",\n    \"css\": \"src/app/globals.css\",\n    \"baseColor\": \"{{shadcn.baseColor}}\",\n    \"cssVariables\": true\n  },\n  \"iconLibrary\": \"{{shadcn.iconLibrary}}\",\n  \"aliases\": {\n    \"components\": \"@/components\",\n    \"utils\": \"@/lib/utils\",\n    \"ui\": \"@/components/ui\",\n    \"lib\": \"@/lib\",\n    \"hooks\": \"@/hooks\"\n  }\n}\n",
   "web/next.config.ts.hbs": "import type { NextConfig } from 'next'\n\nconst nextConfig: NextConfig = {\n{{#if (eq structure 'monorepo')}}\n  transpilePackages: ['@repo/ui', '@repo/backend'],\n{{/if}}\n}\n\nexport default nextConfig\n",
-  "web/package.json.hbs": "{\n  \"name\": \"{{#if (eq structure 'monorepo')}}@repo/web{{else}}{{projectName}}{{/if}}\",\n  \"version\": \"0.1.0\",\n  \"private\": true,\n  \"type\": \"module\",\n  \"scripts\": {\n    \"dev\": \"{{#if (eq structure 'monorepo')}}next dev --turbopack{{else}}node scripts/dev.mjs{{/if}}\",\n    \"dev:next\": \"next dev --turbopack\",\n{{#unless (eq structure 'monorepo')}}    \"dev:setup\": \"npx convex dev --configure --until-success\",\n{{/unless}}    \"build\": \"next build\",\n    \"start\": \"next start\",\n    \"lint\": \"biome check .\",\n    \"lint:fix\": \"biome check --write .\",\n    \"typecheck\": \"tsc --noEmit\",\n    \"test\": \"vitest run\",\n    \"test:watch\": \"vitest\",\n    \"test:e2e\": \"playwright test\"\n  },\n  \"dependencies\": {\n{{#if (eq structure 'monorepo')}}    \"@repo/backend\": \"workspace:*\",\n{{/if}}    \"next\": \"^16.0.0\",\n    \"react\": \"^19.0.0\",\n    \"react-dom\": \"^19.0.0\",\n    \"convex\": \"^1.25.0\",\n    \"@convex-dev/auth\": \"^0.0.90\",\n    \"@auth/core\": \"^0.37.0\",\n    \"@hugeicons/react\": \"^0.3.0\",\n    \"class-variance-authority\": \"^0.7.0\",\n    \"clsx\": \"^2.1.0\",\n    \"tailwind-merge\": \"^2.5.0\",\n    \"tw-animate-css\": \"^1.3.0\",\n    \"resend\": \"^4.0.0\",\n    \"react-email\": \"^3.0.0\",\n    \"@react-email/components\": \"^0.0.36\"{{#if (eq integrations.analytics 'posthog')}},\n    \"posthog-js\": \"^1.200.0\",\n    \"posthog-node\": \"^5.0.0\"{{/if}}{{#if (eq integrations.analytics 'vercel')}},\n    \"@vercel/analytics\": \"^1.4.0\",\n    \"@vercel/speed-insights\": \"^1.1.0\"{{/if}}{{#if (eq integrations.uploads 'uploadthing')}},\n    \"uploadthing\": \"^7.0.0\",\n    \"@uploadthing/react\": \"^7.0.0\"{{/if}}{{#if (eq integrations.uploads 's3')}},\n    \"@aws-sdk/client-s3\": \"^3.700.0\",\n    \"@aws-sdk/s3-request-presigner\": \"^3.700.0\"{{/if}}{{#if (eq integrations.uploads 'vercel-blob')}},\n    \"@vercel/blob\": \"^2.0.0\"{{/if}}{{#if (includes addons 'rate-limiting')}},\n    \"@arcjet/next\": \"^1.0.0-beta.16\"{{/if}}{{#if (includes addons 'monitoring')}},\n    \"@sentry/nextjs\": \"^8.0.0\"{{/if}}\n  },\n  \"devDependencies\": {\n{{#if (eq structure 'monorepo')}}    \"@repo/config-typescript\": \"workspace:*\",\n{{/if}}    \"@types/node\": \"^20.0.0\",\n    \"@types/react\": \"^19.0.0\",\n    \"@types/react-dom\": \"^19.0.0\",\n    \"tailwindcss\": \"^4.0.0\",\n    \"@tailwindcss/postcss\": \"^4.0.0\",\n    \"postcss\": \"^8.4.0\",\n    \"typescript\": \"^5.0.0\",\n    \"vitest\": \"^3.0.0\",\n    \"@vitejs/plugin-react\": \"^4.3.0\",\n    \"@testing-library/react\": \"^16.0.0\",\n    \"jsdom\": \"^26.0.0\",\n    \"playwright\": \"^1.50.0\",\n    \"@playwright/test\": \"^1.50.0\"\n  }\n}\n",
+  "web/package.json.hbs": "{\n  \"name\": \"{{#if (eq structure 'monorepo')}}@repo/web{{else}}{{projectName}}{{/if}}\",\n  \"version\": \"0.1.0\",\n  \"private\": true,\n  \"type\": \"module\",\n  \"scripts\": {\n    \"dev\": \"{{#if (eq structure 'monorepo')}}next dev --turbopack{{else}}node scripts/dev.mjs{{/if}}\",\n    \"dev:next\": \"next dev --turbopack\",\n{{#unless (eq structure 'monorepo')}}    \"dev:setup\": \"npx convex dev --configure --until-success\",\n{{/unless}}    \"build\": \"next build\",\n    \"start\": \"next start\",\n    \"lint\": \"biome check .\",\n    \"lint:fix\": \"biome check --write .\",\n    \"typecheck\": \"tsc --noEmit\",\n    \"test\": \"vitest run\",\n    \"test:watch\": \"vitest\",\n    \"test:e2e\": \"playwright test\"\n  },\n  \"dependencies\": {\n{{#if (eq structure 'monorepo')}}    \"@repo/backend\": \"workspace:*\",\n{{/if}}    \"next\": \"^16.0.0\",\n    \"react\": \"^19.0.0\",\n    \"react-dom\": \"^19.0.0\",\n    \"convex\": \"^1.25.0\",\n    \"@convex-dev/better-auth\": \"^0.3.0\",\n    \"better-auth\": \"1.4.9\",\n    \"@hugeicons/react\": \"^0.3.0\",\n    \"class-variance-authority\": \"^0.7.0\",\n    \"clsx\": \"^2.1.0\",\n    \"tailwind-merge\": \"^2.5.0\",\n    \"tw-animate-css\": \"^1.3.0\",\n    \"resend\": \"^4.0.0\",\n    \"react-email\": \"^3.0.0\",\n    \"@react-email/components\": \"^0.0.36\"{{#if (eq integrations.analytics 'posthog')}},\n    \"posthog-js\": \"^1.200.0\",\n    \"posthog-node\": \"^5.0.0\"{{/if}}{{#if (eq integrations.analytics 'vercel')}},\n    \"@vercel/analytics\": \"^1.4.0\",\n    \"@vercel/speed-insights\": \"^1.1.0\"{{/if}}{{#if (eq integrations.uploads 'uploadthing')}},\n    \"uploadthing\": \"^7.0.0\",\n    \"@uploadthing/react\": \"^7.0.0\"{{/if}}{{#if (eq integrations.uploads 's3')}},\n    \"@aws-sdk/client-s3\": \"^3.700.0\",\n    \"@aws-sdk/s3-request-presigner\": \"^3.700.0\"{{/if}}{{#if (eq integrations.uploads 'vercel-blob')}},\n    \"@vercel/blob\": \"^2.0.0\"{{/if}}{{#if (includes addons 'rate-limiting')}},\n    \"@arcjet/next\": \"^1.0.0-beta.16\"{{/if}}{{#if (includes addons 'monitoring')}},\n    \"@sentry/nextjs\": \"^8.0.0\"{{/if}}\n  },\n  \"devDependencies\": {\n{{#if (eq structure 'monorepo')}}    \"@repo/config-typescript\": \"workspace:*\",\n{{/if}}    \"@types/node\": \"^20.0.0\",\n    \"@types/react\": \"^19.0.0\",\n    \"@types/react-dom\": \"^19.0.0\",\n    \"tailwindcss\": \"^4.0.0\",\n    \"@tailwindcss/postcss\": \"^4.0.0\",\n    \"postcss\": \"^8.4.0\",\n    \"typescript\": \"^5.0.0\",\n    \"vitest\": \"^3.0.0\",\n    \"@vitejs/plugin-react\": \"^4.3.0\",\n    \"@testing-library/react\": \"^16.0.0\",\n    \"jsdom\": \"^26.0.0\",\n    \"playwright\": \"^1.50.0\",\n    \"@playwright/test\": \"^1.50.0\"\n  }\n}\n",
   "web/postcss.config.mjs.hbs": "export default {\n  plugins: {\n    '@tailwindcss/postcss': {},\n  },\n}\n",
   "web/src/app/(auth)/layout.tsx.hbs": "export default function AuthLayout({\n  children,\n}: {\n  children: React.ReactNode\n}) {\n  return (\n    <div className=\"min-h-screen flex items-center justify-center bg-muted/50 p-4\">\n      <div className=\"w-full max-w-md\">\n        {children}\n      </div>\n    </div>\n  )\n}\n",
   "web/src/app/(auth)/sign-in/page.tsx.hbs": "import { SignInForm } from '@/components/auth/sign-in-form'\n\nexport default function SignInPage() {\n  return <SignInForm />\n}\n",
   "web/src/app/(auth)/sign-up/page.tsx.hbs": "import { SignUpForm } from '@/components/auth/sign-up-form'\n\nexport default function SignUpPage() {\n  return <SignUpForm />\n}\n",
+  "web/src/app/api/auth/[...all]/route.ts.hbs": "import { auth } from '@/lib/auth-server'\n\nexport const { GET, POST } = auth.handlers\n",
   "web/src/app/globals.css.hbs": "@import \"tailwindcss\";\n@import \"tw-animate-css\";\n\n@custom-variant dark (&:is(.dark *));\n\n@theme inline {\n  --color-background: var(--background);\n  --color-foreground: var(--foreground);\n  --font-sans: var(--font-geist-sans);\n  --font-mono: var(--font-geist-mono);\n  --color-sidebar-ring: var(--sidebar-ring);\n  --color-sidebar-border: var(--sidebar-border);\n  --color-sidebar-accent-foreground: var(--sidebar-accent-foreground);\n  --color-sidebar-accent: var(--sidebar-accent);\n  --color-sidebar-primary-foreground: var(--sidebar-primary-foreground);\n  --color-sidebar-primary: var(--sidebar-primary);\n  --color-sidebar-foreground: var(--sidebar-foreground);\n  --color-sidebar: var(--sidebar);\n  --color-chart-5: var(--chart-5);\n  --color-chart-4: var(--chart-4);\n  --color-chart-3: var(--chart-3);\n  --color-chart-2: var(--chart-2);\n  --color-chart-1: var(--chart-1);\n  --color-ring: var(--ring);\n  --color-input: var(--input);\n  --color-border: var(--border);\n  --color-destructive: var(--destructive);\n  --color-accent-foreground: var(--accent-foreground);\n  --color-accent: var(--accent);\n  --color-muted-foreground: var(--muted-foreground);\n  --color-muted: var(--muted);\n  --color-secondary-foreground: var(--secondary-foreground);\n  --color-secondary: var(--secondary);\n  --color-primary-foreground: var(--primary-foreground);\n  --color-primary: var(--primary);\n  --color-popover-foreground: var(--popover-foreground);\n  --color-popover: var(--popover);\n  --color-card-foreground: var(--card-foreground);\n  --color-card: var(--card);\n  --radius-sm: calc(var(--radius) - 4px);\n  --radius-md: calc(var(--radius) - 2px);\n  --radius-lg: var(--radius);\n  --radius-xl: calc(var(--radius) + 4px);\n}\n\n:root {\n  --radius: 0.625rem;\n  --background: oklch(1 0 0);\n  --foreground: oklch(0.145 0 0);\n  --card: oklch(1 0 0);\n  --card-foreground: oklch(0.145 0 0);\n  --popover: oklch(1 0 0);\n  --popover-foreground: oklch(0.145 0 0);\n  --primary: oklch(0.205 0 0);\n  --primary-foreground: oklch(0.985 0 0);\n  --secondary: oklch(0.97 0 0);\n  --secondary-foreground: oklch(0.205 0 0);\n  --muted: oklch(0.97 0 0);\n  --muted-foreground: oklch(0.556 0 0);\n  --accent: oklch(0.97 0 0);\n  --accent-foreground: oklch(0.205 0 0);\n  --destructive: oklch(0.577 0.245 27.325);\n  --border: oklch(0.922 0 0);\n  --input: oklch(0.922 0 0);\n  --ring: oklch(0.708 0 0);\n  --chart-1: oklch(0.646 0.222 41.116);\n  --chart-2: oklch(0.6 0.118 184.704);\n  --chart-3: oklch(0.398 0.07 227.392);\n  --chart-4: oklch(0.828 0.189 84.429);\n  --chart-5: oklch(0.769 0.188 70.08);\n  --sidebar: oklch(0.985 0 0);\n  --sidebar-foreground: oklch(0.145 0 0);\n  --sidebar-primary: oklch(0.205 0 0);\n  --sidebar-primary-foreground: oklch(0.985 0 0);\n  --sidebar-accent: oklch(0.97 0 0);\n  --sidebar-accent-foreground: oklch(0.205 0 0);\n  --sidebar-border: oklch(0.922 0 0);\n  --sidebar-ring: oklch(0.708 0 0);\n}\n\n.dark {\n  --background: oklch(0.145 0 0);\n  --foreground: oklch(0.985 0 0);\n  --card: oklch(0.205 0 0);\n  --card-foreground: oklch(0.985 0 0);\n  --popover: oklch(0.205 0 0);\n  --popover-foreground: oklch(0.985 0 0);\n  --primary: oklch(0.922 0 0);\n  --primary-foreground: oklch(0.205 0 0);\n  --secondary: oklch(0.269 0 0);\n  --secondary-foreground: oklch(0.985 0 0);\n  --muted: oklch(0.269 0 0);\n  --muted-foreground: oklch(0.708 0 0);\n  --accent: oklch(0.269 0 0);\n  --accent-foreground: oklch(0.985 0 0);\n  --destructive: oklch(0.704 0.191 22.216);\n  --border: oklch(1 0 0 / 10%);\n  --input: oklch(1 0 0 / 15%);\n  --ring: oklch(0.556 0 0);\n  --chart-1: oklch(0.488 0.243 264.376);\n  --chart-2: oklch(0.696 0.17 162.48);\n  --chart-3: oklch(0.769 0.188 70.08);\n  --chart-4: oklch(0.627 0.265 303.9);\n  --chart-5: oklch(0.645 0.246 16.439);\n  --sidebar: oklch(0.205 0 0);\n  --sidebar-foreground: oklch(0.985 0 0);\n  --sidebar-primary: oklch(0.488 0.243 264.376);\n  --sidebar-primary-foreground: oklch(0.985 0 0);\n  --sidebar-accent: oklch(0.269 0 0);\n  --sidebar-accent-foreground: oklch(0.985 0 0);\n  --sidebar-border: oklch(1 0 0 / 10%);\n  --sidebar-ring: oklch(0.556 0 0);\n}\n\n@layer base {\n  * {\n    @apply border-border outline-ring/50;\n  }\n  body {\n    @apply bg-background text-foreground;\n  }\n}\n",
   "web/src/app/layout.tsx.hbs": "import type { Metadata } from 'next'\nimport { Geist, Geist_Mono } from 'next/font/google'\nimport { ConvexAuthNextjsServerProvider } from '@convex-dev/auth/nextjs/server'\nimport { ConvexClientProvider } from '@/components/providers/convex-provider'\n{{#if (eq integrations.analytics 'posthog')}}\nimport { PostHogProvider } from '@/components/providers/posthog-provider'\n{{/if}}\n{{#if (eq integrations.analytics 'vercel')}}\nimport { Analytics } from '@vercel/analytics/react'\nimport { SpeedInsights } from '@vercel/speed-insights/next'\n{{/if}}\nimport './globals.css'\n\nconst geistSans = Geist({\n  variable: '--font-geist-sans',\n  subsets: ['latin'],\n})\n\nconst geistMono = Geist_Mono({\n  variable: '--font-geist-mono',\n  subsets: ['latin'],\n})\n\nexport const metadata: Metadata = {\n  title: '{{projectName}}',\n  description: 'Built with create-kofi-stack',\n}\n\nexport default function RootLayout({\n  children,\n}: {\n  children: React.ReactNode\n}) {\n  return (\n    <ConvexAuthNextjsServerProvider>\n      <html lang=\"en\" suppressHydrationWarning>\n        <body className={`${geistSans.variable} ${geistMono.variable} antialiased`}>\n          <ConvexClientProvider>\n            {{#if (eq integrations.analytics 'posthog')}}\n            <PostHogProvider>\n              {children}\n            </PostHogProvider>\n            {{else}}\n            {children}\n            {{/if}}\n          </ConvexClientProvider>\n          {{#if (eq integrations.analytics 'vercel')}}\n          <Analytics />\n          <SpeedInsights />\n          {{/if}}\n        </body>\n      </html>\n    </ConvexAuthNextjsServerProvider>\n  )\n}\n",
   "web/src/app/page.tsx.hbs": "'use client'\n\nimport { useQuery } from 'convex/react'\nimport { api } from '{{#if (eq structure 'monorepo')}}@repo/backend/convex/_generated/api{{else}}../convex/_generated/api{{/if}}'\nimport { DashboardLayout } from '@/components/dashboard/dashboard-layout'\nimport { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'\nimport { Skeleton } from '@/components/ui/skeleton'\n\nexport default function HomePage() {\n  const user = useQuery(api.users.viewer)\n\n  if (user === undefined) {\n    return (\n      <DashboardLayout title=\"Dashboard\">\n        <div className=\"space-y-6\">\n          <Skeleton className=\"h-8 w-64\" />\n          <div className=\"grid gap-4 md:grid-cols-2 lg:grid-cols-3\">\n            <Skeleton className=\"h-32\" />\n            <Skeleton className=\"h-32\" />\n            <Skeleton className=\"h-32\" />\n          </div>\n        </div>\n      </DashboardLayout>\n    )\n  }\n\n  return (\n    <DashboardLayout title=\"Dashboard\">\n      <div className=\"space-y-6\">\n        <div>\n          <h1 className=\"text-3xl font-bold tracking-tight\">\n            Welcome back{user?.name ? `, ${user.name}` : ''}!\n          </h1>\n          <p className=\"text-muted-foreground\">\n            Here's what's happening with your project today.\n          </p>\n        </div>\n\n        <div className=\"grid gap-4 md:grid-cols-2 lg:grid-cols-3\">\n          <Card>\n            <CardHeader>\n              <CardTitle>Getting Started</CardTitle>\n              <CardDescription>Quick start guide for your app</CardDescription>\n            </CardHeader>\n            <CardContent>\n              <ul className=\"list-disc list-inside space-y-1 text-sm text-muted-foreground\">\n                <li>Customize your dashboard layout</li>\n                <li>Add new pages to the sidebar</li>\n                <li>Connect your data sources</li>\n              </ul>\n            </CardContent>\n          </Card>\n\n          <Card>\n            <CardHeader>\n              <CardTitle>Documentation</CardTitle>\n              <CardDescription>Learn how to build with Kofi Stack</CardDescription>\n            </CardHeader>\n            <CardContent>\n              <ul className=\"list-disc list-inside space-y-1 text-sm text-muted-foreground\">\n                <li>\n                  <a\n                    href=\"https://docs.convex.dev\"\n                    target=\"_blank\"\n                    rel=\"noopener noreferrer\"\n                    className=\"text-primary hover:underline\"\n                  >\n                    Convex Documentation\n                  </a>\n                </li>\n                <li>\n                  <a\n                    href=\"https://ui.shadcn.com\"\n                    target=\"_blank\"\n                    rel=\"noopener noreferrer\"\n                    className=\"text-primary hover:underline\"\n                  >\n                    shadcn/ui Components\n                  </a>\n                </li>\n                <li>\n                  <a\n                    href=\"https://nextjs.org/docs\"\n                    target=\"_blank\"\n                    rel=\"noopener noreferrer\"\n                    className=\"text-primary hover:underline\"\n                  >\n                    Next.js Documentation\n                  </a>\n                </li>\n              </ul>\n            </CardContent>\n          </Card>\n\n          <Card>\n            <CardHeader>\n              <CardTitle>Your Stack</CardTitle>\n              <CardDescription>Technologies powering your app</CardDescription>\n            </CardHeader>\n            <CardContent>\n              <ul className=\"list-disc list-inside space-y-1 text-sm text-muted-foreground\">\n                <li>Next.js 15 with App Router</li>\n                <li>Convex for backend & database</li>\n                <li>Convex Auth for authentication</li>\n                <li>shadcn/ui components</li>\n                <li>Tailwind CSS for styling</li>\n              </ul>\n            </CardContent>\n          </Card>\n        </div>\n\n        <div className=\"pt-4 border-t\">\n          <p className=\"text-sm text-muted-foreground\">\n            Created with{' '}\n            <a\n              href=\"https://github.com/theodenanyoh11/create-kofi-stack\"\n              className=\"text-primary hover:underline\"\n              target=\"_blank\"\n              rel=\"noopener noreferrer\"\n            >\n              create-kofi-stack\n            </a>\n          </p>\n        </div>\n      </div>\n    </DashboardLayout>\n  )\n}\n",
-  "web/src/components/auth/sign-in-form.tsx.hbs": "'use client'\n\nimport { useState } from 'react'\nimport { useRouter } from 'next/navigation'\nimport Link from 'next/link'\nimport { useAuthActions } from '@convex-dev/auth/react'\nimport { Button } from '@/components/ui/button'\nimport { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'\nimport { Input } from '@/components/ui/input'\nimport { Label } from '@/components/ui/label'\nimport { Separator } from '@/components/ui/separator'\n\nexport function SignInForm() {\n  const router = useRouter()\n  const { signIn } = useAuthActions()\n  const [email, setEmail] = useState('')\n  const [password, setPassword] = useState('')\n  const [isLoading, setIsLoading] = useState(false)\n  const [error, setError] = useState<string | null>(null)\n\n  const handleSubmit = async (e: React.FormEvent) => {\n    e.preventDefault()\n    setIsLoading(true)\n    setError(null)\n\n    try {\n      const formData = new FormData()\n      formData.append('email', email)\n      formData.append('password', password)\n      formData.append('flow', 'signIn')\n\n      await signIn('password', formData)\n      router.push('/')\n    } catch (err) {\n      setError('Invalid email or password')\n    } finally {\n      setIsLoading(false)\n    }\n  }\n\n  const handleSocialSignIn = (provider: 'github' | 'google') => {\n    void signIn(provider)\n  }\n\n  return (\n    <Card>\n      <CardHeader className=\"text-center\">\n        <CardTitle className=\"text-2xl\">Welcome back</CardTitle>\n        <CardDescription>Sign in to your account to continue</CardDescription>\n      </CardHeader>\n      <CardContent>\n        <form onSubmit={handleSubmit} className=\"space-y-4\">\n          <div className=\"space-y-2\">\n            <Label htmlFor=\"email\">Email</Label>\n            <Input\n              id=\"email\"\n              type=\"email\"\n              placeholder=\"you@example.com\"\n              value={email}\n              onChange={(e) => setEmail(e.target.value)}\n              required\n            />\n          </div>\n          <div className=\"space-y-2\">\n            <Label htmlFor=\"password\">Password</Label>\n            <Input\n              id=\"password\"\n              type=\"password\"\n              placeholder=\"Enter your password\"\n              value={password}\n              onChange={(e) => setPassword(e.target.value)}\n              required\n            />\n          </div>\n\n          {error && (\n            <p className=\"text-sm text-destructive\">{error}</p>\n          )}\n\n          <Button type=\"submit\" className=\"w-full\" disabled={isLoading}>\n            {isLoading ? 'Signing in...' : 'Sign In'}\n          </Button>\n        </form>\n\n        <div className=\"relative my-6\">\n          <div className=\"absolute inset-0 flex items-center\">\n            <Separator className=\"w-full\" />\n          </div>\n          <div className=\"relative flex justify-center text-xs uppercase\">\n            <span className=\"bg-card px-2 text-muted-foreground\">Or continue with</span>\n          </div>\n        </div>\n\n        <div className=\"grid grid-cols-2 gap-4\">\n          <Button variant=\"outline\" onClick={() => handleSocialSignIn('github')}>\n            <svg className=\"mr-2 h-4 w-4\" viewBox=\"0 0 24 24\">\n              <path fill=\"currentColor\" d=\"M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z\"/>\n            </svg>\n            GitHub\n          </Button>\n          <Button variant=\"outline\" onClick={() => handleSocialSignIn('google')}>\n            <svg className=\"mr-2 h-4 w-4\" viewBox=\"0 0 24 24\">\n              <path fill=\"currentColor\" d=\"M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z\"/>\n              <path fill=\"currentColor\" d=\"M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z\"/>\n              <path fill=\"currentColor\" d=\"M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z\"/>\n              <path fill=\"currentColor\" d=\"M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z\"/>\n            </svg>\n            Google\n          </Button>\n        </div>\n\n        <p className=\"mt-6 text-center text-sm text-muted-foreground\">\n          Don&apos;t have an account?{' '}\n          <Link href=\"/sign-up\" className=\"text-primary hover:underline font-medium\">\n            Sign up\n          </Link>\n        </p>\n      </CardContent>\n    </Card>\n  )\n}\n",
-  "web/src/components/auth/sign-up-form.tsx.hbs": "'use client'\n\nimport { useState } from 'react'\nimport { useRouter } from 'next/navigation'\nimport Link from 'next/link'\nimport { useAuthActions } from '@convex-dev/auth/react'\nimport { Button } from '@/components/ui/button'\nimport { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'\nimport { Input } from '@/components/ui/input'\nimport { Label } from '@/components/ui/label'\nimport { Separator } from '@/components/ui/separator'\n\nexport function SignUpForm() {\n  const router = useRouter()\n  const { signIn } = useAuthActions()\n  const [name, setName] = useState('')\n  const [email, setEmail] = useState('')\n  const [password, setPassword] = useState('')\n  const [isLoading, setIsLoading] = useState(false)\n  const [error, setError] = useState<string | null>(null)\n\n  const handleSubmit = async (e: React.FormEvent) => {\n    e.preventDefault()\n    setIsLoading(true)\n    setError(null)\n\n    if (password.length < 8) {\n      setError('Password must be at least 8 characters')\n      setIsLoading(false)\n      return\n    }\n\n    try {\n      const formData = new FormData()\n      formData.append('name', name)\n      formData.append('email', email)\n      formData.append('password', password)\n      formData.append('flow', 'signUp')\n\n      await signIn('password', formData)\n      router.push('/')\n    } catch (err) {\n      setError('Failed to create account. Email may already be in use.')\n    } finally {\n      setIsLoading(false)\n    }\n  }\n\n  const handleSocialSignIn = (provider: 'github' | 'google') => {\n    void signIn(provider)\n  }\n\n  return (\n    <Card>\n      <CardHeader className=\"text-center\">\n        <CardTitle className=\"text-2xl\">Create an account</CardTitle>\n        <CardDescription>Enter your details to get started</CardDescription>\n      </CardHeader>\n      <CardContent>\n        <form onSubmit={handleSubmit} className=\"space-y-4\">\n          <div className=\"space-y-2\">\n            <Label htmlFor=\"name\">Name</Label>\n            <Input\n              id=\"name\"\n              type=\"text\"\n              placeholder=\"Your name\"\n              value={name}\n              onChange={(e) => setName(e.target.value)}\n              required\n            />\n          </div>\n          <div className=\"space-y-2\">\n            <Label htmlFor=\"email\">Email</Label>\n            <Input\n              id=\"email\"\n              type=\"email\"\n              placeholder=\"you@example.com\"\n              value={email}\n              onChange={(e) => setEmail(e.target.value)}\n              required\n            />\n          </div>\n          <div className=\"space-y-2\">\n            <Label htmlFor=\"password\">Password</Label>\n            <Input\n              id=\"password\"\n              type=\"password\"\n              placeholder=\"At least 8 characters\"\n              value={password}\n              onChange={(e) => setPassword(e.target.value)}\n              required\n              minLength={8}\n            />\n          </div>\n\n          {error && (\n            <p className=\"text-sm text-destructive\">{error}</p>\n          )}\n\n          <Button type=\"submit\" className=\"w-full\" disabled={isLoading}>\n            {isLoading ? 'Creating account...' : 'Create Account'}\n          </Button>\n        </form>\n\n        <div className=\"relative my-6\">\n          <div className=\"absolute inset-0 flex items-center\">\n            <Separator className=\"w-full\" />\n          </div>\n          <div className=\"relative flex justify-center text-xs uppercase\">\n            <span className=\"bg-card px-2 text-muted-foreground\">Or continue with</span>\n          </div>\n        </div>\n\n        <div className=\"grid grid-cols-2 gap-4\">\n          <Button variant=\"outline\" onClick={() => handleSocialSignIn('github')}>\n            <svg className=\"mr-2 h-4 w-4\" viewBox=\"0 0 24 24\">\n              <path fill=\"currentColor\" d=\"M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z\"/>\n            </svg>\n            GitHub\n          </Button>\n          <Button variant=\"outline\" onClick={() => handleSocialSignIn('google')}>\n            <svg className=\"mr-2 h-4 w-4\" viewBox=\"0 0 24 24\">\n              <path fill=\"currentColor\" d=\"M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z\"/>\n              <path fill=\"currentColor\" d=\"M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z\"/>\n              <path fill=\"currentColor\" d=\"M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z\"/>\n              <path fill=\"currentColor\" d=\"M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z\"/>\n            </svg>\n            Google\n          </Button>\n        </div>\n\n        <p className=\"mt-6 text-center text-sm text-muted-foreground\">\n          Already have an account?{' '}\n          <Link href=\"/sign-in\" className=\"text-primary hover:underline font-medium\">\n            Sign in\n          </Link>\n        </p>\n      </CardContent>\n    </Card>\n  )\n}\n",
-  "web/src/components/dashboard/app-sidebar.tsx.hbs": "'use client'\n\nimport {\n  AudioWaveform,\n  Command,\n  GalleryVerticalEnd,\n  Home,\n  Settings,\n  ChevronsUpDown,\n  LogOut,\n  User,\n} from 'lucide-react'\nimport { useRouter } from 'next/navigation'\nimport { useAuthActions } from '@convex-dev/auth/react'\nimport { useQuery } from 'convex/react'\nimport { api } from '{{#if (eq structure 'monorepo')}}@repo/backend/convex/_generated/api{{else}}../../convex/_generated/api{{/if}}'\nimport {\n  Sidebar,\n  SidebarContent,\n  SidebarFooter,\n  SidebarGroup,\n  SidebarGroupContent,\n  SidebarGroupLabel,\n  SidebarHeader,\n  SidebarMenu,\n  SidebarMenuButton,\n  SidebarMenuItem,\n} from '@/components/ui/sidebar'\nimport {\n  DropdownMenu,\n  DropdownMenuContent,\n  DropdownMenuItem,\n  DropdownMenuSeparator,\n  DropdownMenuTrigger,\n} from '@/components/ui/dropdown-menu'\nimport { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar'\n\nconst navigation = [\n  {\n    title: 'Home',\n    url: '/',\n    icon: Home,\n  },\n  {\n    title: 'Settings',\n    url: '/settings',\n    icon: Settings,\n  },\n]\n\nexport function AppSidebar() {\n  const router = useRouter()\n  const { signOut } = useAuthActions()\n  const user = useQuery(api.users.viewer)\n\n  const handleSignOut = async () => {\n    await signOut()\n    router.push('/sign-in')\n  }\n\n  const getInitials = (name?: string | null) => {\n    if (!name) return 'U'\n    return name\n      .split(' ')\n      .map((n) => n[0])\n      .join('')\n      .toUpperCase()\n      .slice(0, 2)\n  }\n\n  return (\n    <Sidebar>\n      <SidebarHeader>\n        <SidebarMenu>\n          <SidebarMenuItem>\n            <SidebarMenuButton size=\"lg\" asChild>\n              <a href=\"/\">\n                <div className=\"flex aspect-square size-8 items-center justify-center rounded-lg bg-primary text-primary-foreground\">\n                  <GalleryVerticalEnd className=\"size-4\" />\n                </div>\n                <div className=\"flex flex-col gap-0.5 leading-none\">\n                  <span className=\"font-semibold\">{{projectName}}</span>\n                  <span className=\"text-xs text-muted-foreground\">Dashboard</span>\n                </div>\n              </a>\n            </SidebarMenuButton>\n          </SidebarMenuItem>\n        </SidebarMenu>\n      </SidebarHeader>\n      <SidebarContent>\n        <SidebarGroup>\n          <SidebarGroupLabel>Navigation</SidebarGroupLabel>\n          <SidebarGroupContent>\n            <SidebarMenu>\n              {navigation.map((item) => (\n                <SidebarMenuItem key={item.title}>\n                  <SidebarMenuButton asChild>\n                    <a href={item.url}>\n                      <item.icon className=\"size-4\" />\n                      <span>{item.title}</span>\n                    </a>\n                  </SidebarMenuButton>\n                </SidebarMenuItem>\n              ))}\n            </SidebarMenu>\n          </SidebarGroupContent>\n        </SidebarGroup>\n      </SidebarContent>\n      <SidebarFooter>\n        <SidebarMenu>\n          <SidebarMenuItem>\n            <DropdownMenu>\n              <DropdownMenuTrigger asChild>\n                <SidebarMenuButton\n                  size=\"lg\"\n                  className=\"data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground\"\n                >\n                  <Avatar className=\"h-8 w-8 rounded-lg\">\n                    <AvatarImage src={user?.image ?? undefined} alt={user?.name ?? 'User'} />\n                    <AvatarFallback className=\"rounded-lg\">\n                      {getInitials(user?.name)}\n                    </AvatarFallback>\n                  </Avatar>\n                  <div className=\"grid flex-1 text-left text-sm leading-tight\">\n                    <span className=\"truncate font-semibold\">{user?.name ?? 'User'}</span>\n                    <span className=\"truncate text-xs text-muted-foreground\">\n                      {user?.email ?? ''}\n                    </span>\n                  </div>\n                  <ChevronsUpDown className=\"ml-auto size-4\" />\n                </SidebarMenuButton>\n              </DropdownMenuTrigger>\n              <DropdownMenuContent\n                className=\"w-[--radix-dropdown-menu-trigger-width] min-w-56 rounded-lg\"\n                side=\"bottom\"\n                align=\"end\"\n                sideOffset={4}\n              >\n                <DropdownMenuItem asChild>\n                  <a href=\"/settings\">\n                    <User className=\"mr-2 size-4\" />\n                    Profile\n                  </a>\n                </DropdownMenuItem>\n                <DropdownMenuItem asChild>\n                  <a href=\"/settings\">\n                    <Settings className=\"mr-2 size-4\" />\n                    Settings\n                  </a>\n                </DropdownMenuItem>\n                <DropdownMenuSeparator />\n                <DropdownMenuItem onClick={handleSignOut}>\n                  <LogOut className=\"mr-2 size-4\" />\n                  Sign out\n                </DropdownMenuItem>\n              </DropdownMenuContent>\n            </DropdownMenu>\n          </SidebarMenuItem>\n        </SidebarMenu>\n      </SidebarFooter>\n    </Sidebar>\n  )\n}\n",
+  "web/src/components/auth/sign-in-form.tsx.hbs": "'use client'\n\nimport { useState } from 'react'\nimport { useRouter } from 'next/navigation'\nimport Link from 'next/link'\nimport { signIn } from '@/lib/auth'\nimport { Button } from '@/components/ui/button'\nimport { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'\nimport { Input } from '@/components/ui/input'\nimport { Label } from '@/components/ui/label'\nimport { Separator } from '@/components/ui/separator'\n\nexport function SignInForm() {\n  const router = useRouter()\n  const [email, setEmail] = useState('')\n  const [password, setPassword] = useState('')\n  const [isLoading, setIsLoading] = useState(false)\n  const [error, setError] = useState<string | null>(null)\n\n  const handleSubmit = async (e: React.FormEvent) => {\n    e.preventDefault()\n    setIsLoading(true)\n    setError(null)\n\n    try {\n      const result = await signIn.email({\n        email,\n        password,\n      })\n\n      if (result.error) {\n        setError(result.error.message || 'Invalid email or password')\n      } else {\n        router.push('/')\n      }\n    } catch (err) {\n      setError('Invalid email or password')\n    } finally {\n      setIsLoading(false)\n    }\n  }\n\n  const handleSocialSignIn = async (provider: 'github' | 'google') => {\n    await signIn.social({\n      provider,\n      callbackURL: '/',\n    })\n  }\n\n  return (\n    <Card>\n      <CardHeader className=\"text-center\">\n        <CardTitle className=\"text-2xl\">Welcome back</CardTitle>\n        <CardDescription>Sign in to your account to continue</CardDescription>\n      </CardHeader>\n      <CardContent>\n        <form onSubmit={handleSubmit} className=\"space-y-4\">\n          <div className=\"space-y-2\">\n            <Label htmlFor=\"email\">Email</Label>\n            <Input\n              id=\"email\"\n              type=\"email\"\n              placeholder=\"you@example.com\"\n              value={email}\n              onChange={(e) => setEmail(e.target.value)}\n              required\n            />\n          </div>\n          <div className=\"space-y-2\">\n            <Label htmlFor=\"password\">Password</Label>\n            <Input\n              id=\"password\"\n              type=\"password\"\n              placeholder=\"Enter your password\"\n              value={password}\n              onChange={(e) => setPassword(e.target.value)}\n              required\n            />\n          </div>\n\n          {error && (\n            <p className=\"text-sm text-destructive\">{error}</p>\n          )}\n\n          <Button type=\"submit\" className=\"w-full\" disabled={isLoading}>\n            {isLoading ? 'Signing in...' : 'Sign In'}\n          </Button>\n        </form>\n\n        <div className=\"relative my-6\">\n          <div className=\"absolute inset-0 flex items-center\">\n            <Separator className=\"w-full\" />\n          </div>\n          <div className=\"relative flex justify-center text-xs uppercase\">\n            <span className=\"bg-card px-2 text-muted-foreground\">Or continue with</span>\n          </div>\n        </div>\n\n        <div className=\"grid grid-cols-2 gap-4\">\n          <Button variant=\"outline\" onClick={() => handleSocialSignIn('github')}>\n            <svg className=\"mr-2 h-4 w-4\" viewBox=\"0 0 24 24\">\n              <path fill=\"currentColor\" d=\"M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z\"/>\n            </svg>\n            GitHub\n          </Button>\n          <Button variant=\"outline\" onClick={() => handleSocialSignIn('google')}>\n            <svg className=\"mr-2 h-4 w-4\" viewBox=\"0 0 24 24\">\n              <path fill=\"currentColor\" d=\"M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z\"/>\n              <path fill=\"currentColor\" d=\"M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z\"/>\n              <path fill=\"currentColor\" d=\"M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z\"/>\n              <path fill=\"currentColor\" d=\"M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z\"/>\n            </svg>\n            Google\n          </Button>\n        </div>\n\n        <p className=\"mt-6 text-center text-sm text-muted-foreground\">\n          Don&apos;t have an account?{' '}\n          <Link href=\"/sign-up\" className=\"text-primary hover:underline font-medium\">\n            Sign up\n          </Link>\n        </p>\n      </CardContent>\n    </Card>\n  )\n}\n",
+  "web/src/components/auth/sign-up-form.tsx.hbs": "'use client'\n\nimport { useState } from 'react'\nimport { useRouter } from 'next/navigation'\nimport Link from 'next/link'\nimport { signUp, signIn } from '@/lib/auth'\nimport { Button } from '@/components/ui/button'\nimport { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'\nimport { Input } from '@/components/ui/input'\nimport { Label } from '@/components/ui/label'\nimport { Separator } from '@/components/ui/separator'\n\nexport function SignUpForm() {\n  const router = useRouter()\n  const [name, setName] = useState('')\n  const [email, setEmail] = useState('')\n  const [password, setPassword] = useState('')\n  const [isLoading, setIsLoading] = useState(false)\n  const [error, setError] = useState<string | null>(null)\n\n  const handleSubmit = async (e: React.FormEvent) => {\n    e.preventDefault()\n    setIsLoading(true)\n    setError(null)\n\n    if (password.length < 8) {\n      setError('Password must be at least 8 characters')\n      setIsLoading(false)\n      return\n    }\n\n    try {\n      const result = await signUp.email({\n        email,\n        password,\n        name,\n      })\n\n      if (result.error) {\n        setError(result.error.message || 'Failed to create account')\n      } else {\n        router.push('/')\n      }\n    } catch (err) {\n      setError('Failed to create account. Email may already be in use.')\n    } finally {\n      setIsLoading(false)\n    }\n  }\n\n  const handleSocialSignIn = async (provider: 'github' | 'google') => {\n    await signIn.social({\n      provider,\n      callbackURL: '/',\n    })\n  }\n\n  return (\n    <Card>\n      <CardHeader className=\"text-center\">\n        <CardTitle className=\"text-2xl\">Create an account</CardTitle>\n        <CardDescription>Enter your details to get started</CardDescription>\n      </CardHeader>\n      <CardContent>\n        <form onSubmit={handleSubmit} className=\"space-y-4\">\n          <div className=\"space-y-2\">\n            <Label htmlFor=\"name\">Name</Label>\n            <Input\n              id=\"name\"\n              type=\"text\"\n              placeholder=\"Your name\"\n              value={name}\n              onChange={(e) => setName(e.target.value)}\n              required\n            />\n          </div>\n          <div className=\"space-y-2\">\n            <Label htmlFor=\"email\">Email</Label>\n            <Input\n              id=\"email\"\n              type=\"email\"\n              placeholder=\"you@example.com\"\n              value={email}\n              onChange={(e) => setEmail(e.target.value)}\n              required\n            />\n          </div>\n          <div className=\"space-y-2\">\n            <Label htmlFor=\"password\">Password</Label>\n            <Input\n              id=\"password\"\n              type=\"password\"\n              placeholder=\"At least 8 characters\"\n              value={password}\n              onChange={(e) => setPassword(e.target.value)}\n              required\n              minLength={8}\n            />\n          </div>\n\n          {error && (\n            <p className=\"text-sm text-destructive\">{error}</p>\n          )}\n\n          <Button type=\"submit\" className=\"w-full\" disabled={isLoading}>\n            {isLoading ? 'Creating account...' : 'Create Account'}\n          </Button>\n        </form>\n\n        <div className=\"relative my-6\">\n          <div className=\"absolute inset-0 flex items-center\">\n            <Separator className=\"w-full\" />\n          </div>\n          <div className=\"relative flex justify-center text-xs uppercase\">\n            <span className=\"bg-card px-2 text-muted-foreground\">Or continue with</span>\n          </div>\n        </div>\n\n        <div className=\"grid grid-cols-2 gap-4\">\n          <Button variant=\"outline\" onClick={() => handleSocialSignIn('github')}>\n            <svg className=\"mr-2 h-4 w-4\" viewBox=\"0 0 24 24\">\n              <path fill=\"currentColor\" d=\"M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z\"/>\n            </svg>\n            GitHub\n          </Button>\n          <Button variant=\"outline\" onClick={() => handleSocialSignIn('google')}>\n            <svg className=\"mr-2 h-4 w-4\" viewBox=\"0 0 24 24\">\n              <path fill=\"currentColor\" d=\"M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z\"/>\n              <path fill=\"currentColor\" d=\"M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z\"/>\n              <path fill=\"currentColor\" d=\"M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z\"/>\n              <path fill=\"currentColor\" d=\"M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z\"/>\n            </svg>\n            Google\n          </Button>\n        </div>\n\n        <p className=\"mt-6 text-center text-sm text-muted-foreground\">\n          Already have an account?{' '}\n          <Link href=\"/sign-in\" className=\"text-primary hover:underline font-medium\">\n            Sign in\n          </Link>\n        </p>\n      </CardContent>\n    </Card>\n  )\n}\n",
+  "web/src/components/dashboard/app-sidebar.tsx.hbs": "'use client'\n\nimport {\n  GalleryVerticalEnd,\n  Home,\n  Settings,\n  ChevronsUpDown,\n  LogOut,\n  User,\n} from 'lucide-react'\nimport { useRouter } from 'next/navigation'\nimport { signOut, useSession } from '@/lib/auth'\nimport {\n  Sidebar,\n  SidebarContent,\n  SidebarFooter,\n  SidebarGroup,\n  SidebarGroupContent,\n  SidebarGroupLabel,\n  SidebarHeader,\n  SidebarMenu,\n  SidebarMenuButton,\n  SidebarMenuItem,\n} from '@/components/ui/sidebar'\nimport {\n  DropdownMenu,\n  DropdownMenuContent,\n  DropdownMenuItem,\n  DropdownMenuSeparator,\n  DropdownMenuTrigger,\n} from '@/components/ui/dropdown-menu'\nimport { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar'\n\nconst navigation = [\n  {\n    title: 'Home',\n    url: '/',\n    icon: Home,\n  },\n  {\n    title: 'Settings',\n    url: '/settings',\n    icon: Settings,\n  },\n]\n\nexport function AppSidebar() {\n  const router = useRouter()\n  const { data: session } = useSession()\n  const user = session?.user\n\n  const handleSignOut = async () => {\n    await signOut()\n    router.push('/sign-in')\n  }\n\n  const getInitials = (name?: string | null) => {\n    if (!name) return 'U'\n    return name\n      .split(' ')\n      .map((n) => n[0])\n      .join('')\n      .toUpperCase()\n      .slice(0, 2)\n  }\n\n  return (\n    <Sidebar>\n      <SidebarHeader>\n        <SidebarMenu>\n          <SidebarMenuItem>\n            <SidebarMenuButton size=\"lg\" asChild>\n              <a href=\"/\">\n                <div className=\"flex aspect-square size-8 items-center justify-center rounded-lg bg-primary text-primary-foreground\">\n                  <GalleryVerticalEnd className=\"size-4\" />\n                </div>\n                <div className=\"flex flex-col gap-0.5 leading-none\">\n                  <span className=\"font-semibold\">{{projectName}}</span>\n                  <span className=\"text-xs text-muted-foreground\">Dashboard</span>\n                </div>\n              </a>\n            </SidebarMenuButton>\n          </SidebarMenuItem>\n        </SidebarMenu>\n      </SidebarHeader>\n      <SidebarContent>\n        <SidebarGroup>\n          <SidebarGroupLabel>Navigation</SidebarGroupLabel>\n          <SidebarGroupContent>\n            <SidebarMenu>\n              {navigation.map((item) => (\n                <SidebarMenuItem key={item.title}>\n                  <SidebarMenuButton asChild>\n                    <a href={item.url}>\n                      <item.icon className=\"size-4\" />\n                      <span>{item.title}</span>\n                    </a>\n                  </SidebarMenuButton>\n                </SidebarMenuItem>\n              ))}\n            </SidebarMenu>\n          </SidebarGroupContent>\n        </SidebarGroup>\n      </SidebarContent>\n      <SidebarFooter>\n        <SidebarMenu>\n          <SidebarMenuItem>\n            <DropdownMenu>\n              <DropdownMenuTrigger asChild>\n                <SidebarMenuButton\n                  size=\"lg\"\n                  className=\"data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground\"\n                >\n                  <Avatar className=\"h-8 w-8 rounded-lg\">\n                    <AvatarImage src={user?.image ?? undefined} alt={user?.name ?? 'User'} />\n                    <AvatarFallback className=\"rounded-lg\">\n                      {getInitials(user?.name)}\n                    </AvatarFallback>\n                  </Avatar>\n                  <div className=\"grid flex-1 text-left text-sm leading-tight\">\n                    <span className=\"truncate font-semibold\">{user?.name ?? 'User'}</span>\n                    <span className=\"truncate text-xs text-muted-foreground\">\n                      {user?.email ?? ''}\n                    </span>\n                  </div>\n                  <ChevronsUpDown className=\"ml-auto size-4\" />\n                </SidebarMenuButton>\n              </DropdownMenuTrigger>\n              <DropdownMenuContent\n                className=\"w-[--radix-dropdown-menu-trigger-width] min-w-56 rounded-lg\"\n                side=\"bottom\"\n                align=\"end\"\n                sideOffset={4}\n              >\n                <DropdownMenuItem asChild>\n                  <a href=\"/settings\">\n                    <User className=\"mr-2 size-4\" />\n                    Profile\n                  </a>\n                </DropdownMenuItem>\n                <DropdownMenuItem asChild>\n                  <a href=\"/settings\">\n                    <Settings className=\"mr-2 size-4\" />\n                    Settings\n                  </a>\n                </DropdownMenuItem>\n                <DropdownMenuSeparator />\n                <DropdownMenuItem onClick={handleSignOut}>\n                  <LogOut className=\"mr-2 size-4\" />\n                  Sign out\n                </DropdownMenuItem>\n              </DropdownMenuContent>\n            </DropdownMenu>\n          </SidebarMenuItem>\n        </SidebarMenu>\n      </SidebarFooter>\n    </Sidebar>\n  )\n}\n",
   "web/src/components/dashboard/dashboard-layout.tsx.hbs": "'use client'\n\nimport { SidebarInset, SidebarProvider, SidebarTrigger } from '@/components/ui/sidebar'\nimport { Separator } from '@/components/ui/separator'\nimport {\n  Breadcrumb,\n  BreadcrumbItem,\n  BreadcrumbList,\n  BreadcrumbPage,\n} from '@/components/ui/breadcrumb'\nimport { AppSidebar } from './app-sidebar'\n\ninterface DashboardLayoutProps {\n  children: React.ReactNode\n  title?: string\n}\n\nexport function DashboardLayout({ children, title = 'Dashboard' }: DashboardLayoutProps) {\n  return (\n    <SidebarProvider>\n      <AppSidebar />\n      <SidebarInset>\n        <header className=\"flex h-16 shrink-0 items-center gap-2 border-b px-4\">\n          <SidebarTrigger className=\"-ml-1\" />\n          <Separator orientation=\"vertical\" className=\"mr-2 h-4\" />\n          <Breadcrumb>\n            <BreadcrumbList>\n              <BreadcrumbItem>\n                <BreadcrumbPage>{title}</BreadcrumbPage>\n              </BreadcrumbItem>\n            </BreadcrumbList>\n          </Breadcrumb>\n        </header>\n        <main className=\"flex-1 p-4 md:p-6\">{children}</main>\n      </SidebarInset>\n    </SidebarProvider>\n  )\n}\n",
-  "web/src/components/providers/convex-provider.tsx.hbs": "'use client'\n\nimport { ConvexAuthNextjsProvider } from '@convex-dev/auth/nextjs'\nimport { ConvexReactClient } from 'convex/react'\n\nconst convex = new ConvexReactClient(process.env.NEXT_PUBLIC_CONVEX_URL!)\n\nexport function ConvexClientProvider({\n  children,\n}: {\n  children: React.ReactNode\n}) {\n  return (\n    <ConvexAuthNextjsProvider client={convex}>\n      {children}\n    </ConvexAuthNextjsProvider>\n  )\n}\n",
-  "web/src/lib/auth.ts.hbs": "'use client'\n\nimport { useConvexAuth, useQuery } from 'convex/react'\nimport { useAuthActions } from '@convex-dev/auth/react'\nimport { api } from '{{#if (eq structure 'monorepo')}}@repo/backend/convex/_generated/api{{else}}../../convex/_generated/api{{/if}}'\n\nexport function useAuth() {\n  const { isAuthenticated, isLoading } = useConvexAuth()\n  const { signIn, signOut } = useAuthActions()\n  const user = useQuery(api.users.viewer)\n\n  return {\n    isAuthenticated,\n    isLoading,\n    user,\n    signIn: (provider: 'github' | 'google') => {\n      void signIn(provider)\n    },\n    signInWithPassword: async (email: string, password: string, flow: 'signIn' | 'signUp' = 'signIn', name?: string) => {\n      const formData = new FormData()\n      formData.append('email', email)\n      formData.append('password', password)\n      formData.append('flow', flow)\n      if (name) {\n        formData.append('name', name)\n      }\n      await signIn('password', formData)\n    },\n    signOut: () => {\n      void signOut()\n    },\n  }\n}\n",
+  "web/src/components/providers/convex-provider.tsx.hbs": "'use client'\n\nimport { ConvexBetterAuthProvider } from '@convex-dev/better-auth/react'\nimport { ConvexReactClient } from 'convex/react'\n\nconst convex = new ConvexReactClient(process.env.NEXT_PUBLIC_CONVEX_URL!)\n\nexport function ConvexClientProvider({\n  children,\n}: {\n  children: React.ReactNode\n}) {\n  return (\n    <ConvexBetterAuthProvider client={convex}>\n      {children}\n    </ConvexBetterAuthProvider>\n  )\n}\n",
+  "web/src/lib/auth-server.ts.hbs": "import { convexBetterAuthNextJs } from '@convex-dev/better-auth/nextjs'\n\nexport const { auth, getSession, signIn, signOut } = convexBetterAuthNextJs({\n  convexUrl: process.env.NEXT_PUBLIC_CONVEX_URL!,\n  siteUrl: process.env.NEXT_PUBLIC_SITE_URL!,\n})\n",
+  "web/src/lib/auth.ts.hbs": "'use client'\n\nimport { createAuthClient } from 'better-auth/react'\nimport { convexClient } from '@convex-dev/better-auth/client'\n\nexport const authClient = createAuthClient({\n  baseURL: process.env.NEXT_PUBLIC_SITE_URL,\n  plugins: [convexClient()],\n})\n\nexport const {\n  signIn,\n  signUp,\n  signOut,\n  useSession,\n  getSession,\n} = authClient\n",
   "web/src/lib/utils.ts.hbs": "import { clsx, type ClassValue } from 'clsx'\nimport { twMerge } from 'tailwind-merge'\n\nexport function cn(...inputs: ClassValue[]) {\n  return twMerge(clsx(inputs))\n}\n",
-  "web/src/proxy.ts.hbs": "import {\n  convexAuthNextjsProxy,\n  createRouteMatcher,\n  nextjsProxyRedirect,\n} from '@convex-dev/auth/nextjs/server'\n\nconst isPublicRoute = createRouteMatcher(['/sign-in', '/sign-up'])\n\nexport default convexAuthNextjsProxy(async (request, { convexAuth }) => {\n  const isAuthenticated = await convexAuth.isAuthenticated()\n\n  // Redirect unauthenticated users to /sign-up\n  if (!isPublicRoute(request) && !isAuthenticated) {\n    return nextjsProxyRedirect(request, '/sign-up')\n  }\n\n  // Redirect authenticated users from auth pages to / (dashboard)\n  if (isPublicRoute(request) && isAuthenticated) {\n    return nextjsProxyRedirect(request, '/')\n  }\n})\n",
+  "web/src/proxy.ts.hbs": "import { NextResponse } from 'next/server'\nimport type { NextRequest } from 'next/server'\nimport { auth } from '@/lib/auth-server'\n\nconst publicRoutes = ['/sign-in', '/sign-up', '/api/auth']\n\nfunction isPublicRoute(pathname: string) {\n  return publicRoutes.some(route => pathname.startsWith(route))\n}\n\nexport async function proxy(request: NextRequest) {\n  const { pathname } = request.nextUrl\n\n  // Allow public routes\n  if (isPublicRoute(pathname)) {\n    return NextResponse.next()\n  }\n\n  // Check authentication\n  const session = await auth.getSession()\n\n  // Redirect unauthenticated users to /sign-up\n  if (!session) {\n    return NextResponse.redirect(new URL('/sign-up', request.url))\n  }\n\n  return NextResponse.next()\n}\n\nexport const config = {\n  matcher: ['/((?!.*\\\\..*|_next).*)', '/', '/(api|trpc)(.*)'],\n}\n",
   "web/tsconfig.json.hbs": "{\n  \"compilerOptions\": {\n    \"target\": \"ES2017\",\n    \"lib\": [\"dom\", \"dom.iterable\", \"esnext\"],\n    \"allowJs\": true,\n    \"skipLibCheck\": true,\n    \"strict\": true,\n    \"noEmit\": true,\n    \"esModuleInterop\": true,\n    \"module\": \"esnext\",\n    \"moduleResolution\": \"bundler\",\n    \"resolveJsonModule\": true,\n    \"isolatedModules\": true,\n    \"jsx\": \"react-jsx\",\n    \"incremental\": true,\n    \"plugins\": [{ \"name\": \"next\" }],\n    \"paths\": {\n      \"@/*\": [\"./src/*\"]\n    }\n  },\n  \"include\": [\"next-env.d.ts\", \"**/*.ts\", \"**/*.tsx\", \".next/types/**/*.ts\", \".next/dev/types/**/*.ts\"],\n  \"exclude\": [\"node_modules\"]\n}\n"
 }

package/templates/convex/_env.local.hbs

@@ -1,18 +1,23 @@
 # Convex
 CONVEX_DEPLOYMENT=
 NEXT_PUBLIC_CONVEX_URL=
+NEXT_PUBLIC_CONVEX_SITE_URL=
 
-# Auth - GitHub OAuth
-AUTH_GITHUB_ID=
-AUTH_GITHUB_SECRET=
-
-# Auth - Google OAuth
-AUTH_GOOGLE_ID=
-AUTH_GOOGLE_SECRET=
+# Site URL (used for auth redirects)
+SITE_URL=http://localhost:3000
+NEXT_PUBLIC_SITE_URL=http://localhost:3000
 
 # Better Auth Secret (generate with: openssl rand -base64 32)
 BETTER_AUTH_SECRET=
 
+# Auth - GitHub OAuth
+GITHUB_CLIENT_ID=
+GITHUB_CLIENT_SECRET=
+
+# Auth - Google OAuth
+GOOGLE_CLIENT_ID=
+GOOGLE_CLIENT_SECRET=
+
 # Email (Resend) - https://resend.com
 RESEND_API_KEY=
 RESEND_FROM_EMAIL=

package/templates/convex/convex/auth.ts.hbs

@@ -1,34 +1,27 @@
-import GitHub from '@auth/core/providers/github'
-import Google from '@auth/core/providers/google'
-import { Password } from '@convex-dev/auth/providers/Password'
-import { convexAuth } from '@convex-dev/auth/server'
+import { BetterAuth } from '@convex-dev/better-auth'
+import { betterAuth } from 'better-auth'
+import { components } from './_generated/api'
 
-export const { auth, signIn, signOut, store, isAuthenticated } = convexAuth({
-  providers: [
-    GitHub,
-    Google,
-    Password,
-  ],
+const auth = new BetterAuth(components.betterAuth, {
+  trustedOrigins: [process.env.SITE_URL!],
 })
 
-// Email Verification Setup (Optional)
-// ------------------------------------
-// By default, email/password auth works without email verification.
-// To require email verification, configure the Password provider with ResendOTP:
-//
-// 1. Install the Resend component: npm install @convex-dev/resend
-// 2. Update the Password provider:
-//
-// import { ResendOTP } from '@convex-dev/auth/providers/ResendOTP'
-// import { Resend } from '@convex-dev/resend'
-//
-// const resend = new Resend()
-//
-// Password({
-//   verify: ResendOTP({
-//     resend,
-//     from: process.env.RESEND_FROM_EMAIL!,
-//   }),
-// })
-//
-// See: https://labs.convex.dev/auth/config/passwords
+export const { signIn, signUp, signOut, isAuthenticated, getSession } = auth.create(
+  betterAuth({
+    emailAndPassword: {
+      enabled: true,
+    },
+    socialProviders: {
+      github: {
+        clientId: process.env.GITHUB_CLIENT_ID!,
+        clientSecret: process.env.GITHUB_CLIENT_SECRET!,
+      },
+      google: {
+        clientId: process.env.GOOGLE_CLIENT_ID!,
+        clientSecret: process.env.GOOGLE_CLIENT_SECRET!,
+      },
+    },
+  })
+)
+
+export { auth }

package/templates/convex/convex/convex.config.ts.hbs

@@ -0,0 +1,7 @@
+import { defineApp } from 'convex/server'
+import betterAuth from '@convex-dev/better-auth/convex.config'
+
+const app = defineApp()
+app.use(betterAuth)
+
+export default app

package/templates/convex/convex/http.ts.hbs

@@ -3,6 +3,7 @@ import { auth } from './auth'
 
 const http = httpRouter()
 
-auth.addHttpRoutes(http)
+// Register Better Auth routes
+auth.registerRoutes(http)
 
 export default http

package/templates/convex/convex/schema.ts.hbs

@@ -1,15 +1,14 @@
 import { defineSchema, defineTable } from 'convex/server'
-import { authTables } from '@convex-dev/auth/server'
 import { v } from 'convex/values'
 
+// Better Auth manages its own tables via the betterAuth component
+// Add your custom application tables here
 export default defineSchema({
-  ...authTables,
-  // Add your custom tables here
   // Example:
   // posts: defineTable({
   //   title: v.string(),
   //   content: v.string(),
-  //   authorId: v.id('users'),
+  //   userId: v.string(), // Better Auth user ID
   //   createdAt: v.number(),
-  // }).index('by_author', ['authorId']),
+  // }).index('by_user', ['userId']),
 })

package/templates/convex/convex/users.ts.hbs

@@ -1,14 +1,13 @@
 import { query } from './_generated/server'
 import { auth } from './auth'
 
+// Get current user from Better Auth session
 export const current = query({
   args: {},
   handler: async (ctx) => {
-    const userId = await auth.getUserId(ctx)
-    if (!userId) return null
-
-    const user = await ctx.db.get(userId)
-    return user
+    const session = await auth.getSession(ctx)
+    if (!session) return null
+    return session.user
   },
 })
 
@@ -16,10 +15,8 @@ export const current = query({
 export const viewer = query({
   args: {},
   handler: async (ctx) => {
-    const userId = await auth.getUserId(ctx)
-    if (!userId) return null
-
-    const user = await ctx.db.get(userId)
-    return user
+    const session = await auth.getSession(ctx)
+    if (!session) return null
+    return session.user
   },
 })

package/templates/convex/package.json.hbs

@@ -18,8 +18,8 @@
   },
   "dependencies": {
     "convex": "^1.25.0",
-    "@convex-dev/auth": "^0.0.90",
-    "@auth/core": "^0.37.0",
+    "@convex-dev/better-auth": "^0.3.0",
+    "better-auth": "1.4.9",
     "@convex-dev/resend": "^0.2.0"{{#if (eq integrations.uploads 'convex-fs')}},
     "convex-fs": "^0.2.0"{{/if}}{{#if (eq integrations.uploads 'r2')}},
     "@convex-dev/r2": "^0.8.0"{{/if}}{{#if (eq integrations.payments 'stripe')}},

package/templates/web/package.json.hbs

@@ -22,8 +22,8 @@
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "convex": "^1.25.0",
-    "@convex-dev/auth": "^0.0.90",
-    "@auth/core": "^0.37.0",
+    "@convex-dev/better-auth": "^0.3.0",
+    "better-auth": "1.4.9",
     "@hugeicons/react": "^0.3.0",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.0",

package/templates/web/src/app/api/auth/[...all]/route.ts.hbs

@@ -0,0 +1,3 @@
+import { auth } from '@/lib/auth-server'
+
+export const { GET, POST } = auth.handlers

package/templates/web/src/components/auth/sign-in-form.tsx.hbs

@@ -3,7 +3,7 @@
 import { useState } from 'react'
 import { useRouter } from 'next/navigation'
 import Link from 'next/link'
-import { useAuthActions } from '@convex-dev/auth/react'
+import { signIn } from '@/lib/auth'
 import { Button } from '@/components/ui/button'
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'
 import { Input } from '@/components/ui/input'
@@ -12,7 +12,6 @@ import { Separator } from '@/components/ui/separator'
 
 export function SignInForm() {
   const router = useRouter()
-  const { signIn } = useAuthActions()
   const [email, setEmail] = useState('')
   const [password, setPassword] = useState('')
   const [isLoading, setIsLoading] = useState(false)
@@ -24,13 +23,16 @@ export function SignInForm() {
     setError(null)
 
     try {
-      const formData = new FormData()
-      formData.append('email', email)
-      formData.append('password', password)
-      formData.append('flow', 'signIn')
+      const result = await signIn.email({
+        email,
+        password,
+      })
 
-      await signIn('password', formData)
-      router.push('/')
+      if (result.error) {
+        setError(result.error.message || 'Invalid email or password')
+      } else {
+        router.push('/')
+      }
     } catch (err) {
       setError('Invalid email or password')
     } finally {
@@ -38,8 +40,11 @@ export function SignInForm() {
     }
   }
 
-  const handleSocialSignIn = (provider: 'github' | 'google') => {
-    void signIn(provider)
+  const handleSocialSignIn = async (provider: 'github' | 'google') => {
+    await signIn.social({
+      provider,
+      callbackURL: '/',
+    })
   }
 
   return (

package/templates/web/src/components/auth/sign-up-form.tsx.hbs

@@ -3,7 +3,7 @@
 import { useState } from 'react'
 import { useRouter } from 'next/navigation'
 import Link from 'next/link'
-import { useAuthActions } from '@convex-dev/auth/react'
+import { signUp, signIn } from '@/lib/auth'
 import { Button } from '@/components/ui/button'
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'
 import { Input } from '@/components/ui/input'
@@ -12,7 +12,6 @@ import { Separator } from '@/components/ui/separator'
 
 export function SignUpForm() {
   const router = useRouter()
-  const { signIn } = useAuthActions()
   const [name, setName] = useState('')
   const [email, setEmail] = useState('')
   const [password, setPassword] = useState('')
@@ -31,14 +30,17 @@ export function SignUpForm() {
     }
 
     try {
-      const formData = new FormData()
-      formData.append('name', name)
-      formData.append('email', email)
-      formData.append('password', password)
-      formData.append('flow', 'signUp')
+      const result = await signUp.email({
+        email,
+        password,
+        name,
+      })
 
-      await signIn('password', formData)
-      router.push('/')
+      if (result.error) {
+        setError(result.error.message || 'Failed to create account')
+      } else {
+        router.push('/')
+      }
     } catch (err) {
       setError('Failed to create account. Email may already be in use.')
     } finally {
@@ -46,8 +48,11 @@ export function SignUpForm() {
     }
   }
 
-  const handleSocialSignIn = (provider: 'github' | 'google') => {
-    void signIn(provider)
+  const handleSocialSignIn = async (provider: 'github' | 'google') => {
+    await signIn.social({
+      provider,
+      callbackURL: '/',
+    })
   }
 
   return (

package/templates/web/src/components/dashboard/app-sidebar.tsx.hbs

@@ -1,8 +1,6 @@
 'use client'
 
 import {
-  AudioWaveform,
-  Command,
   GalleryVerticalEnd,
   Home,
   Settings,
@@ -11,9 +9,7 @@ import {
   User,
 } from 'lucide-react'
 import { useRouter } from 'next/navigation'
-import { useAuthActions } from '@convex-dev/auth/react'
-import { useQuery } from 'convex/react'
-import { api } from '{{#if (eq structure 'monorepo')}}@repo/backend/convex/_generated/api{{else}}../../convex/_generated/api{{/if}}'
+import { signOut, useSession } from '@/lib/auth'
 import {
   Sidebar,
   SidebarContent,
@@ -50,8 +46,8 @@ const navigation = [
 
 export function AppSidebar() {
   const router = useRouter()
-  const { signOut } = useAuthActions()
-  const user = useQuery(api.users.viewer)
+  const { data: session } = useSession()
+  const user = session?.user
 
   const handleSignOut = async () => {
     await signOut()

package/templates/web/src/components/providers/convex-provider.tsx.hbs

@@ -1,6 +1,6 @@
 'use client'
 
-import { ConvexAuthNextjsProvider } from '@convex-dev/auth/nextjs'
+import { ConvexBetterAuthProvider } from '@convex-dev/better-auth/react'
 import { ConvexReactClient } from 'convex/react'
 
 const convex = new ConvexReactClient(process.env.NEXT_PUBLIC_CONVEX_URL!)
@@ -11,8 +11,8 @@ export function ConvexClientProvider({
   children: React.ReactNode
 }) {
   return (
-    <ConvexAuthNextjsProvider client={convex}>
+    <ConvexBetterAuthProvider client={convex}>
       {children}
-    </ConvexAuthNextjsProvider>
+    </ConvexBetterAuthProvider>
   )
 }

package/templates/web/src/lib/auth-server.ts.hbs

@@ -0,0 +1,6 @@
+import { convexBetterAuthNextJs } from '@convex-dev/better-auth/nextjs'
+
+export const { auth, getSession, signIn, signOut } = convexBetterAuthNextJs({
+  convexUrl: process.env.NEXT_PUBLIC_CONVEX_URL!,
+  siteUrl: process.env.NEXT_PUBLIC_SITE_URL!,
+})

package/templates/web/src/lib/auth.ts.hbs

@@ -1,33 +1,17 @@
 'use client'
 
-import { useConvexAuth, useQuery } from 'convex/react'
-import { useAuthActions } from '@convex-dev/auth/react'
-import { api } from '{{#if (eq structure 'monorepo')}}@repo/backend/convex/_generated/api{{else}}../../convex/_generated/api{{/if}}'
+import { createAuthClient } from 'better-auth/react'
+import { convexClient } from '@convex-dev/better-auth/client'
 
-export function useAuth() {
-  const { isAuthenticated, isLoading } = useConvexAuth()
-  const { signIn, signOut } = useAuthActions()
-  const user = useQuery(api.users.viewer)
+export const authClient = createAuthClient({
+  baseURL: process.env.NEXT_PUBLIC_SITE_URL,
+  plugins: [convexClient()],
+})
 
-  return {
-    isAuthenticated,
-    isLoading,
-    user,
-    signIn: (provider: 'github' | 'google') => {
-      void signIn(provider)
-    },
-    signInWithPassword: async (email: string, password: string, flow: 'signIn' | 'signUp' = 'signIn', name?: string) => {
-      const formData = new FormData()
-      formData.append('email', email)
-      formData.append('password', password)
-      formData.append('flow', flow)
-      if (name) {
-        formData.append('name', name)
-      }
-      await signIn('password', formData)
-    },
-    signOut: () => {
-      void signOut()
-    },
-  }
-}
+export const {
+  signIn,
+  signUp,
+  signOut,
+  useSession,
+  getSession,
+} = authClient

package/templates/web/src/proxy.ts.hbs

@@ -1,21 +1,32 @@
-import {
-  convexAuthNextjsProxy,
-  createRouteMatcher,
-  nextjsProxyRedirect,
-} from '@convex-dev/auth/nextjs/server'
+import { NextResponse } from 'next/server'
+import type { NextRequest } from 'next/server'
+import { auth } from '@/lib/auth-server'
 
-const isPublicRoute = createRouteMatcher(['/sign-in', '/sign-up'])
+const publicRoutes = ['/sign-in', '/sign-up', '/api/auth']
 
-export default convexAuthNextjsProxy(async (request, { convexAuth }) => {
-  const isAuthenticated = await convexAuth.isAuthenticated()
+function isPublicRoute(pathname: string) {
+  return publicRoutes.some(route => pathname.startsWith(route))
+}
 
-  // Redirect unauthenticated users to /sign-up
-  if (!isPublicRoute(request) && !isAuthenticated) {
-    return nextjsProxyRedirect(request, '/sign-up')
+export async function proxy(request: NextRequest) {
+  const { pathname } = request.nextUrl
+
+  // Allow public routes
+  if (isPublicRoute(pathname)) {
+    return NextResponse.next()
   }
 
-  // Redirect authenticated users from auth pages to / (dashboard)
-  if (isPublicRoute(request) && isAuthenticated) {
-    return nextjsProxyRedirect(request, '/')
+  // Check authentication
+  const session = await auth.getSession()
+
+  // Redirect unauthenticated users to /sign-up
+  if (!session) {
+    return NextResponse.redirect(new URL('/sign-up', request.url))
   }
-})
+
+  return NextResponse.next()
+}
+
+export const config = {
+  matcher: ['/((?!.*\\..*|_next).*)', '/', '/(api|trpc)(.*)'],
+}