betterstart-cli 0.0.99 → 0.0.101

package/dist/assets/adapters/next/integrations/_shared/actions/object-key.ts

@@ -1,8 +1,5 @@
 import { randomUUID } from 'node:crypto'
-
-function sanitizeFilename(filename: string): string {
-  return filename.replace(/[^a-zA-Z0-9.-]/g, '_')
-}
+import { sanitizeFilename } from '@admin/actions/storage/sanitize-filename'
 
 /**
  * Object-key naming scheme for every upload, shared by all storage providers.

package/dist/assets/adapters/next/integrations/_shared/actions/sanitize-filename.ts

@@ -0,0 +1,3 @@
+export function sanitizeFilename(filename: string): string {
+  return filename.replace(/[^a-zA-Z0-9.-]/g, '_')
+}

package/dist/assets/adapters/next/integrations/r2/actions/get-client.ts

@@ -0,0 +1,22 @@
+import { getConfig } from '@admin/actions/r2/get-config'
+import { S3Client } from '@aws-sdk/client-s3'
+
+let r2Client: S3Client | null = null
+
+export function getClient(): S3Client {
+  if (r2Client) {
+    return r2Client
+  }
+
+  const config = getConfig()
+  r2Client = new S3Client({
+    region: 'auto',
+    endpoint: `https://${config.accountId}.r2.cloudflarestorage.com`,
+    credentials: {
+      accessKeyId: config.accessKeyId,
+      secretAccessKey: config.secretAccessKey
+    }
+  })
+
+  return r2Client
+}

package/dist/assets/adapters/next/integrations/r2/actions/get-config.ts

@@ -0,0 +1,9 @@
+export function getConfig() {
+  return {
+    accountId: process.env.BETTERSTART_R2_ACCOUNT_ID?.trim() ?? '',
+    accessKeyId: process.env.BETTERSTART_R2_ACCESS_KEY_ID?.trim() ?? '',
+    secretAccessKey: process.env.BETTERSTART_R2_SECRET_ACCESS_KEY?.trim() ?? '',
+    bucketName: process.env.BETTERSTART_R2_BUCKET_NAME?.trim() ?? '',
+    publicUrl: process.env.BETTERSTART_R2_PUBLIC_URL?.trim() ?? ''
+  }
+}

package/dist/assets/adapters/next/integrations/r2/actions/{r2.ts → provider.ts}

@@ -1,36 +1,8 @@
 import type { AdminStorageProvider, AdminStorageUploadInput } from '@admin/actions/storage/types'
+import { getClient } from '@admin/actions/r2/get-client'
+import { getConfig } from '@admin/actions/r2/get-config'
 import { buildStorageObjectKey } from '@admin/actions/storage/object-key'
-import { PutObjectCommand, S3Client } from '@aws-sdk/client-s3'
-
-let r2Client: S3Client | null = null
-
-function getConfig() {
-  return {
-    accountId: process.env.BETTERSTART_R2_ACCOUNT_ID?.trim() ?? '',
-    accessKeyId: process.env.BETTERSTART_R2_ACCESS_KEY_ID?.trim() ?? '',
-    secretAccessKey: process.env.BETTERSTART_R2_SECRET_ACCESS_KEY?.trim() ?? '',
-    bucketName: process.env.BETTERSTART_R2_BUCKET_NAME?.trim() ?? '',
-    publicUrl: process.env.BETTERSTART_R2_PUBLIC_URL?.trim() ?? ''
-  }
-}
-
-function getClient(): S3Client {
-  if (r2Client) {
-    return r2Client
-  }
-
-  const config = getConfig()
-  r2Client = new S3Client({
-    region: 'auto',
-    endpoint: `https://${config.accountId}.r2.cloudflarestorage.com`,
-    credentials: {
-      accessKeyId: config.accessKeyId,
-      secretAccessKey: config.secretAccessKey
-    }
-  })
-
-  return r2Client
-}
+import { PutObjectCommand } from '@aws-sdk/client-s3'
 
 export const r2StorageProvider: AdminStorageProvider = {
   id: 'r2',

package/dist/assets/adapters/next/integrations/r2/integration.ts

@@ -9,13 +9,25 @@ export const r2Integration: BetterstartIntegrationDefinition = {
   dependencies: [],
   conflicts: ['vercel-blob', 'railway-bucket'],
   files: [
+    {
+      outputPath: 'lib/actions/storage/sanitize-filename.ts',
+      templatePath: '../_shared/actions/sanitize-filename.ts'
+    },
     {
       outputPath: 'lib/actions/storage/object-key.ts',
       templatePath: '../_shared/actions/object-key.ts'
     },
+    {
+      outputPath: 'lib/actions/r2/get-config.ts',
+      templatePath: 'actions/get-config.ts'
+    },
+    {
+      outputPath: 'lib/actions/r2/get-client.ts',
+      templatePath: 'actions/get-client.ts'
+    },
     {
       outputPath: 'lib/actions/r2/provider.ts',
-      templatePath: 'actions/r2.ts'
+      templatePath: 'actions/provider.ts'
     }
   ],
   packageDependencies: ['@aws-sdk/client-s3'],

package/dist/assets/adapters/next/integrations/railway-bucket/actions/get-client.ts

@@ -0,0 +1,20 @@
+import { getConfig } from '@admin/actions/railway-bucket/get-config'
+import { S3Client } from '@aws-sdk/client-s3'
+
+let railwayBucketClient: S3Client | null = null
+
+export function getClient(): S3Client {
+  if (railwayBucketClient) return railwayBucketClient
+
+  const config = getConfig()
+  railwayBucketClient = new S3Client({
+    region: config.region,
+    endpoint: config.endpoint,
+    forcePathStyle: config.urlStyle.toLowerCase().includes('path'),
+    credentials: {
+      accessKeyId: config.accessKeyId,
+      secretAccessKey: config.secretAccessKey
+    }
+  })
+  return railwayBucketClient
+}

package/dist/assets/adapters/next/integrations/railway-bucket/actions/get-config.ts

@@ -0,0 +1,10 @@
+export function getConfig() {
+  return {
+    endpoint: process.env.BETTERSTART_RAILWAY_BUCKET_ENDPOINT?.trim() ?? '',
+    accessKeyId: process.env.BETTERSTART_RAILWAY_BUCKET_ACCESS_KEY_ID?.trim() ?? '',
+    secretAccessKey: process.env.BETTERSTART_RAILWAY_BUCKET_SECRET_ACCESS_KEY?.trim() ?? '',
+    bucketName: process.env.BETTERSTART_RAILWAY_BUCKET_NAME?.trim() ?? '',
+    region: process.env.BETTERSTART_RAILWAY_BUCKET_REGION?.trim() ?? '',
+    urlStyle: process.env.BETTERSTART_RAILWAY_BUCKET_URL_STYLE?.trim() ?? ''
+  }
+}

package/dist/assets/adapters/next/integrations/railway-bucket/actions/{railway-bucket.ts → provider.ts}

@@ -1,41 +1,11 @@
 import type { AdminStorageProvider, AdminStorageUploadInput } from '@admin/actions/storage/types'
+import { getClient } from '@admin/actions/railway-bucket/get-client'
+import { getConfig } from '@admin/actions/railway-bucket/get-config'
+import { stableReadUrl } from '@admin/actions/railway-bucket/stable-read-url'
 import { buildStorageObjectKey } from '@admin/actions/storage/object-key'
-import { GetObjectCommand, PutObjectCommand, S3Client } from '@aws-sdk/client-s3'
+import { GetObjectCommand, PutObjectCommand } from '@aws-sdk/client-s3'
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner'
 
-let railwayBucketClient: S3Client | null = null
-
-function getConfig() {
-  return {
-    endpoint: process.env.BETTERSTART_RAILWAY_BUCKET_ENDPOINT?.trim() ?? '',
-    accessKeyId: process.env.BETTERSTART_RAILWAY_BUCKET_ACCESS_KEY_ID?.trim() ?? '',
-    secretAccessKey: process.env.BETTERSTART_RAILWAY_BUCKET_SECRET_ACCESS_KEY?.trim() ?? '',
-    bucketName: process.env.BETTERSTART_RAILWAY_BUCKET_NAME?.trim() ?? '',
-    region: process.env.BETTERSTART_RAILWAY_BUCKET_REGION?.trim() ?? '',
-    urlStyle: process.env.BETTERSTART_RAILWAY_BUCKET_URL_STYLE?.trim() ?? ''
-  }
-}
-
-function stableReadUrl(key: string): string {
-  return `/api/admin/storage/${Buffer.from(key, 'utf-8').toString('base64url')}`
-}
-
-function getClient(): S3Client {
-  if (railwayBucketClient) return railwayBucketClient
-
-  const config = getConfig()
-  railwayBucketClient = new S3Client({
-    region: config.region,
-    endpoint: config.endpoint,
-    forcePathStyle: config.urlStyle.toLowerCase().includes('path'),
-    credentials: {
-      accessKeyId: config.accessKeyId,
-      secretAccessKey: config.secretAccessKey
-    }
-  })
-  return railwayBucketClient
-}
-
 export const railwayBucketStorageProvider = {
   id: 'railway-bucket',
   isConfigured() {

package/dist/assets/adapters/next/integrations/railway-bucket/actions/stable-read-url.ts

@@ -0,0 +1,3 @@
+export function stableReadUrl(key: string): string {
+  return `/api/admin/storage/${Buffer.from(key, 'utf-8').toString('base64url')}`
+}

package/dist/assets/adapters/next/integrations/railway-bucket/integration.ts

@@ -9,13 +9,29 @@ export const railwayBucketIntegration: BetterstartIntegrationDefinition = {
   dependencies: [],
   conflicts: ['r2', 'vercel-blob'],
   files: [
+    {
+      outputPath: 'lib/actions/storage/sanitize-filename.ts',
+      templatePath: '../_shared/actions/sanitize-filename.ts'
+    },
     {
       outputPath: 'lib/actions/storage/object-key.ts',
       templatePath: '../_shared/actions/object-key.ts'
     },
+    {
+      outputPath: 'lib/actions/railway-bucket/get-config.ts',
+      templatePath: 'actions/get-config.ts'
+    },
+    {
+      outputPath: 'lib/actions/railway-bucket/stable-read-url.ts',
+      templatePath: 'actions/stable-read-url.ts'
+    },
+    {
+      outputPath: 'lib/actions/railway-bucket/get-client.ts',
+      templatePath: 'actions/get-client.ts'
+    },
     {
       outputPath: 'lib/actions/railway-bucket/provider.ts',
-      templatePath: 'actions/railway-bucket.ts'
+      templatePath: 'actions/provider.ts'
     }
   ],
   packageDependencies: ['@aws-sdk/client-s3', '@aws-sdk/s3-request-presigner'],

package/dist/assets/adapters/next/integrations/resend/actions/escape-html.ts

@@ -0,0 +1,8 @@
+export function escapeHtml(value: string): string {
+  return value
+    .replace(/&/g, '&')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;')
+    .replace(/'/g, '&#39;')
+}

package/dist/assets/adapters/next/integrations/resend/actions/get-env-value.ts

@@ -0,0 +1,4 @@
+export function getEnvValue(key: string): string | null {
+  const value = process.env[key]?.trim()
+  return value && value.length > 0 ? value : null
+}

package/dist/assets/adapters/next/integrations/resend/actions/get-from-address.ts

@@ -0,0 +1,5 @@
+import { getEnvValue } from '@admin/actions/resend/get-env-value'
+
+export function getFromAddress(): string | null {
+  return getEnvValue('BETTERSTART_EMAIL_FROM')
+}

package/dist/assets/adapters/next/integrations/resend/actions/get-resend-client.ts

@@ -0,0 +1,19 @@
+import { getEnvValue } from '@admin/actions/resend/get-env-value'
+import { Resend } from 'resend'
+
+let cachedClient: Resend | null = null
+let cachedApiKey: string | null = null
+
+export function getResendClient(): Resend | null {
+  const apiKey = getEnvValue('BETTERSTART_RESEND_API_KEY')
+  if (!apiKey) {
+    return null
+  }
+
+  if (!cachedClient || cachedApiKey !== apiKey) {
+    cachedClient = new Resend(apiKey)
+    cachedApiKey = apiKey
+  }
+
+  return cachedClient
+}

package/dist/assets/adapters/next/integrations/resend/actions/html-to-text.ts

@@ -0,0 +1,16 @@
+export function htmlToText(html: string): string {
+  return html
+    .replace(/<style[\s\S]*?<\/style>/gi, '')
+    .replace(/<script[\s\S]*?<\/script>/gi, '')
+    .replace(/<br\s*\/?>/gi, '\n')
+    .replace(/<\/(p|div|h[1-6]|li|tr)>/gi, '\n')
+    .replace(/<[^>]+>/g, '')
+    .replace(/&nbsp;/g, ' ')
+    .replace(/&amp;/g, '&')
+    .replace(/&lt;/g, '<')
+    .replace(/&gt;/g, '>')
+    .replace(/&quot;/g, '"')
+    .replace(/&#39;/g, "'")
+    .replace(/\n{3,}/g, '\n\n')
+    .trim()
+}

package/dist/assets/adapters/next/integrations/resend/actions/is-configured.ts

@@ -0,0 +1,6 @@
+import { getFromAddress } from '@admin/actions/resend/get-from-address'
+import { getResendClient } from '@admin/actions/resend/get-resend-client'
+
+export function isConfigured(): boolean {
+  return Boolean(getResendClient() && getFromAddress())
+}

package/dist/assets/adapters/next/integrations/resend/actions/provider.ts

@@ -0,0 +1,17 @@
+import type { AdminEmailProvider } from '@admin/actions/email/types'
+import { isConfigured } from '@admin/actions/resend/is-configured'
+import { renderPasswordResetEmail } from '@admin/actions/resend/render-password-reset-email'
+import { sendEmail } from '@admin/actions/resend/send-email'
+
+export const resendEmailProvider: AdminEmailProvider = {
+  id: 'resend',
+  isConfigured,
+  sendEmail,
+  async sendPasswordResetEmail(input) {
+    return sendEmail({
+      to: input.user.email,
+      subject: 'Reset your password',
+      html: renderPasswordResetEmail(input)
+    })
+  }
+}

package/dist/assets/adapters/next/integrations/resend/actions/render-password-reset-email.ts

@@ -0,0 +1,25 @@
+import type { PasswordResetEmailInput } from '@admin/actions/email/types'
+import { escapeHtml } from '@admin/actions/resend/escape-html'
+
+export function renderPasswordResetEmail(input: PasswordResetEmailInput): string {
+  const displayName = input.user.name?.trim() || input.user.email
+  const escapedName = escapeHtml(displayName)
+  const escapedUrl = escapeHtml(input.url)
+
+  return `<!doctype html>
+<html>
+  <body style="margin:0;background:#f8fafc;font-family:Inter,-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,sans-serif;color:#0f172a;">
+    <div style="margin:0 auto;max-width:560px;padding:40px 20px;">
+      <div style="border-radius:12px;background:#ffffff;padding:32px;border:1px solid #e2e8f0;">
+        <h1 style="margin:0 0 16px;font-size:24px;line-height:32px;">Reset your password</h1>
+        <p style="margin:0 0 16px;font-size:16px;line-height:24px;">Hi ${escapedName},</p>
+        <p style="margin:0 0 24px;font-size:16px;line-height:24px;">Use the button below to reset your BetterStart Admin password.</p>
+        <p style="margin:0 0 24px;">
+          <a href="${escapedUrl}" style="display:inline-block;border-radius:8px;background:#0f172a;color:#ffffff;padding:12px 18px;text-decoration:none;font-weight:600;">Reset password</a>
+        </p>
+        <p style="margin:0;color:#64748b;font-size:14px;line-height:20px;">If you did not request this email, you can safely ignore it.</p>
+      </div>
+    </div>
+  </body>
+</html>`
+}

package/dist/assets/adapters/next/integrations/resend/actions/send-email.ts

@@ -0,0 +1,43 @@
+import type { SendEmailInput, SendEmailResult } from '@admin/actions/email/types'
+import { getFromAddress } from '@admin/actions/resend/get-from-address'
+import { getResendClient } from '@admin/actions/resend/get-resend-client'
+import { htmlToText } from '@admin/actions/resend/html-to-text'
+
+const NOT_CONFIGURED_REASON =
+  'Resend email delivery requires BETTERSTART_RESEND_API_KEY and BETTERSTART_EMAIL_FROM.'
+
+export async function sendEmail(input: SendEmailInput): Promise<SendEmailResult> {
+  const client = getResendClient()
+  const from = getFromAddress()
+
+  if (!client || !from) {
+    return {
+      delivered: false,
+      reason: NOT_CONFIGURED_REASON
+    }
+  }
+
+  try {
+    const result = await client.emails.send({
+      from,
+      to: input.to,
+      subject: input.subject,
+      html: input.html,
+      text: htmlToText(input.html)
+    })
+
+    if (result.error) {
+      return {
+        delivered: false,
+        reason: result.error.message
+      }
+    }
+
+    return { delivered: true }
+  } catch (error) {
+    return {
+      delivered: false,
+      reason: error instanceof Error ? error.message : 'Resend email delivery failed.'
+    }
+  }
+}

package/dist/assets/adapters/next/integrations/resend/integration.ts

@@ -9,9 +9,41 @@ export const resendIntegration: BetterstartIntegrationDefinition = {
   dependencies: [],
   conflicts: [],
   files: [
+    {
+      outputPath: 'lib/actions/resend/get-env-value.ts',
+      templatePath: 'actions/get-env-value.ts'
+    },
+    {
+      outputPath: 'lib/actions/resend/get-from-address.ts',
+      templatePath: 'actions/get-from-address.ts'
+    },
+    {
+      outputPath: 'lib/actions/resend/get-resend-client.ts',
+      templatePath: 'actions/get-resend-client.ts'
+    },
+    {
+      outputPath: 'lib/actions/resend/is-configured.ts',
+      templatePath: 'actions/is-configured.ts'
+    },
+    {
+      outputPath: 'lib/actions/resend/html-to-text.ts',
+      templatePath: 'actions/html-to-text.ts'
+    },
+    {
+      outputPath: 'lib/actions/resend/send-email.ts',
+      templatePath: 'actions/send-email.ts'
+    },
+    {
+      outputPath: 'lib/actions/resend/escape-html.ts',
+      templatePath: 'actions/escape-html.ts'
+    },
+    {
+      outputPath: 'lib/actions/resend/render-password-reset-email.ts',
+      templatePath: 'actions/render-password-reset-email.ts'
+    },
     {
       outputPath: 'lib/actions/resend/provider.ts',
-      templatePath: 'actions/resend.ts'
+      templatePath: 'actions/provider.ts'
     }
   ],
   packageDependencies: ['resend'],

package/dist/assets/adapters/next/integrations/vercel-blob/actions/get-token.ts

@@ -0,0 +1,3 @@
+export function getToken(): string {
+  return process.env.BLOB_READ_WRITE_TOKEN?.trim() ?? ''
+}

package/dist/assets/adapters/next/integrations/vercel-blob/actions/{vercel-blob.ts → provider.ts}

@@ -1,11 +1,8 @@
 import type { AdminStorageProvider, AdminStorageUploadInput } from '@admin/actions/storage/types'
 import { buildStorageObjectKey } from '@admin/actions/storage/object-key'
+import { getToken } from '@admin/actions/vercel-blob/get-token'
 import { put } from '@vercel/blob'
 
-function getToken(): string {
-  return process.env.BLOB_READ_WRITE_TOKEN?.trim() ?? ''
-}
-
 export const vercelBlobStorageProvider: AdminStorageProvider = {
   id: 'vercel-blob',
   isConfigured() {

package/dist/assets/adapters/next/integrations/vercel-blob/integration.ts

@@ -9,13 +9,21 @@ export const vercelBlobIntegration: BetterstartIntegrationDefinition = {
   dependencies: [],
   conflicts: ['r2', 'railway-bucket'],
   files: [
+    {
+      outputPath: 'lib/actions/storage/sanitize-filename.ts',
+      templatePath: '../_shared/actions/sanitize-filename.ts'
+    },
     {
       outputPath: 'lib/actions/storage/object-key.ts',
       templatePath: '../_shared/actions/object-key.ts'
     },
+    {
+      outputPath: 'lib/actions/vercel-blob/get-token.ts',
+      templatePath: 'actions/get-token.ts'
+    },
     {
       outputPath: 'lib/actions/vercel-blob/provider.ts',
-      templatePath: 'actions/vercel-blob.ts'
+      templatePath: 'actions/provider.ts'
     }
   ],
   packageDependencies: ['@vercel/blob'],

package/dist/assets/adapters/next/templates/init/api/storage-read-route.ts

@@ -1,25 +1,13 @@
 import type { NextRequest } from 'next/server'
 import { getStorageProvider } from '@admin/actions/storage/provider'
+import { decodeStorageKey } from '@admin/utils/storage/decode-storage-key'
+import { storageError } from '@admin/utils/storage/storage-error'
 import { NextResponse } from 'next/server'
 
 type SignedReadStorageProvider = ReturnType<typeof getStorageProvider> & {
   createReadUrl?: (storageKey: string) => Promise<string>
 }
 
-function decodeStorageKey(encodedKey: string): string | undefined {
-  try {
-    const key = Buffer.from(encodedKey, 'base64url').toString('utf-8')
-    const canonicalKey = Buffer.from(key, 'utf-8').toString('base64url')
-    return key && canonicalKey === encodedKey ? key : undefined
-  } catch {
-    return undefined
-  }
-}
-
-function storageError(error: string, status: number) {
-  return NextResponse.json({ error }, { status })
-}
-
 export async function GET(request: NextRequest) {
   const encodedKey = request.nextUrl.pathname.split('/').filter(Boolean).at(-1)
   const key = encodedKey ? decodeStorageKey(encodedKey) : undefined

package/dist/assets/adapters/next/templates/init/api/upload-route.ts

@@ -1,15 +1,17 @@
 import type { UploadedFile } from '@admin/types'
 import type { NextRequest } from 'next/server'
-import { getAuditRequestMetadata } from '@admin/actions/audit/request-metadata'
+import { getAuditRequestMetadata } from '@admin/actions/audit/get-audit-request-metadata'
 import { mediaCacheTags } from '@admin/actions/media/types'
 import { saveUpload } from '@admin/actions/storage'
 import { requireRole, UserRole } from '@admin/auth/middleware'
 import db from '@admin/db'
 import { adminMedia } from '@admin/db/schema'
 import { runAdminEventHooks } from '@admin/lib/lifecycle-hooks'
-import { getTouchedFieldNames } from '@admin/utils/audit/audit'
-import { mapMediaRow, selectMedia } from '@admin/utils/media/query'
-import { validateFiles } from '@admin/utils/validation/validation'
+import { getTouchedFieldNames } from '@admin/utils/audit/get-touched-field-names'
+import { toActionError } from '@admin/utils/error/to-action-error'
+import { mapMediaRow } from '@admin/utils/media/map-media-row'
+import { selectMedia } from '@admin/utils/media/select-media'
+import { validateFiles } from '@admin/utils/validation/validate-files'
 import { eq } from 'drizzle-orm'
 import { revalidateTag } from 'next/cache'
 import { NextResponse } from 'next/server'
@@ -151,7 +153,7 @@ export async function POST(request: NextRequest) {
 
     return NextResponse.json({ success: true, files: uploadedFiles })
   } catch (error) {
-    const message = error instanceof Error ? error.message : 'Failed to upload files'
+    const message = toActionError(error, 'Failed to upload files')
     return NextResponse.json({ success: false, error: message }, { status: 500 })
   }
 }

package/dist/assets/adapters/next/templates/init/components/layouts/admin-settings-sidebar.tsx

@@ -23,12 +23,12 @@ const settingsNav = [
         exact: true
       },
       {
-        label: 'Webhook endpoints',
+        label: 'Webhooks',
         href: '/admin/settings/webhooks',
         exact: true
       },
       {
-        label: 'Webhook logs',
+        label: 'Deliveries',
         href: '/admin/settings/webhooks/logs',
         exact: true
       }

package/dist/assets/adapters/next/templates/init/components/layouts/admin-sign-out.tsx

@@ -1,8 +1,10 @@
 'use client'
 
+import * as React from 'react'
 import { signOut } from '@admin/auth/client'
 import { Button } from '@admin/components/ui/button'
 import { DropdownMenuItem } from '@admin/components/ui/dropdown-menu'
+import { Spinner } from '@admin/components/ui/spinner'
 import { cn } from '@admin/utils/shared/cn'
 import { LogOut } from 'lucide-react'
 import { useRouter } from 'next/navigation'
@@ -15,10 +17,13 @@ export function AdminSignOut({
   mode?: 'menu-item' | 'button'
 }) {
   const router = useRouter()
+  const [isPending, startTransition] = React.useTransition()
 
-  async function handleSignOut() {
-    await signOut()
-    router.push('/admin/login')
+  function handleSignOut() {
+    startTransition(async () => {
+      await signOut()
+      router.push('/admin/login')
+    })
   }
 
   if (mode === 'button') {
@@ -27,18 +32,32 @@ export function AdminSignOut({
         type="button"
         variant="ghost"
         onClick={handleSignOut}
+        disabled={isPending}
+        aria-busy={isPending}
         className={cn('justify-between', className)}
       >
-        <span>Log Out</span>
-        <LogOut strokeWidth={1.2} className="size-4" />
+        <span>{isPending ? 'Signing out…' : 'Sign out'}</span>
+        {isPending ? (
+          <Spinner className="size-4" />
+        ) : (
+          <LogOut strokeWidth={1.2} className="size-4" />
+        )}
       </Button>
     )
   }
 
   return (
-    <DropdownMenuItem onClick={handleSignOut} className={className}>
-      <span>Log Out</span>
-      <LogOut strokeWidth={1.2} className="size-4" />
+    <DropdownMenuItem
+      onSelect={(event) => {
+        event.preventDefault()
+        handleSignOut()
+      }}
+      disabled={isPending}
+      aria-busy={isPending}
+      className={className}
+    >
+      <span>{isPending ? 'Signing out…' : 'Sign out'}</span>
+      {isPending ? <Spinner className="size-4" /> : <LogOut strokeWidth={1.2} className="size-4" />}
     </DropdownMenuItem>
   )
 }

package/dist/assets/adapters/next/templates/init/components/shared/data-table/data-table.tsx

@@ -186,7 +186,9 @@ export function DataTable<TData extends RowData, TValue>({
                 className="flex h-24 items-center justify-center text-center"
                 style={{ gridColumn: '1 / -1' }}
               >
-                <div className="text-destructive">Error: {error.message}</div>
+                <div className="text-destructive">
+                  Failed to load these results. Refresh to try again.
+                </div>
               </DataGridCell>
             </DataGridRow>
           ) : table.getRowModel().rows?.length ? (

package/dist/assets/adapters/next/templates/init/components/shared/delete-dialog.tsx

@@ -46,7 +46,7 @@ export function DeleteDialog({
             Delete {count} {label}?
           </AlertDialogTitle>
           <AlertDialogDescription>
-            This will permanently delete {targetLabel}. This action cannot be undone.
+            This permanently deletes {targetLabel} and cannot be undone.
           </AlertDialogDescription>
         </AlertDialogHeader>
         <AlertDialogFooter>
@@ -57,8 +57,9 @@ export function DeleteDialog({
               onConfirm()
             }}
             disabled={isPending}
+            aria-busy={isPending}
           >
-            {isPending ? 'Deleting...' : 'Delete'}
+            {isPending ? 'Deleting…' : `Delete ${count} ${label}`}
           </AlertDialogAction>
         </AlertDialogFooter>
       </AlertDialogContent>