diff --git a/.changeset/brown-rules-cut.md b/.changeset/brown-rules-cut.md
new file mode 100644
index 00000000000..3c6251b5d0e
--- /dev/null
+++ b/.changeset/brown-rules-cut.md
@@ -0,0 +1,6 @@
+---
+"@tryghost/adapter-base-scheduling": patch
+"@tryghost/adapter-base-sso": patch
+---
+
+Bumped framework dependencies
diff --git a/apps/admin/src/automations/automations.tsx b/apps/admin/src/automations/automations.tsx
index 008834b19dc..78f5326d0dd 100644
--- a/apps/admin/src/automations/automations.tsx
+++ b/apps/admin/src/automations/automations.tsx
@@ -17,7 +17,7 @@ const Automations: React.FC = () => {
     }
 
     return (
-        <Box className='size-full'>
+        <Box className='size-full' data-sentry-mask='true'>
             <Container className='relative flex h-full flex-col' size='page'>
             <ListPage data-testid="automations-page">
                 <ListPage.Header>
diff --git a/apps/admin/src/automations/components/automations-list.test.tsx b/apps/admin/src/automations/components/automations-list.test.tsx
index b6d20714d99..b0710dad327 100644
--- a/apps/admin/src/automations/components/automations-list.test.tsx
+++ b/apps/admin/src/automations/components/automations-list.test.tsx
@@ -1,8 +1,8 @@
 import AutomationsList from './automations-list';
 import React from 'react';
-import {MemoryRouter} from 'react-router';
+import {MemoryRouter, Route, Routes, useParams} from 'react-router';
 import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
-import {render, screen} from '@testing-library/react';
+import {fireEvent, render, screen} from '@testing-library/react';
 
 const automations = [{
     id: 'automation-id-1',
@@ -28,6 +28,21 @@ const automations = [{
 
 const renderWithRouter = (ui: React.ReactElement) => render(<MemoryRouter>{ui}</MemoryRouter>);
 
+const AutomationEditorRoute = () => {
+    const {id} = useParams();
+
+    return <div>Automation editor: {id}</div>;
+};
+
+const renderWithRoutes = () => render(
+    <MemoryRouter initialEntries={['/automations']}>
+        <Routes>
+            <Route element={<AutomationsList automations={automations} showRunAnalytics={true} />} path="/automations" />
+            <Route element={<AutomationEditorRoute />} path="/automations/:id" />
+        </Routes>
+    </MemoryRouter>
+);
+
 describe('AutomationsList', () => {
     beforeEach(() => {
         vi.useFakeTimers();
@@ -80,6 +95,33 @@ describe('AutomationsList', () => {
         expect(screen.getByRole('link', {name: 'Paid member welcome flow'})).toHaveAttribute('href', '/automations/automation-id-2');
     });
 
+    it('follows the row link when clicking another cell', () => {
+        renderWithRoutes();
+
+        fireEvent.click(screen.getByText('1,432'));
+
+        expect(screen.getByText('Automation editor: automation-id-1')).toBeInTheDocument();
+    });
+
+    it('lets the existing row link handle its own navigation', () => {
+        renderWithRoutes();
+
+        fireEvent.click(screen.getByRole('link', {name: 'Free member welcome flow'}));
+
+        expect(screen.getByText('Automation editor: automation-id-1')).toBeInTheDocument();
+    });
+
+    it('does not follow the row link when the click is default-prevented', () => {
+        renderWithRoutes();
+        const analyticsCell = screen.getByText('1,432');
+        analyticsCell.addEventListener('click', event => event.preventDefault(), {once: true});
+
+        fireEvent.click(analyticsCell);
+
+        expect(screen.queryByText('Automation editor: automation-id-1')).not.toBeInTheDocument();
+        expect(analyticsCell).toBeInTheDocument();
+    });
+
     it('renders a table skeleton while loading', () => {
         renderWithRouter(<AutomationsList isLoading={true} showRunAnalytics={true} />);
 
diff --git a/apps/admin/src/automations/components/automations-list.tsx b/apps/admin/src/automations/components/automations-list.tsx
index 3179c0d617b..f4cb20aff89 100644
--- a/apps/admin/src/automations/components/automations-list.tsx
+++ b/apps/admin/src/automations/components/automations-list.tsx
@@ -17,6 +17,14 @@ const AUTOMATION_STAT_COLUMNS = [
     {key: 'inProgressEntries', label: 'In progress', widthClassName: 'w-32', skeletonWidthClassName: 'w-10'}
 ] as const;
 
+const handleRowClick = (event: React.MouseEvent<HTMLTableRowElement>) => {
+    if (event.defaultPrevented || !(event.target instanceof Element) || event.target.closest('a, button, input, select, textarea')) {
+        return;
+    }
+
+    event.currentTarget.querySelector('a')?.click();
+};
+
 interface AutomationsListProps {
     automations?: AutomationBrowseItem[];
     isLoading?: boolean;
@@ -94,12 +102,13 @@ const AutomationsList: React.FC<AutomationsListProps> = ({automations = [], isLo
                     return (
                         <TableRow
                             key={automation.slug}
-                            className="grid w-full cursor-pointer grid-cols-[minmax(0,1fr)_auto] items-center gap-x-4 p-2 hover:bg-table-row-hover lg:table-row lg:p-0"
+                            className="grid w-full cursor-pointer grid-cols-[minmax(0,1fr)_auto] items-center gap-x-4 p-2 hover:bg-table-row-hover has-[:focus-visible]:outline-2 has-[:focus-visible]:outline-offset-[-2px] has-[:focus-visible]:outline-focus-ring lg:table-row lg:p-0"
                             data-testid="automation-list-row"
+                            onClick={handleRowClick}
                         >
-                            <TableHead className="static h-auto min-w-0 p-0 text-left text-base font-normal tracking-normal text-foreground lg:table-cell lg:p-4" scope="row">
+                            <TableHead className="h-auto min-w-0 p-0 text-left text-base font-normal tracking-normal text-foreground lg:table-cell lg:p-4" scope="row">
                                 <Link
-                                    className="before:absolute before:inset-0 before:z-10 before:rounded-sm focus-visible:outline-hidden focus-visible:before:ring-2 focus-visible:before:ring-focus-ring"
+                                    className="rounded-sm focus-visible:outline-hidden"
                                     to={`/automations/${automation.id}`}
                                 >
                                     <span className="block text-md font-semibold">
diff --git a/apps/admin/src/automations/components/email-modal/email-content-modal.tsx b/apps/admin/src/automations/components/email-modal/email-content-modal.tsx
index d0832c02493..b1a305410d3 100644
--- a/apps/admin/src/automations/components/email-modal/email-content-modal.tsx
+++ b/apps/admin/src/automations/components/email-modal/email-content-modal.tsx
@@ -278,6 +278,7 @@ const EmailContentModal: React.FC<EmailContentModalProps> = ({
                     ref={setDialogContentNode}
                     aria-describedby={undefined}
                     className='top-0 left-0 h-[100dvh] w-full max-w-full translate-0 grid-rows-[1fr] gap-0 rounded-none border-0 p-0 shadow-none outline-hidden sm:rounded-none dark:bg-[#151719]'
+                    data-sentry-mask='true'
                     onEscapeKeyDown={(event) => {
                         if (isKoenigPortalFocused()) {
                             // prevent Radix dismissing the dialog but let the
diff --git a/apps/admin/src/automations/components/email-modal/preview-frame.tsx b/apps/admin/src/automations/components/email-modal/preview-frame.tsx
index db87b5fdf0f..aefcf136074 100644
--- a/apps/admin/src/automations/components/email-modal/preview-frame.tsx
+++ b/apps/admin/src/automations/components/email-modal/preview-frame.tsx
@@ -135,6 +135,7 @@ const EmailPreviewFrame: React.FC<EmailPreviewFrameProps> = ({previewState}) =>
                     <iframe
                         ref={previewIframeRef}
                         className='w-full rounded bg-white'
+                        data-sentry-block='true'
                         data-testid='email-preview-iframe'
                         sandbox="allow-same-origin allow-popups allow-popups-to-escape-sandbox"
                         srcDoc={previewState.html}
diff --git a/apps/admin/src/automations/components/email-modal/test-email-dropdown.tsx b/apps/admin/src/automations/components/email-modal/test-email-dropdown.tsx
index 1d2c06f58f9..709ffa98906 100644
--- a/apps/admin/src/automations/components/email-modal/test-email-dropdown.tsx
+++ b/apps/admin/src/automations/components/email-modal/test-email-dropdown.tsx
@@ -81,7 +81,7 @@ const TestEmailDropdown: React.FC<TestEmailDropdownProps> = ({
     };
 
     return (
-        <PopoverContent align='end' className='w-[260px] p-4' data-testid='test-email-dropdown' sideOffset={8}>
+        <PopoverContent align='end' className='w-[260px] p-4' data-sentry-mask='true' data-testid='test-email-dropdown' sideOffset={8}>
             <div className='mb-3'>
                 <label className='mb-2 block text-sm font-semibold' htmlFor='test-email-input'>Send test email</label>
                 <Input
diff --git a/apps/admin/src/automations/components/email-modal/use-email-preview.ts b/apps/admin/src/automations/components/email-modal/use-email-preview.ts
index 13db216171e..3f906563272 100644
--- a/apps/admin/src/automations/components/email-modal/use-email-preview.ts
+++ b/apps/admin/src/automations/components/email-modal/use-email-preview.ts
@@ -33,6 +33,8 @@ const preparePreviewHtml = (html: string) => {
     const parser = new DOMParser();
     const parsed = parser.parseFromString(html, 'text/html');
 
+    parsed.body.setAttribute('data-sentry-mask', 'true');
+
     parsed.querySelectorAll<HTMLAnchorElement>('a[href]').forEach((link) => {
         link.target = '_blank';
         link.rel = 'noopener noreferrer';
diff --git a/apps/admin/src/automations/editor.tsx b/apps/admin/src/automations/editor.tsx
index 6a58c195e67..f1fbe212683 100644
--- a/apps/admin/src/automations/editor.tsx
+++ b/apps/admin/src/automations/editor.tsx
@@ -402,7 +402,7 @@ const AutomationEditorContent: React.FC<{automationId: string}> = ({automationId
     }, []);
 
     return (
-        <div className='fixed inset-0 z-50 flex flex-col bg-background' data-testid='automation-editor'>
+        <div className='fixed inset-0 z-50 flex flex-col bg-background' data-sentry-mask='true' data-testid='automation-editor'>
             <AutomationHeader
                 automation={draft}
                 isLoadingAutomation={isEditorLoading}
diff --git a/apps/admin/src/posts/analytics/components/post-analytics-view.tsx b/apps/admin/src/posts/analytics/components/post-analytics-view.tsx
deleted file mode 100644
index b9728ca19c5..00000000000
--- a/apps/admin/src/posts/analytics/components/post-analytics-view.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import EmptyStatView from '@/shared/analytics/empty-stat-view';
-import PostAnalyticsContent from './post-analytics-content';
-import React from 'react';
-
-interface PostAnalyticsViewProps<T> {
-    isLoading?: boolean;
-    data?: T[] | null;
-    children?: React.ReactNode;
-    loadingComponent?: React.ReactNode;
-    emptyComponent?: React.ReactNode;
-}
-
-const PostAnalyticsView = <T,>({
-    isLoading,
-    data,
-    children,
-    loadingComponent = <>Loading...</>,
-    emptyComponent = <EmptyStatView />
-}: PostAnalyticsViewProps<T>) => {
-    return (
-        <PostAnalyticsContent>
-            {isLoading ? (
-                loadingComponent
-            ) : !data || data.length === 0 ? (
-                emptyComponent
-            ) : (
-                children
-            )}
-        </PostAnalyticsContent>
-    );
-};
-
-export default PostAnalyticsView;
diff --git a/apps/ember-admin/app/routes/application.js b/apps/ember-admin/app/routes/application.js
index 25522777dfb..b57873d0e0f 100644
--- a/apps/ember-admin/app/routes/application.js
+++ b/apps/ember-admin/app/routes/application.js
@@ -27,6 +27,76 @@ function K() {
     return this;
 }
 
+const AUTOMATIONS_REPLAY_SAMPLE_RATE = 1;
+const AUTOMATIONS_REPLAY_MASK_ATTRIBUTE = 'data-sentry-automations-mask';
+
+function isAutomationsUrl(url) {
+    const path = new URL(url).hash.replace(/^#/, '').split('?')[0].replace(/\/+$/, '');
+    return path === '/automations' || path.startsWith('/automations/');
+}
+
+function setupAutomationsSessionReplay(replay, shouldStartRecording) {
+    let initialRouteCheck;
+    let removeNavigationListener;
+    let recordingStarted = false;
+
+    const teardown = () => {
+        clearTimeout(initialRouteCheck);
+        removeNavigationListener?.();
+        document.body.removeAttribute(AUTOMATIONS_REPLAY_MASK_ATTRIBUTE);
+    };
+
+    const updateAutomationsMask = (url) => {
+        const isAutomations = isAutomationsUrl(url);
+
+        if (isAutomations) {
+            document.body.setAttribute(AUTOMATIONS_REPLAY_MASK_ATTRIBUTE, 'true');
+        } else {
+            document.body.removeAttribute(AUTOMATIONS_REPLAY_MASK_ATTRIBUTE);
+        }
+
+        return isAutomations;
+    };
+
+    const maybeStartRecording = (url) => {
+        const isAutomations = updateAutomationsMask(url);
+
+        if (!shouldStartRecording || !isAutomations || recordingStarted) {
+            return;
+        }
+
+        recordingStarted = true;
+        clearTimeout(initialRouteCheck);
+
+        replay.stop().then(() => replay.start()).catch((error) => {
+            try {
+                replay.startBuffering();
+            } catch (e) {
+                // Replay is still running, nothing to restore
+            }
+            console.error('Error starting Sentry Replay recording:', error); // eslint-disable-line no-console
+        });
+    };
+
+    // Keep listening after recording starts so portalled Automations content is
+    // masked only while an Automations route is active. React-owned admin
+    // routes navigate via pushState, which doesn't fire `hashchange`.
+    if (window.navigation) {
+        const onNavigate = event => maybeStartRecording(event.destination.url);
+        window.navigation.addEventListener('navigate', onNavigate);
+        removeNavigationListener = () => window.navigation.removeEventListener('navigate', onNavigate);
+    }
+
+    // Mask direct Automations loads before Replay creates its initial buffer.
+    updateAutomationsMask(window.location.href);
+
+    // Replay defers its sampling initialization during Sentry.init(). Queue the
+    // initial route check behind it to avoid starting a second rrweb recorder.
+    initialRouteCheck = setTimeout(() => maybeStartRecording(window.location.href));
+
+    return teardown;
+}
+
 let shortcuts = {};
 
 shortcuts.esc = {action: 'closeMenus', scope: 'default'};
@@ -192,6 +262,7 @@ export default Route.extend(ShortcutsRoute, {
     },
 
     willDestroy() {
+        this._cleanupAutomationsSessionReplay?.();
         this.ui.cleanupBodyDragHandlers();
     },
 
@@ -203,6 +274,15 @@ export default Route.extend(ShortcutsRoute, {
         if (this.config.sentry_dsn) {
             const sentryConfig = getSentryConfig(this.config.sentry_dsn, this.config.sentry_env, this.config.version);
             Sentry.init(sentryConfig);
+
+            // Keep error-triggered replay buffering everywhere and mask all
+            // Automations portals. Once a sampled app load enters Automations,
+            // record a full session replay for the rest of that load.
+            const replay = Sentry.getClient()?.getIntegrationByName('Replay');
+            if (replay) {
+                const shouldStartRecording = Math.random() < AUTOMATIONS_REPLAY_SAMPLE_RATE;
+                this._cleanupAutomationsSessionReplay = setupAutomationsSessionReplay(replay, shouldStartRecording);
+            }
         }
 
         if (this.session.isAuthenticated) {
diff --git a/apps/ember-admin/app/utils/sentry.js b/apps/ember-admin/app/utils/sentry.js
index 730cfb09974..b7e65ba510e 100644
--- a/apps/ember-admin/app/utils/sentry.js
+++ b/apps/ember-admin/app/utils/sentry.js
@@ -68,8 +68,12 @@ export function getSentryConfig(dsn, environment, appVersion, transport) {
                 // Replace with `Sentry.replayIntegration()` once we've migrated to @sentry/ember 8.x
                 // Docs: https://docs.sentry.io/platforms/javascript/migration/v7-to-v8/#removal-of-sentryreplay-package
                 new Replay({
-                    mask: ['.koenig-lexical', '.gh-dashboard'],
-                    unmask: ['[role="menu"]', '[data-testid="settings-panel"]', '.gh-nav'],
+                    mask: ['.koenig-lexical', '.gh-dashboard', '[data-sentry-automations-mask]'],
+                    unmask: [
+                        'body:not([data-sentry-automations-mask]) [role="menu"]',
+                        'body:not([data-sentry-automations-mask]) [data-testid="settings-panel"]',
+                        'body:not([data-sentry-automations-mask]) .gh-nav'
+                    ],
                     maskAllText: false,
                     maskAllInputs: true,
                     blockAllMedia: true
diff --git a/ghost/core/core/boot.js b/ghost/core/core/boot.js
index e5d9f32e369..04ae64ad0ae 100644
--- a/ghost/core/core/boot.js
+++ b/ghost/core/core/boot.js
@@ -361,7 +361,7 @@ async function initServices({ghostServer, config, prometheusClient}) {
     const statsService = require('./server/services/stats');
     const explorePingService = require('./server/services/explore-ping');
     const domainEvents = require('@tryghost/domain-events');
-    const automations = require('./server/services/automations');
+    const {automationsService} = require('./server/services/automations');
     const automationsApi = require('./server/services/automations/automations-api');
     const adapterManager = require('./server/services/adapter-manager').default;
     const {withErrorCapture} = require('./server/adapters/scheduling/error-capture');
@@ -424,7 +424,7 @@ async function initServices({ghostServer, config, prometheusClient}) {
             internalKeys
         }),
         machinePaymentsService.init(),
-        automations.init({
+        automationsService.init({
             domainEvents,
             apiUrl,
             schedulerAdapter,
@@ -531,6 +531,7 @@ async function bootGhost({backend = true, frontend = true, server = true} = {})
     // We need access to these variables in both the try and catch block
     let bootLogger;
     let config;
+    let flushLogs;
     let ghostServer;
     let logging;
     let metrics;
@@ -553,6 +554,7 @@ async function bootGhost({backend = true, frontend = true, server = true} = {})
         debug('Begin: Load logging');
         logging = require('@tryghost/logging');
         metrics = require('@tryghost/metrics');
+        flushLogs = require('./shared/flush-logs').flushLogs;
         bootLogger = new BootLogger(logging, metrics, startTime);
         debug('End: Load logging');
 
@@ -659,6 +661,7 @@ async function bootGhost({backend = true, frontend = true, server = true} = {})
 
         // If we pass the env var, kill Ghost
         if (process.env.GHOST_CI_SHUTDOWN_AFTER_BOOT) {
+            await flushLogs();
             process.exit(0);
         }
 
@@ -688,10 +691,9 @@ async function bootGhost({backend = true, frontend = true, server = true} = {})
             notifyServerReady(serverStartError);
             ghostServer.shutdown(2);
         } else {
-            // Ghost server failed to start, set a timeout to give logging a chance to flush
-            setTimeout(() => {
-                process.exit(2);
-            }, 100);
+            // Ghost server failed to start, drain the log transports before exiting
+            await flushLogs();
+            process.exit(2);
         }
     }
 }
diff --git a/ghost/core/core/server/ghost-server.js b/ghost/core/core/server/ghost-server.js
index 0b97b5dc526..b349e1ea7d7 100644
--- a/ghost/core/core/server/ghost-server.js
+++ b/ghost/core/core/server/ghost-server.js
@@ -6,6 +6,7 @@ const tpl = require('@tryghost/tpl');
 const logging = require('@tryghost/logging');
 const metrics = require('@tryghost/metrics');
 const notify = require('./notify');
+const {flushLogs} = require('../shared/flush-logs');
 const moment = require('moment');
 const stoppable = require('stoppable');
 
@@ -58,6 +59,9 @@ class GhostServer {
 
         // Tasks that should be run before the server exits
         this.cleanupTasks = [];
+
+        // Tasks that should be run at the very start of shutdown
+        this.preStopTasks = [];
     }
 
     /**
@@ -148,14 +152,12 @@ class GhostServer {
             this.isShuttingDown = true;
             logging.warn(tpl(messages.ghostIsShuttingDown));
             await this.stop();
-            setTimeout(() => {
-                process.exit(code);
-            }, 100);
+            await flushLogs();
+            process.exit(code);
         } catch (error) {
             logging.error(error);
-            setTimeout(() => {
-                process.exit(1);
-            }, 100);
+            await flushLogs();
+            process.exit(1);
         }
     }
 
@@ -168,6 +170,10 @@ class GhostServer {
      */
     async stop() {
         try {
+            // Signal "stop taking new work" before the HTTP server drain, so background
+            // workers aren't still claiming tasks during it
+            this._preStop();
+
             // If we never fully started, there's nothing to stop
             if (this.httpServer && this.httpServer.listening) {
                 // Time how long it takes to close all in-flight requests
@@ -207,6 +213,17 @@ class GhostServer {
         this.cleanupTasks.push({task, label: label || `cleanup task #${this.cleanupTasks.length + 1}`});
     }
 
+    /**
+     * Add a task that runs at the very start of shutdown, before the HTTP server drain.
+     * Synchronous on purpose: this is the shutdown critical path, so it's for cheap "stop
+     * claiming new work" signals only. Draining belongs in a cleanup task.
+     * @param {() => void} task
+     * @param {string} [label] - name used in shutdown timing logs
+     */
+    registerPreStopTask(task, label) {
+        this.preStopTasks.push({task, label: label || `pre-stop task #${this.preStopTasks.length + 1}`});
+    }
+
     /**
      * ### Stop Server
      * Does the work of stopping the server using stoppable
@@ -227,16 +244,52 @@ class GhostServer {
         }
     }
 
+    /**
+     * Best-effort: a throwing task must not skip the ones after it, nor the drain and
+     * cleanup that follow.
+     */
+    _preStop() {
+        for (const {task, label} of this.preStopTasks) {
+            try {
+                task();
+            } catch (error) {
+                logging.error(new errors.InternalServerError({
+                    err: error,
+                    message: `Shutdown: ${label} failed`
+                }));
+            }
+        }
+    }
+
+    /**
+     * Runs cleanup tasks concurrently, timing each so a slow one is identifiable.
+     * Every task runs to completion regardless of its siblings: a rejection escaping the
+     * map would exit the process mid-drain and orphan email batches in `submitting`.
+     */
     async _cleanup() {
-        // Wait for all cleanup tasks to finish, timing each so a slow one is identifiable
-        return Promise.all(this.cleanupTasks.map(async ({task, label}) => {
+        const failed = [];
+
+        await Promise.all(this.cleanupTasks.map(async ({task, label}) => {
             const startTime = Date.now();
             try {
-                return await task();
+                await task();
+            } catch (error) {
+                failed.push(label);
+                logging.error(new errors.InternalServerError({
+                    err: error,
+                    message: `Shutdown: ${label} failed`
+                }));
             } finally {
                 logging.info(`Shutdown: ${label} finished in ${Date.now() - startTime}ms`);
             }
         }));
+
+        // Surface a non-zero exit, but only once every task has settled
+        if (failed.length > 0) {
+            throw new errors.InternalServerError({
+                message: `Shutdown: ${failed.length} cleanup task(s) failed: ${failed.join(', ')}`
+            });
+        }
     }
 
     /**
diff --git a/ghost/core/core/server/services/automations/automations-api.ts b/ghost/core/core/server/services/automations/automations-api.ts
index d88f664b212..c4ea4d88fd0 100644
--- a/ghost/core/core/server/services/automations/automations-api.ts
+++ b/ghost/core/core/server/services/automations/automations-api.ts
@@ -8,13 +8,13 @@ import type {
     AutomationsRepository,
     EditAutomationData
 } from './automations-repository';
+import {StartAutomationsPollEvent} from './events/start-automations-poll-event';
 
 const {knex} = require('../../data/db');
 const domainEvents = require('@tryghost/domain-events');
 const labs = require('../../../shared/labs');
 const config = require('../../../shared/config');
 const lexicalLib = require('../../lib/lexical');
-const StartAutomationsPollEvent = require('./events/start-automations-poll-event');
 
 const MAX_AUTOMATION_ACTIONS = 20;
 
diff --git a/ghost/core/core/server/services/automations/events/start-automations-poll-event.js b/ghost/core/core/server/services/automations/events/start-automations-poll-event.js
deleted file mode 100644
index cac000a9f38..00000000000
--- a/ghost/core/core/server/services/automations/events/start-automations-poll-event.js
+++ /dev/null
@@ -1,16 +0,0 @@
-module.exports = class StartAutomationsPollEvent {
-    /**
-     * @param {Date} timestamp
-     */
-    constructor(timestamp) {
-        this.data = null;
-        this.timestamp = timestamp;
-    }
-
-    /**
-     * @returns {StartAutomationsPollEvent}
-     */
-    static create() {
-        return new StartAutomationsPollEvent(new Date());
-    }
-};
diff --git a/ghost/core/core/server/services/automations/events/start-automations-poll-event.ts b/ghost/core/core/server/services/automations/events/start-automations-poll-event.ts
new file mode 100644
index 00000000000..3287388747d
--- /dev/null
+++ b/ghost/core/core/server/services/automations/events/start-automations-poll-event.ts
@@ -0,0 +1,12 @@
+export class StartAutomationsPollEvent {
+    data = null;
+    timestamp: Date;
+
+    constructor(timestamp: Date) {
+        this.timestamp = timestamp;
+    }
+
+    static create(): StartAutomationsPollEvent {
+        return new StartAutomationsPollEvent(new Date());
+    }
+}
diff --git a/ghost/core/core/server/services/automations/index.js b/ghost/core/core/server/services/automations/index.js
deleted file mode 100644
index efcca5a5c66..00000000000
--- a/ghost/core/core/server/services/automations/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-const {AutomationsService} = require('./service');
-
-module.exports = new AutomationsService();
diff --git a/ghost/core/core/server/services/automations/index.ts b/ghost/core/core/server/services/automations/index.ts
new file mode 100644
index 00000000000..7649b2ac94f
--- /dev/null
+++ b/ghost/core/core/server/services/automations/index.ts
@@ -0,0 +1,3 @@
+import {AutomationsService} from './service';
+
+export const automationsService = new AutomationsService();
diff --git a/ghost/core/core/server/services/automations/service.ts b/ghost/core/core/server/services/automations/service.ts
index fd86ce3508a..359cccde4fc 100644
--- a/ghost/core/core/server/services/automations/service.ts
+++ b/ghost/core/core/server/services/automations/service.ts
@@ -12,11 +12,11 @@ import {SoonestTimer} from '../../lib/soonest-timer';
 import {getSchedulerPollTime} from './scheduler-poll-time';
 // @ts-expect-error This module currently lacks type definitions.
 import emailAnalyticsJobs from '../email-analytics/jobs';
+import {StartAutomationsPollEvent} from './events/start-automations-poll-event';
 
 const urlUtils = require('../../../shared/url-utils').default;
 const logging = require('@tryghost/logging');
 const {getSignedAdminToken} = require('../../adapters/scheduling/utils');
-const StartAutomationsPollEvent = require('./events/start-automations-poll-event');
 const {welcomeEmailAutomationPoll} = require('./welcome-email-automation-poll');
 const memberWelcomeEmailService = require('../member-welcome-emails/service');
 
diff --git a/ghost/core/core/server/services/email-service/batch-sending-service.js b/ghost/core/core/server/services/email-service/batch-sending-service.js
index cee0eda8827..cd4c97b855b 100644
--- a/ghost/core/core/server/services/email-service/batch-sending-service.js
+++ b/ghost/core/core/server/services/email-service/batch-sending-service.js
@@ -42,6 +42,13 @@ class BatchSendingService {
     #AFTER_RETRY_CONFIG = {maxRetries: 20, maxTime: 30 * 60 * 1000, sleep: 2000};
     #MAILGUN_API_RETRY_CONFIG = {sleep: 10 * 1000, maxRetries: 6};
 
+    // The normal budgets (up to 30 minutes) outlive the container's grace period, so
+    // retrying just holds a batch in `submitting` until the process is killed, turning a
+    // recoverable `failed` into an orphan. Give up fast, except on the terminal status
+    // write, which has to land.
+    #SHUTDOWN_RETRY_CONFIG = {maxRetries: 0};
+    #SHUTDOWN_AFTER_RETRY_CONFIG = {maxRetries: 3, maxTime: 10 * 1000, sleep: 250};
+
     /**
      * @param {Object} dependencies
      * @param {EmailRenderer} dependencies.emailRenderer
@@ -112,15 +119,60 @@ class BatchSendingService {
         }
     }
 
+    // Each config carries the policy to switch to on shutdown. retryDb applies it per
+    // attempt, so a shutdown starting mid-retry collapses the remaining budget too.
     #getBeforeRetryConfig(email) {
-        if (email._retryCutOffTime) {
-            return {...this.#BEFORE_RETRY_CONFIG, stopAfterDate: email._retryCutOffTime};
+        if (email?._retryCutOffTime) {
+            return {...this.#BEFORE_RETRY_CONFIG, stopAfterDate: email._retryCutOffTime, shutdownConfig: this.#SHUTDOWN_RETRY_CONFIG};
         }
-        return this.#BEFORE_RETRY_CONFIG;
+        return {...this.#BEFORE_RETRY_CONFIG, shutdownConfig: this.#SHUTDOWN_RETRY_CONFIG};
+    }
+
+    #getAfterRetryConfig() {
+        return {...this.#AFTER_RETRY_CONFIG, shutdownConfig: this.#SHUTDOWN_AFTER_RETRY_CONFIG};
+    }
+
+    #getMailgunRetryConfig() {
+        return {...this.#MAILGUN_API_RETRY_CONFIG, shutdownConfig: this.#SHUTDOWN_RETRY_CONFIG};
+    }
+
+    /**
+     * Normalises retry options for a single attempt: swaps in the shutdown policy once a
+     * shutdown has started, then pins the deadline implied by maxTime (shortest wins).
+     */
+    #resolveRetryOptions(options) {
+        let resolved = options;
+
+        if (this.#shuttingDown && resolved.shutdownConfig && !resolved.shutdownPolicyApplied) {
+            resolved = {
+                ...resolved,
+                ...resolved.shutdownConfig,
+                shutdownConfig: resolved.shutdownConfig,
+                shutdownPolicyApplied: true
+            };
+        }
+
+        if (resolved.maxTime !== undefined) {
+            const stopAfterDate = new Date(Date.now() + resolved.maxTime);
+            if (!resolved.stopAfterDate || stopAfterDate < resolved.stopAfterDate) {
+                resolved = {...resolved, stopAfterDate};
+            }
+        }
+
+        return resolved;
     }
 
     /**
-     * Stops the batch workers and waits for any in-flight sends to finish.
+     * Signals the batch workers to stop claiming new batches. Runs before the HTTP
+     * server drain, so no batch is claimed in a window we can't finish it in.
+     * Synchronous — draining is onShutdown's job. Idempotent.
+     */
+    onPreStop() {
+        this.#shuttingDown = true;
+    }
+
+    /**
+     * Waits for any in-flight sends to finish.
      * Called by the cleanup pipeline when the container is shutting down. Idempotent.
      */
     async onShutdown() {
@@ -161,7 +213,7 @@ class BatchSendingService {
             async () => {
                 return await this.updateStatusLock(this.#models.Email, emailId, 'submitting', ['pending', 'failed']);
             },
-            {...this.#BEFORE_RETRY_CONFIG, description: `updateStatusLock email ${emailId} -> submitting`}
+            {...this.#getBeforeRetryConfig(), description: `updateStatusLock email ${emailId} -> submitting`}
         );
         if (!email) {
             logging.error(`Tried sending email that is not pending or failed ${emailId}`);
@@ -185,9 +237,12 @@ class BatchSendingService {
                     submitted_at: new Date(),
                     error: null
                 }, {patch: true, autoRefresh: false});
-            }, {...this.#AFTER_RETRY_CONFIG, description: `email ${emailId} -> submitted`});
+            }, {...this.#getAfterRetryConfig(), description: `email ${emailId} -> submitted`});
         } catch (e) {
-            if (e && e.code === SHUTDOWN_CODE) {
+            // Any failure while shutting down counts as interrupted, not failed:
+            // collapsed budgets surface transient errors as hard failures, and `failed`
+            // drops the email out of the boot resume scan.
+            if ((e && e.code === SHUTDOWN_CODE) || this.#shuttingDown) {
                 logging.info(`Email ${email.id} send stopped because the container is shutting down — leaving status=submitting so it can resume on next boot`);
                 return;
             }
@@ -209,7 +264,7 @@ class BatchSendingService {
                     status: 'failed',
                     error: e.message || 'Something went wrong while sending the email'
                 }, {patch: true, autoRefresh: false});
-            }, {...this.#AFTER_RETRY_CONFIG, description: `email ${emailId} -> failed`});
+            }, {...this.#getAfterRetryConfig(), description: `email ${emailId} -> failed`});
         }
     }
 
@@ -509,8 +564,12 @@ class BatchSendingService {
             }
         };
 
-        // Run maximum MAX_SENDING_CONCURRENCY at the same time
-        await Promise.all(new Array(MAX_SENDING_CONCURRENCY).fill(0).map(() => runWorker()));
+        // Run maximum MAX_SENDING_CONCURRENCY at the same time.
+        // allSettled so one worker throwing doesn't detach the others: the drain must not
+        // resolve while a sibling's terminal status write is still in flight.
+        const workerResults = await Promise.allSettled(
+            new Array(MAX_SENDING_CONCURRENCY).fill(0).map(() => runWorker())
+        );
 
         logging.info(`Email ${email.id} send done: ${succeededCount}/${batches.length} batches succeeded, ${queue.length} unstarted`);
 
@@ -521,6 +580,11 @@ class BatchSendingService {
             });
         }
 
+        const failedWorker = workerResults.find(result => result.status === 'rejected');
+        if (failedWorker) {
+            throw failedWorker.reason;
+        }
+
         if (succeededCount < batches.length) {
             if (succeededCount > 0) {
                 throw new errors.EmailError({
@@ -604,7 +668,7 @@ class BatchSendingService {
                     deliveryTime,
                     emailBodyCache
                 });
-            }, {...this.#MAILGUN_API_RETRY_CONFIG, description: `Sending email batch ${originalBatch.id} ${deliveryTime ? `with delivery time ${deliveryTime}` : ''}`});
+            }, {...this.#getMailgunRetryConfig(), description: `Sending email batch ${originalBatch.id} ${deliveryTime ? `with delivery time ${deliveryTime}` : ''}`});
             succeeded = true;
 
             await this.retryDb(
@@ -618,7 +682,7 @@ class BatchSendingService {
                         error_data: null
                     }, {patch: true, require: false, autoRefresh: false});
                 },
-                {...this.#AFTER_RETRY_CONFIG, description: `save batch ${originalBatch.id} -> submitted`}
+                {...this.#getAfterRetryConfig(), description: `save batch ${originalBatch.id} -> submitted`}
             );
         } catch (err) {
             if (err.code && err.code === 'BULK_EMAIL_SEND_FAILED') {
@@ -653,8 +717,13 @@ class BatchSendingService {
                             error_data: err.errorDetails ?? null
                         }, {patch: true, require: false, autoRefresh: false});
                     },
-                    {...this.#AFTER_RETRY_CONFIG, description: `save batch ${originalBatch.id} -> failed`}
+                    {...this.#getAfterRetryConfig(), description: `save batch ${originalBatch.id} -> failed`}
                 );
+            } else if (this.#shuttingDown) {
+                // Sent, but the `submitted` write didn't land in the collapsed budget.
+                // Returning success would mark the email submitted with this row left in
+                // `submitting`, which the boot resume scan never looks at.
+                throw err;
             }
         }
 
@@ -665,7 +734,7 @@ class BatchSendingService {
                     .where({batch_id: batch.id})
                     .save({processed_at: new Date()}, {patch: true, require: false, autoRefresh: false});
             },
-            {...this.#AFTER_RETRY_CONFIG, description: `save EmailRecipients ${originalBatch.id} processed_at`}
+            {...this.#getAfterRetryConfig(), description: `save EmailRecipients ${originalBatch.id} processed_at`}
         );
 
         return succeeded;
@@ -744,12 +813,7 @@ class BatchSendingService {
      * @returns {Promise<T>}
      */
     async retryDb(func, options) {
-        if (options.maxTime !== undefined) {
-            const stopAfterDate = new Date(Date.now() + options.maxTime);
-            if (!options.stopAfterDate || stopAfterDate < options.stopAfterDate) {
-                options = {...options, stopAfterDate};
-            }
-        }
+        options = this.#resolveRetryOptions(options);
         const retryCount = (options.retryCount ?? 0);
 
         try {
@@ -765,6 +829,10 @@ class BatchSendingService {
 
             return response;
         } catch (e) {
+            // Shutdown may have started while this attempt was pending — re-resolve so
+            // the collapsed budget decides whether we retry at all
+            options = this.#resolveRetryOptions(options);
+
             const sleep = (options.sleep ?? 0);
             if (retryCount >= options.maxRetries || (options.stopAfterDate && (new Date(Date.now() + sleep)) > options.stopAfterDate)) {
                 if (retryCount > 0) {
@@ -794,7 +862,16 @@ class BatchSendingService {
                     setTimeout(resolve, sleep);
                 });
             }
-            return await this.retryDb(func, {...options, retryCount: retryCount + 1, sleep: sleep * 2});
+
+            // Budget is only checked after a failure, so recursing always spends another
+            // attempt first. Re-check here, or a shutdown that began during the backoff
+            // gets one more go — a fresh Mailgun send well into a shutdown.
+            const nextOptions = this.#resolveRetryOptions({...options, retryCount: retryCount + 1, sleep: sleep * 2});
+            if (nextOptions.retryCount > nextOptions.maxRetries || (nextOptions.stopAfterDate && new Date() > nextOptions.stopAfterDate)) {
+                throw e;
+            }
+
+            return await this.retryDb(func, nextOptions);
         }
     }
 
diff --git a/ghost/core/core/server/services/email-service/email-service-wrapper.js b/ghost/core/core/server/services/email-service/email-service-wrapper.js
index e1fc5065028..d0ee2f80da6 100644
--- a/ghost/core/core/server/services/email-service/email-service-wrapper.js
+++ b/ghost/core/core/server/services/email-service/email-service-wrapper.js
@@ -136,6 +136,10 @@ class EmailServiceWrapper {
         });
 
         if (ghostServer) {
+            // Two phases: stop claiming batches immediately, drain in-flight ones later.
+            // Draining alone would leave workers claiming new batches for the whole HTTP
+            // server drain, each a fresh orphan candidate.
+            ghostServer.registerPreStopTask(() => batchSendingService.onPreStop(), 'Email batch sending (stop claiming)');
             ghostServer.registerCleanupTask(() => batchSendingService.onShutdown(), 'Email batch sending');
         }
 
diff --git a/ghost/core/core/server/services/members/members-api/repositories/member-repository.js b/ghost/core/core/server/services/members/members-api/repositories/member-repository.js
index 1be49c07236..97b01492056 100644
--- a/ghost/core/core/server/services/members/members-api/repositories/member-repository.js
+++ b/ghost/core/core/server/services/members/members-api/repositories/member-repository.js
@@ -9,7 +9,7 @@ const {NotFoundError} = require('@tryghost/errors');
 const validator = require('@tryghost/validator');
 const crypto = require('crypto');
 const hasActiveOffer = require('../utils/has-active-offer');
-const StartAutomationsPollEvent = require('../../../automations/events/start-automations-poll-event');
+const {StartAutomationsPollEvent} = require('../../../automations/events/start-automations-poll-event');
 const {MEMBER_WELCOME_EMAIL_SLUGS} = require('../../../member-welcome-emails/constants');
 const db = require('../../../../data/db');
 const labs = require('../../../../../shared/labs');
diff --git a/ghost/core/core/shared/flush-logs.ts b/ghost/core/core/shared/flush-logs.ts
new file mode 100644
index 00000000000..fbf640792fb
--- /dev/null
+++ b/ghost/core/core/shared/flush-logs.ts
@@ -0,0 +1,16 @@
+import {setTimeout as delay} from 'node:timers/promises';
+import logging from '@tryghost/logging';
+
+const DEFAULT_TIMEOUT_MS = 2000;
+
+/**
+ * Drain buffered log transports before the process exits, bounded so a stuck
+ * transport can never block shutdown.
+ */
+export async function flushLogs(timeoutMs: number = DEFAULT_TIMEOUT_MS): Promise<void> {
+    // Unreffed so the loser of the race can't hold the event loop open
+    await Promise.race([
+        logging.flush(),
+        delay(timeoutMs, undefined, {ref: false})
+    ]);
+}
diff --git a/ghost/core/test/e2e-api/admin/automations.test.js b/ghost/core/test/e2e-api/admin/automations.test.js
index 3906b39ce6e..9a864d81229 100644
--- a/ghost/core/test/e2e-api/admin/automations.test.js
+++ b/ghost/core/test/e2e-api/admin/automations.test.js
@@ -9,7 +9,7 @@ const {getSignedAdminToken} = require('../../../core/server/adapters/scheduling/
 const {MEMBER_WELCOME_EMAIL_SLUGS} = require('../../../core/server/services/member-welcome-emails/constants');
 const {agentProvider, fixtureManager, matchers, assertions} = require('../../utils/e2e-framework');
 const {cleanupAutomationsFixture, EMPTY_EMAIL_LEXICAL, NON_EMPTY_EMAIL_LEXICAL, setupAutomationsFixture, TEST_EMAIL_DESIGN_SETTING_ID} = require('../../utils/automations-fixtures');
-const StartAutomationsPollEvent = require('../../../core/server/services/automations/events/start-automations-poll-event');
+const {StartAutomationsPollEvent} = require('../../../core/server/services/automations/events/start-automations-poll-event');
 
 const {anyContentVersion, anyEtag, anyErrorId, anyISODateTime, anyObjectId} = matchers;
 const {cacheInvalidateHeaderNotSet} = assertions;
diff --git a/ghost/core/test/unit/api/endpoints/automations.test.js b/ghost/core/test/unit/api/endpoints/automations.test.js
index 0664ebfb375..117efcd0659 100644
--- a/ghost/core/test/unit/api/endpoints/automations.test.js
+++ b/ghost/core/test/unit/api/endpoints/automations.test.js
@@ -2,7 +2,7 @@ const assert = require('node:assert/strict');
 const sinon = require('sinon');
 const domainEvents = require('@tryghost/domain-events');
 const automationsController = require('../../../../core/server/api/endpoints/automations');
-const StartAutomationsPollEvent = require('../../../../core/server/services/automations/events/start-automations-poll-event');
+const {StartAutomationsPollEvent} = require('../../../../core/server/services/automations/events/start-automations-poll-event');
 
 describe('Automations controller', function () {
     // Other endpoints are tested in E2E tests.
diff --git a/ghost/core/test/unit/server/ghost-server.test.js b/ghost/core/test/unit/server/ghost-server.test.js
new file mode 100644
index 00000000000..cca06dde975
--- /dev/null
+++ b/ghost/core/test/unit/server/ghost-server.test.js
@@ -0,0 +1,73 @@
+const assert = require('node:assert/strict');
+const sinon = require('sinon');
+const logging = require('@tryghost/logging');
+
+const GhostServer = require('../../../core/server/ghost-server');
+
+describe('GhostServer', function () {
+    let server;
+
+    beforeEach(function () {
+        sinon.stub(logging, 'info');
+        sinon.stub(logging, 'warn');
+        sinon.stub(logging, 'error');
+        server = new GhostServer({url: 'http://localhost:2368', env: 'testing', serverConfig: {}});
+    });
+
+    afterEach(function () {
+        sinon.restore();
+    });
+
+    describe('_cleanup', function () {
+        it('runs every task even when one rejects', async function () {
+            const slow = sinon.stub().resolves();
+            server.registerCleanupTask(() => Promise.reject(new Error('nope')), 'failing task');
+            server.registerCleanupTask(slow, 'Email batch sending');
+
+            // Rejects so the exit code still reflects the failure...
+            await assert.rejects(server._cleanup(), /1 cleanup task\(s\) failed: failing task/);
+
+            // ...but only after the sibling ran to completion. Rejecting early would
+            // exit the process mid-drain and orphan email batches in `submitting`.
+            sinon.assert.calledOnce(slow);
+        });
+
+        it('resolves when every task succeeds', async function () {
+            server.registerCleanupTask(() => Promise.resolve(), 'a');
+            server.registerCleanupTask(() => Promise.resolve(), 'b');
+
+            await server._cleanup();
+        });
+    });
+
+    describe('_preStop', function () {
+        it('runs every task before the server drain, isolating failures', function () {
+            const second = sinon.stub();
+            server.registerPreStopTask(() => {
+                throw new Error('nope');
+            }, 'failing signal');
+            server.registerPreStopTask(second, 'Email batch sending (stop claiming)');
+
+            // Must not throw — a bad signal cannot skip the drain and cleanup that follow.
+            server._preStop();
+
+            sinon.assert.calledOnce(second);
+        });
+
+        it('has run before the HTTP server is stopped', async function () {
+            const order = [];
+            server.registerPreStopTask(() => order.push('pre-stop'), 'stop claiming');
+            server.registerCleanupTask(async () => {
+                order.push('cleanup');
+            }, 'drain');
+            sinon.stub(server, '_stopServer').callsFake(async () => {
+                order.push('stop-server');
+            });
+            server.httpServer = {listening: true};
+
+            await server.stop();
+
+            assert.deepEqual(order, ['pre-stop', 'stop-server', 'cleanup']);
+        });
+    });
+});
diff --git a/ghost/core/test/unit/server/services/automations/automations-api.test.js b/ghost/core/test/unit/server/services/automations/automations-api.test.ts
similarity index 92%
rename from ghost/core/test/unit/server/services/automations/automations-api.test.js
rename to ghost/core/test/unit/server/services/automations/automations-api.test.ts
index e2167ab58e6..83fc9669f83 100644
--- a/ghost/core/test/unit/server/services/automations/automations-api.test.js
+++ b/ghost/core/test/unit/server/services/automations/automations-api.test.ts
@@ -1,9 +1,9 @@
-const assert = require('node:assert/strict');
-const ObjectId = require('bson-objectid').default;
-const sinon = require('sinon');
+import assert from 'node:assert/strict';
+import ObjectId from 'bson-objectid';
+import sinon from 'sinon';
 
-const automationsApi = require('../../../../../core/server/services/automations/automations-api');
-const {EMPTY_EMAIL_LEXICAL, NON_EMPTY_EMAIL_LEXICAL} = require('../../../../utils/automations-fixtures');
+import * as automationsApi from '../../../../../core/server/services/automations/automations-api';
+import {EMPTY_EMAIL_LEXICAL, NON_EMPTY_EMAIL_LEXICAL} from '../../../../utils/automations-fixtures';
 
 const buildSendEmailAction = (dataOverrides = {}) => ({
     id: ObjectId().toHexString(),
diff --git a/ghost/core/test/unit/server/services/automations/service.test.js b/ghost/core/test/unit/server/services/automations/service.test.js
index 1f8fa811452..e98c9d5e360 100644
--- a/ghost/core/test/unit/server/services/automations/service.test.js
+++ b/ghost/core/test/unit/server/services/automations/service.test.js
@@ -3,7 +3,7 @@ const sinon = require('sinon');
 const {randomUUID} = require('node:crypto');
 const {setImmediate: flushEventLoop} = require('node:timers/promises');
 
-const StartAutomationsPollEvent = require('../../../../../core/server/services/automations/events/start-automations-poll-event');
+const {StartAutomationsPollEvent} = require('../../../../../core/server/services/automations/events/start-automations-poll-event');
 const {AutomationsService} = require('../../../../../core/server/services/automations/service');
 
 describe('automations service', function () {
diff --git a/ghost/core/test/unit/server/services/email-analytics/index.test.ts b/ghost/core/test/unit/server/services/email-analytics/index.test.ts
index d2820ef7a31..6a6e0c75e0d 100644
--- a/ghost/core/test/unit/server/services/email-analytics/index.test.ts
+++ b/ghost/core/test/unit/server/services/email-analytics/index.test.ts
@@ -63,7 +63,7 @@ describe('email analytics service', function () {
         sinon.restore();
     });
 
-    it('initializes newsletter and automation analytics', function () {
+    it('initializes newsletter, automation, and gift analytics', function () {
         init(dependencies);
 
         sinon.assert.calledOnceWithExactly(newslettersInit, sinon.match({
diff --git a/ghost/core/test/unit/server/services/email-service/batch-sending-service.test.js b/ghost/core/test/unit/server/services/email-service/batch-sending-service.test.js
index 1817c5678e8..b9ab10a0f65 100644
--- a/ghost/core/test/unit/server/services/email-service/batch-sending-service.test.js
+++ b/ghost/core/test/unit/server/services/email-service/batch-sending-service.test.js
@@ -1254,6 +1254,44 @@ describe('Batch Sending Service', function () {
             assert.equal(members.length, 2);
         });
 
+        it('Propagates a failed submitted-status write during shutdown', async function () {
+            const sendingService = {
+                send: sinon.stub().resolves({id: 'providerid@example.com'}),
+                getMaximumRecipients: () => 5
+            };
+            const service = new BatchSendingService({
+                models: {EmailRecipient},
+                sendingService
+            });
+            const batch = createModel({status: 'pending', member_segment: null});
+            const save = sinon.stub(batch, 'save').rejects(new Error('deadlock'));
+            sinon.stub(service, 'updateStatusLock').resolves(batch);
+
+            service.onPreStop();
+
+            const clock = sinon.useFakeTimers();
+            const promise = service.sendBatch({
+                email: createModel({}),
+                batch: createModel({}),
+                post: createModel({}),
+                newsletter: createModel({})
+            });
+            // Drain the collapsed shutdown retry budget without waiting in real time
+            const assertion = assert.rejects(promise);
+            await clock.tickAsync(30000);
+            await assertion;
+            clock.restore();
+
+            // Mailgun accepted the batch, so reporting success would let the parent email
+            // be saved as `submitted` with this row left behind in `submitting`
+            sinon.assert.calledOnce(sendingService.send);
+            assert.ok(save.callCount > 0);
+            assert.ok(
+                save.getCalls().every(call => call.args[0].status === 'submitted'),
+                'batch must never be downgraded to failed once Mailgun has accepted it'
+            );
+        });
+
         it('Does send with a deliverytime', async function () {
             const EmailBatch = createModelClass({
                 findOne: {
@@ -2134,5 +2172,206 @@ describe('Batch Sending Service', function () {
             // logging.info was stubbed in the outer beforeEach — confirm the shutdown breadcrumb was emitted.
             sinon.assert.calledWithMatch(logging.info, /send stopped because the container is shutting down/);
         });
+
+        it('emailJob leaves email in submitting status for any error once shutting down', async function () {
+            const Email = createModelClass({
+                findOne: {
+                    status: 'pending'
+                }
+            });
+            const service = new BatchSendingService({
+                models: {Email}
+            });
+            let afterEmailModel;
+            // A plain transient error, not SHUTDOWN_CODE — the kind the collapsed
+            // shutdown retry budgets stop absorbing.
+            sinon.stub(service, 'sendEmail').callsFake((email) => {
+                afterEmailModel = email;
+                return Promise.reject(new Error('connection lost'));
+            });
+            service.onPreStop();
+
+            await service.emailJob({emailId: '123'});
+
+            assert.equal(afterEmailModel.get('status'), 'submitting', 'Email must stay submitting so the boot resume scan picks it up');
+            assert.equal(afterEmailModel.get('error'), undefined);
+        });
+
+        it('onPreStop stops workers claiming new batches without waiting for in-flight ones', async function () {
+            const clock = sinon.useFakeTimers(new Date());
+            const service = new BatchSendingService({
+                sendingService: {
+                    getTargetDeliveryWindow() {
+                        return 0;
+                    }
+                }
+            });
+            const sendBatch = sinon.stub(service, 'sendBatch').callsFake(async () => {
+                await simulateSleep(5, clock);
+                return true;
+            });
+            // 6 batches, 2 workers: the first 2 are claimed immediately, 4 stay queued.
+            const batches = new Array(6).fill(0).map(() => createModel({}));
+            const sendPromise = service.sendBatches({
+                email: createModel({}),
+                batches,
+                post: createModel({}),
+                newsletter: createModel({})
+            });
+
+            // Synchronous — must not await the in-flight batches.
+            service.onPreStop();
+
+            await assert.rejects(
+                sendPromise,
+                err => err.code === BatchSendingService.SHUTDOWN_CODE
+            );
+            sinon.assert.callCount(sendBatch, 2);
+            clock.restore();
+        });
+
+        it('collapses pre-send retries once shutting down', async function () {
+            const buildService = () => {
+                const service = new BatchSendingService({
+                    models: {EmailBatch: createModelClass({findOne: {status: 'pending'}})},
+                    BEFORE_RETRY_CONFIG: {maxRetries: 3, sleep: 0}
+                });
+                const updateStatusLock = sinon.stub(service, 'updateStatusLock').rejects(new Error('deadlock'));
+                return {service, updateStatusLock};
+            };
+            const args = () => ({
+                email: createModel({}),
+                batch: createModel({status: 'pending'}),
+                post: createModel({}),
+                newsletter: createModel({})
+            });
+
+            // Baseline: the configured budget is spent trying to claim the batch.
+            const baseline = buildService();
+            await assert.rejects(baseline.service.sendBatch(args()));
+            sinon.assert.callCount(baseline.updateStatusLock, 4);
+
+            // Shutting down: give up on the first failure instead of holding the batch
+            // in `submitting` until the container is killed.
+            const shuttingDown = buildService();
+            shuttingDown.service.onPreStop();
+            await assert.rejects(shuttingDown.service.sendBatch(args()));
+            sinon.assert.callCount(shuttingDown.updateStatusLock, 1);
+        });
+
+        it('collapses retries for a shutdown that starts while an attempt is pending', async function () {
+            const service = new BatchSendingService({});
+            const func = sinon.stub().callsFake(async () => {
+                // Shutdown begins mid-attempt, after the caller already picked its policy
+                service.onPreStop();
+                throw new Error('deadlock');
+            });
+
+            await assert.rejects(service.retryDb(func, {
+                maxRetries: 10,
+                maxTime: 10 * 60 * 1000,
+                sleep: 0,
+                shutdownConfig: {maxRetries: 0},
+                description: 'mid-flight shutdown'
+            }));
+
+            // The captured 10-retry budget must not survive the shutdown
+            sinon.assert.callCount(func, 1);
+        });
+
+        it('waits for every worker to settle when one throws', async function () {
+            const service = new BatchSendingService({
+                sendingService: {
+                    getTargetDeliveryWindow() {
+                        return 0;
+                    }
+                }
+            });
+
+            let slowBatchSettled = false;
+            let releaseSlowBatch;
+            const slowBatch = new Promise((resolve) => {
+                releaseSlowBatch = resolve;
+            });
+
+            sinon.stub(service, 'sendBatch').callsFake(async ({batch}) => {
+                if (batch.get('member_segment') === 'throws') {
+                    throw new Error('lock timeout');
+                }
+                await slowBatch;
+                slowBatchSettled = true;
+                return true;
+            });
+
+            let outcome = null;
+            const tracked = service.sendBatches({
+                email: createModel({}),
+                batches: [createModel({member_segment: 'throws'}), createModel({member_segment: 'slow'})],
+                post: createModel({}),
+                newsletter: createModel({})
+            }).then(
+                () => {
+                    outcome = 'fulfilled';
+                },
+                (err) => {
+                    outcome = err;
+                }
+            );
+
+            // Let every pending microtask and timer callback run. The throwing worker has
+            // rejected by now; with Promise.all that alone settled sendBatches, leaving
+            // the sibling's status write in flight while the drain reported itself done.
+            await new Promise((resolve) => {
+                setImmediate(resolve);
+            });
+            assert.equal(outcome, null, 'sendBatches must not settle while a worker is still in flight');
+            assert.equal(slowBatchSettled, false);
+
+            releaseSlowBatch();
+            await tracked;
+
+            assert.equal(slowBatchSettled, true);
+            assert.match(outcome.message, /lock timeout/, 'the worker failure must still surface');
+        });
+
+        it('does not retry when shutdown starts during the backoff sleep', async function () {
+            const service = new BatchSendingService({});
+            const func = sinon.stub().rejects(new Error('mailgun 500'));
+
+            const promise = service.retryDb(func, {
+                maxRetries: 6,
+                sleep: 20,
+                shutdownConfig: {maxRetries: 0},
+                description: 'shutdown during backoff'
+            });
+
+            // First attempt has already failed and retryDb is now sleeping before the
+            // next one — the window where a Mailgun send would otherwise fire again.
+            await new Promise((resolve) => {
+                setTimeout(resolve, 10);
+            });
+            service.onPreStop();
+
+            await assert.rejects(promise);
+            sinon.assert.callCount(func, 1);
+        });
+
+        it('keeps a short retry budget for terminal status writes during shutdown', async function () {
+            const service = new BatchSendingService({});
+            const func = sinon.stub().rejects(new Error('deadlock'));
+            service.onPreStop();
+
+            await assert.rejects(service.retryDb(func, {
+                maxRetries: 20,
+                maxTime: 30 * 60 * 1000,
+                sleep: 0,
+                shutdownConfig: {maxRetries: 3, maxTime: 10 * 1000, sleep: 0},
+                description: 'terminal write'
+            }));
+
+            // Collapsed to the shutdown budget, but not to zero — this write is the one
+            // that has to land, or the batch orphans in `submitting`
+            sinon.assert.callCount(func, 4);
+        });
     });
 });
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 962dd4c9b98..1bdd7f8019e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -151,8 +151,8 @@ catalogs:
       specifier: 14.3.1
       version: 14.3.1
     '@tryghost/api-framework':
-      specifier: 3.3.5
-      version: 3.3.5
+      specifier: 3.3.9
+      version: 3.3.9
     '@tryghost/brute-knex':
       specifier: 3.2.2
       version: 3.2.2
@@ -163,11 +163,11 @@ catalogs:
       specifier: 1.0.11
       version: 1.0.11
     '@tryghost/debug':
-      specifier: 2.3.8
-      version: 2.3.8
+      specifier: 2.3.9
+      version: 2.3.9
     '@tryghost/domain-events':
-      specifier: 3.3.9
-      version: 3.3.9
+      specifier: 3.3.10
+      version: 3.3.10
     '@tryghost/helpers':
       specifier: 1.1.106
       version: 1.1.106
@@ -175,14 +175,14 @@ catalogs:
       specifier: 1.5.6
       version: 1.5.6
     '@tryghost/metrics':
-      specifier: 3.4.2
-      version: 3.4.2
+      specifier: 3.5.0
+      version: 3.5.0
     '@tryghost/mongo-knex':
       specifier: 0.11.2
       version: 0.11.2
     '@tryghost/request':
-      specifier: 4.0.1
-      version: 4.0.1
+      specifier: 4.0.2
+      version: 4.0.2
     '@tryghost/string':
       specifier: 0.3.5
       version: 0.3.5
@@ -190,8 +190,8 @@ catalogs:
       specifier: 1.0.0
       version: 1.0.0
     '@tryghost/tpl':
-      specifier: 2.3.8
-      version: 2.3.8
+      specifier: 2.3.9
+      version: 2.3.9
     '@types/express':
       specifier: 4.17.25
       version: 4.17.25
@@ -516,8 +516,8 @@ catalogs:
 overrides:
   cron-validate: 1.4.5
   knex-migrator>knex: 2.4.2
-  '@tryghost/errors': 3.3.8
-  '@tryghost/logging': 5.3.4
+  '@tryghost/errors': 3.3.9
+  '@tryghost/logging': 5.4.0
   '@tryghost/nql': 0.13.4
   '@tryghost/nql-lang': 0.7.0
   jackspeak: 4.2.3
@@ -1159,7 +1159,7 @@ importers:
         version: 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)
       '@tryghost/debug':
         specifier: 'catalog:'
-        version: 2.3.8(supports-color@10.2.2)
+        version: 2.3.9(supports-color@10.2.2)
       react:
         specifier: catalog:react17
         version: 17.0.2
@@ -1650,7 +1650,7 @@ importers:
     dependencies:
       '@tryghost/debug':
         specifier: 'catalog:'
-        version: 2.3.8(supports-color@10.2.2)
+        version: 2.3.9(supports-color@10.2.2)
     devDependencies:
       '@doist/react-interpolate':
         specifier: 2.2.4
@@ -1931,7 +1931,7 @@ importers:
     dependencies:
       '@tryghost/debug':
         specifier: 'catalog:'
-        version: 2.3.8(supports-color@10.2.2)
+        version: 2.3.9(supports-color@10.2.2)
       react:
         specifier: 'catalog:'
         version: 18.3.1
@@ -2001,7 +2001,7 @@ importers:
     dependencies:
       '@tryghost/debug':
         specifier: 'catalog:'
-        version: 2.3.8(supports-color@10.2.2)
+        version: 2.3.9(supports-color@10.2.2)
       '@tryghost/i18n':
         specifier: workspace:*
         version: link:../../packages/i18n
@@ -2142,10 +2142,10 @@ importers:
         version: 1.61.1
       '@tryghost/debug':
         specifier: 'catalog:'
-        version: 2.3.8(supports-color@10.2.2)
+        version: 2.3.9(supports-color@10.2.2)
       '@tryghost/logging':
-        specifier: 5.3.4
-        version: 5.3.4(supports-color@10.2.2)
+        specifier: 5.4.0
+        version: 5.4.0(supports-color@10.2.2)
       '@tryghost/test-data':
         specifier: workspace:*
         version: link:../packages/testing/test-data
@@ -2244,7 +2244,7 @@ importers:
         version: link:../../packages/admin-api-schema
       '@tryghost/api-framework':
         specifier: 'catalog:'
-        version: 3.3.5(supports-color@10.2.2)
+        version: 3.3.9(supports-color@10.2.2)
       '@tryghost/bookshelf-plugins':
         specifier: 2.3.8
         version: 2.3.8(supports-color@10.2.2)
@@ -2268,16 +2268,16 @@ importers:
         version: 2.3.2
       '@tryghost/debug':
         specifier: 'catalog:'
-        version: 2.3.8(supports-color@10.2.2)
+        version: 2.3.9(supports-color@10.2.2)
       '@tryghost/domain-events':
         specifier: 'catalog:'
-        version: 3.3.9(supports-color@10.2.2)
+        version: 3.3.10(supports-color@10.2.2)
       '@tryghost/email-mock-receiver':
         specifier: 2.1.0
         version: 2.1.0
       '@tryghost/errors':
-        specifier: 3.3.8
-        version: 3.3.8
+        specifier: 3.3.9
+        version: 3.3.9
       '@tryghost/helpers':
         specifier: 'catalog:'
         version: 1.1.106
@@ -2315,11 +2315,11 @@ importers:
         specifier: 'catalog:'
         version: 1.5.6
       '@tryghost/logging':
-        specifier: 5.3.4
-        version: 5.3.4(supports-color@10.2.2)
+        specifier: 5.4.0
+        version: 5.4.0(supports-color@10.2.2)
       '@tryghost/metrics':
         specifier: 'catalog:'
-        version: 3.4.2(supports-color@10.2.2)
+        version: 3.5.0(supports-color@10.2.2)
       '@tryghost/mongo-knex':
         specifier: 'catalog:'
         version: 0.11.2(supports-color@10.2.2)
@@ -2361,7 +2361,7 @@ importers:
         version: 0.1.21
       '@tryghost/request':
         specifier: 'catalog:'
-        version: 4.0.1
+        version: 4.0.2
       '@tryghost/root-utils':
         specifier: 2.3.2
         version: 2.3.2
@@ -2376,7 +2376,7 @@ importers:
         version: 0.3.5
       '@tryghost/tpl':
         specifier: 'catalog:'
-        version: 2.3.8
+        version: 2.3.9
       '@tryghost/url-utils':
         specifier: 5.2.6
         version: 5.2.6
@@ -3867,8 +3867,8 @@ importers:
   packages/adapters/scheduling-base:
     dependencies:
       '@tryghost/logging':
-        specifier: 5.3.4
-        version: 5.3.4(supports-color@10.2.2)
+        specifier: 5.4.0
+        version: 5.4.0(supports-color@10.2.2)
     devDependencies:
       '@internal/cfg-eslint':
         specifier: 'workspace:'
@@ -3907,8 +3907,8 @@ importers:
   packages/adapters/sso-base:
     dependencies:
       '@tryghost/errors':
-        specifier: 3.3.8
-        version: 3.3.8
+        specifier: 3.3.9
+        version: 3.3.9
     devDependencies:
       '@internal/cfg-eslint':
         specifier: workspace:*
@@ -3981,8 +3981,8 @@ importers:
   packages/admin-api-schema:
     dependencies:
       '@tryghost/errors':
-        specifier: 3.3.8
-        version: 3.3.8
+        specifier: 3.3.9
+        version: 3.3.9
       ajv:
         specifier: 'catalog:'
         version: 8.20.0
@@ -4056,7 +4056,7 @@ importers:
     dependencies:
       '@tryghost/debug':
         specifier: 'catalog:'
-        version: 2.3.8(supports-color@10.2.2)
+        version: 2.3.9(supports-color@10.2.2)
       i18next:
         specifier: 23.16.8
         version: 23.16.8
@@ -9256,8 +9256,8 @@ packages:
     resolution: {integrity: sha512-VyMVKRrpHTT8PnotUeV8L/mDaMwD5DaAKCFLP73zAqAtvF0FCqky+Ki7BYbFCYQmqFyTe9316Ed5zS70QUR9eg==}
     engines: {node: '>= 10'}
 
-  '@tryghost/api-framework@3.3.5':
-    resolution: {integrity: sha512-6bDBLtKAHPG82P3ZdY0gT0ZcfpfLbRiK5uwcJhLbr4CfhhH8IWvrecvjkKUskQldL18Tdr2Ct+rfbj2SOYGXog==}
+  '@tryghost/api-framework@3.3.9':
+    resolution: {integrity: sha512-G05CO9tbwQnLWGlpC7c0tANQlgdQbJUK9l/j0o4ykfqz6d0W/uZ7avvniU2TKFO24D1pA+POZskZhigqMTCzDA==}
 
   '@tryghost/bookshelf-collision@2.3.7':
     resolution: {integrity: sha512-CIrIW1BhzyBaybKTKF7Ly6jcnx/AOzCmH1rrLlLhxUjW/5tRZt7qHfXgH7r/SbYbzR8+CVuljq1jGA4vqjM9SA==}
@@ -9296,8 +9296,8 @@ packages:
     resolution: {integrity: sha512-wdhqZV5klysUO+0ZthzxkaWiSxqKKoJm7rkqby3llt5FHZTU5yiaJ55yraio9knm5MHqfDd+IFspNTKEjAnsIw==}
     engines: {node: '>=20.20.0'}
 
-  '@tryghost/bunyan-rotating-filestream@0.0.14':
-    resolution: {integrity: sha512-ECV9pTYcuCQjzzGwEpsWYDHC6RCAJXafAjAjKg1FN8J52uP8ekQ4J7dAaXBdd76b3ktfsNo90Ul1eGd+5yeT2w==}
+  '@tryghost/bunyan-rotating-filestream@0.0.15':
+    resolution: {integrity: sha512-slSrnLFWWDoNsPsyXDyf5+mG2gULzQb//Ntp60NDEWu40yq1OVEJsbd8Jl+1F34cKQyoFBD1pm+J6srH+qOr8Q==}
 
   '@tryghost/color-utils@0.2.20':
     resolution: {integrity: sha512-0KLCQDX7TbJGKNihs+OB1+3hEvhdP4YXOKpdbqJlUkvEFdY+Gl1FlI4WL8wnn0v6oc1aOjvrKmva5BUT0pWtIg==}
@@ -9323,20 +9323,17 @@ packages:
   '@tryghost/debug@2.3.1':
     resolution: {integrity: sha512-m35yRGwmmmvHWzs42qJnf0duCvi5Yd456bPa436Gcldv/rxK5YMPehtGDrwjHstJ4K2If0oguXsdHJf3tjgAjw==}
 
-  '@tryghost/debug@2.3.5':
-    resolution: {integrity: sha512-t08spG/+SXLb7x1C2zJ0ATw/sM3CC5ssaeCHm/Ew2zPaIF+4SaFzNMynGRxKjzlIb+bxUoWPMJlW0EQaveOPeg==}
-
   '@tryghost/debug@2.3.7':
     resolution: {integrity: sha512-qS8QrBLNdDTu1DBgx/RwnNeF/7abDvT1iRZ+bDJ95TIj6gKcHbQN2gQs0rLhZLsnxQs2aC4arb0QjHRy8JyazA==}
 
-  '@tryghost/debug@2.3.8':
-    resolution: {integrity: sha512-7c9/8cCRjmt0AuFjEt+5ALHzoffa8QdqSYaTRXn0Y5PcflStLvv19jF7yUTdvo4JFn4gTvpNosg1QxEohfFgmQ==}
+  '@tryghost/debug@2.3.9':
+    resolution: {integrity: sha512-nWwKuyJIzCzBFbTMh2bcGAocqSeMbjPifb56AqqZybt0KErbuqrw+RfYox92UXTCQR/TLMhPmBq9ccHD0OG33w==}
 
-  '@tryghost/domain-events@3.3.9':
-    resolution: {integrity: sha512-Lw8//qojB7ljRdEXvAK8Jtv0RHKpzZLNdh6kulBtxDKNE67ei8ZoTT/yLR8aKmGzdQ6PJnsOalYPvVJeaXJrqg==}
+  '@tryghost/domain-events@3.3.10':
+    resolution: {integrity: sha512-Kh23N3SOCNpp0ozkgAmOt6qMKMwHjXPeXOvAhHAsA8ybaO0t+uEH1KJUn5xjCwptTu9JjgJ5YD3aiqovB8gdxg==}
 
-  '@tryghost/elasticsearch@5.4.5':
-    resolution: {integrity: sha512-8sjw9VQhfjUzIH2Vu1Gl/a4CP+gsohhc9Qw9tIkQFeMH6LMEKDzYik3gkOlaWj+MyT5BUkizU2tKPdlm1jTEKQ==}
+  '@tryghost/elasticsearch@5.4.6':
+    resolution: {integrity: sha512-7bE2Nm4XfXhlOiVSxVV4FrKyHMxbd/NxNHnowe1vXyKzQp6ExWVNdrgPFnUUYoUyT1THz20HMY7SB0bUje1ZLg==}
 
   '@tryghost/email-mock-receiver@2.1.0':
     resolution: {integrity: sha512-bgEVM5eRnN53rnqWJ8ZkjuGCzMwwt5Ch29TTXRp3qSGTJruUW44DtN/mjB36DDti0hq4unJV9+D1qIIKxdbong==}
@@ -9345,8 +9342,8 @@ packages:
     resolution: {integrity: sha512-py/Fi3jbr+UiUped74m2VRhNEJQrFSgPEhQu/FSHkPjUPWruIokwJoO4TDedklGcMJ+0RKr3YiigcuMFxXjf7A==}
     engines: {node: 12.* || >= 14.*}
 
-  '@tryghost/errors@3.3.8':
-    resolution: {integrity: sha512-11AaQCyPC8w8Fh9zmAfXIUCDO8q6i0tHsGl65XnZCzqOd5G6HOXgf+rt+cjhLhslBxdcp9qX1nForZ0jrct31Q==}
+  '@tryghost/errors@3.3.9':
+    resolution: {integrity: sha512-hcrIXQoWZV0Th8DwndC8bA5BcCcgd7Zw0anAYv6ys/SsKlDMmpzZplECC3pEL8HKI/Cz05/TXkQJiBNrTK11/Q==}
 
   '@tryghost/express-test@2.1.0':
     resolution: {integrity: sha512-gY2AeFzBLvDtDCdc5rE54crDeEC9TzVboViUTmP1Vwbt35BA3O177Ox2j6vb/LQ9HCQ1tp3DOa0hbNYZFaaJAQ==}
@@ -9362,8 +9359,8 @@ packages:
   '@tryghost/http-cache-utils@0.1.25':
     resolution: {integrity: sha512-OJAD1ESvV+F81w6IOTKCX0JLGIiJqNn87HVFMskpUC3IUGpqcDP1pCM79d72khxLWy5oRQDYu8xIqicHJ9ST1Q==}
 
-  '@tryghost/http-stream@2.3.9':
-    resolution: {integrity: sha512-ffxWIJ8bGBZS2d/NkFfOgqWEkd1LoqT9AIEqdBTvlDm3jDMqu585IbIluTddrnZIIGgKJNi5+lyFfjBj5z1CAg==}
+  '@tryghost/http-stream@2.3.10':
+    resolution: {integrity: sha512-qvod+MltdcQhcfii1B+VpNsJD9pi/1QYqdLckH0Z5DnFD3euDgB7cys+dr/2XS0TgxQc9Gj7cHZDl0OOtKe2RQ==}
 
   '@tryghost/image-transform@1.4.17':
     resolution: {integrity: sha512-+WipAbQ6gTOB9hbhmTDHW7tzaB1lPIRszoN+z1qV+vlI+cR/4qO70Ux+HkSYT9gt4WpxRZJZCBCk3+x4Nm0LhQ==}
@@ -9377,11 +9374,11 @@ packages:
   '@tryghost/limit-service@1.5.6':
     resolution: {integrity: sha512-wR+Hm2v5k2FjOUhLhfPZ0p0acCfaTQoSEhuw96uw8c15CLZtm/HKsLnxA5d3AXwYmjRo5gkYskP8UYxrCKNcoQ==}
 
-  '@tryghost/logging@5.3.4':
-    resolution: {integrity: sha512-7ZRknXmKLFK+WW2xwQ1UJ392bh/yDaqyMCJCPvCI//UwVUkhsRfOAVYCYaMn5VWYDLYEflk1fOL8aYhatmeVEQ==}
+  '@tryghost/logging@5.4.0':
+    resolution: {integrity: sha512-H0jWmJBJ0EEwBkq+SErWt4N/LQwwdYCfQcUT3a5RZbF5bcZTRcWnGfSw5aPBIphra9BaOHCiCYeQbyg5wcJkBw==}
 
-  '@tryghost/metrics@3.4.2':
-    resolution: {integrity: sha512-20ldmzt6yHK7835yuU/PJDfZXaHlLl9Y3QfKM2tHUXJH0t6VdTEx1CSEnMjdSgxKG2z5+5uK84FoFD67toUVrQ==}
+  '@tryghost/metrics@3.5.0':
+    resolution: {integrity: sha512-fBIKCodafcG23Eq5rjhmixI+CSzVZ555jNqj7tdDeCXtfVA9ws3X3H3dNo7jgxgZs2SbC7ElYbhBSj4dHX8RKw==}
 
   '@tryghost/mongo-knex@0.11.2':
     resolution: {integrity: sha512-0l7L/J609p+12+rA15Muya1JoIeSfBxIUZRB2FfROtJ2U+FTEOzZ/c0HgxB8eAArJMW2VXECmLCAbNUwygRzfg==}
@@ -9413,8 +9410,8 @@ packages:
   '@tryghost/pretty-cli@3.3.2':
     resolution: {integrity: sha512-JOWoEwrdF+flxZBWq+ikww5BRvU95jfUzUnx25pkrSNJEdTYWzJj3bsTGt7LravWCN41M9y4+XvYwEp6cfawpg==}
 
-  '@tryghost/pretty-stream@2.3.8':
-    resolution: {integrity: sha512-yd95fnXZ9ssS4nfMzzaPCnD+v2GR0c2cQonX1X9+njH3gBln+nyEUlOhQZWGArqq393YeITeC0B2ctPNBFuQRA==}
+  '@tryghost/pretty-stream@2.3.9':
+    resolution: {integrity: sha512-5bq3xDBmLm1auQzsuoIxxwimuQFSnTia+rV9kQ6HmId4GRCbZrqcQOx7y9MVe2kwAUkdHqQrkSZkxoNebCiaRQ==}
 
   '@tryghost/prometheus-metrics@1.0.8':
     resolution: {integrity: sha512-E1LRRwLgiWIN/P20uHgpTK+JVYYQ3+BarKCBszB6qmK5IBANJvQHI3LQV0wDWefVwFyl5FI6AqxLpOOpquvahA==}
@@ -9425,15 +9422,15 @@ packages:
   '@tryghost/promise@2.3.2':
     resolution: {integrity: sha512-WAwvjo85D5DVHfQ+YhBAb8Vq8h3NS/tfn/gVzrIy/L6TztvSxxPG2t9hU/XVsPbFguEV8lqhInowHdJehW/f0w==}
 
-  '@tryghost/promise@2.3.5':
-    resolution: {integrity: sha512-PsWt9XndId4iduE3HGMRWXM2bqicUgCS/kNY7mko+nBl/QRVc4ejBkqW9w5hDtIpYvW61kp2wfyrbGAPCA5ksA==}
+  '@tryghost/promise@2.3.9':
+    resolution: {integrity: sha512-O/d4kTvvHrD/T9Czfhl057uPCJVQulfcQl/XsFHrWOhXewZUc6rsmqTFo6zz9Iv5NRye+SicsUya7BSJFSgKCQ==}
 
   '@tryghost/referrer-parser@0.1.21':
     resolution: {integrity: sha512-Uz7bj8IadLah1j9GgieGQ0VGytdOG6mIlYdbpNu1r8/o9pjR2IS4bt88tvwpGSPNb47P9NrGntGn+Le1W/90jg==}
     engines: {node: '>=16.0.0'}
 
-  '@tryghost/request@4.0.1':
-    resolution: {integrity: sha512-AZdig94vsNuG6PORGe5Ygm5+tuAOQikND7znHiwMASWxP34Kt1pd8QNuKvCyGDtlD7hwanX8/Pc4IP7RCtganA==}
+  '@tryghost/request@4.0.2':
+    resolution: {integrity: sha512-43mgzdOSd09u7Ek9nIjgk1MIkYteZ5FmiS4UYc+H82G8ci5RnVvkW2qplaNYK8Rpih36KxxjNIb7SglX6IL+kg==}
 
   '@tryghost/root-utils@0.3.38':
     resolution: {integrity: sha512-ARn8wC6qv867lCr7BZ+IS8S/88K5go0j6HgQFhP27rKje4b40PsxH/P3rO4Ez2NzF/Do8ywFrTWHoLCSsCazXQ==}
@@ -9444,14 +9441,11 @@ packages:
   '@tryghost/root-utils@2.3.2':
     resolution: {integrity: sha512-tUyMS4xJUceE62JjZIjWAXCeoVlbNHWF2dIy6xJkaYgeHw4oZ5YoKMu9Mzqa7TPHIapU+BxwdWV0HvMj9dZGlA==}
 
-  '@tryghost/root-utils@2.3.5':
-    resolution: {integrity: sha512-7OnoEPEAAaT9LFgR0WNxHUeehC1VSits1k3KuW5FpqitE6NznieiSK9Cpo8v0489Xq7d0Xbkc9qsDytWCCRGCg==}
-
   '@tryghost/root-utils@2.3.7':
     resolution: {integrity: sha512-8HR0W95it+s+ERkRI3syWHDLyYcinBFexpVlmLBhMMf8yEcL7r6tio6H3sUAj09L/YE8Kk5uGhvjAZAT3TU77Q==}
 
-  '@tryghost/root-utils@2.3.8':
-    resolution: {integrity: sha512-n12HsmW0mms6hlfYYSOcsJ9um6jifBvBFXJak2yPBySSmoTZpCgPezG9JlTXtPjG+4VmfvKaOE7NxlbEJyegiw==}
+  '@tryghost/root-utils@2.3.9':
+    resolution: {integrity: sha512-jhnWp6PVubyPoc3BDJSeQ7rX7kC73X7Asp8gv8mCosae9/ciBST95SND/Kblh8FI5yGwuENN8b6Z2w+YBl13FA==}
 
   '@tryghost/security@1.0.6':
     resolution: {integrity: sha512-h4FiUK4ndHezlXeuRzfwTZrX/a8ZdCS/FRqmZWCHcMUiBH6lewHv8eIjsPemN6e6Gn9jtsWZsKnuYM2mD0meSQ==}
@@ -9478,14 +9472,11 @@ packages:
   '@tryghost/tpl@2.3.1':
     resolution: {integrity: sha512-qqa2SvhnBVKFYN+G4hfj2cYZuZXINBDyJ9cTzNBtev/FRNUKniyGarPKAkyb6ZBtvp3Nqlmyvrqe+SFoqHcfrQ==}
 
-  '@tryghost/tpl@2.3.5':
-    resolution: {integrity: sha512-wexPVuAfF+k/Ysy1uTLTHPznQVsKe5kImlvhKd3IQU1eA4ZYGwymtD7GaSvJxHvyaS6zRB8FXzbgXl2dpAUyVg==}
-
   '@tryghost/tpl@2.3.7':
     resolution: {integrity: sha512-TIDQF9tj4MaQKrIxNB8CxpElShAwLfyByozggIBnuzIVkGudX07gy/o9oWGRYslRselrvdByf+NpYonQ9j3Y0Q==}
 
-  '@tryghost/tpl@2.3.8':
-    resolution: {integrity: sha512-WkStVunfpAzfZsGx9Hy4hi+CF5ZYNzwBkxY6+JAeQs8O4npWfVpMLQCEP+CaHpFkuJRhVVtH63Y4KbRw97cH6g==}
+  '@tryghost/tpl@2.3.9':
+    resolution: {integrity: sha512-55bUKq9vG9YvJNtrJKptv2zZoLYXxGUPnX7q6mV6cuZEwxZaWY0uukcs2l3oCG9hollXj0pKJW4KdulcuYi20w==}
 
   '@tryghost/url-utils@5.2.6':
     resolution: {integrity: sha512-3TQRcseZW/rq3UsSMP94n6WgKYZJqufreNdv9wJT5P4Fm5bNQ04rEHvL8i1AggXWa2kUPmwt2ed7KzNY6xx7zA==}
@@ -9496,17 +9487,14 @@ packages:
   '@tryghost/validator@0.2.22':
     resolution: {integrity: sha512-dmobNVEKXMi3K4OdAXLBFwa78hVgy8cYvCPJgfV4h3NtYIyRHqwARr3upT3/ASpVBpKGVBu7XexfSv+tibzsuQ==}
 
-  '@tryghost/validator@3.2.5':
-    resolution: {integrity: sha512-uIpY/QFGjsVgTjT2Hzps4iTxyS3Shjh5g3MpB1QCG6yXm7KWinTfuh8ps2ZNgxKqDjCPEQH6gTWpREugTlLHaw==}
-
-  '@tryghost/validator@3.2.8':
-    resolution: {integrity: sha512-aw5c77K9vl8/dh8AEqoG7bf3YE0gtqKJSasJeu5j56VbaVHhexAh92FXK5BP8pyOfQwqz1ZREuWsfwiDUl5YGQ==}
+  '@tryghost/validator@3.2.9':
+    resolution: {integrity: sha512-dhb8ix2Xd1TVCjpwAJ87MRO/39m1fTl72dfqLbjnmA8r/vgA59SLVUF+BimH3DHcN6vDldwJlDlfJ4nHl5NEaA==}
 
   '@tryghost/version@2.3.2':
     resolution: {integrity: sha512-tBW8gJKLJTUsrGdt/mM1k28Vy4DRTQF7tfZPUf9DQ0KkTgFc+5Z2WipGa50dOaicGysM15imOq7AK7IfXddCHw==}
 
-  '@tryghost/version@2.3.8':
-    resolution: {integrity: sha512-25Aa+J9AvnTLhcu3ph4Klw/nt45h2EUtmfGpSLN6TQykreV20bGvBLzUHlHhnL1kuNpuQaR9qSCvMNU9yYzXmA==}
+  '@tryghost/version@2.3.9':
+    resolution: {integrity: sha512-jRBIcJuU/ljnTmpGnWZfzUyj+KY/9NChAD+tlkqI9ZQoSn4/VZFnZn8zGb0cRI245wzIi2YTjZokO0RJutqvTg==}
 
   '@tryghost/webhook-mock-receiver@2.1.0':
     resolution: {integrity: sha512-Cka5SW4igfgbGv33fFyEjkgt1HCA3lNhKCL88ThsDCw3/9ROxKQLcHMB+S7SNcewIDfsS5kI2INHtD+1Tbp/BA==}
@@ -28657,20 +28645,20 @@ snapshots:
 
   '@tootallnate/once@3.0.1': {}
 
-  '@tryghost/api-framework@3.3.5(supports-color@10.2.2)':
+  '@tryghost/api-framework@3.3.9(supports-color@10.2.2)':
     dependencies:
-      '@tryghost/debug': 2.3.5(supports-color@10.2.2)
-      '@tryghost/errors': 3.3.8
-      '@tryghost/promise': 2.3.5
-      '@tryghost/tpl': 2.3.5
-      '@tryghost/validator': 3.2.5
+      '@tryghost/debug': 2.3.9(supports-color@10.2.2)
+      '@tryghost/errors': 3.3.9
+      '@tryghost/promise': 2.3.9
+      '@tryghost/tpl': 2.3.9
+      '@tryghost/validator': 3.2.9
       lodash: 4.18.1
     transitivePeerDependencies:
       - supports-color
 
   '@tryghost/bookshelf-collision@2.3.7':
     dependencies:
-      '@tryghost/errors': 3.3.8
+      '@tryghost/errors': 3.3.9
       lodash: 4.18.1
       moment-timezone: 0.5.45
 
@@ -28686,7 +28674,7 @@ snapshots:
   '@tryghost/bookshelf-filter@2.3.7(supports-color@10.2.2)':
     dependencies:
       '@tryghost/debug': 2.3.7(supports-color@10.2.2)
-      '@tryghost/errors': 3.3.8
+      '@tryghost/errors': 3.3.9
       '@tryghost/nql': 0.13.4(supports-color@10.2.2)
       '@tryghost/tpl': 2.3.7
     transitivePeerDependencies:
@@ -28712,7 +28700,7 @@ snapshots:
 
   '@tryghost/bookshelf-pagination@2.4.1':
     dependencies:
-      '@tryghost/errors': 3.3.8
+      '@tryghost/errors': 3.3.9
       '@tryghost/tpl': 2.3.7
       lodash: 4.18.1
 
@@ -28749,7 +28737,7 @@ snapshots:
       - supports-color
       - tedious
 
-  '@tryghost/bunyan-rotating-filestream@0.0.14':
+  '@tryghost/bunyan-rotating-filestream@0.0.15':
     dependencies:
       long-timeout: 0.1.1
 
@@ -28785,13 +28773,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@tryghost/debug@2.3.5(supports-color@10.2.2)':
-    dependencies:
-      '@tryghost/root-utils': 2.3.5
-      debug: 4.4.3(supports-color@10.2.2)
-    transitivePeerDependencies:
-      - supports-color
-
   '@tryghost/debug@2.3.7(supports-color@10.2.2)':
     dependencies:
       '@tryghost/root-utils': 2.3.7
@@ -28799,24 +28780,24 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@tryghost/debug@2.3.8(supports-color@10.2.2)':
+  '@tryghost/debug@2.3.9(supports-color@10.2.2)':
     dependencies:
-      '@tryghost/root-utils': 2.3.8
+      '@tryghost/root-utils': 2.3.9
       debug: 4.4.3(supports-color@10.2.2)
     transitivePeerDependencies:
       - supports-color
 
-  '@tryghost/domain-events@3.3.9(supports-color@10.2.2)':
+  '@tryghost/domain-events@3.3.10(supports-color@10.2.2)':
     dependencies:
-      '@tryghost/logging': 5.3.4(supports-color@10.2.2)
+      '@tryghost/logging': 5.4.0(supports-color@10.2.2)
     transitivePeerDependencies:
       - '@75lb/nature'
       - supports-color
 
-  '@tryghost/elasticsearch@5.4.5(supports-color@10.2.2)':
+  '@tryghost/elasticsearch@5.4.6(supports-color@10.2.2)':
     dependencies:
       '@elastic/elasticsearch': 8.19.2(supports-color@10.2.2)
-      '@tryghost/debug': 2.3.8(supports-color@10.2.2)
+      '@tryghost/debug': 2.3.9(supports-color@10.2.2)
       split2: 4.2.0
     transitivePeerDependencies:
       - '@75lb/nature'
@@ -28845,7 +28826,7 @@ snapshots:
       - webpack-cli
       - webpack-command
 
-  '@tryghost/errors@3.3.8': {}
+  '@tryghost/errors@3.3.9': {}
 
   '@tryghost/express-test@2.1.0(express@4.22.2(supports-color@10.2.2))(supports-color@10.2.2)':
     dependencies:
@@ -28868,14 +28849,14 @@ snapshots:
 
   '@tryghost/http-cache-utils@0.1.25': {}
 
-  '@tryghost/http-stream@2.3.9':
+  '@tryghost/http-stream@2.3.10':
     dependencies:
-      '@tryghost/errors': 3.3.8
-      '@tryghost/request': 4.0.1
+      '@tryghost/errors': 3.3.9
+      '@tryghost/request': 4.0.2
 
   '@tryghost/image-transform@1.4.17(@types/node@22.20.1)':
     dependencies:
-      '@tryghost/errors': 3.3.8
+      '@tryghost/errors': 3.3.9
       fs-extra: 11.3.6
     optionalDependencies:
       sharp: 0.35.3(@types/node@22.20.1)
@@ -28886,7 +28867,7 @@ snapshots:
     dependencies:
       '@jest/expect': 30.3.0(supports-color@10.2.2)
       '@jest/expect-utils': 30.3.0
-      '@tryghost/errors': 3.3.8
+      '@tryghost/errors': 3.3.9
       jest-snapshot: 30.3.0(supports-color@10.2.2)
     transitivePeerDependencies:
       - supports-color
@@ -28894,8 +28875,8 @@ snapshots:
   '@tryghost/job-manager@1.0.9(supports-color@10.2.2)':
     dependencies:
       '@breejs/later': 4.2.0
-      '@tryghost/errors': 3.3.8
-      '@tryghost/logging': 5.3.4(supports-color@10.2.2)
+      '@tryghost/errors': 3.3.9
+      '@tryghost/logging': 5.4.0(supports-color@10.2.2)
       bree: 6.5.0(supports-color@10.2.2)
       cron-validate: 1.4.5
       fastq: 1.20.1
@@ -28907,17 +28888,17 @@ snapshots:
 
   '@tryghost/limit-service@1.5.6':
     dependencies:
-      '@tryghost/errors': 3.3.8
+      '@tryghost/errors': 3.3.9
       lodash: 4.18.1
       luxon: 3.7.2
 
-  '@tryghost/logging@5.3.4(supports-color@10.2.2)':
+  '@tryghost/logging@5.4.0(supports-color@10.2.2)':
     dependencies:
-      '@tryghost/bunyan-rotating-filestream': 0.0.14
-      '@tryghost/elasticsearch': 5.4.5(supports-color@10.2.2)
-      '@tryghost/http-stream': 2.3.9
-      '@tryghost/pretty-stream': 2.3.8
-      '@tryghost/root-utils': 2.3.8
+      '@tryghost/bunyan-rotating-filestream': 0.0.15
+      '@tryghost/elasticsearch': 5.4.6(supports-color@10.2.2)
+      '@tryghost/http-stream': 2.3.10
+      '@tryghost/pretty-stream': 2.3.9
+      '@tryghost/root-utils': 2.3.9
       bunyan: 1.8.15
       fs-extra: 11.4.0
       gelf-stream: 1.1.1
@@ -28927,11 +28908,11 @@ snapshots:
       - '@75lb/nature'
       - supports-color
 
-  '@tryghost/metrics@3.4.2(supports-color@10.2.2)':
+  '@tryghost/metrics@3.5.0(supports-color@10.2.2)':
     dependencies:
-      '@tryghost/elasticsearch': 5.4.5(supports-color@10.2.2)
-      '@tryghost/pretty-stream': 2.3.8
-      '@tryghost/root-utils': 2.3.8
+      '@tryghost/elasticsearch': 5.4.6(supports-color@10.2.2)
+      '@tryghost/pretty-stream': 2.3.9
+      '@tryghost/root-utils': 2.3.9
       json-stringify-safe: 5.0.1
     transitivePeerDependencies:
       - '@75lb/nature'
@@ -28955,7 +28936,7 @@ snapshots:
   '@tryghost/mw-error-handler@1.0.13(supports-color@10.2.2)':
     dependencies:
       '@tryghost/debug': 0.1.40(supports-color@10.2.2)
-      '@tryghost/errors': 3.3.8
+      '@tryghost/errors': 3.3.9
       '@tryghost/http-cache-utils': 0.1.25
       '@tryghost/tpl': 0.1.40
       lodash: 4.18.1
@@ -28968,7 +28949,7 @@ snapshots:
   '@tryghost/nodemailer@2.3.1(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2)':
     dependencies:
       '@aws-sdk/client-sesv2': 3.1073.0
-      '@tryghost/errors': 3.3.8
+      '@tryghost/errors': 3.3.9
       '@tryghost/tpl': 2.3.1
       nodemailer: 9.0.1
       nodemailer-mailgun-transport: 2.1.5(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2)
@@ -29001,7 +28982,7 @@ snapshots:
       chalk: 5.6.2
       sywac: 1.3.0
 
-  '@tryghost/pretty-stream@2.3.8':
+  '@tryghost/pretty-stream@2.3.9':
     dependencies:
       date-format: 4.0.14
       lodash: 4.18.1
@@ -29009,7 +28990,7 @@ snapshots:
 
   '@tryghost/prometheus-metrics@1.0.8(supports-color@10.2.2)':
     dependencies:
-      '@tryghost/logging': 5.3.4(supports-color@10.2.2)
+      '@tryghost/logging': 5.4.0(supports-color@10.2.2)
       express: 4.22.1(supports-color@10.2.2)
       prom-client: 15.1.3
       stoppable: 1.1.0
@@ -29021,15 +29002,15 @@ snapshots:
 
   '@tryghost/promise@2.3.2': {}
 
-  '@tryghost/promise@2.3.5': {}
+  '@tryghost/promise@2.3.9': {}
 
   '@tryghost/referrer-parser@0.1.21': {}
 
-  '@tryghost/request@4.0.1':
+  '@tryghost/request@4.0.2':
     dependencies:
-      '@tryghost/errors': 3.3.8
-      '@tryghost/validator': 3.2.8
-      '@tryghost/version': 2.3.8
+      '@tryghost/errors': 3.3.9
+      '@tryghost/validator': 3.2.9
+      '@tryghost/version': 2.3.9
       cacheable-lookup: 7.0.0
       got: 15.1.0
       lodash: 4.18.1
@@ -29049,17 +29030,12 @@ snapshots:
       caller: 1.1.0
       find-root: 1.1.0
 
-  '@tryghost/root-utils@2.3.5':
-    dependencies:
-      caller: 1.1.0
-      find-root: 1.1.0
-
   '@tryghost/root-utils@2.3.7':
     dependencies:
       caller: 1.1.0
       find-root: 1.1.0
 
-  '@tryghost/root-utils@2.3.8':
+  '@tryghost/root-utils@2.3.9':
     dependencies:
       caller: 1.1.0
       find-root: 1.1.0
@@ -29072,7 +29048,7 @@ snapshots:
   '@tryghost/server@3.1.1(supports-color@10.2.2)':
     dependencies:
       '@tryghost/debug': 2.3.1(supports-color@10.2.2)
-      '@tryghost/logging': 5.3.4(supports-color@10.2.2)
+      '@tryghost/logging': 5.4.0(supports-color@10.2.2)
     transitivePeerDependencies:
       - '@75lb/nature'
       - supports-color
@@ -29095,11 +29071,9 @@ snapshots:
 
   '@tryghost/tpl@2.3.1': {}
 
-  '@tryghost/tpl@2.3.5': {}
-
   '@tryghost/tpl@2.3.7': {}
 
-  '@tryghost/tpl@2.3.8': {}
+  '@tryghost/tpl@2.3.9': {}
 
   '@tryghost/url-utils@5.2.6':
     dependencies:
@@ -29123,24 +29097,16 @@ snapshots:
 
   '@tryghost/validator@0.2.22':
     dependencies:
-      '@tryghost/errors': 3.3.8
+      '@tryghost/errors': 3.3.9
       '@tryghost/tpl': 0.1.40
       lodash: 4.18.1
       moment-timezone: 0.5.45
       validator: 7.2.0
 
-  '@tryghost/validator@3.2.5':
-    dependencies:
-      '@tryghost/errors': 3.3.8
-      '@tryghost/tpl': 2.3.5
-      lodash: 4.18.1
-      moment-timezone: 0.5.45
-      validator: 13.15.35
-
-  '@tryghost/validator@3.2.8':
+  '@tryghost/validator@3.2.9':
     dependencies:
-      '@tryghost/errors': 3.3.8
-      '@tryghost/tpl': 2.3.8
+      '@tryghost/errors': 3.3.9
+      '@tryghost/tpl': 2.3.9
       lodash: 4.18.1
       moment-timezone: 0.5.45
       validator: 13.15.35
@@ -29150,9 +29116,9 @@ snapshots:
       '@tryghost/root-utils': 2.3.2
       semver: 7.8.5
 
-  '@tryghost/version@2.3.8':
+  '@tryghost/version@2.3.9':
     dependencies:
-      '@tryghost/root-utils': 2.3.8
+      '@tryghost/root-utils': 2.3.9
       semver: 7.8.5
 
   '@tryghost/webhook-mock-receiver@2.1.0':
@@ -29161,7 +29127,7 @@ snapshots:
 
   '@tryghost/zip@3.5.0(supports-color@10.2.2)':
     dependencies:
-      '@tryghost/errors': 3.3.8
+      '@tryghost/errors': 3.3.9
       archiver: 8.0.0
       extract-zip: 2.0.1(supports-color@10.2.2)
     transitivePeerDependencies:
@@ -29172,7 +29138,7 @@ snapshots:
 
   '@tryghost/zip@3.5.1(supports-color@10.2.2)':
     dependencies:
-      '@tryghost/errors': 3.3.8
+      '@tryghost/errors': 3.3.9
       archiver: 8.0.0
       extract-zip: 2.0.1(supports-color@10.2.2)
     transitivePeerDependencies:
@@ -31883,7 +31849,7 @@ snapshots:
   bookshelf-relations@2.8.0(bookshelf@1.2.0(knex@2.4.2(better-sqlite3@12.11.1)(mysql2@3.22.5(@types/node@22.20.1))(supports-color@10.2.2)))(supports-color@10.2.2):
     dependencies:
       '@tryghost/debug': 0.1.40(supports-color@10.2.2)
-      '@tryghost/errors': 3.3.8
+      '@tryghost/errors': 3.3.9
       bluebird: 3.7.2
       bookshelf: 1.2.0(knex@2.4.2(better-sqlite3@12.11.1)(mysql2@3.22.5(@types/node@22.20.1))(supports-color@10.2.2))
       lodash: 4.18.1
@@ -37774,8 +37740,8 @@ snapshots:
       '@sentry/node': 10.65.0(@opentelemetry/core@2.9.0(@opentelemetry/api@1.9.1))(supports-color@10.2.2)
       '@tryghost/config': 2.3.1
       '@tryghost/debug': 2.3.1(supports-color@10.2.2)
-      '@tryghost/errors': 3.3.8
-      '@tryghost/logging': 5.3.4(supports-color@10.2.2)
+      '@tryghost/errors': 3.3.9
+      '@tryghost/logging': 5.4.0(supports-color@10.2.2)
       '@tryghost/nql': 0.13.4(supports-color@10.2.2)
       '@tryghost/pretty-cli': 3.3.1
       '@tryghost/server': 3.1.1(supports-color@10.2.2)
@@ -39634,8 +39600,8 @@ snapshots:
   knex-migrator@5.4.1(@types/node@22.20.1)(supports-color@10.2.2):
     dependencies:
       '@tryghost/database-info': 0.3.35
-      '@tryghost/errors': 3.3.8
-      '@tryghost/logging': 5.3.4(supports-color@10.2.2)
+      '@tryghost/errors': 3.3.9
+      '@tryghost/logging': 5.4.0(supports-color@10.2.2)
       '@tryghost/promise': 0.3.20
       commander: 5.1.0
       compare-ver: 2.0.2
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 08654163777..956902de3fb 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -78,24 +78,24 @@ catalog:
   '@tanstack/react-virtual': 3.14.9
   '@testing-library/jest-dom': 6.9.1
   '@testing-library/react': 14.3.1
-  '@tryghost/api-framework': 3.3.5
+  '@tryghost/api-framework': 3.3.9
   '@tryghost/brute-knex': 3.2.2
   '@tryghost/color-utils': 0.2.20
   '@tryghost/custom-fonts': 1.0.11
-  '@tryghost/debug': 2.3.8
-  '@tryghost/domain-events': 3.3.9
-  '@tryghost/errors': 3.3.8
+  '@tryghost/debug': 2.3.9
+  '@tryghost/domain-events': 3.3.10
+  '@tryghost/errors': 3.3.9
   '@tryghost/helpers': 1.1.106
   '@tryghost/limit-service': 1.5.6
-  '@tryghost/logging': 5.3.4
-  '@tryghost/metrics': 3.4.2
+  '@tryghost/logging': 5.4.0
+  '@tryghost/metrics': 3.5.0
   '@tryghost/mongo-knex': 0.11.2
   '@tryghost/nql': 0.13.4
   '@tryghost/nql-lang': 0.7.0
-  '@tryghost/request': 4.0.1
+  '@tryghost/request': 4.0.2
   '@tryghost/string': 0.3.5
   '@tryghost/timezone-data': 1.0.0
-  '@tryghost/tpl': 2.3.8
+  '@tryghost/tpl': 2.3.9
   '@types/express': 4.17.25
   '@types/html-minifier': ^4.0.6
   '@types/lodash': 4.17.25