betterstart-cli 0.0.28 → 0.0.29

package/dist/cli.js

@@ -1410,16 +1410,29 @@ import path9 from "path";
 var PG_SSL_WARNING_START = "Warning: SECURITY WARNING: The SSL modes 'prefer', 'require', and 'verify-ca' are treated as aliases for 'verify-full'.";
 var PG_SSL_WARNING_END = "See https://www.postgresql.org/docs/current/libpq-ssl.html for libpq SSL mode definitions.";
 var NODE_TRACE_WARNING_HINT = "(Use `node --trace-warnings";
-var DRIZZLE_CONFIG_BANNER_PATTERNS = [
+var DRIZZLE_NOISE_PATTERNS = [
   /^No config path provided, using default 'drizzle\.config\.ts'$/,
   /^Reading config file '.+drizzle\.config\.ts'$/,
-  /^Using 'pg' driver for database querying$/
+  /^Using 'pg' driver for database querying$/,
+  /^\[.\] Pulling schema from database\.\.\.$/u,
+  /^\[.\] Changes applied$/u
 ];
-function resolveDrizzlePushStdio(inheritStdio) {
-  return inheritStdio ? "inherit" : "pipe";
+var SUPPRESSIBLE_LINE_STARTS = [
+  "No config path provided",
+  "Reading config file '",
+  "Using 'pg' driver",
+  "(node:",
+  "["
+];
+var ANSI_ESCAPE_PATTERN = /\u001B\[[0-9;]*[A-Za-z]/g;
+function resolveDrizzlePushStdio(interactive) {
+  return interactive ? ["inherit", "pipe", "pipe"] : "pipe";
+}
+function stripAnsi(text7) {
+  return text7.replace(ANSI_ESCAPE_PATTERN, "").replaceAll("\r", "");
 }
-function shouldSuppressWarningLine(line, state) {
-  const text7 = line.trimEnd();
+function shouldSuppressOutputLine(line, state) {
+  const text7 = stripAnsi(line).trim();
   if (state.suppressNextTraceHint) {
     state.suppressNextTraceHint = false;
     if (text7.startsWith(NODE_TRACE_WARNING_HINT)) {
@@ -1437,20 +1450,20 @@ function shouldSuppressWarningLine(line, state) {
     }
     return true;
   }
-  return false;
-}
-function shouldSuppressDrizzleConfigBannerLine(line) {
-  const text7 = line.trim();
-  return DRIZZLE_CONFIG_BANNER_PATTERNS.some((pattern) => pattern.test(text7));
+  return DRIZZLE_NOISE_PATTERNS.some((pattern) => pattern.test(text7));
 }
-function shouldSuppressOutputLine(line, state) {
-  return shouldSuppressWarningLine(line, state) || shouldSuppressDrizzleConfigBannerLine(line);
-}
-function filterWarningLines(output, state) {
+function filterNoiseLines(output, state) {
   const lines = output.match(/[^\n]*\n|[^\n]+/g) ?? [];
   return lines.filter((line) => !shouldSuppressOutputLine(line, state)).join("");
 }
-function createPgConnectionStringSslWarningFilter(write) {
+function couldBecomeSuppressible(partial, state) {
+  if (state.suppressingPgSslWarning || state.suppressNextTraceHint) {
+    return true;
+  }
+  const text7 = stripAnsi(partial);
+  return SUPPRESSIBLE_LINE_STARTS.some((start) => text7.startsWith(start) || start.startsWith(text7));
+}
+function createDrizzleNoiseFilter(forward) {
   const state = {
     suppressingPgSslWarning: false,
     suppressNextTraceHint: false
@@ -1460,24 +1473,27 @@ function createPgConnectionStringSslWarningFilter(write) {
     write(chunk) {
       buffer += chunk;
       const lastNewlineIndex = buffer.lastIndexOf("\n");
-      if (lastNewlineIndex === -1) {
-        return;
+      if (lastNewlineIndex !== -1) {
+        const complete = buffer.slice(0, lastNewlineIndex + 1);
+        buffer = buffer.slice(lastNewlineIndex + 1);
+        const filtered = filterNoiseLines(complete, state);
+        if (filtered) {
+          forward(filtered);
+        }
       }
-      const complete = buffer.slice(0, lastNewlineIndex + 1);
-      buffer = buffer.slice(lastNewlineIndex + 1);
-      const filtered = filterWarningLines(complete, state);
-      if (filtered) {
-        write(filtered);
+      if (buffer && !couldBecomeSuppressible(buffer, state)) {
+        forward(buffer);
+        buffer = "";
       }
     },
     end() {
       if (!buffer) {
         return;
       }
-      const filtered = filterWarningLines(buffer, state);
+      const filtered = filterNoiseLines(buffer, state);
       buffer = "";
       if (filtered) {
-        write(filtered);
+        forward(filtered);
       }
     }
   };
@@ -1487,20 +1503,20 @@ function runDrizzlePush(cwd, options = {}) {
     const drizzleBin = path9.join(cwd, "node_modules", ".bin", "drizzle-kit");
     const child = spawn2(drizzleBin, ["push", "--force"], {
       cwd,
-      stdio: resolveDrizzlePushStdio(options.inheritStdio),
+      stdio: resolveDrizzlePushStdio(options.interactive),
       env: { ...process.env }
     });
     let stdout = "";
     let stderr = "";
-    const stderrFilter = createPgConnectionStringSslWarningFilter((chunk) => {
-      if (options.inheritStdio) {
+    const stderrFilter = createDrizzleNoiseFilter((chunk) => {
+      if (options.interactive) {
         process.stderr.write(chunk);
         return;
       }
       stderr += chunk;
     });
-    const stdoutFilter = createPgConnectionStringSslWarningFilter((chunk) => {
-      if (options.inheritStdio) {
+    const stdoutFilter = createDrizzleNoiseFilter((chunk) => {
+      if (options.interactive) {
         process.stdout.write(chunk);
         return;
       }
@@ -1515,7 +1531,7 @@ function runDrizzlePush(cwd, options = {}) {
     child.on("close", (code, signal) => {
       stdoutFilter.end();
       stderrFilter.end();
-      if (options.inheritStdio) {
+      if (options.interactive) {
         if (code === 0) {
           resolve({ success: true, error: null });
           return;
@@ -1733,7 +1749,7 @@ async function runPostGenerate(cwd, schemaName, options = {}) {
     } else {
       console.log("\n  Running drizzle-kit push...");
       try {
-        const pushResult = await runDrizzlePush(cwd, { inheritStdio: true });
+        const pushResult = await runDrizzlePush(cwd, { interactive: true });
         if (!pushResult.success) {
           throw new Error(pushResult.error ?? "drizzle-kit push failed");
         }
@@ -2856,6 +2872,8 @@ function resolveProjectPaths(config) {
   const adminTypesDir = path14.posix.join(adminDir, "types");
   const adminNavigationFile = path14.posix.join(adminDir, "data", "navigation.ts");
   const adminNavigationDir = path14.posix.join(adminDir, "data", "navigation");
+  const adminWebhookEventsFile = path14.posix.join(adminDir, "data", "webhook-events.ts");
+  const adminWebhookEventsDir = path14.posix.join(adminDir, "data", "webhook-events");
   const adminActionsDir = path14.posix.join(adminDir, "lib", "actions");
   return {
     adminDir,
@@ -2872,6 +2890,8 @@ function resolveProjectPaths(config) {
     adminTypesNavigationFile: path14.posix.join(adminTypesDir, "navigation.ts"),
     adminNavigationFile,
     adminNavigationDir,
+    adminWebhookEventsFile,
+    adminWebhookEventsDir,
     adminActionsDir,
     adminEmailTemplatesDir: path14.posix.join(adminDir, "components", "email-templates"),
     adminHooksDir: path14.posix.join(adminDir, "hooks")
@@ -6322,6 +6342,22 @@ function lifecycleHookContextExample(event, schemaName, input, data, schemaType
   if (schemaType === "form") {
     context.schemaType = "form";
   }
+  if (event === "beforeRestore" || event === "afterRestore") {
+    context.entityId = SAMPLE_UUID;
+    context.changedFields = [];
+    context.metadata = { restoredFromVersion: 2 };
+    if (phase === "after") {
+      context.data = data;
+    }
+    return createExample("Context", context);
+  }
+  if (event === "beforeReorder" || event === "afterReorder") {
+    context.changedFields = ["sortOrder"];
+    if (phase === "after") {
+      context.data = { order: [{ id: SAMPLE_UUID, sortOrder: 0 }] };
+    }
+    return createExample("Context", context);
+  }
   if (event !== "beforeCreate" && event !== "afterCreate") {
     context.entityId = SAMPLE_UUID;
   }
@@ -6348,7 +6384,11 @@ function buildEntityDevModeLifecycleHooks(schema, adminImportAlias) {
     "beforeUpdate",
     "afterUpdate",
     "beforeDelete",
-    "afterDelete"
+    "afterDelete",
+    "beforeRestore",
+    "afterRestore",
+    "beforeReorder",
+    "afterReorder"
   ];
   if (schema.actions?.draft === true) {
     events.push("beforePublish", "afterPublish", "beforeUnpublish", "afterUnpublish");
@@ -6896,7 +6936,7 @@ function generatePageSkeleton(pascal, label) {
   return `export function ${pascal}SubmissionsPageSkeleton() {
   return (
     <div className="flex items-center justify-center h-48">
-      <div className="text-muted-foreground">Loading ${label}...</div>
+      <div className="text-muted-foreground">Loading ${label}\u2026</div>
     </div>
   )
 }
@@ -7059,7 +7099,7 @@ ${deleteTransition}${bulkDeleteHandler}
           <div className="flex items-center gap-1">
             <${devModeIntegrateButtonExportName} initialSettings={initialSettings} />${exportButton}
             <Button variant="outline" asChild>
-              <Link href="${adminRoutePath}/forms/${kebab}/settings">
+              <Link href="${adminRoutePath}/settings/forms">
                 <Settings className="size-3.5" />
                 Settings
               </Link>
@@ -7105,199 +7145,6 @@ ${bulkDeleteActions}
 `;
 }
 
-// adapters/next/generators/form-admin/admin-settings-page.ts
-function generateSettingsPage(pascal, kebab) {
-  return `import { getFormSettings } from '@admin/actions/forms'
-import { ${pascal}SettingsPageContent } from './settings-page-content'
-
-export default async function ${pascal}SettingsPage() {
-  const settings = await getFormSettings('${kebab}')
-
-  return <${pascal}SettingsPageContent initialSettings={settings} />
-}
-`;
-}
-function generateSettingsPageContent(pascal, kebab, label) {
-  return `'use client'
-
-import {
-  testFormWebhook,
-  type FormSettingsData,
-  upsertFormSettings,
-} from '@admin/actions/forms'
-import { PageHeader } from '@admin/components/shared/page-header'
-import { Button } from '@admin/components/ui/button'
-import {
-  Form,
-  FormControl,
-  FormDescription,
-  FormField,
-  FormItem,
-  FormLabel,
-} from '@admin/components/ui/form'
-import { Input } from '@admin/components/ui/input'
-import { Switch } from '@admin/components/ui/switch'
-import { Textarea } from '@admin/components/ui/textarea'
-import { LoaderCircle } from 'lucide-react'
-import * as React from 'react'
-import { useForm } from 'react-hook-form'
-import { toast } from 'sonner'
-
-interface ${pascal}SettingsPageContentProps {
-  initialSettings: FormSettingsData | null
-}
-
-interface ${pascal}SettingsFormValues {
-  notificationEmails: string
-  webhookUrl: string
-  webhookEnabled: boolean
-}
-
-export function ${pascal}SettingsPageContent({
-  initialSettings,
-}: ${pascal}SettingsPageContentProps) {
-  const form = useForm<${pascal}SettingsFormValues>({
-    defaultValues: {
-      notificationEmails: initialSettings?.notificationEmails ?? '',
-      webhookUrl: initialSettings?.webhookUrl ?? '',
-      webhookEnabled: initialSettings?.webhookEnabled ?? false,
-    },
-  })
-  const [isSaving, startSaveTransition] = React.useTransition()
-  const [isTesting, startTestTransition] = React.useTransition()
-  const webhookUrl = form.watch('webhookUrl')
-  const webhookEnabled = form.watch('webhookEnabled')
-
-  const handleSave = (values: ${pascal}SettingsFormValues) => {
-    startSaveTransition(async () => {
-      const result = await upsertFormSettings('${kebab}', {
-        notificationEmails: values.notificationEmails || null,
-        webhookUrl: values.webhookUrl || null,
-        webhookEnabled: values.webhookEnabled,
-      })
-      if (result.success) {
-        toast.success('Settings saved successfully')
-      } else {
-        toast.error(result.error || 'Failed to save settings')
-      }
-    })
-  }
-
-  const handleTestWebhook = () => {
-    startTestTransition(async () => {
-      const result = await testFormWebhook('${kebab}')
-      if (result.success) {
-        toast.success('Test webhook sent successfully')
-      } else {
-        toast.error(result.error || 'Failed to send test webhook')
-      }
-    })
-  }
-
-  return (
-    <>
-      <PageHeader title="${label} Settings" />
-      <Form {...form}>
-        <form
-          onSubmit={form.handleSubmit(handleSave)}
-          className="space-y-6 rounded-sm border p-6 mx-6 mt-6"
-        >
-          <FormField
-            control={form.control}
-            name="notificationEmails"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>Notification Emails</FormLabel>
-                <FormControl>
-                  <Textarea
-                    placeholder="email@example.com, another@example.com"
-                    rows={3}
-                    {...field}
-                  />
-                </FormControl>
-                <FormDescription>
-                  Comma-separated list of email addresses to notify on new submissions.
-                </FormDescription>
-              </FormItem>
-            )}
-          />
-
-          <div className="space-y-4 border-t pt-6">
-            <FormField
-              control={form.control}
-              name="webhookUrl"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>Webhook URL</FormLabel>
-                  <FormControl>
-                    <Input
-                      type="url"
-                      placeholder="https://hooks.example.com/endpoint"
-                      {...field}
-                    />
-                  </FormControl>
-                  <FormDescription>
-                    Receive a POST request with form data on each submission.
-                  </FormDescription>
-                </FormItem>
-              )}
-            />
-
-            <FormField
-              control={form.control}
-              name="webhookEnabled"
-              render={({ field }) => (
-                <FormItem className="flex flex-row items-center space-x-2 space-y-0">
-                  <FormControl>
-                    <Switch
-                      checked={field.value}
-                      onCheckedChange={field.onChange}
-                    />
-                  </FormControl>
-                  <FormLabel>Enable Webhook</FormLabel>
-                </FormItem>
-              )}
-            />
-
-            {webhookUrl && webhookEnabled && (
-              <Button
-                type="button"
-                variant="outline"
-                onClick={handleTestWebhook}
-                disabled={isTesting}
-              >
-                {isTesting ? (
-                  <>
-                    <LoaderCircle className="animate-spin" />
-                    Sending...
-                  </>
-                ) : (
-                  'Test Webhook'
-                )}
-              </Button>
-            )}
-          </div>
-
-          <div className="border-t pt-6">
-            <Button type="submit" disabled={isSaving}>
-              {isSaving ? (
-                <>
-                  <LoaderCircle className="animate-spin" />
-                  Saving...
-                </>
-              ) : (
-                'Save Settings'
-              )}
-            </Button>
-          </div>
-        </form>
-      </Form>
-    </>
-  )
-}
-`;
-}
-
 // adapters/next/generators/form-admin/admin-submission-drawer.ts
 function generateSubmissionDrawer(pascal, kebab, fields, label, includeDynamic, _actionImportPath) {
   const fieldItems = fields.filter((f) => f.name).map((f) => {
@@ -7428,7 +7275,7 @@ export function ${pascal}SubmissionDrawer({
         </DrawerHeader>
         <ScrollArea className="min-h-0 flex-1">
           {isPending ? (
-            <div className="p-4 text-sm text-muted-foreground">Loading submission...</div>
+            <div className="p-4 text-sm text-muted-foreground">Loading submission\u2026</div>
           ) : error ? (
             <div className="p-4 text-sm text-destructive">
               Error loading submission: {error.message}
@@ -7468,7 +7315,6 @@ import {
   DataGridRow
 } from '@admin/components/shared/data-table/data-grid'
 import { DataTablePagination } from '@admin/components/shared/data-table/data-table-pagination'
-import { Card, CardContent } from '@admin/components/ui/card'
 import { use${pascal}Submissions } from '@admin/hooks/use-${kebab}-form'
 import { useTableUtils } from '@admin/hooks/use-table-utils'
 import {
@@ -7602,108 +7448,104 @@ export function ${pascal}SubmissionsTable<TValue>({
 
   return (
     <div className={cn("flex flex-col gap-6 pt-px pb-2 h-full", className)}>
-      <Card className="min-h-0 flex-1 p-0">
-        <CardContent ref={tableContainerRef} className="flex min-h-0 flex-1 flex-col p-0">
-          <DataGrid containerClassName="min-h-0 flex-1" gridTemplateColumns={gridTemplateColumns} style={{ width: table.getTotalSize() }}>
-          <DataGridHeader>
-            {table.getHeaderGroups().map((headerGroup) => (
-              <DataGridRow key={headerGroup.id}>
-                {headerGroup.headers.map((header, headerIndex) => {
-                  const meta = header.column.columnDef.meta as Record<string, unknown> | undefined
-                  const resizeLabel = typeof header.column.columnDef.header === 'string' ? header.column.columnDef.header : header.column.id
-                  const nextHeader = headerGroup.headers[headerIndex + 1]
-                  const canResizeColumn = header.column.getCanResize() && nextHeader?.column.getCanResize() === true
-                  return (
-                    <DataGridHead
-                      key={header.id}
-                      className={cn('group/resize-header relative overflow-hidden text-foreground', {
-                        'text-center': meta?.align === 'center',
-                        'text-right': meta?.align === 'right'
-                      })}
-                      data-column-id={header.column.id}
-                      onMouseEnter={() => setHoveredColumnId(header.column.id)}
-                      onMouseLeave={() => setHoveredColumnId((current) => (current === header.column.id ? null : current))}
-                    >
-                      {header.isPlaceholder
-                        ? null
-                        : flexRender(header.column.columnDef.header, header.getContext())}
-                      {canResizeColumn ? (
-                        <button
-                          type="button"
-                          aria-label={\`Resize \${resizeLabel} column\`}
-                          className="group/resize-handle absolute right-0 top-0 z-10 flex h-full w-5 cursor-col-resize touch-none select-none items-center justify-center text-muted-foreground opacity-0 transition-opacity hover:text-foreground focus-visible:text-foreground focus-visible:opacity-100 focus-visible:outline-none group-focus-within/resize-header:opacity-100 data-[column-hovered=true]:opacity-100 data-[resizing=true]:opacity-100"
-                          data-resize-handle
-                          data-column-hovered={hoveredColumnId === header.column.id ? 'true' : 'false'}
-                          data-resizing={header.column.getIsResizing() ? 'true' : 'false'}
-                          onDoubleClick={resetColumnSizingToContainer}
-                          onMouseDown={header.getResizeHandler()}
-                          onTouchStart={header.getResizeHandler()}
-                        >
-                          <GripVertical aria-hidden="true" className={cn('size-3.5', { 'text-ring': header.column.getIsResizing() })} />
-                        </button>
-                      ) : null}
-                    </DataGridHead>
-                  )
-                })}
-              </DataGridRow>
-            ))}
-          </DataGridHeader>
-          <DataGridBody>
-            {isPending ? (
-              <DataGridRow>
-                <DataGridCell className="flex h-24 items-center justify-center text-center" style={{ gridColumn: '1 / -1' }}>
-                  <div className="text-muted-foreground">Loading ${label} submissions...</div>
-                </DataGridCell>
-              </DataGridRow>
-            ) : error ? (
-              <DataGridRow>
-                <DataGridCell className="flex h-24 items-center justify-center text-center" style={{ gridColumn: '1 / -1' }}>
-                  <div className="text-destructive">Error loading ${label} submissions: {error.message}</div>
-                </DataGridCell>
-              </DataGridRow>
-            ) : table.getRowModel().rows?.length ? (
-              table.getRowModel().rows.map((row) => (
-                <DataGridRow
-                  key={row.id}
-                  data-state={row.getIsSelected() ? 'selected' : undefined}
-                  className="cursor-pointer hover:bg-muted/50"
-                  onClick={(e) => {
-                    const target = e.target as HTMLElement
-                    if (!e.currentTarget.contains(target)) return
-                    if (target.closest('button, a, input, [role="checkbox"]')) return
-                    onViewSubmission(row.original.id)
-                  }}
-                >
-                  {row.getVisibleCells().map((cell) => {
-                    const meta = cell.column.columnDef.meta as Record<string, unknown> | undefined
-                    return (
-                      <DataGridCell
-                        key={cell.id}
-                        className={cn({
-                          'text-center': meta?.align === 'center',
-                          'text-right': meta?.align === 'right'
-                        })}
-                        data-column-id={cell.column.id}
-                        onMouseEnter={() => setHoveredColumnId(cell.column.id)}
-                        onMouseLeave={() => setHoveredColumnId((current) => (current === cell.column.id ? null : current))}
-                      >
-                        {flexRender(cell.column.columnDef.cell, cell.getContext())}
-                      </DataGridCell>
-                    )
+      <DataGrid containerClassName="min-h-0 flex-1" containerRef={tableContainerRef} gridTemplateColumns={gridTemplateColumns} style={{ width: table.getTotalSize() }}>
+      <DataGridHeader>
+        {table.getHeaderGroups().map((headerGroup) => (
+          <DataGridRow key={headerGroup.id}>
+            {headerGroup.headers.map((header, headerIndex) => {
+              const meta = header.column.columnDef.meta as Record<string, unknown> | undefined
+              const resizeLabel = typeof header.column.columnDef.header === 'string' ? header.column.columnDef.header : header.column.id
+              const nextHeader = headerGroup.headers[headerIndex + 1]
+              const canResizeColumn = header.column.getCanResize() && nextHeader?.column.getCanResize() === true
+              return (
+                <DataGridHead
+                  key={header.id}
+                  className={cn('group/resize-header relative overflow-hidden', {
+                    'text-center': meta?.align === 'center',
+                    'text-right': meta?.align === 'right'
                   })}
-                </DataGridRow>
-              ))
-            ) : (
-              <DataGridRow>
-                <DataGridCell className="flex h-24 items-center justify-center text-center" style={{ gridColumn: '1 / -1' }}>
-                  No ${label} submissions found.
-                </DataGridCell>
-              </DataGridRow>
-            )}
-          </DataGridBody>
-          </DataGrid>
-        </CardContent>
-      </Card>
+                  data-column-id={header.column.id}
+                  onMouseEnter={() => setHoveredColumnId(header.column.id)}
+                  onMouseLeave={() => setHoveredColumnId((current) => (current === header.column.id ? null : current))}
+                >
+                  {header.isPlaceholder
+                    ? null
+                    : flexRender(header.column.columnDef.header, header.getContext())}
+                  {canResizeColumn ? (
+                    <button
+                      type="button"
+                      aria-label={\`Resize \${resizeLabel} column\`}
+                      className="group/resize-handle absolute right-0 top-0 z-10 flex h-full w-5 cursor-col-resize touch-none select-none items-center justify-center text-muted-foreground opacity-0 transition-opacity hover:text-foreground focus-visible:text-foreground focus-visible:opacity-100 focus-visible:outline-none group-focus-within/resize-header:opacity-100 data-[column-hovered=true]:opacity-100 data-[resizing=true]:opacity-100"
+                      data-resize-handle
+                      data-column-hovered={hoveredColumnId === header.column.id ? 'true' : 'false'}
+                      data-resizing={header.column.getIsResizing() ? 'true' : 'false'}
+                      onDoubleClick={resetColumnSizingToContainer}
+                      onMouseDown={header.getResizeHandler()}
+                      onTouchStart={header.getResizeHandler()}
+                    >
+                      <GripVertical aria-hidden="true" className={cn('size-3.5', { 'text-ring': header.column.getIsResizing() })} />
+                    </button>
+                  ) : null}
+                </DataGridHead>
+              )
+            })}
+          </DataGridRow>
+        ))}
+      </DataGridHeader>
+      <DataGridBody>
+        {isPending ? (
+          <DataGridRow>
+            <DataGridCell className="flex h-24 items-center justify-center text-center" style={{ gridColumn: '1 / -1' }}>
+              <div className="text-muted-foreground">Loading ${label} submissions\u2026</div>
+            </DataGridCell>
+          </DataGridRow>
+        ) : error ? (
+          <DataGridRow>
+            <DataGridCell className="flex h-24 items-center justify-center text-center" style={{ gridColumn: '1 / -1' }}>
+              <div className="text-destructive">Error loading ${label} submissions: {error.message}</div>
+            </DataGridCell>
+          </DataGridRow>
+        ) : table.getRowModel().rows?.length ? (
+          table.getRowModel().rows.map((row) => (
+            <DataGridRow
+              key={row.id}
+              data-state={row.getIsSelected() ? 'selected' : undefined}
+              className="cursor-pointer hover:bg-muted/50"
+              onClick={(e) => {
+                const target = e.target as HTMLElement
+                if (!e.currentTarget.contains(target)) return
+                if (target.closest('button, a, input, [role="checkbox"]')) return
+                onViewSubmission(row.original.id)
+              }}
+            >
+              {row.getVisibleCells().map((cell) => {
+                const meta = cell.column.columnDef.meta as Record<string, unknown> | undefined
+                return (
+                  <DataGridCell
+                    key={cell.id}
+                    className={cn({
+                      'text-center': meta?.align === 'center',
+                      'text-right': meta?.align === 'right'
+                    })}
+                    data-column-id={cell.column.id}
+                    onMouseEnter={() => setHoveredColumnId(cell.column.id)}
+                    onMouseLeave={() => setHoveredColumnId((current) => (current === cell.column.id ? null : current))}
+                  >
+                    {flexRender(cell.column.columnDef.cell, cell.getContext())}
+                  </DataGridCell>
+                )
+              })}
+            </DataGridRow>
+          ))
+        ) : (
+          <DataGridRow>
+            <DataGridCell className="flex h-24 items-center justify-center text-center" style={{ gridColumn: '1 / -1' }}>
+              No ${label} submissions found.
+            </DataGridCell>
+          </DataGridRow>
+        )}
+      </DataGridBody>
+      </DataGrid>
 
       {shouldShowPagination ? (
         <DataTablePagination
@@ -7812,14 +7654,6 @@ function generateFormAdminPages(schema, pagesDir, options) {
           hasDynamicFields(schema),
           actionImportPath
         )
-      ),
-      createGeneratedFile(
-        `${pagesDir}/forms/${kebab}/settings/page.tsx`,
-        generateSettingsPage(pascal, kebab)
-      ),
-      createGeneratedFile(
-        `${pagesDir}/forms/${kebab}/settings/settings-page-content.tsx`,
-        generateSettingsPageContent(pascal, kebab, schema.label)
       )
     ]
   };
@@ -8227,7 +8061,6 @@ import { ${tableName} } from '@admin/db/schema'
 import { getFormSettings } from '@admin/actions/forms'
 import { sendFormEmails } from '@admin/actions/email/form-delivery'
 import { getTouchedFieldNames } from '@admin/utils/audit/audit'
-import { sendWebhook } from '@admin/utils/webhook/webhook'
 import { ${cacheInvalidationFn} } from 'next/cache'
 ${mailchimpImport}
 import { CACHE_TAG, CACHE_TAG_BY_ID } from './types'
@@ -8268,16 +8101,7 @@ export async function create${pascal}Submission(
       submitterEmail: ${submitterEmailField ? `data.${submitterEmailField}` : "null"},
       submissionData: { ...data },
       submittedAt: created${pascal}Submission.submittedAt,
-    })
-
-    if (settings?.webhookEnabled && settings?.webhookUrl) {
-      sendWebhook(settings.webhookUrl, {
-        form_name: '${formName}',
-        submission_id: created${pascal}Submission.id,
-        ...data,
-        submitted_at: created${pascal}Submission.submittedAt,
-      })
-    }${mailchimpCall}
+    })${mailchimpCall}
 
     ${cacheInvalidationFn}(CACHE_TAG)
     ${cacheInvalidationFn}(CACHE_TAG_BY_ID(created${pascal}Submission.id))
@@ -8792,6 +8616,58 @@ function namespaceGeneratedFiles(files, namespace) {
   }));
 }
 
+// adapters/next/generators/webhook-events.ts
+var NO_WEBHOOK_SCHEMAS = /* @__PURE__ */ new Set(["settings"]);
+function renderExtract(schemaName, kind, label, events, settingsKey) {
+  const lines = [
+    `  schema: '${schemaName}'`,
+    `  kind: '${kind}'`,
+    `  label: ${JSON.stringify(label)}`,
+    `  events: [${events.map((event) => `'${event}'`).join(", ")}]`
+  ];
+  if (settingsKey) {
+    lines.push(`  settingsKey: '${settingsKey}'`);
+  }
+  return `import type { WebhookEventSource } from '@admin/types/webhooks'
+
+export const ${toCamelCase(schemaName)}WebhookEvents: WebhookEventSource = {
+${lines.join(",\n")}
+}
+`;
+}
+function updateWebhookEvents(schema, webhookEventsDir, kind) {
+  if (NO_WEBHOOK_SCHEMAS.has(schema.name)) {
+    return { files: [] };
+  }
+  const events = kind === "single" ? [`${schema.name}.updated`] : [
+    `${schema.name}.created`,
+    `${schema.name}.updated`,
+    `${schema.name}.deleted`,
+    ...schema.actions?.draft === true ? [`${schema.name}.published`, `${schema.name}.unpublished`] : [],
+    `${schema.name}.restored`,
+    `${schema.name}.reordered`
+  ];
+  return {
+    files: [
+      createGeneratedFile(
+        `${webhookEventsDir}/${schema.name}.ts`,
+        renderExtract(schema.name, kind, schema.label, events)
+      )
+    ]
+  };
+}
+function updateFormWebhookEvents(schema, webhookEventsDir) {
+  const kebabName = toKebabCase(schema.name);
+  return {
+    files: [
+      createGeneratedFile(
+        `${webhookEventsDir}/${schema.name}.ts`,
+        renderExtract(schema.name, "form", schema.label, [`form.${kebabName}.submitted`], kebabName)
+      )
+    ]
+  };
+}
+
 // adapters/next/generators/form-pipeline/pipeline.ts
 function runFormPipeline(schema, cwd, config, options = {}) {
   const paths = resolveProjectPaths(config);
@@ -8831,6 +8707,10 @@ function runFormPipeline(schema, cwd, config, options = {}) {
     {
       name: "Navigation",
       run: () => updateFormNavigation(schema, paths.adminNavigationDir, namespacedOptions).files
+    },
+    {
+      name: "Webhook events",
+      run: () => updateFormWebhookEvents(schema, paths.adminWebhookEventsDir).files
     }
   ];
   for (let i = 0; i < steps.length; i++) {
@@ -9839,6 +9719,13 @@ function buildRestoreManyToManyStatements(ctx) {
 }
 function genRestoreContent(ctx) {
   const kebabSingular = toKebabCase(ctx.singular);
+  const restoreContext = lifecycleContext(
+    ctx.plural,
+    `,
+      entityId: versionRow.entityId,
+      changedFields: [],
+      metadata: { restoredFromVersion: versionRow.version }`
+  );
   const snapshotImport = ctx.hasM2M ? `build${ctx.Singular}VersionSnapshotWithRelationships` : `build${ctx.Singular}VersionSnapshot`;
   const currentSnapshot = ctx.hasM2M ? `await build${ctx.Singular}VersionSnapshotWithRelationships(currentRow as unknown as ${ctx.Singular}, tx)` : `build${ctx.Singular}VersionSnapshot(currentRow as unknown as ${ctx.Singular})`;
   const dbImports = [
@@ -9864,6 +9751,7 @@ import {
   build${ctx.Singular}RestoreData,
   ${snapshotImport}
 } from './helpers'
+${lifecycleHookImport()}
 import type { ${ctx.Singular}UpdateResult, ${ctx.Singular} } from './types'
 
 export async function restore${ctx.Singular}Version(
@@ -9885,6 +9773,9 @@ export async function restore${ctx.Singular}Version(
 
     const versionData = versionRow.data as Record<string, unknown>
     const restoreData = build${ctx.Singular}RestoreData(versionData)
+    const auditRequestMetadata = await getAuditRequestMetadata()
+    const lifecycleContext = ${restoreContext}
+    ${beforeHook("beforeRestore", "lifecycleContext")}
 
     const result = await db.transaction(async (tx) => {
       const [currentRow] = await tx
@@ -9916,6 +9807,13 @@ ${restoreM2M}
     ${ctx.cacheInvalidationFn}(${ctx.camelPlural}CacheTags.byId(versionRow.entityId))
     ${ctx.cacheInvalidationFn}(entityVersionsCacheTags.for('${ctx.plural}', versionRow.entityId))
     const restored${ctx.Singular} = await get${ctx.Singular}ById(versionRow.entityId)
+    ${afterHook(
+    "afterRestore",
+    `{
+      ...lifecycleContext,
+      data: (restored${ctx.Singular} ?? result[0]) as unknown as Record<string, unknown>
+    }`
+  )}
 
     return {
       success: true,
@@ -10128,14 +10026,20 @@ export async function delete${ctx.Singular}(id: string): Promise<${ctx.Singular}
   ${beforeHook("beforeDelete", "lifecycleContext")}
 
   try {
-    await db.transaction(async (tx) => {
+    const [deletedRow] = await db.transaction(async (tx) => {
       await deleteEntityVersions(tx, '${ctx.plural}', [id])
-      await tx.delete(${ctx.tableVar}).where(eq(${ctx.tableVar}.id, id))
+      return tx.delete(${ctx.tableVar}).where(eq(${ctx.tableVar}.id, id)).returning()
     })
     ${ctx.cacheInvalidationFn}(${ctx.camelPlural}CacheTags.all)
     ${ctx.cacheInvalidationFn}(${ctx.camelPlural}CacheTags.byId(id))
     ${ctx.cacheInvalidationFn}(entityVersionsCacheTags.for('${ctx.plural}', id))
-    ${afterHook("afterDelete", "lifecycleContext")}
+    ${afterHook(
+    "afterDelete",
+    `{
+      ...lifecycleContext,
+      data: deletedRow as unknown as Record<string, unknown> | undefined
+    }`
+  )}
     return { success: true }
   } catch (error) {
     console.error('Error deleting ${ctx.singular}:', error)
@@ -10179,17 +10083,26 @@ export async function deleteBulk${ctx.Plural}(ids: string[]): Promise<${ctx.Sing
   }
 
   try {
-    await db.transaction(async (tx) => {
+    const deletedRows = await db.transaction(async (tx) => {
       await deleteEntityVersions(tx, '${ctx.plural}', ids)
-      await tx.delete(${ctx.tableVar}).where(inArray(${ctx.tableVar}.id, ids))
+      return tx.delete(${ctx.tableVar}).where(inArray(${ctx.tableVar}.id, ids)).returning()
     })
+    const deletedRowsById = new Map(
+      deletedRows.map((row) => [row.id, row as unknown as Record<string, unknown>])
+    )
     ${ctx.cacheInvalidationFn}(${ctx.camelPlural}CacheTags.all)
     for (const id of ids) {
       ${ctx.cacheInvalidationFn}(${ctx.camelPlural}CacheTags.byId(id))
       ${ctx.cacheInvalidationFn}(entityVersionsCacheTags.for('${ctx.plural}', id))
     }
     for (const lifecycleContext of lifecycleContexts) {
-      ${afterHook("afterDelete", "lifecycleContext")}
+      ${afterHook(
+    "afterDelete",
+    `{
+        ...lifecycleContext,
+        data: deletedRowsById.get(lifecycleContext.entityId)
+      }`
+  )}
     }
     return { success: true }
   } catch (error) {
@@ -10200,6 +10113,8 @@ export async function deleteBulk${ctx.Plural}(ids: string[]): Promise<${ctx.Sing
 `;
 }
 function genBulkSortOrderContent(ctx) {
+  const reorderContext = lifecycleContext(ctx.plural, `,
+      changedFields: ['sortOrder']`);
   return `'use server'
 
 import db from '@admin/db'
@@ -10208,15 +10123,20 @@ import { ${ctx.tableVar} } from '@admin/db/schema'
 import { asc, eq, notInArray } from 'drizzle-orm'
 import { ${ctx.cacheInvalidationFn} } from 'next/cache'
 import { ${ctx.camelPlural}CacheTags } from './types'
+${lifecycleHookImport()}
 
 export async function bulkUpdate${ctx.Plural}SortOrder(
   updates: Array<{ id: string; sortOrder: number }>
 ): Promise<{ success: boolean; error?: string }> {
-  await requireRole([UserRole.ADMIN, UserRole.EDITOR])
+  const actor = await requireRole([UserRole.ADMIN, UserRole.EDITOR])
+  if (updates.length === 0) return { success: true }
 
-  try {
-    if (updates.length === 0) return { success: true }
+  const now = new Date().toISOString()
+  const auditRequestMetadata = await getAuditRequestMetadata()
+  const lifecycleContext = ${reorderContext}
+  ${beforeHook("beforeReorder", "lifecycleContext")}
 
+  try {
     // Sort the provided items by their new position
     const sorted = [...updates].sort((a, b) => a.sortOrder - b.sortOrder)
     const updatedIds = sorted.map((u) => u.id)
@@ -10260,13 +10180,18 @@ export async function bulkUpdate${ctx.Plural}SortOrder(
     }
 
     // Renumber all items gap-free
+    const appliedOrder = allIds
+      .filter(Boolean)
+      .map((id, index) => ({ id, sortOrder: index }))
+
     await Promise.all(
-      allIds.filter(Boolean).map((id, index) =>
-        db.update(${ctx.tableVar}).set({ sortOrder: index }).where(eq(${ctx.tableVar}.id, id))
+      appliedOrder.map(({ id, sortOrder }) =>
+        db.update(${ctx.tableVar}).set({ sortOrder }).where(eq(${ctx.tableVar}.id, id))
       )
     )
 
     ${ctx.cacheInvalidationFn}(${ctx.camelPlural}CacheTags.all)
+    ${afterHook("afterReorder", "{ ...lifecycleContext, data: { order: appliedOrder } }")}
     return { success: true }
   } catch (error) {
     console.error('Error bulk updating sort order:', error)
@@ -11628,7 +11553,7 @@ import { getAuditRequestMetadata } from '@admin/actions/audit/request-metadata'
 import db from '@admin/db'
 import { ${upsertDbImports.join(", ")} } from '@admin/db/schema'
 import { eq } from 'drizzle-orm'
-import { runAdminEventHooks } from '@admin/lib/lifecycle-hooks'
+import { runAfterHooks, runBeforeHooks } from '@admin/lib/lifecycle-hooks'
 import { getChangedFieldNames, getTouchedFieldNames } from '@admin/utils/audit/audit'
 import { ${cacheInvalidationFn} } from 'next/cache'
 import { get${Singular} } from './get-${kebabSingular}'
@@ -11680,6 +11605,22 @@ ${htmlUpsertBlock}
       ? getChangedFieldNames(previousRow as unknown as Record<string, unknown>, processedData)
       : getTouchedFieldNames(processedData)
 
+    const lifecycleContext = {
+      user: actor,
+      entityType: '${schema.name}',
+      schemaType: 'single' as const,
+      auditCategory: '${auditCategory}' as const,
+      timestamp: now,
+      sourceType: 'admin_ui' as const,
+      ipAddress: auditRequestMetadata.ipAddress,
+      userAgent: auditRequestMetadata.userAgent,
+      entityId: SINGLETON_ID,
+      input: processedData,
+      changedFields,
+      targetLabel: ${JSON.stringify(schema.label)}
+    }
+    await runBeforeHooks(previousRow ? 'beforeUpdate' : 'beforeCreate', lifecycleContext)
+
     const result = await db.transaction(async (tx) => {
       const rows = await tx
         .insert(${tableVar})
@@ -11704,18 +11645,9 @@ ${m2mWriteStatements}
 
     ${cacheInvalidationFn}(${cacheTagsVar}.all)
     const saved${Singular} = await get${Singular}()
-    runAdminEventHooks({
-      category: '${auditCategory}',
-      action: previousRow ? 'update' : 'create',
-      targetType: '${schema.name}',
-      targetId: SINGLETON_ID,
-      targetLabel: ${JSON.stringify(schema.label)},
-      user: actor,
-      timestamp: now,
-      sourceType: 'admin_ui' as const,
-      changedFields,
-      metadata: { schemaType: 'single' },
-      ...auditRequestMetadata
+    runAfterHooks(previousRow ? 'afterUpdate' : 'afterCreate', {
+      ...lifecycleContext,
+      data: (saved${Singular} ?? result[0]) as unknown as Record<string, unknown>
     })
 
     return {
@@ -16574,7 +16506,7 @@ export default async function ${Plural}Page() {
   const skeletonContent = `export function ${Plural}PageSkeleton() {
   return (
     <div className="flex items-center justify-center h-48">
-      <div className="text-muted-foreground">Loading ${schema.label}...</div>
+      <div className="text-muted-foreground">Loading ${schema.label}\u2026</div>
     </div>
   )
 }
@@ -16906,7 +16838,6 @@ function generateSinglePage(schema, pagesDir, options = {}) {
   const Singular = toPascalCase(singular);
   const PageName = toPascalCase(schema.name);
   const actionImportPath = resolveSchemaActionImportPath(schema.name, options.outputNamespace);
-  const adminRoutePath = options.adminRoutePath ?? "/admin";
   const devModeIntegration = buildSingleDevModeIntegration(
     schema,
     options.adminDir ?? "admin",
@@ -16914,7 +16845,6 @@ function generateSinglePage(schema, pagesDir, options = {}) {
     options.adminImportAlias
   );
   const settingsImport = schema.name === "settings" ? "" : "import { getSetting } from '@admin/actions/settings'\n";
-  const settingsAuditImports = schema.name === "settings" ? "import { Button } from '@admin/components/ui/button'\nimport { ScrollText } from 'lucide-react'\nimport Link from 'next/link'\n" : "";
   const dataLoad = schema.name === "settings" ? `  const data = await get${Singular}()
 ` : `  const [data, initialSettings] = await Promise.all([
     get${Singular}(),
@@ -16922,16 +16852,7 @@ function generateSinglePage(schema, pagesDir, options = {}) {
   ])
 `;
   const initialSettingsProp = schema.name === "settings" ? "initialSettings={data}" : "initialSettings={initialSettings}";
-  const actionsContent = schema.name === "settings" ? `<div className="flex items-center gap-2">
-            <Button asChild variant="outline" size="sm">
-              <Link href="${adminRoutePath}/system/audit-log">
-                <ScrollText />
-                Audit Log
-              </Link>
-            </Button>
-            <${devModeIntegration.buttonExportName} ${initialSettingsProp} />
-          </div>` : `<${devModeIntegration.buttonExportName} ${initialSettingsProp} />`;
-  const content = `${settingsImport}${settingsAuditImports}import { get${Singular} } from '@admin/actions/${actionImportPath}'
+  const content = `${settingsImport}import { get${Singular} } from '@admin/actions/${actionImportPath}'
 import { PageHeader } from '@admin/components/shared/page-header'
 import { ${devModeIntegration.buttonExportName} } from '${devModeIntegration.buttonImportPath}'
 import { ${Singular}Form } from './${schema.name}-form'
@@ -16944,9 +16865,9 @@ ${dataLoad}
     <React.Fragment>
       <PageHeader
         title="${schema.label}"
-        actions={${actionsContent}}
+        actions={<${devModeIntegration.buttonExportName} ${initialSettingsProp} />}
       />
-      <main className="container mx-auto max-w-5xl w-full p-4">
+      <main className="mx-auto max-w-5xl w-full p-4">
         <${Singular}Form initialData={data} />
       </main>
     </React.Fragment>
@@ -17007,7 +16928,6 @@ import { GripVertical } from 'lucide-react'
 import { parseAsInteger, parseAsString, useQueryStates } from 'nuqs'
 ${hasEdit ? "import { useRouter } from 'next/navigation'\n" : ""}import { use${Plural} } from '@admin/hooks/use-${schema.name}'
 import type { ${Singular} } from '@admin/actions/${actionImportPath}'
-import { Card, CardContent } from '@admin/components/ui/card'
 import { useTableUtils } from '@admin/hooks/use-table-utils'
 import { cn } from '@admin/utils/shared/cn'
 
@@ -17113,110 +17033,106 @@ ${hasEdit ? "  const router = useRouter()\n" : ""}  const [{
     <div
       className={cn("flex flex-col gap-6 pt-px pb-2 h-full", className)}
     >
-      <Card className="min-h-0 flex-1 p-0">
-        <CardContent ref={tableContainerRef} className="flex min-h-0 flex-1 flex-col p-0">
-          <DataGrid containerClassName="min-h-0 flex-1" gridTemplateColumns={gridTemplateColumns} style={{ width: table.getTotalSize() }}>
-            <DataGridHeader>
-              {table.getHeaderGroups().map((headerGroup) => (
-                <DataGridRow key={headerGroup.id}>
-                  {headerGroup.headers.map((header, headerIndex) => {
-                    const meta = header.column.columnDef.meta as Record<string, unknown> | undefined
-                    const resizeLabel = typeof header.column.columnDef.header === 'string' ? header.column.columnDef.header : header.column.id
-                    const nextHeader = headerGroup.headers[headerIndex + 1]
-                    const canResizeColumn = header.column.getCanResize() && nextHeader?.column.getCanResize() === true
-                    return (
-                      <DataGridHead
-                        key={header.id}
-                        className={cn('group/resize-header relative overflow-hidden text-foreground', {
-                          'text-center': meta?.align === 'center',
-                          'text-right': meta?.align === 'right'
-                        })}
-                        data-column-id={header.column.id}
-                        onMouseEnter={() => setHoveredColumnId(header.column.id)}
-                        onMouseLeave={() => setHoveredColumnId((current) => (current === header.column.id ? null : current))}
-                      >
-                        {header.isPlaceholder
-                          ? null
-                          : flexRender(header.column.columnDef.header, header.getContext())}
-                        {canResizeColumn ? (
-                          <button
-                            type="button"
-                            aria-label={\`Resize \${resizeLabel} column\`}
-                            className="group/resize-handle absolute right-0 top-0 z-10 flex h-full w-5 cursor-col-resize touch-none select-none items-center justify-center text-muted-foreground opacity-0 transition-opacity hover:text-foreground focus-visible:text-foreground focus-visible:opacity-100 focus-visible:outline-none group-focus-within/resize-header:opacity-100 data-[column-hovered=true]:opacity-100 data-[resizing=true]:opacity-100"
-                            data-resize-handle
-                            data-column-hovered={hoveredColumnId === header.column.id ? 'true' : 'false'}
-                            data-resizing={header.column.getIsResizing() ? 'true' : 'false'}
-                            onDoubleClick={resetColumnSizingToContainer}
-                            onMouseDown={header.getResizeHandler()}
-                            onTouchStart={header.getResizeHandler()}
-                          >
-                            <GripVertical aria-hidden="true" className={cn('size-3.5', { 'text-ring': header.column.getIsResizing() })} />
-                          </button>
-                        ) : null}
-                      </DataGridHead>
-                    )
-                  })}
-                </DataGridRow>
-              ))}
-            </DataGridHeader>
-            <DataGridBody>
-              {isPending ? (
-                <DataGridRow>
-                  <DataGridCell className="flex h-24 items-center justify-center text-center" style={{ gridColumn: '1 / -1' }}>
-                    <div className="text-muted-foreground">Loading ${schema.label}...</div>
-                  </DataGridCell>
-                </DataGridRow>
-              ) : error ? (
-                <DataGridRow>
-                  <DataGridCell className="flex h-24 items-center justify-center text-center" style={{ gridColumn: '1 / -1' }}>
-                    <div className="text-destructive">Error loading ${schema.label}: {error.message}</div>
-                  </DataGridCell>
-                </DataGridRow>
-              ) : table.getRowModel().rows?.length ? (
-                table.getRowModel().rows.map((row) => (
-                  <DataGridRow
-                    key={row.id}
-                    className={cn('hover:bg-muted/50', {
-                      'cursor-pointer': ${hasEdit ? "true" : "false"}
+      <DataGrid containerClassName="min-h-0 flex-1" containerRef={tableContainerRef} gridTemplateColumns={gridTemplateColumns} style={{ width: table.getTotalSize() }}>
+        <DataGridHeader>
+          {table.getHeaderGroups().map((headerGroup) => (
+            <DataGridRow key={headerGroup.id}>
+              {headerGroup.headers.map((header, headerIndex) => {
+                const meta = header.column.columnDef.meta as Record<string, unknown> | undefined
+                const resizeLabel = typeof header.column.columnDef.header === 'string' ? header.column.columnDef.header : header.column.id
+                const nextHeader = headerGroup.headers[headerIndex + 1]
+                const canResizeColumn = header.column.getCanResize() && nextHeader?.column.getCanResize() === true
+                return (
+                  <DataGridHead
+                    key={header.id}
+                    className={cn('group/resize-header relative overflow-hidden', {
+                      'text-center': meta?.align === 'center',
+                      'text-right': meta?.align === 'right'
                     })}
-                    data-state={row.getIsSelected() ? 'selected' : undefined}${hasEdit ? `
-                    onClick={(e) => {
-                      const target = e.target as HTMLElement
-                      if (!e.currentTarget.contains(target)) return
-                      if (target.closest('button, a, input, [role="checkbox"]')) return
-                      router.push(\`${adminRoutePath}/${schema.name}/\${row.original.id}/edit\`)
-                    }}` : ""}
+                    data-column-id={header.column.id}
+                    onMouseEnter={() => setHoveredColumnId(header.column.id)}
+                    onMouseLeave={() => setHoveredColumnId((current) => (current === header.column.id ? null : current))}
                   >
-                    {row.getVisibleCells().map((cell) => {
-                    const meta = cell.column.columnDef.meta as Record<string, unknown> | undefined
-                    return (
-                        <DataGridCell
-                          key={cell.id}
-                          className={cn({
-                            'text-center': meta?.align === 'center',
-                            'text-right': meta?.align === 'right'
-                          })}
-                          data-column-id={cell.column.id}
-                          onMouseEnter={() => setHoveredColumnId(cell.column.id)}
-                          onMouseLeave={() => setHoveredColumnId((current) => (current === cell.column.id ? null : current))}
-                        >
-                          {flexRender(cell.column.columnDef.cell, cell.getContext())}
-                        </DataGridCell>
-                      )
-                    })}
-                  </DataGridRow>
-                ))
-              ) : (
-                <DataGridRow>
-                  <DataGridCell className="flex h-24 items-center justify-center text-center" style={{ gridColumn: '1 / -1' }}>
-                    No ${schema.label} found.
-                  </DataGridCell>
-                </DataGridRow>
-              )}
-            </DataGridBody>
-          </DataGrid>
-        </CardContent>
-      </Card>
+                    {header.isPlaceholder
+                      ? null
+                      : flexRender(header.column.columnDef.header, header.getContext())}
+                    {canResizeColumn ? (
+                      <button
+                        type="button"
+                        aria-label={\`Resize \${resizeLabel} column\`}
+                        className="group/resize-handle absolute right-0 top-0 z-10 flex h-full w-5 cursor-col-resize touch-none select-none items-center justify-center text-muted-foreground opacity-0 transition-opacity hover:text-foreground focus-visible:text-foreground focus-visible:opacity-100 focus-visible:outline-none group-focus-within/resize-header:opacity-100 data-[column-hovered=true]:opacity-100 data-[resizing=true]:opacity-100"
+                        data-resize-handle
+                        data-column-hovered={hoveredColumnId === header.column.id ? 'true' : 'false'}
+                        data-resizing={header.column.getIsResizing() ? 'true' : 'false'}
+                        onDoubleClick={resetColumnSizingToContainer}
+                        onMouseDown={header.getResizeHandler()}
+                        onTouchStart={header.getResizeHandler()}
+                      >
+                        <GripVertical aria-hidden="true" className={cn('size-3.5', { 'text-ring': header.column.getIsResizing() })} />
+                      </button>
+                    ) : null}
+                  </DataGridHead>
+                )
+              })}
+            </DataGridRow>
+          ))}
+        </DataGridHeader>
+        <DataGridBody>
+          {isPending ? (
+            <DataGridRow>
+              <DataGridCell className="flex h-24 items-center justify-center text-center" style={{ gridColumn: '1 / -1' }}>
+                <div className="text-muted-foreground">Loading ${schema.label}\u2026</div>
+              </DataGridCell>
+            </DataGridRow>
+          ) : error ? (
+            <DataGridRow>
+              <DataGridCell className="flex h-24 items-center justify-center text-center" style={{ gridColumn: '1 / -1' }}>
+                <div className="text-destructive">Error loading ${schema.label}: {error.message}</div>
+              </DataGridCell>
+            </DataGridRow>
+          ) : table.getRowModel().rows?.length ? (
+            table.getRowModel().rows.map((row) => (
+              <DataGridRow
+                key={row.id}
+                className={cn('hover:bg-muted/50', {
+                  'cursor-pointer': ${hasEdit ? "true" : "false"}
+                })}
+                data-state={row.getIsSelected() ? 'selected' : undefined}${hasEdit ? `
+                onClick={(e) => {
+                  const target = e.target as HTMLElement
+                  if (!e.currentTarget.contains(target)) return
+                  if (target.closest('button, a, input, [role="checkbox"]')) return
+                  router.push(\`${adminRoutePath}/${schema.name}/\${row.original.id}/edit\`)
+                }}` : ""}
+              >
+                {row.getVisibleCells().map((cell) => {
+                const meta = cell.column.columnDef.meta as Record<string, unknown> | undefined
+                return (
+                    <DataGridCell
+                      key={cell.id}
+                      className={cn({
+                        'text-center': meta?.align === 'center',
+                        'text-right': meta?.align === 'right'
+                      })}
+                      data-column-id={cell.column.id}
+                      onMouseEnter={() => setHoveredColumnId(cell.column.id)}
+                      onMouseLeave={() => setHoveredColumnId((current) => (current === cell.column.id ? null : current))}
+                    >
+                      {flexRender(cell.column.columnDef.cell, cell.getContext())}
+                    </DataGridCell>
+                  )
+                })}
+              </DataGridRow>
+            ))
+          ) : (
+            <DataGridRow>
+              <DataGridCell className="flex h-24 items-center justify-center text-center" style={{ gridColumn: '1 / -1' }}>
+                No ${schema.label} found.
+              </DataGridCell>
+            </DataGridRow>
+          )}
+        </DataGridBody>
+      </DataGrid>
 
       {shouldShowPagination ? (
         <DataTablePagination
@@ -17331,6 +17247,10 @@ function runEntityPipeline(schema, cwd, config, options = {}) {
     name: "Navigation",
     run: () => updateNavigation(normalizedSchema, paths.adminNavigationDir, namespacedOptions).files
   });
+  steps.push({
+    name: "Webhook events",
+    run: () => updateWebhookEvents(normalizedSchema, paths.adminWebhookEventsDir, "entity").files
+  });
   for (let i = 0; i < steps.length; i++) {
     const step = steps[i];
     const stepNum = i + 1;
@@ -17393,6 +17313,10 @@ function runSinglePipeline(schema, cwd, config, options = {}) {
     {
       name: "Navigation",
       run: () => updateNavigation(normalizedSchema, paths.adminNavigationDir, namespacedOptions).files
+    },
+    {
+      name: "Webhook events",
+      run: () => updateWebhookEvents(normalizedSchema, paths.adminWebhookEventsDir, "single").files
     }
   ];
   for (let i = 0; i < steps.length; i++) {
@@ -17968,18 +17892,41 @@ others.sort((a, b) => {
 export const ${namespace.camel}Navigation = [...(dashboard ? [dashboard] : []), ...others]
 `;
 }
+function renderWebhookEventsBarrel(extractNames, namespaceValue) {
+  const namespace = resolveAdminNamespace(namespaceValue);
+  const importLines = extractNames.map(
+    (name) => `import { ${toCamelCase(name)}WebhookEvents } from './webhook-events/${name}'`
+  );
+  const entryLines = extractNames.map((name) => `  ${toCamelCase(name)}WebhookEvents`);
+  const extractImports = importLines.length > 0 ? `
+${importLines.join("\n")}` : "";
+  const entries = entryLines.length > 0 ? `[
+${entryLines.join(",\n")}
+]` : "[]";
+  return `import type { WebhookEventSource } from '${namespace.alias}/types/webhooks'${extractImports}
+
+export type { WebhookEventSource } from '${namespace.alias}/types/webhooks'
+
+export const webhookEventSources: WebhookEventSource[] = ${entries}
+`;
+}
 function renderBarrelFiles(cwd, config) {
   const paths = resolveProjectPaths(config);
   const dbExtracts = listNamespacedExtracts(cwd, paths.adminDbDir).filter(
     (extract) => !(extract.namespace === "core" && extract.name === "schema")
   );
   const navExtractNames = listExtractNames(cwd, paths.adminNavigationDir, /* @__PURE__ */ new Set(["core"]));
+  const webhookEventExtractNames = listExtractNames(cwd, paths.adminWebhookEventsDir);
   return namespaceGeneratedFiles(
     [
       createGeneratedFile(paths.adminDbSchemaFile, renderDbBarrel(dbExtracts)),
       createGeneratedFile(
         paths.adminNavigationFile,
         renderNavigationBarrel(navExtractNames, config.frameworkConfig.next.namespace)
+      ),
+      createGeneratedFile(
+        paths.adminWebhookEventsFile,
+        renderWebhookEventsBarrel(webhookEventExtractNames, config.frameworkConfig.next.namespace)
       )
     ],
     config.frameworkConfig.next.namespace
@@ -22337,6 +22284,10 @@ function scaffoldComponents({ cwd, config }) {
     "components/layouts/admin-sidebar-nav-link-skeleton.tsx",
     readTemplate("components/layouts/admin-sidebar-nav-link-skeleton.tsx")
   );
+  write(
+    "components/layouts/admin-settings-sidebar.tsx",
+    readTemplate("components/layouts/admin-settings-sidebar.tsx")
+  );
   write(
     "components/layouts/admin-sidebar-user-menu.tsx",
     readTemplate("components/layouts/admin-sidebar-user-menu.tsx")
@@ -22501,6 +22452,7 @@ function scaffoldComponents({ cwd, config }) {
   write("types/auth.ts", readTemplate("types/auth.ts"));
   write("types/navigation.ts", readTemplate("types/navigation.ts"));
   write("types/table-meta.ts", readTemplate("types/table-meta.ts"));
+  write("types/webhooks.ts", readTemplate("types/webhooks.ts"));
   for (const relPath of [
     "utils/auth/roles.ts",
     "utils/audit/audit.ts",
@@ -22536,7 +22488,7 @@ function scaffoldComponents({ cwd, config }) {
     "utils/upload/upload.ts",
     "utils/user/user.ts",
     "utils/validation/validation.ts",
-    "utils/webhook/webhook.ts"
+    "utils/webhook/signature.ts"
   ]) {
     write(relPath, readTemplate(relPath));
   }
@@ -22618,6 +22570,7 @@ function scaffoldComponents({ cwd, config }) {
   write("hooks/use-admin-theme.tsx", readTemplate("hooks/use-admin-theme.tsx"));
   write("hooks/use-audit-log.ts", readTemplate("hooks/use-audit-log.ts"));
   write("hooks/use-users.ts", readTemplate("hooks/use-users.ts"));
+  write("hooks/use-webhooks.ts", readTemplate("hooks/use-webhooks.ts"));
   write("hooks/use-mobile.ts", readTemplate("hooks/use-mobile.ts"));
   write("hooks/use-failed-image-url.ts", readTemplate("hooks/use-failed-image-url.ts"));
   write("hooks/use-media.ts", readTemplate("hooks/use-media.ts"));
@@ -22632,14 +22585,28 @@ function scaffoldComponents({ cwd, config }) {
   const adminNamespace = resolveAdminNamespace(namespace);
   const projectName = detectProjectName(cwd);
   write("data/navigation.ts", readTemplate("data/navigation.ts"));
+  write("data/webhook-events.ts", readTemplate("data/webhook-events.ts"));
   write(`utils/app/${adminNamespace.camel}.ts`, adminDataTemplate(projectName, namespace));
   for (const relPath of [
     "lib/actions/forms/types.ts",
     "lib/actions/forms/get-form-settings.ts",
     "lib/actions/forms/upsert-form-settings.ts",
     "lib/actions/forms/get-all-form-settings.ts",
-    "lib/actions/forms/test-form-webhook.ts",
     "lib/actions/forms/index.ts",
+    "lib/actions/webhooks/types.ts",
+    "lib/actions/webhooks/internal-get-active-endpoints.ts",
+    "lib/actions/webhooks/dispatch.ts",
+    "lib/actions/webhooks/get-webhooks.ts",
+    "lib/actions/webhooks/create-webhook.ts",
+    "lib/actions/webhooks/update-webhook.ts",
+    "lib/actions/webhooks/delete-webhook.ts",
+    "lib/actions/webhooks/get-webhook-secret.ts",
+    "lib/actions/webhooks/regenerate-webhook-secret.ts",
+    "lib/actions/webhooks/get-webhook-subscriptions.ts",
+    "lib/actions/webhooks/send-test-webhook.ts",
+    "lib/actions/webhooks/get-webhook-deliveries.ts",
+    "lib/actions/webhooks/register.ts",
+    "lib/actions/webhooks/index.ts",
     "lib/actions/entity-versions/types.ts",
     "lib/actions/entity-versions/get-entity-versions.ts",
     "lib/actions/entity-versions/internal-create-entity-version.ts",
@@ -22824,41 +22791,27 @@ function defaultSettingsSchema() {
           type: "section",
           name: "siteSettings",
           label: "Dashboard Settings",
-          description: "General settings for the dashboard",
           fields: [
             {
               name: "title",
               type: "string",
-              label: "Name",
+              label: "Application Name",
               hint: "Displayed in the sidebar and throughout the dashboard",
               default: "BetterStart"
             },
-            {
-              name: "dashboardDescription",
-              type: "text",
-              label: "Description",
-              hint: "A brief description of the application"
-            }
+            { name: "dashboardLogo", type: "image", label: "Logo" }
           ]
         },
-        {
-          type: "section",
-          name: "branding",
-          label: "Branding",
-          description: "Logo and visual identity",
-          fields: [{ name: "dashboardLogo", type: "image", label: "Logo" }]
-        },
         {
           type: "section",
           name: "developer",
-          label: "Developer",
-          description: "Developer tools for the dashboard",
+          label: "Developers",
           fields: [
             {
               name: "devMode",
               type: "boolean",
               label: "Dev Mode",
-              hint: "Show generated integration snippets and schema details in the dashboard",
+              hint: "Show generated integration snippets and schema details for developers",
               default: true
             }
           ]
@@ -22867,7 +22820,6 @@ function defaultSettingsSchema() {
           type: "section",
           name: "auditLog",
           label: "Audit Log",
-          description: "Audit retention controls",
           fields: [
             {
               name: "auditRetentionEnabled",
@@ -23188,6 +23140,78 @@ function scaffoldLayout({ cwd, config }) {
     path41.join(usersDir, "change-password-dialog.tsx"),
     readTemplate("pages/users/change-password-dialog.tsx")
   );
+  const settingsDir = path41.join(config.paths.pages, "settings");
+  write(path41.join(settingsDir, "layout.tsx"), readTemplate("pages/settings/settings-layout.tsx"));
+  const settingsFormsDir = path41.join(settingsDir, "forms");
+  write(
+    path41.join(settingsFormsDir, "page.tsx"),
+    readTemplate("pages/settings/forms/forms-settings-page.tsx")
+  );
+  write(
+    path41.join(settingsFormsDir, "forms-settings-page-skeleton.tsx"),
+    readTemplate("pages/settings/forms/forms-settings-page-skeleton.tsx")
+  );
+  write(
+    path41.join(settingsFormsDir, "forms-settings-page-content.tsx"),
+    readTemplate("pages/settings/forms/forms-settings-page-content.tsx")
+  );
+  write(
+    path41.join(settingsFormsDir, "edit-form-notifications-dialog.tsx"),
+    readTemplate("pages/settings/forms/edit-form-notifications-dialog.tsx")
+  );
+  const settingsWebhooksDir = path41.join(settingsDir, "webhooks");
+  write(
+    path41.join(settingsWebhooksDir, "page.tsx"),
+    readTemplate("pages/settings/webhooks/webhooks-page.tsx")
+  );
+  write(
+    path41.join(settingsWebhooksDir, "webhooks-page-skeleton.tsx"),
+    readTemplate("pages/settings/webhooks/webhooks-page-skeleton.tsx")
+  );
+  write(
+    path41.join(settingsWebhooksDir, "webhooks-page-content.tsx"),
+    readTemplate("pages/settings/webhooks/webhooks-page-content.tsx")
+  );
+  write(
+    path41.join(settingsWebhooksDir, "webhooks-table.tsx"),
+    readTemplate("pages/settings/webhooks/webhooks-table.tsx")
+  );
+  write(
+    path41.join(settingsWebhooksDir, "webhooks-columns.tsx"),
+    readTemplate("pages/settings/webhooks/webhooks-columns.tsx")
+  );
+  write(
+    path41.join(settingsWebhooksDir, "webhook-actions.tsx"),
+    readTemplate("pages/settings/webhooks/webhook-actions.tsx")
+  );
+  write(
+    path41.join(settingsWebhooksDir, "webhook-enabled-switch.tsx"),
+    readTemplate("pages/settings/webhooks/webhook-enabled-switch.tsx")
+  );
+  write(
+    path41.join(settingsWebhooksDir, "webhook-endpoint-dialog.tsx"),
+    readTemplate("pages/settings/webhooks/webhook-endpoint-dialog.tsx")
+  );
+  write(
+    path41.join(settingsWebhooksDir, "delete-webhook-dialog.tsx"),
+    readTemplate("pages/settings/webhooks/delete-webhook-dialog.tsx")
+  );
+  write(
+    path41.join(settingsWebhooksDir, "webhooks-logs-page-content.tsx"),
+    readTemplate("pages/settings/webhooks/webhooks-logs-page-content.tsx")
+  );
+  write(
+    path41.join(settingsWebhooksDir, "webhooks-logs-table.tsx"),
+    readTemplate("pages/settings/webhooks/webhooks-logs-table.tsx")
+  );
+  write(
+    path41.join(settingsWebhooksDir, "webhooks-logs-columns.tsx"),
+    readTemplate("pages/settings/webhooks/webhooks-logs-columns.tsx")
+  );
+  write(
+    path41.join(settingsWebhooksDir, "logs", "page.tsx"),
+    readTemplate("pages/settings/webhooks/webhooks-logs-page.tsx")
+  );
   const mediaDir = path41.join(config.paths.pages, "media");
   write(path41.join(mediaDir, "page.tsx"), readTemplate("pages/media/media-page.tsx"));
   write(
@@ -23198,23 +23222,34 @@ function scaffoldLayout({ cwd, config }) {
     path41.join(mediaDir, "media-page-content.tsx"),
     readTemplate("pages/media/media-page-content.tsx")
   );
-  const auditLogDir = path41.join(config.paths.pages, "system", "audit-log");
-  write(path41.join(auditLogDir, "page.tsx"), readTemplate("pages/audit-log/audit-log-page.tsx"));
+  const auditLogDir = path41.join(config.paths.pages, "settings", "audit-log");
+  write(
+    path41.join(auditLogDir, "page.tsx"),
+    readTemplate("pages/settings/audit-log/audit-log-page.tsx")
+  );
   write(
     path41.join(auditLogDir, "audit-log-page-skeleton.tsx"),
-    readTemplate("pages/audit-log/audit-log-page-skeleton.tsx")
+    readTemplate("pages/settings/audit-log/audit-log-page-skeleton.tsx")
   );
   write(
     path41.join(auditLogDir, "audit-log-page-content.tsx"),
-    readTemplate("pages/audit-log/audit-log-page-content.tsx")
+    readTemplate("pages/settings/audit-log/audit-log-page-content.tsx")
+  );
+  write(
+    path41.join(auditLogDir, "audit-log-table.tsx"),
+    readTemplate("pages/settings/audit-log/audit-log-table.tsx")
+  );
+  write(
+    path41.join(auditLogDir, "audit-log-columns.tsx"),
+    readTemplate("pages/settings/audit-log/audit-log-columns.tsx")
   );
   write(
     path41.join(auditLogDir, "audit-log-detail-drawer.tsx"),
-    readTemplate("pages/audit-log/audit-log-detail-drawer.tsx")
+    readTemplate("pages/settings/audit-log/audit-log-detail-drawer.tsx")
   );
   write(
     path41.join(auditLogDir, "audit-log-detail-row.tsx"),
-    readTemplate("pages/audit-log/audit-log-detail-row.tsx")
+    readTemplate("pages/settings/audit-log/audit-log-detail-row.tsx")
   );
   const accountDir = path41.join(adminDir, "(account)");
   write(path41.join(accountDir, "layout.tsx"), readTemplate("pages/account-layout.tsx"));
@@ -25038,10 +25073,15 @@ async function main() {
     process.exit(0)
   }
 
-  const EMAIL = process.env.SEED_EMAIL!
-  const PASSWORD = process.env.SEED_PASSWORD!
+  const EMAIL = process.env.SEED_EMAIL
+  const PASSWORD = process.env.SEED_PASSWORD
   const NAME = process.env.SEED_NAME || 'Admin'
 
+  if (!EMAIL || !PASSWORD) {
+    console.error('  SEED_EMAIL and SEED_PASSWORD are required.')
+    process.exit(1)
+  }
+
   // Check if a user already exists with the requested email
   const existingUser = await db
     .select({ id: schema.user.id, name: schema.user.name })
@@ -25221,7 +25261,7 @@ async function runSeedCommand(options) {
 }
 
 // adapters/next/commands/init.ts
-var ANSI_ESCAPE_PATTERN = /\u001B\[[0-?]*[ -/]*[@-~]/g;
+var ANSI_ESCAPE_PATTERN2 = /\u001B\[[0-?]*[ -/]*[@-~]/g;
 var REMOVABLE_NAMESPACE_PATTERN = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 function normalizeNamespaceForRemoval(value) {
   if (typeof value !== "string") {
@@ -25868,7 +25908,7 @@ async function runInitCommand(name, options) {
       } else {
         s.start("Pushing database schema (drizzle-kit push)");
       }
-      const pushResult = await runDrizzlePush(cwd, { inheritStdio: useTerminalForDbPush });
+      const pushResult = await runDrizzlePush(cwd, { interactive: useTerminalForDbPush });
       if (pushResult.success) {
         if (useTerminalForDbPush) {
           const verification = await verifyDatabaseReachable(cwd);
@@ -26463,8 +26503,8 @@ function runQuietCommand(bin, args, options) {
     });
   });
 }
-function stripAnsi(value) {
-  return value.replace(ANSI_ESCAPE_PATTERN, "");
+function stripAnsi2(value) {
+  return value.replace(ANSI_ESCAPE_PATTERN2, "");
 }
 function printAdminReadyNote(state) {
   const lines = [`Admin: ${pc7.cyan(state.adminLoginUrl)}`];
@@ -26475,7 +26515,7 @@ function printAdminReadyNote(state) {
   p17.note(lines.join("\n"), "Admin ready");
 }
 function shouldSuppressDevServerStartupLine(line) {
-  const plain = stripAnsi(line).trim();
+  const plain = stripAnsi2(line).trim();
   if (plain.length === 0) {
     return { suppress: true, isReadyLine: false };
   }
@@ -26718,6 +26758,7 @@ function cleanupEmptyDirs3(cwd, deletedPaths, configPaths) {
   const stopRoots = /* @__PURE__ */ new Set([
     path54.join(cwd, ...configPaths.adminDir.split("/")),
     path54.join(cwd, ...configPaths.adminNavigationDir.split("/")),
+    path54.join(cwd, ...configPaths.adminWebhookEventsDir.split("/")),
     path54.join(cwd, ...configPaths.pagesDir.split("/"))
   ]);
   for (const deletedPath of deletedPaths) {
@@ -27504,6 +27545,11 @@ var TEMPLATE_REGISTRY = {
     relPath: "components/layouts/admin-sidebar-nav-link-skeleton.tsx",
     content: () => readTemplate("components/layouts/admin-sidebar-nav-link-skeleton.tsx")
   },
+  "admin-settings-sidebar": {
+    relPath: "components/layouts/admin-settings-sidebar.tsx",
+    content: () => readTemplate("components/layouts/admin-settings-sidebar.tsx"),
+    dependencies: ["admin-sidebar-nav-link"]
+  },
   "admin-sidebar-user-menu": {
     relPath: "components/layouts/admin-sidebar-user-menu.tsx",
     content: () => readTemplate("components/layouts/admin-sidebar-user-menu.tsx"),
@@ -27898,6 +27944,11 @@ var TEMPLATE_REGISTRY = {
     dependencies: ["audit-action"]
   },
   "use-users": { relPath: "hooks/use-users.ts", content: () => readTemplate("hooks/use-users.ts") },
+  "use-webhooks": {
+    relPath: "hooks/use-webhooks.ts",
+    content: () => readTemplate("hooks/use-webhooks.ts"),
+    dependencies: ["webhooks-action", "form-settings-action"]
+  },
   "use-mobile": {
     relPath: "hooks/use-mobile.ts",
     content: () => readTemplate("hooks/use-mobile.ts")
@@ -27946,6 +27997,10 @@ var TEMPLATE_REGISTRY = {
     relPath: "types/table-meta.ts",
     content: () => readTemplate("types/table-meta.ts")
   },
+  "webhooks-types": {
+    relPath: "types/webhooks.ts",
+    content: () => readTemplate("types/webhooks.ts")
+  },
   // Utils
   "app-admin": {
     relPath: ({ config }) => `utils/app/${resolveAdminNamespace(config.frameworkConfig.next.namespace).camel}.ts`,
@@ -28078,9 +28133,9 @@ var TEMPLATE_REGISTRY = {
     relPath: "utils/validation/validation.ts",
     content: () => readTemplate("utils/validation/validation.ts")
   },
-  webhook: {
-    relPath: "utils/webhook/webhook.ts",
-    content: () => readTemplate("utils/webhook/webhook.ts")
+  "webhook-signature": {
+    relPath: "utils/webhook/signature.ts",
+    content: () => readTemplate("utils/webhook/signature.ts")
   },
   "dev-mode-code-block-height-utils": {
     relPath: "utils/dev-mode/code-block-height.ts",
@@ -28113,7 +28168,8 @@ var TEMPLATE_REGISTRY = {
   },
   "lifecycle-hooks-register": {
     relPath: "lib/lifecycle-hooks/register.ts",
-    content: () => readTemplate("lib/lifecycle-hooks/register.ts")
+    content: () => readTemplate("lib/lifecycle-hooks/register.ts"),
+    dependencies: ["webhooks-register-action"]
   },
   "lifecycle-hooks-register-local": {
     relPath: "lib/lifecycle-hooks/register.local.ts",
@@ -28298,6 +28354,119 @@ var TEMPLATE_REGISTRY = {
     base: "cwd",
     dependencies: ["profile-action", "users-action"]
   },
+  "settings-layout": {
+    relPath: "app/(admin)/admin/(authenticated)/settings/layout.tsx",
+    content: () => readTemplate("pages/settings/settings-layout.tsx"),
+    base: "cwd",
+    dependencies: ["admin-settings-sidebar"]
+  },
+  "forms-settings-page": {
+    relPath: "app/(admin)/admin/(authenticated)/settings/forms/page.tsx",
+    content: () => readTemplate("pages/settings/forms/forms-settings-page.tsx"),
+    base: "cwd",
+    dependencies: ["forms-settings-page-skeleton", "forms-settings-page-content"]
+  },
+  "forms-settings-page-skeleton": {
+    relPath: "app/(admin)/admin/(authenticated)/settings/forms/forms-settings-page-skeleton.tsx",
+    content: () => readTemplate("pages/settings/forms/forms-settings-page-skeleton.tsx"),
+    base: "cwd"
+  },
+  "forms-settings-page-content": {
+    relPath: "app/(admin)/admin/(authenticated)/settings/forms/forms-settings-page-content.tsx",
+    content: () => readTemplate("pages/settings/forms/forms-settings-page-content.tsx"),
+    base: "cwd",
+    dependencies: ["edit-form-notifications-dialog", "use-webhooks"]
+  },
+  "edit-form-notifications-dialog": {
+    relPath: "app/(admin)/admin/(authenticated)/settings/forms/edit-form-notifications-dialog.tsx",
+    content: () => readTemplate("pages/settings/forms/edit-form-notifications-dialog.tsx"),
+    base: "cwd",
+    dependencies: ["form-settings-action"]
+  },
+  "webhooks-page": {
+    relPath: "app/(admin)/admin/(authenticated)/settings/webhooks/page.tsx",
+    content: () => readTemplate("pages/settings/webhooks/webhooks-page.tsx"),
+    base: "cwd",
+    dependencies: ["webhooks-page-skeleton", "webhooks-page-content"]
+  },
+  "webhooks-page-skeleton": {
+    relPath: "app/(admin)/admin/(authenticated)/settings/webhooks/webhooks-page-skeleton.tsx",
+    content: () => readTemplate("pages/settings/webhooks/webhooks-page-skeleton.tsx"),
+    base: "cwd"
+  },
+  "webhooks-page-content": {
+    relPath: "app/(admin)/admin/(authenticated)/settings/webhooks/webhooks-page-content.tsx",
+    content: () => readTemplate("pages/settings/webhooks/webhooks-page-content.tsx"),
+    base: "cwd",
+    dependencies: [
+      "webhooks-table",
+      "webhooks-columns",
+      "webhook-endpoint-dialog",
+      "delete-webhook-dialog",
+      "use-webhooks",
+      "webhooks-action"
+    ]
+  },
+  "webhooks-table": {
+    relPath: "app/(admin)/admin/(authenticated)/settings/webhooks/webhooks-table.tsx",
+    content: () => readTemplate("pages/settings/webhooks/webhooks-table.tsx"),
+    base: "cwd",
+    dependencies: ["use-webhooks"]
+  },
+  "webhooks-columns": {
+    relPath: "app/(admin)/admin/(authenticated)/settings/webhooks/webhooks-columns.tsx",
+    content: () => readTemplate("pages/settings/webhooks/webhooks-columns.tsx"),
+    base: "cwd",
+    dependencies: ["webhook-actions", "webhook-enabled-switch"]
+  },
+  "webhook-actions": {
+    relPath: "app/(admin)/admin/(authenticated)/settings/webhooks/webhook-actions.tsx",
+    content: () => readTemplate("pages/settings/webhooks/webhook-actions.tsx"),
+    base: "cwd",
+    dependencies: ["use-webhooks"]
+  },
+  "webhook-enabled-switch": {
+    relPath: "app/(admin)/admin/(authenticated)/settings/webhooks/webhook-enabled-switch.tsx",
+    content: () => readTemplate("pages/settings/webhooks/webhook-enabled-switch.tsx"),
+    base: "cwd",
+    dependencies: ["use-webhooks"]
+  },
+  "webhook-endpoint-dialog": {
+    relPath: "app/(admin)/admin/(authenticated)/settings/webhooks/webhook-endpoint-dialog.tsx",
+    content: () => readTemplate("pages/settings/webhooks/webhook-endpoint-dialog.tsx"),
+    base: "cwd",
+    dependencies: ["use-webhooks", "webhooks-action"]
+  },
+  "delete-webhook-dialog": {
+    relPath: "app/(admin)/admin/(authenticated)/settings/webhooks/delete-webhook-dialog.tsx",
+    content: () => readTemplate("pages/settings/webhooks/delete-webhook-dialog.tsx"),
+    base: "cwd",
+    dependencies: ["webhooks-action"]
+  },
+  "webhooks-logs-page": {
+    relPath: "app/(admin)/admin/(authenticated)/settings/webhooks/logs/page.tsx",
+    content: () => readTemplate("pages/settings/webhooks/webhooks-logs-page.tsx"),
+    base: "cwd",
+    dependencies: ["webhooks-logs-page-content", "webhooks-page-skeleton"]
+  },
+  "webhooks-logs-page-content": {
+    relPath: "app/(admin)/admin/(authenticated)/settings/webhooks/webhooks-logs-page-content.tsx",
+    content: () => readTemplate("pages/settings/webhooks/webhooks-logs-page-content.tsx"),
+    base: "cwd",
+    dependencies: ["webhooks-logs-table", "webhooks-logs-columns", "use-webhooks"]
+  },
+  "webhooks-logs-table": {
+    relPath: "app/(admin)/admin/(authenticated)/settings/webhooks/webhooks-logs-table.tsx",
+    content: () => readTemplate("pages/settings/webhooks/webhooks-logs-table.tsx"),
+    base: "cwd",
+    dependencies: ["use-webhooks"]
+  },
+  "webhooks-logs-columns": {
+    relPath: "app/(admin)/admin/(authenticated)/settings/webhooks/webhooks-logs-columns.tsx",
+    content: () => readTemplate("pages/settings/webhooks/webhooks-logs-columns.tsx"),
+    base: "cwd",
+    dependencies: ["webhooks-action"]
+  },
   // Lib
   "email-index": {
     relPath: "lib/actions/email/index.ts",
@@ -28375,8 +28544,7 @@ var TEMPLATE_REGISTRY = {
       "form-settings-types",
       "get-form-settings-action",
       "upsert-form-settings-action",
-      "get-all-form-settings-action",
-      "test-form-webhook-action"
+      "get-all-form-settings-action"
     ]
   },
   "form-settings-types": {
@@ -28398,9 +28566,87 @@ var TEMPLATE_REGISTRY = {
     content: () => readTemplate("lib/actions/forms/get-all-form-settings.ts"),
     dependencies: ["form-settings-types"]
   },
-  "test-form-webhook-action": {
-    relPath: "lib/actions/forms/test-form-webhook.ts",
-    content: () => readTemplate("lib/actions/forms/test-form-webhook.ts")
+  "webhooks-action": {
+    relPath: "lib/actions/webhooks/index.ts",
+    content: () => readTemplate("lib/actions/webhooks/index.ts"),
+    dependencies: [
+      "webhooks-action-types",
+      "internal-get-active-endpoints-action",
+      "webhooks-dispatch",
+      "get-webhooks-action",
+      "create-webhook-action",
+      "update-webhook-action",
+      "delete-webhook-action",
+      "get-webhook-secret-action",
+      "regenerate-webhook-secret-action",
+      "get-webhook-subscriptions-action",
+      "send-test-webhook-action",
+      "get-webhook-deliveries-action",
+      "webhooks-register-action"
+    ]
+  },
+  "webhooks-action-types": {
+    relPath: "lib/actions/webhooks/types.ts",
+    content: () => readTemplate("lib/actions/webhooks/types.ts")
+  },
+  "internal-get-active-endpoints-action": {
+    relPath: "lib/actions/webhooks/internal-get-active-endpoints.ts",
+    content: () => readTemplate("lib/actions/webhooks/internal-get-active-endpoints.ts")
+  },
+  "webhooks-dispatch": {
+    relPath: "lib/actions/webhooks/dispatch.ts",
+    content: () => readTemplate("lib/actions/webhooks/dispatch.ts"),
+    dependencies: ["webhook-signature", "internal-get-active-endpoints-action"]
+  },
+  "get-webhooks-action": {
+    relPath: "lib/actions/webhooks/get-webhooks.ts",
+    content: () => readTemplate("lib/actions/webhooks/get-webhooks.ts"),
+    dependencies: ["webhooks-action-types"]
+  },
+  "create-webhook-action": {
+    relPath: "lib/actions/webhooks/create-webhook.ts",
+    content: () => readTemplate("lib/actions/webhooks/create-webhook.ts"),
+    dependencies: ["webhooks-action-types", "webhook-signature"]
+  },
+  "update-webhook-action": {
+    relPath: "lib/actions/webhooks/update-webhook.ts",
+    content: () => readTemplate("lib/actions/webhooks/update-webhook.ts"),
+    dependencies: ["webhooks-action-types"]
+  },
+  "delete-webhook-action": {
+    relPath: "lib/actions/webhooks/delete-webhook.ts",
+    content: () => readTemplate("lib/actions/webhooks/delete-webhook.ts"),
+    dependencies: ["webhooks-action-types"]
+  },
+  "get-webhook-secret-action": {
+    relPath: "lib/actions/webhooks/get-webhook-secret.ts",
+    content: () => readTemplate("lib/actions/webhooks/get-webhook-secret.ts"),
+    dependencies: ["webhooks-action-types"]
+  },
+  "regenerate-webhook-secret-action": {
+    relPath: "lib/actions/webhooks/regenerate-webhook-secret.ts",
+    content: () => readTemplate("lib/actions/webhooks/regenerate-webhook-secret.ts"),
+    dependencies: ["webhooks-action-types", "webhook-signature"]
+  },
+  "get-webhook-subscriptions-action": {
+    relPath: "lib/actions/webhooks/get-webhook-subscriptions.ts",
+    content: () => readTemplate("lib/actions/webhooks/get-webhook-subscriptions.ts"),
+    dependencies: ["webhooks-action-types"]
+  },
+  "send-test-webhook-action": {
+    relPath: "lib/actions/webhooks/send-test-webhook.ts",
+    content: () => readTemplate("lib/actions/webhooks/send-test-webhook.ts"),
+    dependencies: ["webhooks-action-types", "webhook-signature", "webhooks-dispatch"]
+  },
+  "get-webhook-deliveries-action": {
+    relPath: "lib/actions/webhooks/get-webhook-deliveries.ts",
+    content: () => readTemplate("lib/actions/webhooks/get-webhook-deliveries.ts"),
+    dependencies: ["webhooks-action-types"]
+  },
+  "webhooks-register-action": {
+    relPath: "lib/actions/webhooks/register.ts",
+    content: () => readTemplate("lib/actions/webhooks/register.ts"),
+    dependencies: ["webhooks-dispatch", "webhooks-types"]
   },
   "entity-versions-action": {
     relPath: "lib/actions/entity-versions/index.ts",
@@ -28688,44 +28934,50 @@ var TEMPLATE_REGISTRY = {
     dependencies: ["use-media", "media-grid-pagination"]
   },
   "audit-log-page": {
-    relPath: "app/(admin)/admin/(authenticated)/system/audit-log/page.tsx",
-    content: () => readTemplate("pages/audit-log/audit-log-page.tsx"),
+    relPath: "app/(admin)/admin/(authenticated)/settings/audit-log/page.tsx",
+    content: () => readTemplate("pages/settings/audit-log/audit-log-page.tsx"),
     base: "cwd",
     dependencies: ["audit-log-page-content", "audit-log-page-skeleton"]
   },
   "audit-log-page-skeleton": {
-    relPath: "app/(admin)/admin/(authenticated)/system/audit-log/audit-log-page-skeleton.tsx",
-    content: () => readTemplate("pages/audit-log/audit-log-page-skeleton.tsx"),
+    relPath: "app/(admin)/admin/(authenticated)/settings/audit-log/audit-log-page-skeleton.tsx",
+    content: () => readTemplate("pages/settings/audit-log/audit-log-page-skeleton.tsx"),
     base: "cwd",
     dependencies: ["page-header", "skeleton"]
   },
   "audit-log-page-content": {
-    relPath: "app/(admin)/admin/(authenticated)/system/audit-log/audit-log-page-content.tsx",
-    content: () => readTemplate("pages/audit-log/audit-log-page-content.tsx"),
+    relPath: "app/(admin)/admin/(authenticated)/settings/audit-log/audit-log-page-content.tsx",
+    content: () => readTemplate("pages/settings/audit-log/audit-log-page-content.tsx"),
     base: "cwd",
     dependencies: [
+      "audit-log-columns",
       "audit-log-detail-drawer",
-      "badge",
-      "button",
-      "card",
-      "data-grid",
-      "data-table-pagination",
+      "audit-log-table",
       "entity-filters-bar",
-      "page-header",
-      "sort-indicator",
-      "use-table-utils",
-      "use-audit-log"
+      "page-header"
     ]
   },
+  "audit-log-table": {
+    relPath: "app/(admin)/admin/(authenticated)/settings/audit-log/audit-log-table.tsx",
+    content: () => readTemplate("pages/settings/audit-log/audit-log-table.tsx"),
+    base: "cwd",
+    dependencies: ["data-grid", "data-table-pagination", "use-audit-log", "use-table-utils"]
+  },
+  "audit-log-columns": {
+    relPath: "app/(admin)/admin/(authenticated)/settings/audit-log/audit-log-columns.tsx",
+    content: () => readTemplate("pages/settings/audit-log/audit-log-columns.tsx"),
+    base: "cwd",
+    dependencies: ["badge", "button", "sort-indicator"]
+  },
   "audit-log-detail-drawer": {
-    relPath: "app/(admin)/admin/(authenticated)/system/audit-log/audit-log-detail-drawer.tsx",
-    content: () => readTemplate("pages/audit-log/audit-log-detail-drawer.tsx"),
+    relPath: "app/(admin)/admin/(authenticated)/settings/audit-log/audit-log-detail-drawer.tsx",
+    content: () => readTemplate("pages/settings/audit-log/audit-log-detail-drawer.tsx"),
     base: "cwd",
     dependencies: ["audit-log-detail-row", "badge", "drawer", "scroll-area"]
   },
   "audit-log-detail-row": {
-    relPath: "app/(admin)/admin/(authenticated)/system/audit-log/audit-log-detail-row.tsx",
-    content: () => readTemplate("pages/audit-log/audit-log-detail-row.tsx"),
+    relPath: "app/(admin)/admin/(authenticated)/settings/audit-log/audit-log-detail-row.tsx",
+    content: () => readTemplate("pages/settings/audit-log/audit-log-detail-row.tsx"),
     base: "cwd"
   }
 };