diff --git a/apps/web/src/components/settings/automations/AutomationList.tsx b/apps/web/src/components/settings/automations/AutomationList.tsx
new file mode 100644
index 000000000..3fd32cb47
--- /dev/null
+++ b/apps/web/src/components/settings/automations/AutomationList.tsx
@@ -0,0 +1,150 @@
+'use client';
+
+import type { ComponentType, ReactNode } from 'react';
+
+import {
+  Input,
+  Label,
+  RadioGroup,
+  RadioGroupItem,
+  Search,
+} from '@/components/system';
+
+export type AutomationListFilter = 'all' | 'custom' | 'built-in';
+
+export function AutomationListToolbar({
+  filter,
+  search,
+  leading,
+  action,
+  showBuiltInFilter = true,
+  onFilterChange,
+  onSearchChange,
+}: {
+  filter: AutomationListFilter;
+  search: string;
+  leading?: ReactNode;
+  action?: ReactNode;
+  showBuiltInFilter?: boolean;
+  onFilterChange: (filter: AutomationListFilter) => void;
+  onSearchChange: (search: string) => void;
+}) {
+  return (
+    <div className="flex flex-col gap-3 md:flex-row md:items-center">
+      {leading}
+      <RadioGroup
+        value={filter}
+        onValueChange={(value) => onFilterChange(value as AutomationListFilter)}
+        aria-label="Automation type"
+        className="flex items-center gap-4 md:ml-auto"
+      >
+        {(
+          [
+            ['all', 'All'],
+            ['custom', 'Custom'],
+            ['built-in', 'Built-in'],
+          ] as const
+        )
+          .filter(([value]) => showBuiltInFilter || value !== 'built-in')
+          .map(([value, label]) => (
+            <div key={value} className="flex items-center gap-2">
+              <RadioGroupItem value={value} id={`automation-filter-${value}`} />
+              <Label
+                htmlFor={`automation-filter-${value}`}
+                className="cursor-pointer text-sm font-normal"
+              >
+                {label}
+              </Label>
+            </div>
+          ))}
+      </RadioGroup>
+      <div className="relative">
+        <Search className="pointer-events-none absolute top-1/2 left-2.5 size-3.5 -translate-y-1/2 text-muted-foreground" />
+        <Input
+          value={search}
+          onChange={(event) => onSearchChange(event.currentTarget.value)}
+          placeholder="Search automations"
+          aria-label="Search automations"
+          className="h-8 w-full pl-8 text-sm sm:w-56"
+        />
+      </div>
+      {action}
+    </div>
+  );
+}
+
+export function AutomationListHeader() {
+  return (
+    <div
+      role="row"
+      className="hidden grid-cols-[auto_minmax(0,4fr)_minmax(0,6fr)_auto] gap-4 border-b border-background px-4 py-2 text-xs font-medium text-muted-foreground md:grid"
+    >
+      <span role="columnheader" className="sr-only">
+        Enabled
+      </span>
+      <span role="columnheader" className="col-start-2">
+        Name
+      </span>
+      <span role="columnheader" className="col-start-3">
+        Description
+      </span>
+      <span role="columnheader" className="sr-only">
+        Actions
+      </span>
+    </div>
+  );
+}
+
+export function AutomationListRow({
+  icon: Icon,
+  name,
+  summary,
+  description,
+  enabledControl,
+  actions,
+}: {
+  icon: ComponentType<{ className?: string }>;
+  name: string;
+  summary: ReactNode;
+  description: ReactNode;
+  enabledControl: ReactNode;
+  actions?: ReactNode;
+}) {
+  return (
+    <div
+      role="row"
+      className="grid grid-cols-[auto_minmax(0,1fr)_auto] gap-x-2 gap-y-1 px-2 py-1.5 md:grid-cols-[auto_minmax(0,4fr)_minmax(0,6fr)_auto] md:items-center md:gap-4 md:px-4 md:py-3"
+    >
+      <div
+        role="cell"
+        className="col-start-1 row-span-2 row-start-1 flex w-8 items-start pt-0.5 md:row-span-1 md:items-center md:pt-0"
+      >
+        {enabledControl}
+      </div>
+      <div
+        role="cell"
+        className="col-start-2 row-start-1 flex min-w-0 items-start gap-2"
+      >
+        <Icon className="mt-0.5 size-4 shrink-0" />
+        <div className="min-w-0 space-y-1">
+          <p className="truncate text-sm font-semibold">{name}</p>
+          <div className="flex flex-wrap items-center gap-x-1 text-xs text-muted-foreground">
+            {summary}
+          </div>
+        </div>
+      </div>
+      <div
+        role="cell"
+        className="col-span-2 col-start-2 row-start-2 min-w-0 whitespace-normal pl-6 text-xs text-muted-foreground/80 md:col-span-1 md:col-start-3 md:row-start-1 md:pl-0"
+      >
+        {description}
+      </div>
+      <div
+        role="cell"
+        className="col-start-3 row-start-1 flex shrink-0 items-center justify-end gap-1 md:col-start-4"
+      >
+        {actions}
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/src/components/settings/automations/AutomationsSettings.render.client.test.tsx b/apps/web/src/components/settings/automations/AutomationsSettings.render.client.test.tsx
index 4047e6fe9..ca7be4618 100644
--- a/apps/web/src/components/settings/automations/AutomationsSettings.render.client.test.tsx
+++ b/apps/web/src/components/settings/automations/AutomationsSettings.render.client.test.tsx
@@ -564,10 +564,7 @@ vi.mock('@/trpc/client', () => ({
   }),
 }));
 
-import {
-  AutomationsSettings,
-  getAutomationHistoryHref,
-} from './AutomationsSettings';
+import { AutomationsSettings } from './AutomationsSettings';
 import { CustomAutomationsSection } from './CustomAutomationsSection';
 
 it.each([false, true])(
@@ -593,6 +590,12 @@ it('opens the standalone custom editor without querying admin settings', () => {
   state.queriedKeys = [];
   render(<CustomAutomationsSection />);
 
+  expect(
+    screen.queryByRole('radio', { name: 'Built-in' }),
+  ).not.toBeInTheDocument();
+  expect(
+    screen.getByText('No custom automations created yet.'),
+  ).toBeInTheDocument();
   fireEvent.click(screen.getByRole('button', { name: 'New' }));
   expect(screen.getByRole('button', { name: 'Create' })).toBeInTheDocument();
   expect(state.queriedKeys).toContainEqual([
@@ -606,16 +609,16 @@ it('opens the standalone custom editor without querying admin settings', () => {
 
 async function openSuggesterCard() {
   fireEvent.click(
-    await screen.findByRole('button', {
-      name: /(?:Set up|Configure) Suggest Ideas/,
+    await screen.findByRole('switch', {
+      name: /(?:Set up|Configure) Suggest Ideas enabled state/,
     }),
   );
 }
 
 async function openReviewerCard() {
   fireEvent.click(
-    await screen.findByRole('button', {
-      name: /(?:Set up|Configure) Review Code/,
+    await screen.findByRole('switch', {
+      name: /(?:Set up|Configure) Review Code enabled state/,
     }),
   );
 }
@@ -689,8 +692,8 @@ describe('AutomationsSettings', () => {
     render(<AutomationsSettings />);
 
     expect(
-      await screen.findByRole('button', {
-        name: /(?:Set up|Configure) Weekly Manager Stats/,
+      await screen.findByRole('switch', {
+        name: /(?:Set up|Configure) Weekly Manager Stats enabled state/,
       }),
     ).toBeInTheDocument();
     expect(screen.queryByText('Beta')).not.toBeInTheDocument();
@@ -700,8 +703,8 @@ describe('AutomationsSettings', () => {
     render(<AutomationsSettings />);
 
     fireEvent.click(
-      await screen.findByRole('button', {
-        name: 'Configure Inference Provider Usage Alerts',
+      await screen.findByRole('switch', {
+        name: 'Configure Inference Provider Usage Alerts enabled state',
       }),
     );
 
@@ -721,8 +724,8 @@ describe('AutomationsSettings', () => {
     render(<AutomationsSettings />);
 
     fireEvent.click(
-      await screen.findByRole('button', {
-        name: 'Set up Call Roomote via emoji',
+      await screen.findByRole('switch', {
+        name: 'Set up Call Roomote via emoji enabled state',
       }),
     );
     fireEvent.click(
@@ -786,8 +789,8 @@ describe('AutomationsSettings', () => {
     render(<AutomationsSettings />);
 
     fireEvent.click(
-      await screen.findByRole('button', {
-        name: /(?:Set up|Configure) Weekly Manager Stats/,
+      await screen.findByRole('switch', {
+        name: /(?:Set up|Configure) Weekly Manager Stats enabled state/,
       }),
     );
     expect(
@@ -798,8 +801,8 @@ describe('AutomationsSettings', () => {
     ).toBeInTheDocument();
     closeAutomationDialog();
     fireEvent.click(
-      screen.getByRole('button', {
-        name: /(?:Set up|Configure) Triage Sentry Issues/,
+      screen.getByRole('switch', {
+        name: /(?:Set up|Configure) Triage Sentry Issues enabled state/,
       }),
     );
     expect(
@@ -807,8 +810,8 @@ describe('AutomationsSettings', () => {
     ).toBeInTheDocument();
     closeAutomationDialog();
     fireEvent.click(
-      screen.getByRole('button', {
-        name: /(?:Set up|Configure) Triage Dependabot Alerts/,
+      screen.getByRole('switch', {
+        name: /(?:Set up|Configure) Triage Dependabot Alerts enabled state/,
       }),
     );
 
@@ -841,8 +844,8 @@ describe('AutomationsSettings', () => {
     render(<AutomationsSettings />);
 
     fireEvent.click(
-      await screen.findByRole('button', {
-        name: /(?:Set up|Configure) Weekly Manager Stats/,
+      await screen.findByRole('switch', {
+        name: /(?:Set up|Configure) Weekly Manager Stats enabled state/,
       }),
     );
     expect(
@@ -850,8 +853,8 @@ describe('AutomationsSettings', () => {
     ).toBeInTheDocument();
     closeAutomationDialog();
     fireEvent.click(
-      screen.getByRole('button', {
-        name: /(?:Set up|Configure) Triage Sentry Issues/,
+      screen.getByRole('switch', {
+        name: /(?:Set up|Configure) Triage Sentry Issues enabled state/,
       }),
     );
 
@@ -881,8 +884,8 @@ describe('AutomationsSettings', () => {
     render(<AutomationsSettings />);
 
     fireEvent.click(
-      await screen.findByRole('button', {
-        name: /(?:Set up|Configure) Automation output/,
+      await screen.findByRole('switch', {
+        name: /(?:Set up|Configure) Automation output enabled state/,
       }),
     );
     const destination = await screen.findByRole('button', {
@@ -915,8 +918,8 @@ describe('AutomationsSettings', () => {
     render(<AutomationsSettings />);
 
     fireEvent.click(
-      await screen.findByRole('button', {
-        name: /(?:Set up|Configure) Alert on Config Errors/,
+      await screen.findByRole('switch', {
+        name: /(?:Set up|Configure) Alert on Config Errors enabled state/,
       }),
     );
 
@@ -936,8 +939,8 @@ describe('AutomationsSettings', () => {
     render(<AutomationsSettings />);
 
     fireEvent.click(
-      await screen.findByRole('button', {
-        name: /(?:Set up|Configure) Alert on Config Errors/,
+      await screen.findByRole('switch', {
+        name: /(?:Set up|Configure) Alert on Config Errors enabled state/,
       }),
     );
 
@@ -951,8 +954,8 @@ describe('AutomationsSettings', () => {
   it('hides the launch mode picker when decision mode is disabled', async () => {
     render(<AutomationsSettings />);
 
-    const expandButton = await screen.findByRole('button', {
-      name: /(?:Set up|Configure) Auto-respond to channels/,
+    const expandButton = await screen.findByRole('switch', {
+      name: /(?:Set up|Configure) Auto-respond to channels enabled state/,
     });
     fireEvent.click(expandButton);
 
@@ -991,69 +994,51 @@ describe('AutomationsSettings', () => {
     render(<AutomationsSettings />);
 
     await screen.findByText('Triage Dependabot Alerts');
-    const providerSupport = screen.getAllByText('GitHub only')[0]!;
-    expect(providerSupport.tagName).toBe('P');
-    expect(providerSupport).toHaveClass('text-sm', 'text-foreground');
+    const providerSupport = screen.getAllByText(/GitHub only/)[0]!;
+    expect(providerSupport.tagName).toBe('SPAN');
+    expect(providerSupport.closest('[role="row"]')).toHaveTextContent(
+      'Triage Dependabot Alerts',
+    );
   });
 
-  it('groups built-in automations into Enabled and Available sections', async () => {
+  it('renders custom and built-in automations in one list by default', async () => {
     render(<AutomationsSettings />);
 
-    expect(await screen.findByText('Enabled')).toBeInTheDocument();
-    expect(screen.getByText('Available')).toBeInTheDocument();
-    expect(screen.queryByText('Source Code automations')).toBeNull();
-    expect(screen.queryByText('Meta automations')).toBeNull();
+    expect(
+      await screen.findByRole('table', { name: 'Automations' }),
+    ).toBeInTheDocument();
+    expect(screen.getByRole('radio', { name: 'All' })).toBeChecked();
+    expect(screen.getByText('Auto-respond to channels')).toBeInTheDocument();
+    expect(screen.getByRole('columnheader', { name: 'Enabled' })).toHaveClass(
+      'sr-only',
+    );
+    expect(screen.getByRole('columnheader', { name: 'Actions' })).toHaveClass(
+      'sr-only',
+    );
+    expect(screen.queryByText('Available')).not.toBeInTheDocument();
   });
 
-  it('links enabled built-in automations to their filtered task history', async () => {
+  it('uses the left switch as the built-in configuration entry point', async () => {
     render(<AutomationsSettings />);
 
+    const enabledSwitch = await screen.findByRole('switch', {
+      name: 'Configure Auto-respond to channels enabled state',
+    });
+    expect(enabledSwitch).toBeChecked();
     expect(
-      await screen.findByRole('link', {
+      screen.queryByRole('link', {
         name: 'View previous runs for Auto-respond to channels',
       }),
-    ).toHaveAttribute(
-      'href',
-      '/tasks?userId=automation%3Aslack_channel_auto_start',
-    );
+    ).not.toBeInTheDocument();
     expect(
-      screen.queryByRole('link', {
-        name: 'View previous runs for Review Code',
+      screen.getByRole('button', {
+        name: 'Configure Auto-respond to channels',
       }),
-    ).not.toBeInTheDocument();
-  });
-
-  it.each([
-    ['callRoomoteViaEmoji', 'call_roomote_via_emoji'],
-    ['channelAutoStart', 'slack_channel_auto_start'],
-    ['managerStats', 'manager_stats'],
-    ['sentryTriage', 'sentry_triage'],
-    ['dependabotTriage', 'dependabot_triage'],
-    ['codeqlTriage', 'codeql_triage'],
-    ['issueFixer', 'issue_fixer'],
-    ['securityAuditor', 'security_auditor'],
-    ['codeQualityAuditor', 'code_quality_auditor'],
-    ['ciFailureTriage', 'ci_failure_triage'],
-    ['reviewer', 'review_code'],
-    ['conflictResolver', 'conflict_resolver'],
-    ['suggester', 'suggester'],
-    ['announcer', 'announcer'],
-    ['platformIssueAlerts', 'platform_issue_alerts'],
-  ] as const)(
-    'builds the filtered task history link for %s',
-    (automationId, automationKey) => {
-      expect(getAutomationHistoryHref(automationId)).toBe(
-        `/tasks?userId=${encodeURIComponent(`automation:${automationKey}`)}`,
-      );
-    },
-  );
-
-  it('does not add task history to non-running built-in configuration', () => {
-    expect(getAutomationHistoryHref('managerChannel')).toBeNull();
-  });
-
-  it('does not add task history to provider usage alerts', () => {
-    expect(getAutomationHistoryHref('providerUsageLimit')).toBeNull();
+    ).toBeInTheDocument();
+    fireEvent.click(enabledSwitch);
+    expect(
+      await screen.findByRole('dialog', { name: 'Auto-respond to channels' }),
+    ).toBeInTheDocument();
   });
 
   it('shows Merge announcer as a webhook-driven automation without task history', async () => {
@@ -1071,10 +1056,10 @@ describe('AutomationsSettings', () => {
         'Summarize commits pushed to each active repository’s default branch and announce who pushed them.',
       ),
     ).toBeInTheDocument();
-    expect(getAutomationHistoryHref('mergeAnnouncer')).toBeNull();
-
     fireEvent.click(
-      screen.getByRole('button', { name: 'Configure Merge announcer' }),
+      screen.getByRole('switch', {
+        name: 'Configure Merge announcer enabled state',
+      }),
     );
     expect(
       screen.getByRole('combobox', { name: 'Destination provider' }),
@@ -1084,33 +1069,22 @@ describe('AutomationsSettings', () => {
     ).toHaveTextContent('DM me');
   });
 
-  it('filters available automations by category and provider-aware search', async () => {
+  it('filters the unified list by type and searches built-in summaries', async () => {
     render(<AutomationsSettings />);
 
-    const categoryFilter = await screen.findByRole('combobox', {
-      name: 'Filter available automations by category',
-    });
-    expect(categoryFilter).toHaveTextContent('All');
-
     fireEvent.change(
-      screen.getByRole('textbox', { name: 'Search available automations' }),
-      { target: { value: 'Discord' } },
-    );
-
-    expect(screen.getByText('Auto-respond to channels')).toBeInTheDocument();
-    expect(screen.queryByText('Review Code')).not.toBeInTheDocument();
-    fireEvent.click(
-      screen.getByRole('button', { name: 'Clear automation filters' }),
+      await screen.findByRole('textbox', { name: 'Search automations' }),
+      { target: { value: 'Pull request events' } },
     );
     expect(screen.getByText('Review Code')).toBeInTheDocument();
-
-    fireEvent.click(categoryFilter);
-    fireEvent.click(await screen.findByRole('option', { name: 'Operations' }));
-    expect(screen.getByText('Triage Sentry Issues')).toBeInTheDocument();
-    expect(screen.queryByText('Review Code')).not.toBeInTheDocument();
     expect(
-      screen.queryByText('Call Roomote via emoji'),
+      screen.queryByText('Auto-respond to channels'),
     ).not.toBeInTheDocument();
+
+    fireEvent.click(screen.getByRole('radio', { name: 'Custom' }));
+    expect(screen.queryByText('Review Code')).not.toBeInTheDocument();
+    fireEvent.click(screen.getByRole('radio', { name: 'Built-in' }));
+    expect(screen.getByText('Review Code')).toBeInTheDocument();
   });
 
   it('shows independent structural skeletons for custom and built-in automations', () => {
@@ -1143,11 +1117,12 @@ describe('AutomationsSettings', () => {
       screen.queryByText('No built-in automations enabled yet.'),
     ).not.toBeInTheDocument();
     expect(
-      await screen.findByRole('button', {
-        name: 'Configure Alert on Config Errors',
+      await screen.findByRole('switch', {
+        name: 'Configure Alert on Config Errors enabled state',
       }),
     ).toBeInTheDocument();
-    const customEmptyState = screen.getByText(
+    fireEvent.click(screen.getByRole('radio', { name: 'Custom' }));
+    const customEmptyState = await screen.findByText(
       'No custom automations created yet.',
     );
     expect(customEmptyState.tagName).toBe('P');
@@ -1218,14 +1193,6 @@ describe('AutomationsSettings', () => {
     expect(
       screen.getByRole('button', { name: 'Run Weekly flaky-test scan now' }),
     ).toBeEnabled();
-    expect(
-      screen.getByRole('link', {
-        name: 'View previous runs for Weekly flaky-test scan',
-      }),
-    ).toHaveAttribute(
-      'href',
-      '/tasks?userId=automation%3Acustom_automation%3Aautomation-1',
-    );
     fireEvent.click(
       screen.getByRole('button', { name: 'Run Weekly flaky-test scan now' }),
     );
@@ -1271,11 +1238,6 @@ describe('AutomationsSettings', () => {
         name: 'Configure Weekly flaky-test scan',
       }),
     ).toBeInTheDocument();
-    expect(
-      screen.getByRole('link', {
-        name: 'View previous runs for Weekly flaky-test scan',
-      }),
-    ).toBeInTheDocument();
     expect(
       screen.getByRole('button', { name: 'Delete Weekly flaky-test scan' }),
     ).toBeInTheDocument();
@@ -1369,14 +1331,14 @@ describe('AutomationsSettings', () => {
     render(<AutomationsSettings />);
 
     expect(await screen.findByText('Daily →')).toBeInTheDocument();
-    expect(
-      screen.getByText('No actionable regressions found.'),
-    ).toBeInTheDocument();
-    expect(
-      screen.getByRole('link', {
-        name: 'View previous runs for Fast daily digest',
-      }),
-    ).toBeInTheDocument();
+    const search = screen.getByRole('textbox', { name: 'Search automations' });
+    fireEvent.change(search, {
+      target: { value: 'Summarize priorities' },
+    });
+    expect(screen.getByText('Fast daily digest')).toBeInTheDocument();
+    fireEvent.change(search, { target: { value: 'No matching automation' } });
+    expect(screen.queryByText('Fast daily digest')).not.toBeInTheDocument();
+    fireEvent.change(search, { target: { value: '' } });
     fireEvent.click(
       screen.getByRole('button', { name: 'Configure Fast daily digest' }),
     );
diff --git a/apps/web/src/components/settings/automations/AutomationsSettings.tsx b/apps/web/src/components/settings/automations/AutomationsSettings.tsx
index 81e77586a..7fbed6c73 100644
--- a/apps/web/src/components/settings/automations/AutomationsSettings.tsx
+++ b/apps/web/src/components/settings/automations/AutomationsSettings.tsx
@@ -2,7 +2,15 @@
 
 import Link from 'next/link';
 import type { ComponentType } from 'react';
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import {
+  createContext,
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { toast } from 'sonner';
 import {
@@ -67,6 +75,7 @@ import {
   SCHEDULE_ONLY_AUTOMATION_UI_DEFINITIONS,
 } from './ScheduleOnlyAutomationContent';
 import { CustomAutomationsSection } from './CustomAutomationsSection';
+import { AutomationListRow, type AutomationListFilter } from './AutomationList';
 import { AutomationDestinationPicker } from './AutomationDestinationPicker';
 import { AutomationAdditionalRules } from './CiFailureTriageAdditionalRules';
 import {
@@ -92,7 +101,6 @@ import {
   Button,
   Card,
   CardHeader,
-  CardTitle,
   ChartColumnIncreasing,
   Check,
   Dialog,
@@ -107,9 +115,6 @@ import {
   Label,
   Lightbulb,
   Play,
-  Plus,
-  RotateCcwClock,
-  Search,
   Select,
   SelectContent,
   SelectItem,
@@ -126,7 +131,6 @@ import {
   Textarea,
   TriangleAlert,
   Users,
-  X,
 } from '@/components/system';
 
 type FieldErrors = Partial<
@@ -252,16 +256,6 @@ type AutomationDefinition = {
 
 type AutomationCategory = 'source-code' | 'communication' | 'operations';
 
-const AUTOMATION_CATEGORY_OPTIONS: Array<{
-  value: AutomationCategory | 'all';
-  label: string;
-}> = [
-  { value: 'all', label: 'All' },
-  { value: 'source-code', label: 'Source code' },
-  { value: 'communication', label: 'Communication' },
-  { value: 'operations', label: 'Operations' },
-];
-
 /**
  * Where an automation's next run will report, as resolved server-side through
  * the destination waterfall (own target -> Manager Channel -> primary
@@ -595,6 +589,10 @@ const AUTOMATION_DEFINITIONS: Record<AutomationId, AutomationDefinition> = {
   },
 };
 
+const AutomationSummaryContext = createContext<
+  Partial<Record<AutomationId, string>>
+>({});
+
 const HASH_ALIAS_TO_AUTOMATION_ID: Record<string, AutomationId> = {
   ...Object.fromEntries(
     Object.keys(AUTOMATION_DEFINITIONS).map((automationId) => [
@@ -662,34 +660,6 @@ const AUTOMATION_RUN_KEYS_BY_ID: Partial<
   ),
 };
 
-const AUTOMATION_HISTORY_KEYS_BY_ID: Partial<
-  Record<AutomationId, BackgroundAutomationKey>
-> = {
-  callRoomoteViaEmoji: 'call_roomote_via_emoji',
-  channelAutoStart: 'slack_channel_auto_start',
-  reviewer: 'review_code',
-  platformIssueAlerts: 'platform_issue_alerts',
-  ...AUTOMATION_RUN_KEYS_BY_ID,
-};
-
-export function getAutomationHistoryHref(
-  automationId: AutomationId,
-): string | null {
-  // Provider usage alerts are delivered directly to a communication channel;
-  // their runner does not create Roomote tasks to inspect.
-  if (
-    automationId === 'providerUsageLimit' ||
-    automationId === 'mergeAnnouncer'
-  ) {
-    return null;
-  }
-
-  const automationKey = AUTOMATION_HISTORY_KEYS_BY_ID[automationId];
-  return automationKey
-    ? `/tasks?userId=${encodeURIComponent(`automation:${automationKey}`)}`
-    : null;
-}
-
 type ScheduleOnlyAutomationFrequencyState = Pick<
   FormState,
   ScheduleOnlyBackgroundAutomationFrequencyField
@@ -1441,76 +1411,66 @@ function AutomationCard({
   const actionLabel = iconEnabled
     ? `Configure ${automation.label}`
     : `Set up ${automation.label}`;
-  const historyHref = getAutomationHistoryHref(automation.id);
+  const summaries = useContext(AutomationSummaryContext);
 
-  if (!iconEnabled && !isAvailableMatch) {
+  if (!isAvailableMatch) {
     return null;
   }
 
   return (
     <div
       id={automation.id}
-      className={cn('scroll-mt-24', iconEnabled ? 'order-[-20]' : 'order-0')}
+      className="scroll-mt-24"
       aria-disabled={disabled || undefined}
     >
-      <Card
-        className={cn(
-          'h-full gap-3 px-5 py-4 md:px-6 md:py-6',
-          disabled && 'opacity-50',
-        )}
-      >
-        <CardHeader>
-          <div className="flex items-start justify-between gap-3">
-            <div className="flex min-w-0 items-start gap-3">
-              <div className="mt-0.5 flex w-[34px] shrink-0 items-start justify-center">
-                <div className="rounded-xl border border-border/70 bg-muted/30 p-2">
-                  <Icon className="size-5" />
-                </div>
-              </div>
-              <div className="min-w-0 space-y-1">
-                <CardTitle className="text-base">{automation.label}</CardTitle>
-                {automation.commsBadge || automation.scmBadge ? (
-                  <p className="text-sm text-foreground">
-                    {[automation.commsBadge, automation.scmBadge]
-                      .filter(Boolean)
-                      .join(' · ')}
-                  </p>
-                ) : null}
-                <p className="text-sm text-muted-foreground">
-                  {automation.description}
-                </p>
-              </div>
-            </div>
-            <div className="flex shrink-0 items-center gap-1">
-              {historyHref && iconEnabled && !disabled ? (
-                <BasicTooltip content="View previous runs">
-                  <Button asChild size="icon" variant="ghost">
-                    <Link
-                      href={historyHref}
-                      aria-label={`View previous runs for ${automation.label}`}
-                    >
-                      <RotateCcwClock />
-                    </Link>
-                  </Button>
-                </BasicTooltip>
-              ) : null}
-              {runAction && iconEnabled && !disabled ? runAction : null}
-              <BasicTooltip content={actionLabel}>
-                <Button
-                  type="button"
-                  size="icon"
-                  variant="ghost"
-                  aria-label={actionLabel}
-                  disabled={disabled}
-                  onClick={() => onOpenChange(true)}
-                >
-                  {iconEnabled ? <Settings2 /> : <Plus />}
-                </Button>
-              </BasicTooltip>
-            </div>
-          </div>
-        </CardHeader>
-      </Card>
+      <AutomationListRow
+        icon={Icon}
+        name={automation.label}
+        description={automation.description}
+        summary={
+          <>
+            <span>
+              {summaries[automation.id] ?? (iconEnabled ? 'Enabled' : 'Off')}
+            </span>
+            {automation.commsBadge || automation.scmBadge ? (
+              <span>
+                ·{' '}
+                {[automation.commsBadge, automation.scmBadge]
+                  .filter(Boolean)
+                  .join(' · ')}
+              </span>
+            ) : null}
+          </>
+        }
+        enabledControl={
+          <BasicTooltip content={actionLabel}>
+            <Switch
+              checked={iconEnabled}
+              disabled={disabled}
+              className="border-border data-[state=unchecked]:bg-muted"
+              aria-label={`${actionLabel} enabled state`}
+              onCheckedChange={() => onOpenChange(true)}
+            />
+          </BasicTooltip>
+        }
+        actions={
+          <>
+            {runAction && iconEnabled && !disabled ? runAction : null}
+            <BasicTooltip content={actionLabel}>
+              <Button
+                type="button"
+                size="icon"
+                variant="ghost"
+                aria-label={actionLabel}
+                disabled={disabled}
+                onClick={() => onOpenChange(true)}
+              >
+                <Settings2 />
+              </Button>
+            </BasicTooltip>
+          </>
+        }
+      />
 
       <Dialog
         open={open}
@@ -1639,7 +1599,11 @@ function ScheduledAutomationCard<TFrequency extends string>({
   );
 }
 
-export function AutomationsSettings() {
+export function AutomationsSettings({
+  toolbarLeading,
+}: {
+  toolbarLeading?: React.ReactNode;
+} = {}) {
   const showAutomationDebugRuns = false;
   const trpc = useTRPC();
   const queryClient = useQueryClient();
@@ -1661,10 +1625,9 @@ export function AutomationsSettings() {
   const [openAutomationIds, setOpenAutomationIds] = useState<Set<AutomationId>>(
     () => new Set(),
   );
-  const [availableCategory, setAvailableCategory] = useState<
-    AutomationCategory | 'all'
-  >('all');
-  const [availableSearch, setAvailableSearch] = useState('');
+  const [automationFilter, setAutomationFilter] =
+    useState<AutomationListFilter>('all');
+  const [automationSearch, setAutomationSearch] = useState('');
   const formStateRef = useRef<FormState | null>(null);
   const savedStateRef = useRef<FormState | null>(null);
   const didApplyInitialHashRef = useRef(false);
@@ -2540,28 +2503,108 @@ export function AutomationsSettings() {
     announcer: announcerIsEnabled,
     platformIssueAlerts: isPlatformIssueAlertsEnabled(formState),
   } satisfies Record<AutomationId, boolean>;
-  const normalizedAvailableSearch = availableSearch.trim().toLowerCase();
-  const availableAutomationMatches = new Set(
+
+  const resolvedDestinationLabel = (
+    automationKey: keyof NonNullable<
+      typeof settingsQuery.data
+    >['resolvedDestinations'],
+  ): string => {
+    const destination = settingsQuery.data?.resolvedDestinations[automationKey];
+    if (!destination) return 'No report destination';
+
+    return `${getCommunicationProviderDisplayName(destination.provider)} ${destination.displayName ?? destination.channelId}`;
+  };
+  const scheduledSummary = (
+    frequency: keyof typeof TRIGGERABLE_AUTOMATION_SCHEDULE_LABELS | undefined,
+    destination?: string,
+  ): string => {
+    const schedule = frequency
+      ? TRIGGERABLE_AUTOMATION_SCHEDULE_LABELS[frequency]
+      : 'Off';
+    return destination ? `${schedule} → ${destination}` : schedule;
+  };
+  const scheduleOnlySummaries = Object.fromEntries(
+    SCHEDULE_ONLY_BACKGROUND_AUTOMATION_LIST.map((automation) => {
+      const definition = SCHEDULE_ONLY_AUTOMATION_UI_DEFINITIONS[automation.id];
+      const frequency = formState?.[automation.frequencyField];
+      const trigger =
+        definition.control.kind === 'toggle'
+          ? automation.id === 'issueFixer'
+            ? 'Issue opened or reopened'
+            : automation.id === 'mergeAnnouncer'
+              ? 'Default-branch push'
+              : 'CI failure event'
+          : frequency && frequency !== 'off'
+            ? TRIGGERABLE_AUTOMATION_SCHEDULE_LABELS[frequency]
+            : 'Off';
+      return [
+        automation.id,
+        `${definition.control.kind === 'toggle' && frequency === 'off' ? 'Off · ' : ''}${trigger} → ${
+          automation.id === 'issueFixer'
+            ? 'source control issue'
+            : resolvedDestinationLabel(automation.automationKey)
+        }`,
+      ];
+    }),
+  ) as Record<ScheduleOnlyBackgroundAutomationId, string>;
+  const automationSummaries = {
+    callRoomoteViaEmoji: 'Emoji reaction → source thread',
+    channelAutoStart: `${formState?.channelAutoStartChannels.length ?? 0} configured channel${formState?.channelAutoStartChannels.length === 1 ? '' : 's'} → Sessions`,
+    managerChannel: managerChannelConfigured
+      ? `Shared output → ${managerSlackChannelId ? `Slack ${formState?.managerSlackChannel || managerSlackChannelId}` : `Discord ${formState?.managerDiscordChannel || managerDiscordChannelId}`}`
+      : 'No shared output destination',
+    managerStats: scheduledSummary(
+      formState?.managerStatsFrequency,
+      resolvedDestinationLabel('manager_stats'),
+    ),
+    providerUsageLimit: scheduledSummary(
+      formState?.providerUsageLimitFrequency,
+      resolvedDestinationLabel('provider_usage_limit'),
+    ),
+    sentryTriage: scheduledSummary(
+      formState?.sentryTriageFrequency,
+      resolvedDestinationLabel('sentry_triage'),
+    ),
+    dependabotTriage: scheduledSummary(
+      formState?.dependabotTriageFrequency,
+      resolvedDestinationLabel('dependabot_triage'),
+    ),
+    codeqlTriage: scheduledSummary(
+      formState?.codeqlTriageFrequency,
+      resolvedDestinationLabel('codeql_triage'),
+    ),
+    ...scheduleOnlySummaries,
+    reviewer: 'Pull request events and manual runs → source control',
+    conflictResolver: scheduledSummary(formState?.conflictResolverFrequency),
+    suggester: scheduledSummary(
+      formState?.suggesterFrequency,
+      resolvedDestinationLabel('suggester'),
+    ),
+    announcer: scheduledSummary(
+      formState?.announcerFrequency,
+      resolvedDestinationLabel('announcer'),
+    ),
+    platformIssueAlerts: `Configuration errors → ${resolvedDestinationLabel('platform_issue_alerts')}`,
+  } satisfies Record<AutomationId, string>;
+
+  const normalizedAutomationSearch = automationSearch.trim().toLowerCase();
+  const visibleBuiltInAutomations = new Set(
     Object.values(AUTOMATION_DEFINITIONS)
       .filter(
         (automation) =>
-          !iconEnabled[automation.id] &&
-          (availableCategory === 'all' ||
-            automation.category === availableCategory) &&
-          (!normalizedAvailableSearch ||
-            [
-              automation.label,
-              automation.description,
-              ...(automation.searchTerms ?? []),
-            ]
-              .join(' ')
-              .toLowerCase()
-              .includes(normalizedAvailableSearch)),
+          !normalizedAutomationSearch ||
+          [
+            automation.label,
+            automation.description,
+            automationSummaries[automation.id],
+            ...(automation.searchTerms ?? []),
+          ]
+            .join(' ')
+            .toLowerCase()
+            .includes(normalizedAutomationSearch),
       )
       .map((automation) => automation.id),
   );
-  const hasAvailableFilters =
-    availableCategory !== 'all' || Boolean(normalizedAvailableSearch);
 
   const isAutomationSaving = (automationId: AutomationId) =>
     updateMutation.isPending && savingAutomation === automationId;
@@ -2647,86 +2690,24 @@ export function AutomationsSettings() {
         </Alert>
       ) : null}
 
-      <CustomAutomationsSection />
-
-      {settingsQuery.isPending || !formState ? (
-        <LoadingSkeleton />
-      ) : (
-        <div className="space-y-4">
-          <div className="grid gap-4 md:grid-cols-2">
-            <h2 className="order-[-30] col-span-full text-sm font-semibold text-foreground">
-              Enabled
-            </h2>
-            {Object.values(iconEnabled).some(Boolean) ? null : (
-              <p className="order-[-20] col-span-full text-sm text-muted-foreground">
-                No built-in automations enabled yet.
-              </p>
-            )}
-            <div className="order-[-10] col-span-full flex flex-col gap-2 sm:flex-row sm:items-center sm:justify-between">
-              <h2 className="text-sm font-semibold text-foreground">
-                Available
-              </h2>
-              <div className="flex flex-wrap items-center gap-2">
-                <Select
-                  value={availableCategory}
-                  onValueChange={(value) =>
-                    setAvailableCategory(value as AutomationCategory | 'all')
-                  }
-                >
-                  <SelectTrigger
-                    size="sm"
-                    aria-label="Filter available automations by category"
-                    className="w-40"
-                  >
-                    <SelectValue />
-                  </SelectTrigger>
-                  <SelectContent>
-                    {AUTOMATION_CATEGORY_OPTIONS.map((option) => (
-                      <SelectItem key={option.value} value={option.value}>
-                        {option.label}
-                      </SelectItem>
-                    ))}
-                  </SelectContent>
-                </Select>
-                <div className="relative">
-                  <Search className="pointer-events-none absolute left-2.5 top-1/2 size-3.5 -translate-y-1/2 text-muted-foreground" />
-                  <Input
-                    value={availableSearch}
-                    onChange={(event) =>
-                      setAvailableSearch(event.currentTarget.value)
-                    }
-                    placeholder="Search"
-                    aria-label="Search available automations"
-                    className="h-8 w-36 pl-8 text-sm"
-                  />
-                </div>
-                {hasAvailableFilters ? (
-                  <BasicTooltip content="Clear filters">
-                    <Button
-                      type="button"
-                      size="icon"
-                      className="size-8"
-                      variant="ghost"
-                      aria-label="Clear automation filters"
-                      onClick={() => {
-                        setAvailableCategory('all');
-                        setAvailableSearch('');
-                      }}
-                    >
-                      <X />
-                    </Button>
-                  </BasicTooltip>
-                ) : null}
-              </div>
-            </div>
-            {availableAutomationMatches.size === 0 ? (
-              <p className="order-0 col-span-full text-sm text-muted-foreground">
-                No available automations match these filters.
-              </p>
-            ) : null}
+      <CustomAutomationsSection
+        filter={automationFilter}
+        search={automationSearch}
+        onFilterChange={setAutomationFilter}
+        onSearchChange={setAutomationSearch}
+        toolbarLeading={toolbarLeading}
+      >
+        {settingsQuery.isPending || !formState ? (
+          <LoadingSkeleton />
+        ) : visibleBuiltInAutomations.size === 0 ? (
+          <p className="px-4 py-6 text-sm text-muted-foreground">
+            No built-in automations match your search.
+          </p>
+        ) : (
+          <AutomationSummaryContext.Provider value={automationSummaries}>
             <AutomationCard
               automation={AUTOMATION_DEFINITIONS.callRoomoteViaEmoji}
-              isAvailableMatch={availableAutomationMatches.has(
+              isAvailableMatch={visibleBuiltInAutomations.has(
                 'callRoomoteViaEmoji',
               )}
               isOpen={openAutomationIds.has('callRoomoteViaEmoji')}
@@ -2835,7 +2816,7 @@ export function AutomationsSettings() {
 
             <AutomationCard
               automation={AUTOMATION_DEFINITIONS.reviewer}
-              isAvailableMatch={availableAutomationMatches.has('reviewer')}
+              isAvailableMatch={visibleBuiltInAutomations.has('reviewer')}
               isOpen={openAutomationIds.has('reviewer')}
               onOpenChange={(open) => setAutomationOpen('reviewer', open)}
               iconEnabled={iconEnabled.reviewer}
@@ -3008,7 +2989,7 @@ export function AutomationsSettings() {
                 <AutomationCard
                   key={automation.id}
                   automation={AUTOMATION_DEFINITIONS[automation.id]}
-                  isAvailableMatch={availableAutomationMatches.has(
+                  isAvailableMatch={visibleBuiltInAutomations.has(
                     automation.id,
                   )}
                   isOpen={openAutomationIds.has(automation.id)}
@@ -3087,7 +3068,7 @@ export function AutomationsSettings() {
 
             <AutomationCard
               automation={AUTOMATION_DEFINITIONS.conflictResolver}
-              isAvailableMatch={availableAutomationMatches.has(
+              isAvailableMatch={visibleBuiltInAutomations.has(
                 'conflictResolver',
               )}
               isOpen={openAutomationIds.has('conflictResolver')}
@@ -3297,7 +3278,7 @@ export function AutomationsSettings() {
                 <AutomationCard
                   key={automation.id}
                   automation={AUTOMATION_DEFINITIONS[automation.id]}
-                  isAvailableMatch={availableAutomationMatches.has(
+                  isAvailableMatch={visibleBuiltInAutomations.has(
                     automation.id,
                   )}
                   isOpen={openAutomationIds.has(automation.id)}
@@ -3469,7 +3450,7 @@ export function AutomationsSettings() {
 
             <ScheduledAutomationCard
               automation={AUTOMATION_DEFINITIONS.dependabotTriage}
-              isAvailableMatch={availableAutomationMatches.has(
+              isAvailableMatch={visibleBuiltInAutomations.has(
                 'dependabotTriage',
               )}
               isOpen={openAutomationIds.has('dependabotTriage')}
@@ -3547,7 +3528,7 @@ export function AutomationsSettings() {
 
             <ScheduledAutomationCard
               automation={AUTOMATION_DEFINITIONS.codeqlTriage}
-              isAvailableMatch={availableAutomationMatches.has('codeqlTriage')}
+              isAvailableMatch={visibleBuiltInAutomations.has('codeqlTriage')}
               isOpen={openAutomationIds.has('codeqlTriage')}
               onOpenChange={(open) => setAutomationOpen('codeqlTriage', open)}
               iconEnabled={iconEnabled.codeqlTriage}
@@ -3638,7 +3619,7 @@ export function AutomationsSettings() {
                 <AutomationCard
                   key={automation.id}
                   automation={AUTOMATION_DEFINITIONS[automation.id]}
-                  isAvailableMatch={availableAutomationMatches.has(
+                  isAvailableMatch={visibleBuiltInAutomations.has(
                     automation.id,
                   )}
                   isOpen={openAutomationIds.has(automation.id)}
@@ -3781,7 +3762,7 @@ export function AutomationsSettings() {
 
             <AutomationCard
               automation={AUTOMATION_DEFINITIONS.channelAutoStart}
-              isAvailableMatch={availableAutomationMatches.has(
+              isAvailableMatch={visibleBuiltInAutomations.has(
                 'channelAutoStart',
               )}
               isOpen={openAutomationIds.has('channelAutoStart')}
@@ -3839,9 +3820,7 @@ export function AutomationsSettings() {
 
             <AutomationCard
               automation={AUTOMATION_DEFINITIONS.managerChannel}
-              isAvailableMatch={availableAutomationMatches.has(
-                'managerChannel',
-              )}
+              isAvailableMatch={visibleBuiltInAutomations.has('managerChannel')}
               isOpen={openAutomationIds.has('managerChannel')}
               onOpenChange={(open) => setAutomationOpen('managerChannel', open)}
               iconEnabled={iconEnabled.managerChannel}
@@ -3906,7 +3885,7 @@ export function AutomationsSettings() {
 
             <AutomationCard
               automation={AUTOMATION_DEFINITIONS.managerStats}
-              isAvailableMatch={availableAutomationMatches.has('managerStats')}
+              isAvailableMatch={visibleBuiltInAutomations.has('managerStats')}
               isOpen={openAutomationIds.has('managerStats')}
               onOpenChange={(open) => setAutomationOpen('managerStats', open)}
               iconEnabled={iconEnabled.managerStats}
@@ -3993,7 +3972,7 @@ export function AutomationsSettings() {
 
             <AutomationCard
               automation={AUTOMATION_DEFINITIONS.providerUsageLimit}
-              isAvailableMatch={availableAutomationMatches.has(
+              isAvailableMatch={visibleBuiltInAutomations.has(
                 'providerUsageLimit',
               )}
               isOpen={openAutomationIds.has('providerUsageLimit')}
@@ -4123,7 +4102,7 @@ export function AutomationsSettings() {
 
             <AutomationCard
               automation={AUTOMATION_DEFINITIONS.sentryTriage}
-              isAvailableMatch={availableAutomationMatches.has('sentryTriage')}
+              isAvailableMatch={visibleBuiltInAutomations.has('sentryTriage')}
               isOpen={openAutomationIds.has('sentryTriage')}
               onOpenChange={(open) => setAutomationOpen('sentryTriage', open)}
               iconEnabled={iconEnabled.sentryTriage}
@@ -4302,7 +4281,7 @@ export function AutomationsSettings() {
 
             <AutomationCard
               automation={AUTOMATION_DEFINITIONS.suggester}
-              isAvailableMatch={availableAutomationMatches.has('suggester')}
+              isAvailableMatch={visibleBuiltInAutomations.has('suggester')}
               isOpen={openAutomationIds.has('suggester')}
               onOpenChange={(open) => setAutomationOpen('suggester', open)}
               iconEnabled={iconEnabled.suggester}
@@ -4440,7 +4419,7 @@ export function AutomationsSettings() {
 
             <AutomationCard
               automation={AUTOMATION_DEFINITIONS.announcer}
-              isAvailableMatch={availableAutomationMatches.has('announcer')}
+              isAvailableMatch={visibleBuiltInAutomations.has('announcer')}
               isOpen={openAutomationIds.has('announcer')}
               onOpenChange={(open) => setAutomationOpen('announcer', open)}
               iconEnabled={iconEnabled.announcer}
@@ -4566,7 +4545,7 @@ export function AutomationsSettings() {
 
             <AutomationCard
               automation={AUTOMATION_DEFINITIONS.platformIssueAlerts}
-              isAvailableMatch={availableAutomationMatches.has(
+              isAvailableMatch={visibleBuiltInAutomations.has(
                 'platformIssueAlerts',
               )}
               isOpen={openAutomationIds.has('platformIssueAlerts')}
@@ -4626,9 +4605,9 @@ export function AutomationsSettings() {
                 })}
               </div>
             </AutomationCard>
-          </div>
-        </div>
-      )}
+          </AutomationSummaryContext.Provider>
+        )}
+      </CustomAutomationsSection>
     </div>
   );
 }
diff --git a/apps/web/src/components/settings/automations/CustomAutomationsSection.tsx b/apps/web/src/components/settings/automations/CustomAutomationsSection.tsx
index deecc9e4e..04e6978db 100644
--- a/apps/web/src/components/settings/automations/CustomAutomationsSection.tsx
+++ b/apps/web/src/components/settings/automations/CustomAutomationsSection.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import Link from 'next/link';
+import type { ReactNode } from 'react';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { toast } from 'sonner';
@@ -16,7 +16,6 @@ import {
 
 import { tryParseCronSchedule } from '@/lib/cron-schedule';
 import { formatDistanceToNowCompact, formatTimeZone } from '@/lib/formatters';
-import { buildCreatorFilterValue } from '@/lib/task-creator-filter';
 import { useTRPC } from '@/trpc/client';
 import type { CustomAutomationListItem } from '@/trpc/commands/automations';
 
@@ -34,7 +33,6 @@ import {
   Label,
   Play,
   Plus,
-  RotateCcwClock,
   Select,
   SelectContent,
   SelectItem,
@@ -45,6 +43,7 @@ import {
   Switch,
   Textarea,
   Trash2,
+  Zap,
 } from '@/components/system';
 
 import { ModelSelect } from '@/components/tasks/ModelSelect';
@@ -56,6 +55,12 @@ import {
   AutomationDestinationPicker,
   type AutomationDestinationProvider,
 } from './AutomationDestinationPicker';
+import {
+  AutomationListHeader,
+  AutomationListRow,
+  AutomationListToolbar,
+  type AutomationListFilter,
+} from './AutomationList';
 
 type ConnectedDestinationProvider = Exclude<
   AutomationDestinationProvider,
@@ -281,7 +286,21 @@ function scheduleSummaryLine(summary: string, timeZone: string): string {
     : `${summary} (${timeZoneLabel})`;
 }
 
-export function CustomAutomationsSection() {
+export function CustomAutomationsSection({
+  filter: controlledFilter,
+  search: controlledSearch,
+  onFilterChange,
+  onSearchChange,
+  toolbarLeading,
+  children,
+}: {
+  filter?: AutomationListFilter;
+  search?: string;
+  onFilterChange?: (filter: AutomationListFilter) => void;
+  onSearchChange?: (search: string) => void;
+  toolbarLeading?: ReactNode;
+  children?: ReactNode;
+} = {}) {
   const { isAdmin } = useAuthorizedUser();
   const trpc = useTRPC();
   const queryClient = useQueryClient();
@@ -309,6 +328,12 @@ export function CustomAutomationsSection() {
   const [form, setForm] = useState<CustomAutomationFormState>(EMPTY_FORM);
   const [resolvedCron, setResolvedCron] = useState<string | null>(null);
   const [scheduleSummary, setScheduleSummary] = useState<string | null>(null);
+  const [localFilter, setLocalFilter] = useState<AutomationListFilter>('all');
+  const [localSearch, setLocalSearch] = useState('');
+  const filter = controlledFilter ?? localFilter;
+  const search = controlledSearch ?? localSearch;
+  const setFilter = onFilterChange ?? setLocalFilter;
+  const setSearch = onSearchChange ?? setLocalSearch;
 
   // New destinations default to the shared manager channel, matching where
   // the other automations report by default.
@@ -483,6 +508,51 @@ export function CustomAutomationsSection() {
       : scheduleSummary;
 
   const rows = useMemo(() => listQuery.data ?? [], [listQuery.data]);
+  const normalizedSearch = search.trim().toLowerCase();
+  const visibleRows =
+    filter === 'built-in'
+      ? []
+      : rows.filter((row) => {
+          const target = targetFromRow(row);
+          const environmentName =
+            row.executionMode === 'fast'
+              ? ''
+              : (environmentOptions.find(
+                  (environment) => environment.id === row.environmentId,
+                )?.name ?? 'Environment missing');
+          const destinationName =
+            DESTINATION_OPTIONS.find(
+              (option) => option.value === target.provider,
+            )?.label ?? 'No report channel';
+          const destinationLabel =
+            target.provider === 'slack'
+              ? (slackOptions.find(
+                  (option) =>
+                    option.id === target.channelId ||
+                    option.name === target.channelId,
+                )?.label ?? target.channelId)
+              : target.provider === 'discord'
+                ? (discordOptions.find(
+                    (option) => option.id === target.channelId,
+                  )?.label ?? target.channelId)
+                : target.channelId;
+
+          return (
+            !normalizedSearch ||
+            [
+              row.name,
+              row.prompt,
+              cadenceLabel(row),
+              environmentName,
+              destinationName,
+              destinationLabel,
+              row.createdByName ?? '',
+            ]
+              .join(' ')
+              .toLowerCase()
+              .includes(normalizedSearch)
+          );
+        });
   const atCap = rows.length >= MAX_CUSTOM_AUTOMATIONS;
   const busy =
     createMutation.isPending ||
@@ -885,54 +955,53 @@ export function CustomAutomationsSection() {
     </DialogContent>
   );
 
+  const newButton =
+    !isCreating && !editingId ? (
+      <Button
+        type="button"
+        size="sm"
+        disabled={busy || atCap || !capabilitiesLoaded}
+        onClick={() => {
+          const managerProvider =
+            managerSlackChannelId && capabilities?.slackConnected
+              ? 'slack'
+              : managerDiscordChannelId && capabilities?.discordConnected
+                ? 'discord'
+                : null;
+          const targetProvider =
+            managerProvider ?? connectedDestinationOptions[0]?.value ?? 'none';
+          setIsCreating(true);
+          setEditingId(null);
+          setForm({
+            ...EMPTY_FORM,
+            targetProvider,
+            targetChannelId:
+              targetProvider === 'slack'
+                ? managerSlackChannelId
+                : targetProvider === 'discord'
+                  ? managerDiscordChannelId
+                  : '',
+          });
+          setResolvedCron(null);
+          setScheduleSummary(null);
+        }}
+      >
+        <Plus />
+        New
+      </Button>
+    ) : null;
+
   return (
-    <section className="space-y-3" aria-labelledby="custom-automations-heading">
-      <div className="flex items-start justify-between gap-3 pt-2">
-        <div className="space-y-1">
-          <h2
-            id="custom-automations-heading"
-            className="text-sm font-semibold text-foreground"
-          >
-            Custom
-          </h2>
-        </div>
-        {!isCreating && !editingId ? (
-          <Button
-            type="button"
-            size="sm"
-            disabled={busy || atCap || !capabilitiesLoaded}
-            onClick={() => {
-              const managerProvider =
-                managerSlackChannelId && capabilities?.slackConnected
-                  ? 'slack'
-                  : managerDiscordChannelId && capabilities?.discordConnected
-                    ? 'discord'
-                    : null;
-              const targetProvider =
-                managerProvider ??
-                connectedDestinationOptions[0]?.value ??
-                'none';
-              setIsCreating(true);
-              setEditingId(null);
-              setForm({
-                ...EMPTY_FORM,
-                targetProvider,
-                targetChannelId:
-                  targetProvider === 'slack'
-                    ? managerSlackChannelId
-                    : targetProvider === 'discord'
-                      ? managerDiscordChannelId
-                      : '',
-              });
-              setResolvedCron(null);
-              setScheduleSummary(null);
-            }}
-          >
-            <Plus className="size-4" />
-            New
-          </Button>
-        ) : null}
-      </div>
+    <section className="space-y-3" aria-label="Automations">
+      <AutomationListToolbar
+        filter={filter}
+        search={search}
+        leading={toolbarLeading}
+        action={newButton}
+        showBuiltInFilter={Boolean(children)}
+        onFilterChange={setFilter}
+        onSearchChange={setSearch}
+      />
 
       <Dialog
         open={isCreating || Boolean(editingId)}
@@ -943,34 +1012,37 @@ export function CustomAutomationsSection() {
         {isCreating || editingId ? renderEditor() : null}
       </Dialog>
 
-      {listQuery.isPending ? (
-        <Card variant="snug" data-testid="custom-automations-skeleton">
-          <CardContent>
-            <div className="divide-y divide-background">
-              {Array.from({ length: 2 }).map((_, index) => (
-                <div
-                  key={index}
-                  className="flex items-start gap-3 py-3 first:pt-0 last:pb-0"
-                >
-                  <Skeleton className="mt-0.5 h-5 w-9 rounded-full" />
-                  <div className="flex-1 space-y-2">
-                    <Skeleton className="h-4 w-48" />
-                    <Skeleton className="h-3 w-full max-w-lg" />
-                  </div>
+      <Card variant="snug">
+        <CardContent className="p-0!">
+          <div role="table" aria-label="Automations">
+            <AutomationListHeader />
+            <div role="rowgroup" className="divide-y divide-background">
+              {listQuery.isPending && filter !== 'built-in' ? (
+                <div data-testid="custom-automations-skeleton">
+                  {Array.from({ length: 2 }).map((_, index) => (
+                    <div
+                      key={index}
+                      className="flex items-start gap-3 px-4 py-3"
+                    >
+                      <Skeleton className="mt-0.5 h-5 w-9 rounded-full" />
+                      <div className="flex-1 space-y-2">
+                        <Skeleton className="h-4 w-48" />
+                        <Skeleton className="h-3 w-full max-w-lg" />
+                      </div>
+                    </div>
+                  ))}
                 </div>
-              ))}
-            </div>
-          </CardContent>
-        </Card>
-      ) : rows.length === 0 && !isCreating ? (
-        <p className="text-sm text-muted-foreground -mt-4">
-          No custom automations created yet.
-        </p>
-      ) : (
-        <Card variant="snug">
-          <CardContent>
-            <div className="divide-y divide-background">
-              {rows.map((row) => {
+              ) : null}
+              {!listQuery.isPending &&
+              visibleRows.length === 0 &&
+              (filter === 'custom' || (!children && filter === 'all')) ? (
+                <p className="px-4 py-6 text-sm text-muted-foreground">
+                  {normalizedSearch
+                    ? 'No custom automations match your search.'
+                    : 'No custom automations created yet.'}
+                </p>
+              ) : null}
+              {visibleRows.map((row) => {
                 const environmentName =
                   row.executionMode === 'fast'
                     ? null
@@ -998,34 +1070,29 @@ export function CustomAutomationsSection() {
                               (option) => option.id === target.channelId,
                             )?.label ?? target.channelId)
                           : target.channelId;
-                const historyFilter = buildCreatorFilterValue({
-                  initiatorKind: 'automation',
-                  initiatorUserId: null,
-                  initiatorAutomation: 'custom_automation',
-                  actorExternalId: row.id,
-                });
-
                 return (
-                  <div
+                  <AutomationListRow
                     key={row.id}
-                    className="grid grid-cols-[1fr_auto] gap-3 py-3 first:pt-0 last:pb-0 sm:grid-cols-[auto_1fr_auto] sm:items-start"
-                  >
-                    <Switch
-                      aria-label={`Toggle ${row.name}`}
-                      checked={row.enabled}
-                      disabled={busy}
-                      className="col-start-1 row-start-2 mt-0.5 sm:row-start-1"
-                      onCheckedChange={(enabled) =>
-                        toggleMutation.mutate({
-                          id: row.id,
-                          ...writeInputFromRow(row),
-                          enabled,
-                        })
-                      }
-                    />
-                    <div className="col-span-2 row-start-1 min-w-0 space-y-1 sm:col-span-1 sm:col-start-2">
-                      <p className="text-sm font-semibold">{row.name}</p>
-                      <p className="flex flex-wrap items-center gap-x-1 text-sm text-muted-foreground">
+                    icon={Zap}
+                    name={row.name}
+                    description={<p className="line-clamp-2">{row.prompt}</p>}
+                    enabledControl={
+                      <Switch
+                        aria-label={`Toggle ${row.name}`}
+                        checked={row.enabled}
+                        disabled={busy}
+                        className="border-border data-[state=unchecked]:bg-muted"
+                        onCheckedChange={(enabled) =>
+                          toggleMutation.mutate({
+                            id: row.id,
+                            ...writeInputFromRow(row),
+                            enabled,
+                          })
+                        }
+                      />
+                    }
+                    summary={
+                      <>
                         <span>
                           {cadenceLabel(row)}
                           {environmentName
@@ -1043,86 +1110,81 @@ export function CustomAutomationsSection() {
                           {destinationName}
                           {destinationLabel ? ` ${destinationLabel}` : ''}
                         </span>
-                      </p>
-                      <p className="text-xs text-muted-foreground">
-                        Created by {row.createdByName ?? 'Unknown'}
-                        {row.lastRunAt ? (
-                          <>
-                            {' · Last run '}
-                            <span
-                              title={new Date(row.lastRunAt).toLocaleString()}
-                            >
-                              {formatDistanceToNowCompact(
-                                new Date(row.lastRunAt),
-                                { addSuffix: true },
-                              )}
-                            </span>
-                          </>
-                        ) : null}
-                      </p>
-                      {row.latestFastResult ? (
-                        <p className="line-clamp-2 text-xs text-muted-foreground">
-                          {row.latestFastResult}
-                        </p>
-                      ) : null}
-                    </div>
-                    <div className="col-start-2 row-start-2 flex shrink-0 items-center gap-1 sm:col-start-3 sm:row-start-1">
-                      {historyFilter ? (
-                        <BasicTooltip content="View previous runs">
-                          <Button asChild size="icon" variant="ghost">
-                            <Link
-                              href={`/tasks?userId=${encodeURIComponent(historyFilter)}`}
-                              aria-label={`View previous runs for ${row.name}`}
-                            >
-                              <RotateCcwClock />
-                            </Link>
+                        <span>
+                          Created by {row.createdByName ?? 'Unknown'}
+                          {row.lastRunAt ? (
+                            <>
+                              {' · Last run '}
+                              <span
+                                title={new Date(row.lastRunAt).toLocaleString()}
+                              >
+                                {formatDistanceToNowCompact(
+                                  new Date(row.lastRunAt),
+                                  { addSuffix: true },
+                                )}
+                              </span>
+                            </>
+                          ) : null}
+                        </span>
+                      </>
+                    }
+                    actions={
+                      <>
+                        <CustomAutomationRunButton
+                          automation={row}
+                          disabled={busy}
+                        />
+                        <BasicTooltip content="Configure">
+                          <Button
+                            type="button"
+                            size="icon"
+                            variant="ghost"
+                            disabled={busy}
+                            aria-label={`Configure ${row.name}`}
+                            onClick={() => editAutomation(row)}
+                          >
+                            <Settings2 />
                           </Button>
                         </BasicTooltip>
-                      ) : null}
-                      <CustomAutomationRunButton
-                        automation={row}
-                        disabled={busy}
-                      />
-                      <BasicTooltip content="Configure">
-                        <Button
-                          type="button"
-                          size="icon"
-                          variant="ghost"
-                          disabled={busy}
-                          aria-label={`Configure ${row.name}`}
-                          onClick={() => editAutomation(row)}
-                        >
-                          <Settings2 />
-                        </Button>
-                      </BasicTooltip>
-                      <BasicTooltip content="Delete">
-                        <Button
-                          type="button"
-                          size="sm"
-                          variant="ghost"
-                          disabled={busy}
-                          onClick={() => {
-                            if (
-                              window.confirm(
-                                `Delete custom automation “${row.name}”?`,
-                              )
-                            ) {
-                              deleteMutation.mutate({ id: row.id });
-                            }
-                          }}
-                          aria-label={`Delete ${row.name}`}
-                        >
-                          <Trash2 />
-                        </Button>
-                      </BasicTooltip>
-                    </div>
-                  </div>
+                        <BasicTooltip content="Delete">
+                          <Button
+                            type="button"
+                            size="sm"
+                            variant="ghost"
+                            disabled={busy}
+                            onClick={() => {
+                              if (
+                                window.confirm(
+                                  `Delete custom automation “${row.name}”?`,
+                                )
+                              ) {
+                                deleteMutation.mutate({ id: row.id });
+                              }
+                            }}
+                            aria-label={`Delete ${row.name}`}
+                          >
+                            <Trash2 />
+                          </Button>
+                        </BasicTooltip>
+                      </>
+                    }
+                  />
                 );
               })}
+              {filter !== 'custom' ? children : null}
+              {!listQuery.isPending &&
+              visibleRows.length === 0 &&
+              !children &&
+              filter !== 'custom' &&
+              filter !== 'all' ? (
+                <p className="px-4 py-6 text-sm text-muted-foreground">
+                  No automations match your filters.
+                </p>
+              ) : null}
             </div>
-          </CardContent>
-        </Card>
-      )}
+          </div>
+        </CardContent>
+      </Card>
     </section>
   );
 }
diff --git a/apps/web/src/components/settings/pages/AutomationsSettingsPage.client.test.tsx b/apps/web/src/components/settings/pages/AutomationsSettingsPage.client.test.tsx
index 70fe6a3e2..843a06583 100644
--- a/apps/web/src/components/settings/pages/AutomationsSettingsPage.client.test.tsx
+++ b/apps/web/src/components/settings/pages/AutomationsSettingsPage.client.test.tsx
@@ -1,3 +1,4 @@
+import type { ReactNode } from 'react';
 import { render, screen } from '@testing-library/react';
 
 const state = vi.hoisted(() => ({ isAdmin: false }));
@@ -7,7 +8,12 @@ vi.mock('@/hooks/useUser', () => ({
 }));
 
 vi.mock('@/components/settings/automations', () => ({
-  AutomationsSettings: () => <div>Full automation settings</div>,
+  AutomationsSettings: ({ toolbarLeading }: { toolbarLeading?: ReactNode }) => (
+    <>
+      {toolbarLeading}
+      <div>Full automation settings</div>
+    </>
+  ),
 }));
 
 vi.mock('@/components/settings/automations/CustomAutomationsSection', () => ({
diff --git a/apps/web/src/components/settings/pages/AutomationsSettingsPage.tsx b/apps/web/src/components/settings/pages/AutomationsSettingsPage.tsx
index 9fa2c02e5..9eded11f7 100644
--- a/apps/web/src/components/settings/pages/AutomationsSettingsPage.tsx
+++ b/apps/web/src/components/settings/pages/AutomationsSettingsPage.tsx
@@ -33,10 +33,13 @@ export function AutomationsSettingsPage() {
         </header>
 
         {isAdmin ? (
-          <>
-            <DeploymentTimeZoneSetting />
-            <AutomationsSettings />
-          </>
+          <AutomationsSettings
+            toolbarLeading={
+              <div className="md:mr-auto">
+                <DeploymentTimeZoneSetting />
+              </div>
+            }
+          />
         ) : (
           <CustomAutomationsSection />
         )}
diff --git a/apps/web/src/components/system/primitives/icons.ts b/apps/web/src/components/system/primitives/icons.ts
index 960e7513e..f6a0c656b 100644
--- a/apps/web/src/components/system/primitives/icons.ts
+++ b/apps/web/src/components/system/primitives/icons.ts
@@ -159,7 +159,6 @@ export {
   RefreshCwIcon,
   RectangleHorizontal,
   RotateCcw,
-  History as RotateCcwClock,
   RotateCcwKey,
   ScrollText,
   Rows4,
diff --git a/apps/web/src/testing/exclusive-automation-settings-database-lock.ts b/apps/web/src/testing/exclusive-automation-settings-database-lock.ts
new file mode 100644
index 000000000..1174a7442
--- /dev/null
+++ b/apps/web/src/testing/exclusive-automation-settings-database-lock.ts
@@ -0,0 +1,36 @@
+import { db, sql } from '@roomote/db/server';
+
+const AUTOMATION_SETTINGS_TEST_LOCK = [20260910, 2451] as const;
+
+/** Serializes suites that replace deployment-wide automation settings rows. */
+export function registerExclusiveAutomationSettingsDatabaseLock() {
+  let releaseLock: (() => void) | undefined;
+  let lockTransaction: Promise<void> | undefined;
+
+  beforeAll(async () => {
+    let markAcquired: (() => void) | undefined;
+    let rejectAcquired: ((error: unknown) => void) | undefined;
+    const acquired = new Promise<void>((resolve, reject) => {
+      markAcquired = resolve;
+      rejectAcquired = reject;
+    });
+    const released = new Promise<void>((resolve) => {
+      releaseLock = resolve;
+    });
+
+    lockTransaction = db.transaction(async (tx) => {
+      await tx.execute(
+        sql`select pg_advisory_xact_lock(${AUTOMATION_SETTINGS_TEST_LOCK[0]}, ${AUTOMATION_SETTINGS_TEST_LOCK[1]})`,
+      );
+      markAcquired?.();
+      await released;
+    });
+    void lockTransaction.catch((error) => rejectAcquired?.(error));
+    await acquired;
+  });
+
+  afterAll(async () => {
+    releaseLock?.();
+    await lockTransaction;
+  });
+}
diff --git a/apps/web/src/trpc/commands/automations/__tests__/settings-read.test.ts b/apps/web/src/trpc/commands/automations/__tests__/settings-read.test.ts
index 90cf8764b..f76634f92 100644
--- a/apps/web/src/trpc/commands/automations/__tests__/settings-read.test.ts
+++ b/apps/web/src/trpc/commands/automations/__tests__/settings-read.test.ts
@@ -10,9 +10,12 @@ import {
 import { USER_FACING_AUTOMATION_KEYS } from '@roomote/types';
 
 import type { UserAuthSuccess } from '@/types';
+import { registerExclusiveAutomationSettingsDatabaseLock } from '@/testing/exclusive-automation-settings-database-lock';
 
 import { getBackgroundAgentSettingsCommand } from '../settings-read';
 
+registerExclusiveAutomationSettingsDatabaseLock();
+
 const SETTINGS_READ_USER_ID = 'user-settings-read-admin';
 const MANAGER_CHANNEL_ID = 'CMANAGER1';
 const MANAGER_DISCORD_CHANNEL_ID = 'DMANAGER1';
diff --git a/apps/web/src/trpc/commands/automations/__tests__/settings-update-discord.test.ts b/apps/web/src/trpc/commands/automations/__tests__/settings-update-discord.test.ts
index b6a7bc9c1..6e5c3f399 100644
--- a/apps/web/src/trpc/commands/automations/__tests__/settings-update-discord.test.ts
+++ b/apps/web/src/trpc/commands/automations/__tests__/settings-update-discord.test.ts
@@ -20,6 +20,7 @@ import {
 } from '@roomote/types';
 
 import type { UserAuthSuccess } from '@/types';
+import { registerExclusiveAutomationSettingsDatabaseLock } from '@/testing/exclusive-automation-settings-database-lock';
 
 import { updateBackgroundAgentSettingsCommand } from '../settings-update';
 import { mergeAnnouncerDestinationInputSchema } from '../settings-schema';
@@ -60,6 +61,8 @@ vi.mock('@roomote/telemetry/server', () => ({
   captureActivationAutomationChanged: mockCaptureActivationAutomationChanged,
 }));
 
+registerExclusiveAutomationSettingsDatabaseLock();
+
 // Keep the test hermetic: the command constructs a SlackNotifier whenever a
 // Slack installation exists and probes channel membership/names after saving.
 vi.mock('@roomote/slack', async (importOriginal) => {
@@ -273,6 +276,11 @@ describe('updateBackgroundAgentSettingsCommand Discord destinations', () => {
   });
 
   it('tracks a built-in automation when its enabled state changes', async () => {
+    await upsertAutomation(db, {
+      key: 'manager_stats',
+      enabled: false,
+      schedule: { mode: 'weekly' },
+    });
     await insertAvailableDiscordChannel({
       guildId: 'guild-1',
       channelId: 'channel-1',
@@ -611,6 +619,11 @@ describe('updateBackgroundAgentSettingsCommand Discord destinations', () => {
   });
 
   it('does not track a built-in automation when its enabled state is unchanged', async () => {
+    await upsertAutomation(db, {
+      key: 'manager_stats',
+      enabled: false,
+      schedule: { mode: 'weekly' },
+    });
     const result = await updateBackgroundAgentSettingsCommand(
       adminAuth,
       buildInput({ savingAutomation: 'managerStats' }),
@@ -800,6 +813,11 @@ describe('updateBackgroundAgentSettingsCommand Discord destinations', () => {
   }, 15_000);
 
   it('switches a Discord manager channel to Slack and clears Discord', async () => {
+    await upsertAutomation(db, {
+      key: 'manager_stats',
+      enabled: false,
+      schedule: { mode: 'weekly' },
+    });
     await insertSlackInstallation();
     await db.insert(deploymentSettings).values({
       id: 'default',
diff --git a/apps/web/src/trpc/commands/slack/auth-provisioning.test.ts b/apps/web/src/trpc/commands/slack/auth-provisioning.test.ts
index 04c751944..4a3bff473 100644
--- a/apps/web/src/trpc/commands/slack/auth-provisioning.test.ts
+++ b/apps/web/src/trpc/commands/slack/auth-provisioning.test.ts
@@ -13,6 +13,9 @@ import {
 } from '@roomote/db/server';
 import { USER_FACING_AUTOMATION_KEYS } from '@roomote/types';
 import type { UserAuthSuccess } from '@/types';
+import { registerExclusiveAutomationSettingsDatabaseLock } from '@/testing/exclusive-automation-settings-database-lock';
+
+registerExclusiveAutomationSettingsDatabaseLock();
 
 const { ensureChannel, education, decodeState, fetchMock } = vi.hoisted(() => ({
   ensureChannel: vi.fn(),