From c76e3c278c238fc519995f6ddc2da8bc70b5ebef Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Mon, 10 Aug 2026 09:20:41 -0500
Subject: [PATCH 1/9] Added per-role first-login smoke tests for Ghost Admin
 (#29815)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

no ref
- New e2e spec `e2e/tests/admin/staff-role-smoke.test.ts`: every staff
role performs a real first login in a fresh browser context and the test
asserts the role's landing view plus the navigation it should (and
should not) have:
- **Administrator** → `/analytics`, full sidebar (Analytics, View site,
Posts, Pages, Tags, Members, Settings)
- **Editor** → `/site`, sidebar with Posts, Pages, Tags, Settings (no
Analytics/View site/Members)
  - **Super Editor** → `/site`, Editor set plus Members
  - **Author** → `/site`, Posts and Pages only
- **Contributor** → `/posts`, no sidebar at all — floating avatar menu
with Posts / View site / Your profile
- New Playwright fixtures `ghostAccountEditor`,
`ghostAccountSuperEditor`, `ghostAccountAdministrator`, reusing the
existing StaffAccountFactory invite + MailPit flow (Author/Contributor
already existed).
- New `ContributorUserMenu` page object backed by new selector constants
in `@tryghost/test-data`.
- Corrected the stale `NAV_ITEMS` role-visibility metadata in the
sidebar page object (it claimed Editors see View site and Members,
contradicting the shipped gating) and added `Super Editor` to its
`UserRole` union.
---
 .../admin/sidebar/contributor-user-menu.ts    | 26 +++++
 e2e/helpers/pages/admin/sidebar/index.ts      |  1 +
 .../pages/admin/sidebar/sidebar-page.ts       | 21 ++--
 e2e/helpers/playwright/fixture.ts             | 15 +++
 e2e/tests/admin/staff-role-smoke.test.ts      | 97 +++++++++++++++++++
 .../test-data/src/selectors/sidebar.ts        |  4 +
 6 files changed, 158 insertions(+), 6 deletions(-)
 create mode 100644 e2e/helpers/pages/admin/sidebar/contributor-user-menu.ts
 create mode 100644 e2e/tests/admin/staff-role-smoke.test.ts

diff --git a/e2e/helpers/pages/admin/sidebar/contributor-user-menu.ts b/e2e/helpers/pages/admin/sidebar/contributor-user-menu.ts
new file mode 100644
index 00000000000..7faaf94fb79
--- /dev/null
+++ b/e2e/helpers/pages/admin/sidebar/contributor-user-menu.ts
@@ -0,0 +1,26 @@
+import * as sidebarSel from '@tryghost/test-data/selectors/sidebar';
+import {AdminPage} from '@/admin-pages';
+import {Locator, Page} from '@playwright/test';
+
+/**
+ * Contributors get a floating avatar menu instead of the admin sidebar
+ * (apps/admin/src/layout/admin-layout.tsx).
+ */
+export class ContributorUserMenu extends AdminPage {
+    public readonly trigger: Locator;
+    public readonly postsMenuItem: Locator;
+    public readonly viewSiteMenuItem: Locator;
+    public readonly profileMenuItem: Locator;
+
+    constructor(page: Page) {
+        super(page);
+        this.trigger = page.getByRole('button', {name: sidebarSel.contributorMenuTrigger});
+        this.postsMenuItem = page.getByRole('menuitem', {name: sidebarSel.contributorPostsMenuItem});
+        this.viewSiteMenuItem = page.getByRole('menuitem', {name: sidebarSel.contributorViewSiteMenuItem});
+        this.profileMenuItem = page.getByRole('menuitem', {name: sidebarSel.profileMenuItem});
+    }
+
+    async open(): Promise<void> {
+        await this.trigger.click();
+    }
+}
diff --git a/e2e/helpers/pages/admin/sidebar/index.ts b/e2e/helpers/pages/admin/sidebar/index.ts
index d96ef6afe35..ca9558e1703 100644
--- a/e2e/helpers/pages/admin/sidebar/index.ts
+++ b/e2e/helpers/pages/admin/sidebar/index.ts
@@ -1 +1,2 @@
+export * from './contributor-user-menu';
 export * from './sidebar-page';
diff --git a/e2e/helpers/pages/admin/sidebar/sidebar-page.ts b/e2e/helpers/pages/admin/sidebar/sidebar-page.ts
index 6d1fb51f871..226c9c0d9be 100644
--- a/e2e/helpers/pages/admin/sidebar/sidebar-page.ts
+++ b/e2e/helpers/pages/admin/sidebar/sidebar-page.ts
@@ -3,7 +3,7 @@ import {AdminPage} from '@/admin-pages';
 import {Locator, Page} from '@playwright/test';
 import {whatsNewMenuItem} from '@tryghost/test-data/selectors/whats-new';
 
-export type UserRole = 'Administrator' | 'Editor' | 'Author' | 'Contributor';
+export type UserRole = 'Administrator' | 'Editor' | 'Super Editor' | 'Author' | 'Contributor';
 
 export interface NavItem {
     name: string;
@@ -15,15 +15,20 @@ export interface NavItem {
 /**
  * Navigation items in the sidebar with their expected paths and role visibility.
  * Used for navigation tests and force upgrade redirect validation.
+ *
+ * `roles` = roles whose sidebar shows the item (Owner sees everything
+ * Administrator does; Contributors have no sidebar at all — they get a
+ * floating user menu instead). Gating source:
+ * apps/admin/src/layout/app-sidebar/{nav-main,nav-content}.tsx.
  */
 export const NAV_ITEMS: NavItem[] = [
     {name: 'Analytics', path: /\/ghost\/#\/analytics\/?$/, directUrl: '/ghost/#/analytics', roles: ['Administrator']},
     {name: 'Network', path: /\/ghost\/#\/(network|activitypub)\/?/, directUrl: '/ghost/#/activitypub', roles: ['Administrator']},
-    {name: 'View site', path: /\/ghost\/#\/site\/?$/, directUrl: '/ghost/#/site', roles: ['Administrator', 'Editor']},
-    {name: 'Posts', path: /\/ghost\/#\/posts\/?$/, directUrl: '/ghost/#/posts', roles: ['Administrator', 'Editor', 'Author', 'Contributor']},
-    {name: 'Pages', path: /\/ghost\/#\/pages\/?$/, directUrl: '/ghost/#/pages', roles: ['Administrator', 'Editor']},
-    {name: 'Tags', path: /\/ghost\/#\/tags\/?$/, directUrl: '/ghost/#/tags', roles: ['Administrator', 'Editor']},
-    {name: 'Members', path: /\/ghost\/#\/members\/?$/, directUrl: '/ghost/#/members', roles: ['Administrator', 'Editor']}
+    {name: 'View site', path: /\/ghost\/#\/site\/?$/, directUrl: '/ghost/#/site', roles: ['Administrator']},
+    {name: 'Posts', path: /\/ghost\/#\/posts\/?$/, directUrl: '/ghost/#/posts', roles: ['Administrator', 'Editor', 'Super Editor', 'Author']},
+    {name: 'Pages', path: /\/ghost\/#\/pages\/?$/, directUrl: '/ghost/#/pages', roles: ['Administrator', 'Editor', 'Super Editor', 'Author']},
+    {name: 'Tags', path: /\/ghost\/#\/tags\/?$/, directUrl: '/ghost/#/tags', roles: ['Administrator', 'Editor', 'Super Editor']},
+    {name: 'Members', path: /\/ghost\/#\/members\/?$/, directUrl: '/ghost/#/members', roles: ['Administrator', 'Super Editor']}
 ];
 
 /**
@@ -36,6 +41,7 @@ export const NAV_ITEMS: NavItem[] = [
  */
 export class SidebarPage extends AdminPage {
     public readonly sidebar: Locator;
+    public readonly adminSidebar: Locator;
     public readonly postsToggle: Locator;
     public readonly userDropdownTrigger: Locator;
     public readonly appearanceMenuItem: Locator;
@@ -57,6 +63,9 @@ export class SidebarPage extends AdminPage {
         // carry a breadcrumb <nav aria-label="breadcrumb"> too), so anchor on
         // the site search control, which only the sidebar contains.
         this.sidebar = page.getByRole('navigation').filter({has: page.getByRole('button', {name: /Search site/})});
+        // Container testid — for asserting the sidebar's absence (contributors
+        // get a floating avatar menu instead of the sidebar).
+        this.adminSidebar = page.getByTestId(sidebarSel.adminSidebar);
         this.postsToggle = this.sidebar.getByRole('button', {name: sidebarSel.postsToggle});
         this.userDropdownTrigger = page.getByRole('button', {name: sidebarSel.userMenuTrigger});
         this.appearanceMenuItem = page.getByRole('menuitem', {name: sidebarSel.appearanceMenuItem});
diff --git a/e2e/helpers/playwright/fixture.ts b/e2e/helpers/playwright/fixture.ts
index 628d23762fd..bb1b54cb477 100644
--- a/e2e/helpers/playwright/fixture.ts
+++ b/e2e/helpers/playwright/fixture.ts
@@ -107,6 +107,9 @@ export interface GhostInstanceFixture {
     ghostAccountOwner: User;
     ghostAccountAuthor: StaffAccount;
     ghostAccountContributor: StaffAccount;
+    ghostAccountEditor: StaffAccount;
+    ghostAccountSuperEditor: StaffAccount;
+    ghostAccountAdministrator: StaffAccount;
     pageWithAuthenticatedUser: {
         page: Page;
         context: BrowserContext;
@@ -570,6 +573,18 @@ export const test = base.extend<GhostInstanceFixture & InternalFixtures, WorkerF
         await use(await createStaffAccount(pageWithAuthenticatedUser.page, emailClient, 'Contributor'));
     },
 
+    ghostAccountEditor: async ({pageWithAuthenticatedUser, emailClient}, use) => {
+        await use(await createStaffAccount(pageWithAuthenticatedUser.page, emailClient, 'Editor'));
+    },
+
+    ghostAccountSuperEditor: async ({pageWithAuthenticatedUser, emailClient}, use) => {
+        await use(await createStaffAccount(pageWithAuthenticatedUser.page, emailClient, 'Super Editor'));
+    },
+
+    ghostAccountAdministrator: async ({pageWithAuthenticatedUser, emailClient}, use) => {
+        await use(await createStaffAccount(pageWithAuthenticatedUser.page, emailClient, 'Administrator'));
+    },
+
     // Intermediate fixture that sets up the page and returns all setup data
     pageWithAuthenticatedUser: async ({browser, ghostInstance, ghostAccountOwner, _testEnvironmentContext}, use) => {
         if (!ghostInstance.baseUrl) {
diff --git a/e2e/tests/admin/staff-role-smoke.test.ts b/e2e/tests/admin/staff-role-smoke.test.ts
new file mode 100644
index 00000000000..12286788ddc
--- /dev/null
+++ b/e2e/tests/admin/staff-role-smoke.test.ts
@@ -0,0 +1,97 @@
+import {AnalyticsOverviewPage, ContributorUserMenu, LoginPage, PostsPage, SidebarPage, SitePage} from '@/admin-pages';
+import {Page} from '@playwright/test';
+import {expect, test, withIsolatedPage} from '@/helpers/playwright';
+
+test.describe('Ghost Admin - Staff role smoke', () => {
+    async function signInFirstTime(page: Page, account: {email: string; password: string}) {
+        const loginPage = new LoginPage(page);
+        await loginPage.goto();
+        await loginPage.signIn(account.email, account.password);
+    }
+
+    async function expectNavigation(sidebarPage: SidebarPage, {visible, hidden}: {visible: string[]; hidden: string[]}) {
+        await expect(sidebarPage.sidebar).toBeVisible();
+        for (const name of visible) {
+            await expect(sidebarPage.getNavLink(name)).toBeVisible();
+        }
+        for (const name of hidden) {
+            await expect(sidebarPage.getNavLink(name)).toHaveCount(0);
+        }
+    }
+
+    test('administrator first login - lands on analytics with full navigation', async ({browser, baseURL, ghostAccountAdministrator}) => {
+        await withIsolatedPage(browser, {baseURL}, async ({page}) => {
+            await signInFirstTime(page, ghostAccountAdministrator);
+
+            const analyticsPage = new AnalyticsOverviewPage(page);
+            await expect(analyticsPage.header).toBeVisible();
+
+            const sidebarPage = new SidebarPage(page);
+            await expect(sidebarPage.adminSidebar).toBeVisible();
+            await expectNavigation(sidebarPage, {
+                visible: ['Analytics', 'View site', 'Posts', 'Pages', 'Tags', 'Members', 'Settings'],
+                hidden: []
+            });
+        });
+    });
+
+    test('editor first login - lands on site view with content navigation', async ({browser, baseURL, ghostAccountEditor}) => {
+        await withIsolatedPage(browser, {baseURL}, async ({page}) => {
+            await signInFirstTime(page, ghostAccountEditor);
+
+            const sitePage = new SitePage(page);
+            await sitePage.waitForPageToFullyLoad();
+
+            await expectNavigation(new SidebarPage(page), {
+                visible: ['Posts', 'Pages', 'Tags', 'Settings'],
+                hidden: ['Analytics', 'View site', 'Members']
+            });
+        });
+    });
+
+    test('super editor first login - lands on site view with members navigation', async ({browser, baseURL, ghostAccountSuperEditor}) => {
+        await withIsolatedPage(browser, {baseURL}, async ({page}) => {
+            await signInFirstTime(page, ghostAccountSuperEditor);
+
+            const sitePage = new SitePage(page);
+            await sitePage.waitForPageToFullyLoad();
+
+            await expectNavigation(new SidebarPage(page), {
+                visible: ['Posts', 'Pages', 'Tags', 'Members', 'Settings'],
+                hidden: ['Analytics', 'View site']
+            });
+        });
+    });
+
+    test('author first login - lands on site view with posts and pages navigation', async ({browser, baseURL, ghostAccountAuthor}) => {
+        await withIsolatedPage(browser, {baseURL}, async ({page}) => {
+            await signInFirstTime(page, ghostAccountAuthor);
+
+            const sitePage = new SitePage(page);
+            await sitePage.waitForPageToFullyLoad();
+
+            await expectNavigation(new SidebarPage(page), {
+                visible: ['Posts', 'Pages'],
+                hidden: ['Analytics', 'View site', 'Tags', 'Members', 'Settings']
+            });
+        });
+    });
+
+    test('contributor first login - lands on posts list with floating user menu instead of sidebar', async ({browser, baseURL, ghostAccountContributor}) => {
+        await withIsolatedPage(browser, {baseURL}, async ({page}) => {
+            await signInFirstTime(page, ghostAccountContributor);
+
+            const postsPage = new PostsPage(page);
+            await postsPage.waitForPageToFullyLoad();
+
+            const sidebarPage = new SidebarPage(page);
+            await expect(sidebarPage.adminSidebar).toHaveCount(0);
+
+            const contributorMenu = new ContributorUserMenu(page);
+            await contributorMenu.open();
+            await expect(contributorMenu.postsMenuItem).toBeVisible();
+            await expect(contributorMenu.viewSiteMenuItem).toBeVisible();
+            await expect(contributorMenu.profileMenuItem).toBeVisible();
+        });
+    });
+});
diff --git a/packages/testing/test-data/src/selectors/sidebar.ts b/packages/testing/test-data/src/selectors/sidebar.ts
index 5e0ac6c91fa..e2940c6fc02 100644
--- a/packages/testing/test-data/src/selectors/sidebar.ts
+++ b/packages/testing/test-data/src/selectors/sidebar.ts
@@ -10,6 +10,10 @@ export const networkNotificationBadge = "network-notification-badge";
 // accessible names
 export const postsToggle = "Toggle post views";
 export const userMenuTrigger = "User menu";
+/** Contributors get a floating avatar menu instead of the sidebar. */
+export const contributorMenuTrigger = "Open user menu";
+export const contributorPostsMenuItem = "Posts";
+export const contributorViewSiteMenuItem = "View site";
 export const profileMenuItem = "Your profile";
 export const signOutMenuItem = "Sign out";
 /** The appearance item's accessible name includes the current choice ("Appearance Light"). */

From 53b292926aebb33be591c0e4720370e1bd286e48 Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Mon, 10 Aug 2026 09:25:36 -0500
Subject: [PATCH 2/9] Version-pin pnpm dependency build approvals (#29808)

no ref

Version-scoped every `allowBuilds: true` entry in `pnpm-workspace.yaml` to the exact version or versions currently resolved in `pnpm-lock.yaml`. This tightens up our security a touch against worm attacks.
---
 pnpm-workspace.yaml | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index db00f0b81ec..6723df2361f 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -15,23 +15,25 @@ minimumReleaseAge: 4320 # 3 days in minutes; matches Renovate's minimumReleaseAg
 blockExoticSubdeps: true
 
 allowBuilds:
+  # Permitted builds are version-scoped. Adding or updating a permitted version
+  # requires an explicit Platform security review.
   # sentry-cli's postinstall downloads its binary, which is only used for
   # sourcemap upload — that was gated on the old Koenig repo's IS_SHIPPING
   # publish flow and isn't part of dev or CI builds here.
   '@sentry/cli': false
-  '@swc/core': true
-  better-sqlite3: true
-  core-js: true
+  '@swc/core@1.15.43': true
+  'better-sqlite3@12.11.1': true
+  'core-js@2.6.12': true
   cpu-features: false
-  dtrace-provider: true
-  esbuild: true
-  fsevents: true
-  msw: true
-  nx: true
-  protobufjs: true
-  re2: true
-  sharp: true
-  sqlite3: true
+  'dtrace-provider@0.8.8': true
+  'esbuild@0.25.12 || 0.28.1': true
+  'fsevents@1.2.13 || 2.3.2 || 2.3.3': true
+  'msw@2.14.6': true
+  'nx@23.0.1': true
+  'protobufjs@7.6.4': true
+  're2@1.25.0': true
+  'sharp@0.35.3': true
+  'sqlite3@5.1.7': true
   ssh2: false
 
 catalog:

From 8a31056e3770928d2eb36df786f9c493f2de7fad Mon Sep 17 00:00:00 2001
From: Evan Hahn <chris@chrisraible.com>
Date: Mon, 10 Aug 2026 09:28:59 -0500
Subject: [PATCH 3/9] Removed unused member email analytics job (#29816)

ref 6a0f14118c341c5383145f1280e871edf187344d

This code has been unused since 2025.

There was an edge case where this job was inserted and then the
associated code was removed, which I considered as an issue. But current
code won't execute this job--with or without the file.
---
 .../jobs/update-member-email-analytics/index.js    | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 ghost/core/core/server/services/email-analytics/jobs/update-member-email-analytics/index.js

diff --git a/ghost/core/core/server/services/email-analytics/jobs/update-member-email-analytics/index.js b/ghost/core/core/server/services/email-analytics/jobs/update-member-email-analytics/index.js
deleted file mode 100644
index 51e36554a86..00000000000
--- a/ghost/core/core/server/services/email-analytics/jobs/update-member-email-analytics/index.js
+++ /dev/null
@@ -1,14 +0,0 @@
-const queries = require('../../lib/queries');
-
-/**
- * Updates email analytics for a specific member
- *
- * @param {Object} options - The options object
- * @param {string} options.memberId - The ID of the member to update analytics for
- * @returns {Promise<Object>} The result of the aggregation query (1/0)
- */
-module.exports = async function updateMemberEmailAnalytics({memberId}) {
-    // Use the batch method with a single member for consistency
-    const result = await queries.aggregateMemberStatsBatch([memberId]);
-    return result;
-};
\ No newline at end of file

From 77098a042526b96854b1b78b7246ad8cede8be1d Mon Sep 17 00:00:00 2001
From: Evan Hahn <evan@ghost.org>
Date: Mon, 10 Aug 2026 09:41:36 -0500
Subject: [PATCH 4/9] Forced UTC for automation timestamps (#29811)

closes https://linear.app/ghost/issue/NY-1404

_I recommend [reviewing this one commit at a
time](https://github.com/TryGhost/Ghost/pull/29811/commits)._

Most of the time, Ghost runs in a UTC environment where this change has
no effect. But if you:

- self-host
- use SQLite
- use a time other than UTC

Automation timezones might have been messed up for you.

This fixes that by forcing everything to use UTC.

In addition to automated tests, I manually tested this by making sure
scheduled automations still worked:

https://github.com/user-attachments/assets/aff984ce-0249-4d43-8844-e3a0fcae193f

Co-authored-by: Troy Ciesco <tmciesco@gmail.com>
---
 .../database-automations-repository.ts        | 24 +++---
 .../services/automations/database-date.ts     | 25 +++++-
 .../automations-repository.test.ts            |  7 +-
 .../automations/database-date.test.ts         | 76 ++++++++++++++++++-
 4 files changed, 113 insertions(+), 19 deletions(-)

diff --git a/ghost/core/core/server/services/automations/database-automations-repository.ts b/ghost/core/core/server/services/automations/database-automations-repository.ts
index 014073c5bf2..db184a2529d 100644
--- a/ghost/core/core/server/services/automations/database-automations-repository.ts
+++ b/ghost/core/core/server/services/automations/database-automations-repository.ts
@@ -21,7 +21,7 @@ import type {
     EditAutomationData,
     Page
 } from './automations-repository';
-import {toDatabaseDate} from './database-date';
+import {fromDatabaseDate, toDatabaseDate, type DatabaseDate} from './database-date';
 import {getStaleLockCutoff} from './stale-lock-cutoff';
 import type {ExclusifyUnion, ReadonlyDeep} from 'type-fest';
 
@@ -48,8 +48,8 @@ interface AutomationRow {
     slug: string;
     name: string;
     status: string;
-    created_at: string;
-    updated_at: string;
+    created_at: DatabaseDate;
+    updated_at: DatabaseDate;
 }
 
 
@@ -76,7 +76,7 @@ type ActionLinkRow = {
 
 type ActionRevisionRow = {
     action_id: string;
-    created_at: string;
+    created_at: DatabaseDate;
     wait_hours: number | null;
     email_subject: string | null;
     email_lexical: string | null;
@@ -108,7 +108,7 @@ type StepToRunRow = {
     action_id: string;
     automation_action_revision_id: string;
     type: string;
-    ready_at: string;
+    ready_at: DatabaseDate;
     step_attempts: number;
     wait_hours: number | null;
     email_subject: string | null;
@@ -709,14 +709,14 @@ async function findNextPendingReadyAt(trx: Knex.Transaction, staleLockCutoff: Re
         })
         .orderBy('ready_at')
         .first();
-    return row?.next_ready_at ? new Date(row.next_ready_at) : null;
+    return row?.next_ready_at ? fromDatabaseDate(row.next_ready_at) : null;
 }
 
 function buildStepToRun(row: ReadonlyDeep<StepToRunRow>): AutomationStepToRun {
     const base = {
         id: row.id,
         step_attempts: row.step_attempts,
-        ready_at: new Date(row.ready_at),
+        ready_at: fromDatabaseDate(row.ready_at),
         locked_by: row.locked_by,
         automation_run_id: row.automation_run_id,
         automation_id: row.automation_id,
@@ -1259,13 +1259,13 @@ async function insertActionRevisions(
     );
 }
 
-function getNextRevisionCreatedAt(latestCreatedAt: string | null, requestedCreatedAt: string) {
+function getNextRevisionCreatedAt(latestCreatedAt: DatabaseDate | null, requestedCreatedAt: string) {
     if (!latestCreatedAt) {
         return toDatabaseDate(requestedCreatedAt);
     }
 
-    const requestedTime = new Date(requestedCreatedAt).getTime();
-    const latestTime = new Date(latestCreatedAt).getTime();
+    const requestedTime = fromDatabaseDate(requestedCreatedAt).getTime();
+    const latestTime = fromDatabaseDate(latestCreatedAt).getTime();
 
     if (requestedTime > latestTime) {
         return toDatabaseDate(requestedCreatedAt);
@@ -1355,8 +1355,8 @@ function buildAutomationSummary(automation: AutomationRow): AutomationSummary {
     };
 }
 
-function serializeDate(date: string) {
-    const normalizedDate = new Date(date);
+function serializeDate(date: DatabaseDate) {
+    const normalizedDate = fromDatabaseDate(date);
     normalizedDate.setMilliseconds(0);
     return normalizedDate.toISOString();
 }
diff --git a/ghost/core/core/server/services/automations/database-date.ts b/ghost/core/core/server/services/automations/database-date.ts
index b90fa8130e2..545f7b725cd 100644
--- a/ghost/core/core/server/services/automations/database-date.ts
+++ b/ghost/core/core/server/services/automations/database-date.ts
@@ -1,5 +1,26 @@
 import moment from 'moment';
+import * as errors from '@tryghost/errors';
 
-const DATABASE_DATE_FORMAT = 'YYYY-MM-DD HH:mm:ss';
+export const DATABASE_DATE_FORMAT = 'YYYY-MM-DD HH:mm:ss';
 
-export const toDatabaseDate = (date: Date | string): string => moment(date).format(DATABASE_DATE_FORMAT);
+export type DatabaseDate = Date | string | number;
+
+export const toDatabaseDate = (date: Date | string): string => moment.utc(date).format(DATABASE_DATE_FORMAT);
+
+export const fromDatabaseDate = (date: DatabaseDate): Date => {
+    if (date instanceof Date) {
+        return new Date(date);
+    }
+
+    if (typeof date === 'string') {
+        return moment.utc(date, DATABASE_DATE_FORMAT).toDate();
+    }
+
+    // Defense-in-depth for legacy SQLite rows stored as epoch milliseconds.
+    if (typeof date === 'number') {
+        return moment.utc(date).toDate();
+    }
+
+    const exhaustive: never = date;
+    throw new errors.InternalServerError({message: `Unexpected type for database date: ${exhaustive}`});
+};
diff --git a/ghost/core/test/unit/server/services/automations/automations-repository.test.ts b/ghost/core/test/unit/server/services/automations/automations-repository.test.ts
index 545b3c61d79..2597c181d12 100644
--- a/ghost/core/test/unit/server/services/automations/automations-repository.test.ts
+++ b/ghost/core/test/unit/server/services/automations/automations-repository.test.ts
@@ -8,13 +8,12 @@ import {NON_EMPTY_EMAIL_LEXICAL} from '../../../../utils/automations-fixtures';
 import ghostConfig from '../../../../../core/shared/config';
 import {createDatabaseAutomationsRepository} from '../../../../../core/server/services/automations/database-automations-repository';
 import type {AutomatedEmailEvents, AutomationAction, AutomationsRepository, AutomationStepToRun} from '../../../../../core/server/services/automations/automations-repository';
+import {DATABASE_DATE_FORMAT, fromDatabaseDate, toDatabaseDate} from '../../../../../core/server/services/automations/database-date';
 
 const HOUR_MS = 60 * 60 * 1000;
 const FAKE_WAIT_HOURS_MULTIPLIER = 2500;
-const DATABASE_DATE_FORMAT = 'YYYY-MM-DD HH:mm:ss';
 
-const toDatabaseDate = (date: Date | string): string => moment(date).format(DATABASE_DATE_FORMAT);
-const toRepositoryDateISOString = (date: Date | string): string => new Date(toDatabaseDate(date)).toISOString();
+const toRepositoryDateISOString = (date: Date | string): string => fromDatabaseDate(toDatabaseDate(date)).toISOString();
 const linkLexical = (url: string): string => JSON.stringify({
     root: {
         children: [{
@@ -30,7 +29,7 @@ const hashRedirectDestination = (url: string): Buffer => createHash('sha256').up
 
 const addHours = (dateCol: unknown, hours: number): Date => {
     assert(typeof dateCol === 'string', 'Expected date column to be a string');
-    return moment(dateCol, DATABASE_DATE_FORMAT).add(hours, 'hours').toDate();
+    return moment(fromDatabaseDate(dateCol)).add(hours, 'hours').toDate();
 };
 
 const createDatabase = async (): Promise<Knex> => {
diff --git a/ghost/core/test/unit/server/services/automations/database-date.test.ts b/ghost/core/test/unit/server/services/automations/database-date.test.ts
index 9ce3ea2ca10..8ba86a91db7 100644
--- a/ghost/core/test/unit/server/services/automations/database-date.test.ts
+++ b/ghost/core/test/unit/server/services/automations/database-date.test.ts
@@ -1,7 +1,46 @@
 import assert from 'node:assert/strict';
-import {toDatabaseDate} from '../../../../../core/server/services/automations/database-date';
+import {spawn} from 'node:child_process';
+import {once} from 'node:events';
+import {fromDatabaseDate, toDatabaseDate} from '../../../../../core/server/services/automations/database-date';
 
 describe('database date utilities', function () {
+    const timezones = [
+        {tz: 'UTC', expectedNaive: '2020-01-01T12:34:56.000Z'},
+        {tz: 'Africa/Cairo', expectedNaive: '2020-01-01T10:34:56.000Z'},
+        {tz: 'Europe/London', expectedNaive: '2020-01-01T12:34:56.000Z'},
+        {tz: 'Pacific/Auckland', expectedNaive: '2019-12-31T23:34:56.000Z'}
+    ];
+
+    /**
+     * Run some code in another timezone.
+     *
+     * We need to do this in a separate process in order to change the system timezone.
+     */
+    const runInOtherTimezones = async (toRun: string) => {
+        // JSON.stringify does a good job wrapping strings in quotes and escaping.
+        const s = JSON.stringify;
+        const modulePath = require.resolve('../../../../../core/server/services/automations/database-date');
+
+        await Promise.all(timezones.map(async ({tz, expectedNaive}) => {
+            const source = `
+            const assert = require('node:assert/strict');
+            const {fromDatabaseDate, toDatabaseDate} = require(${s(modulePath)});
+
+            assert.deepEqual(new Date('2020-01-01 12:34:56'), new Date(${s(expectedNaive)}), 'test setup');
+
+            ${toRun}
+            `;
+
+            const child = spawn(
+                process.execPath,
+                ['-e', source],
+                {stdio: 'inherit', env: {...process.env, TZ: tz}}
+            );
+            const [code] = await once(child, 'exit');
+            assert.equal(code, 0, `Child process exited with code ${code}. 0 was expected`);
+        }));
+    };
+
     describe('toDatabaseDate', function () {
         it('converts Dates to database date strings', function () {
             const input = new Date('2024-06-01T12:34:56Z');
@@ -20,5 +59,40 @@ describe('database date utilities', function () {
             const result = toDatabaseDate(input);
             assert.strictEqual(result, '2024-06-01 16:34:56');
         });
+
+        it('converts unzoned strings to UTC date strings in your system timezone', function () {
+            const input = '2020-01-01 12:34:56';
+            const result = toDatabaseDate(input);
+            assert.strictEqual(result, '2020-01-01 12:34:56');
+        });
+
+        it('converts unzoned strings to UTC date strings in other system timezones', async function () {
+            await runInOtherTimezones(`
+                assert.deepEqual(toDatabaseDate('2020-01-01 12:34:56'), '2020-01-01 12:34:56');
+            `);
+        });
+    });
+
+    describe('fromDatabaseDate', function () {
+        it('clones Date objects', function () {
+            const input = new Date('2020-01-01T12:34:56Z');
+            const result = fromDatabaseDate(input);
+            assert.deepEqual(result, input, 'they are deep equal');
+            assert.notEqual(result, input, 'they are not the same object');
+        });
+
+        it('converts strings to Date objects, parsing as UTC, in your system timezone', async function () {
+            assert.deepEqual(fromDatabaseDate('2020-01-01T12:34:56.000Z'), new Date('2020-01-01T12:34:56.000Z'));
+        });
+
+        it('converts strings to Date objects, parsing as UTC, in other system timezones', async function () {
+            await runInOtherTimezones(`
+                assert.deepEqual(fromDatabaseDate('2020-01-01 12:34:56'), new Date('2020-01-01T12:34:56.000Z'));
+            `);
+        });
+
+        it('converts numbers to Date objects', function () {
+            assert.deepEqual(fromDatabaseDate(1577882096000), new Date('2020-01-01T12:34:56.000Z'));
+        });
     });
 });

From 829e8d6ebf1615c7b794e55cd376ceaf6be80255 Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Mon, 10 Aug 2026 09:47:51 -0500
Subject: [PATCH 5/9] Removed e2e tests duplicated by admin acceptance coverage
 (#29452)

no ref

Prunes Playwright e2e tests whose behavior is already pinned by the
`apps/admin` acceptance tier (Vitest Browser Mode against the MSW fake
Admin API), after verifying each counterpart file covers what the e2e
test asserted.
---
 .../custom-fields.acceptance.test.tsx         | 52 ++++++++++++-----
 .../member-welcome-emails.acceptance.test.tsx |  8 ++-
 .../sections/custom-fields-section.ts         | 57 -------------------
 .../pages/admin/settings/sections/index.ts    |  1 -
 .../admin/settings/sections/labs-section.ts   | 48 ----------------
 .../sections/member-welcome-emails-section.ts | 32 -----------
 .../pages/admin/settings/settings-page.ts     | 18 +-----
 .../settings/custom-fields-lifecycle.test.ts  | 56 ------------------
 .../paid-member-welcome-emails.test.ts        | 44 --------------
 .../admin/settings/settings-search.test.ts    | 35 ------------
 10 files changed, 47 insertions(+), 304 deletions(-)
 delete mode 100644 e2e/helpers/pages/admin/settings/sections/labs-section.ts
 delete mode 100644 e2e/tests/admin/settings/custom-fields-lifecycle.test.ts
 delete mode 100644 e2e/tests/admin/settings/paid-member-welcome-emails.test.ts
 delete mode 100644 e2e/tests/admin/settings/settings-search.test.ts

diff --git a/apps/admin/src/settings/membership/custom-fields.acceptance.test.tsx b/apps/admin/src/settings/membership/custom-fields.acceptance.test.tsx
index 9b55efda1f1..ac1e2044275 100644
--- a/apps/admin/src/settings/membership/custom-fields.acceptance.test.tsx
+++ b/apps/admin/src/settings/membership/custom-fields.acceptance.test.tsx
@@ -30,10 +30,31 @@ function customFieldsBoot() {
     };
 }
 
-function fakeCustomFields(fields = [companyField]) {
-    // Settings opts into archived fields (`?filter=status:[active,archived]`),
-    // so the fake matches the path with any query.
-    return fakeAdminEndpoint("GET", new RegExp("^/members/custom_fields/\\?"), {members_custom_fields: fields});
+type CustomField = typeof companyField;
+
+// Settings opts into archived fields (`?filter=status:[active,archived]`),
+// so the fakes match the path with any query.
+const customFieldsBrowsePath = new RegExp("^/members/custom_fields/\\?");
+
+function fakeCustomFields(fields: CustomField[] = [companyField]) {
+    return fakeAdminEndpoint("GET", customFieldsBrowsePath, {members_custom_fields: fields});
+}
+
+/**
+ * Mutations invalidate and refetch the list, so a spec observing the list
+ * after a create serves it from state that grows when the POST lands; the
+ * created entity is declared by the spec, the fake invents nothing.
+ * Post-mutation outcomes of edits and deletes are server behavior, owned by
+ * the API suite (ghost/core e2e-api member-custom-fields) — those specs
+ * assert the outgoing request and the refetch instead.
+ */
+function fakeCustomFieldsWithCreate(initial: CustomField[], created: CustomField) {
+    let fields = initial;
+    fakeAdminEndpoint("GET", customFieldsBrowsePath, () => ({members_custom_fields: fields}));
+    return fakeAdminEndpoint("POST", "/members/custom_fields/", () => {
+        fields = [...fields, created];
+        return {members_custom_fields: [created]};
+    });
 }
 
 describe("Custom fields", () => {
@@ -202,17 +223,12 @@ describe("Custom fields", () => {
 
     it("reveals a just-created field even when the list is collapsed", async () => {
         fakeSettingsScreens();
-        let currentFields = Array.from({length: 6}, (_, index) => ({
+        const initialFields = Array.from({length: 6}, (_, index) => ({
             ...companyField,
             key: `field-${index}`,
             name: `Field ${index}`,
         }));
-        fakeAdminEndpoint("GET", new RegExp("^/members/custom_fields/\\?"), () => ({members_custom_fields: currentFields}));
-        fakeAdminEndpoint("POST", "/members/custom_fields/", () => {
-            const created = {...companyField, key: "newest", name: "Newest"};
-            currentFields = [...currentFields, created];
-            return {members_custom_fields: [created]};
-        });
+        fakeCustomFieldsWithCreate(initialFields, {...companyField, key: "newest", name: "Newest"});
         await renderAdminApp("/settings", {boot: customFieldsBoot()});
 
         const rows = settingsScreen.customFields().getByTestId("custom-field-list-item");
@@ -237,7 +253,7 @@ describe("Custom fields", () => {
 
     it("permanently deletes an archived field from the header menu, after a heavy warning", async () => {
         fakeSettingsScreens();
-        fakeCustomFields([companyField, archivedField]);
+        const customFieldsApi = fakeCustomFields([companyField, archivedField]);
         const deleteApi = fakeAdminEndpoint("DELETE", "/members/custom_fields/old-hobby/", {});
         await renderAdminApp("/settings", {boot: customFieldsBoot()});
 
@@ -251,10 +267,15 @@ describe("Custom fields", () => {
 
         const confirmation = settingsScreen.confirmationModal();
         await expect.element(confirmation).toHaveTextContent("Old hobby and every value collected from your members will be permanently deleted from the database. This can’t be undone.");
+        const fetchesBeforeConfirm = customFieldsApi.requests.length;
         await confirmation.getByRole("button", {name: "Delete"}).click();
 
         await expect.element(settingsScreen.successToast()).toHaveTextContent("Custom field deleted");
         expect(deleteApi.requests).toHaveLength(1);
+
+        // The list refetches after the delete; the refreshed outcome (the
+        // field leaving Archived) is server behavior, owned by the API suite.
+        await expect.poll(() => customFieldsApi.requests.length).toBeGreaterThan(fetchesBeforeConfirm);
     });
 
     it("does not expose permanent deletion for an active field", async () => {
@@ -280,7 +301,7 @@ describe("Custom fields", () => {
 
     it("reactivates an archived field after confirmation, as a status edit", async () => {
         fakeSettingsScreens();
-        fakeCustomFields([companyField, archivedField]);
+        const customFieldsApi = fakeCustomFields([companyField, archivedField]);
         const editApi = fakeAdminEndpoint("PUT", "/members/custom_fields/old-hobby/", {
             members_custom_fields: [{...archivedField, status: "active"}],
         });
@@ -291,9 +312,14 @@ describe("Custom fields", () => {
         await settingsScreen.customFieldModal().getByRole("button", {name: "Reactivate"}).click();
         const confirmation = settingsScreen.confirmationModal();
         await expect.element(confirmation).toHaveTextContent("Values already collected for this field will remain unchanged");
+        const fetchesBeforeConfirm = customFieldsApi.requests.length;
         await confirmation.getByRole("button", {name: "Reactivate"}).click();
 
         await expect.element(settingsScreen.successToast()).toHaveTextContent("Custom field reactivated");
         expect(editApi.lastRequest?.body).toEqual({members_custom_fields: [{status: "active"}]});
+
+        // The list refetches after the edit; the refreshed outcome (the field
+        // moving back under Active) is server behavior, owned by the API suite.
+        await expect.poll(() => customFieldsApi.requests.length).toBeGreaterThan(fetchesBeforeConfirm);
     });
 });
diff --git a/apps/admin/src/settings/membership/member-welcome-emails.acceptance.test.tsx b/apps/admin/src/settings/membership/member-welcome-emails.acceptance.test.tsx
index 63da3dc5586..9df849573d2 100644
--- a/apps/admin/src/settings/membership/member-welcome-emails.acceptance.test.tsx
+++ b/apps/admin/src/settings/membership/member-welcome-emails.acceptance.test.tsx
@@ -488,12 +488,13 @@ describe("Member welcome emails", () => {
         expect(editApi.lastRequest?.body).toMatchObject({automated_emails: [{id: freeWelcomeEmail.id, status: "inactive"}]});
     });
 
-    it("shows the paid welcome email row when Stripe is connected", async () => {
+    it("shows and enables the paid welcome email row when Stripe is connected", async () => {
         fakeSettingsScreens();
         fakeDefaultNewsletter();
         fakeAutomatedEmails();
         fakeRecentPosts();
         fakeTiers([tier({name: "Supporter"})]);
+        const addApi = fakeAdminEndpoint("POST", "/automated_emails/", {automated_emails: [{...paidWelcomeEmail, status: "active"}]});
         const stripe = settingsResponse({settings: {
             stripe_connect_publishable_key: "pk_test_123",
             stripe_connect_secret_key: "sk_test_123",
@@ -506,6 +507,11 @@ describe("Member welcome emails", () => {
         await expect.element(paidRow).toBeVisible();
         await expect.element(paidRow).toHaveTextContent("Paid members welcome email");
         await expect.element(paidRow.getByRole("switch")).toHaveAttribute("aria-checked", "false");
+
+        await paidRow.getByRole("switch").click();
+
+        await expect.element(page.getByText("Paid members welcome email enabled")).toBeVisible();
+        expect(addApi.lastRequest?.body).toMatchObject({automated_emails: [{slug: "member-welcome-email-paid", status: "active"}]});
     });
 
     it("keeps the newest draft's preview when a stale preview response arrives late", async () => {
diff --git a/e2e/helpers/pages/admin/settings/sections/custom-fields-section.ts b/e2e/helpers/pages/admin/settings/sections/custom-fields-section.ts
index 8fbde3b59b3..a251f53724f 100644
--- a/e2e/helpers/pages/admin/settings/sections/custom-fields-section.ts
+++ b/e2e/helpers/pages/admin/settings/sections/custom-fields-section.ts
@@ -23,14 +23,6 @@ export class CustomFieldsSection extends BasePage {
         return this.section.getByTestId('custom-field-list-item').filter({hasText: name});
     }
 
-    tab(name: 'Active' | 'Archived'): Locator {
-        return this.section.getByRole('tab', {name});
-    }
-
-    async openTab(name: 'Active' | 'Archived'): Promise<void> {
-        await this.tab(name).click();
-    }
-
     /**
      * Create a field of the default (short text) type. That keeps the member
      * detail editor a plain text input, which is all the cross-surface flow
@@ -43,53 +35,4 @@ export class CustomFieldsSection extends BasePage {
         await this.modal.getByRole('button', {name: 'Save'}).click();
         await this.listItem(name).waitFor();
     }
-
-    /** Open a field's edit modal from whichever tab it lives in. */
-    async openField(name: string): Promise<void> {
-        await this.listItem(name).click();
-        await this.modal.waitFor();
-    }
-
-    /** Rename a field in place; the modal closes on success. */
-    async renameField(name: string, newName: string): Promise<void> {
-        await this.openField(name);
-        await this.modal.getByLabel('Name').fill(newName);
-        await this.modal.getByRole('button', {name: 'Save'}).click();
-        await this.listItem(newName).waitFor();
-    }
-
-    /**
-     * Archive an active field. Both the edit modal and the confirmation dialog
-     * carry an "Archive" button; the edit modal closes as the confirmation
-     * opens, so the second click lands on the confirmation.
-     */
-    async archiveField(name: string): Promise<void> {
-        await this.openField(name);
-        await this.modal.getByRole('button', {name: 'Archive'}).click();
-        // The edit modal removes itself as the confirmation opens; wait for it to
-        // go so the confirmation's "Archive" button is the only match.
-        await this.modal.waitFor({state: 'detached'});
-        await this.page.getByRole('button', {name: 'Archive'}).click();
-    }
-
-    /** Reactivate an archived field (open it from the Archived tab first). */
-    async reactivateField(name: string): Promise<void> {
-        await this.openField(name);
-        await this.modal.getByRole('button', {name: 'Reactivate'}).click();
-        await this.modal.waitFor({state: 'detached'});
-        await this.page.getByRole('button', {name: 'Reactivate'}).click();
-    }
-
-    /**
-     * Permanently delete an archived field. Deletion lives behind the modal's
-     * header menu, then a destructive confirmation — the API only allows it on
-     * an already-archived field.
-     */
-    async deleteField(name: string): Promise<void> {
-        await this.openField(name);
-        await this.modal.getByRole('button', {name: 'Menu'}).click();
-        await this.page.getByRole('menuitem', {name: 'Delete custom field'}).click();
-        await this.modal.waitFor({state: 'detached'});
-        await this.page.getByRole('button', {name: 'Delete', exact: true}).click();
-    }
 }
diff --git a/e2e/helpers/pages/admin/settings/sections/index.ts b/e2e/helpers/pages/admin/settings/sections/index.ts
index 4008ff03f8d..6adc78f50bc 100644
--- a/e2e/helpers/pages/admin/settings/sections/index.ts
+++ b/e2e/helpers/pages/admin/settings/sections/index.ts
@@ -2,7 +2,6 @@ export {AnnouncementBarSection} from './announcement-bar-section';
 export {DangerZoneSection} from './danger-zone-section';
 export {AccessSection} from './access-section';
 export {CustomFieldsSection} from './custom-fields-section';
-export {LabsSection} from './labs-section';
 export {IntegrationsSection} from './integrations-section';
 export {DesignSection} from './design-section';
 export {MemberWelcomeEmailsSection} from './member-welcome-emails-section';
diff --git a/e2e/helpers/pages/admin/settings/sections/labs-section.ts b/e2e/helpers/pages/admin/settings/sections/labs-section.ts
deleted file mode 100644
index ae5e7cec20a..00000000000
--- a/e2e/helpers/pages/admin/settings/sections/labs-section.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import {BasePage} from '@/helpers/pages';
-import {Locator, Page} from '@playwright/test';
-
-export class LabsSection extends BasePage {
-    readonly section: Locator;
-    readonly heading: Locator;
-
-    readonly openButton: Locator;
-    readonly closeButton: Locator;
-    readonly content: Locator;
-
-    readonly betaFeaturesTab: Locator;
-    readonly privateFeaturesTab: Locator;
-
-    constructor(page: Page) {
-        super(page, '/ghost/#/settings/labs');
-
-        this.section = page.getByTestId('labs');
-        this.heading = page.getByRole('heading', {level: 5, name: 'Labs'});
-        this.content = this.section.locator('[role="tabpanel"]');
-
-        this.openButton = page.getByTestId('labs').getByRole('button', {name: 'Open'});
-        this.closeButton = page.getByTestId('labs').getByRole('button', {name: 'Close'});
-
-        this.betaFeaturesTab = page.getByRole('tab', {name: 'Beta features'});
-        this.privateFeaturesTab = page.getByRole('tab', {name: 'Private features'});
-    }
-
-    async isLabsOpen(): Promise<boolean> {
-        const closeButtonVisible = await this.closeButton.isVisible().catch(() => false);
-        const contentVisible = await this.content.isVisible().catch(() => false);
-        return closeButtonVisible || contentVisible;
-    }
-
-    async openLabs() {
-        if (!await this.isLabsOpen()) {
-            await this.openButton.click();
-            await this.content.waitFor({state: 'visible'});
-        }
-    }
-
-    async closeLabs() {
-        if (await this.isLabsOpen()) {
-            await this.closeButton.click();
-            await this.content.waitFor({state: 'hidden'});
-        }
-    }
-}
diff --git a/e2e/helpers/pages/admin/settings/sections/member-welcome-emails-section.ts b/e2e/helpers/pages/admin/settings/sections/member-welcome-emails-section.ts
index 49e6a24e25b..310ed8447aa 100644
--- a/e2e/helpers/pages/admin/settings/sections/member-welcome-emails-section.ts
+++ b/e2e/helpers/pages/admin/settings/sections/member-welcome-emails-section.ts
@@ -4,9 +4,7 @@ import {FrameLocator, Locator, Page} from '@playwright/test';
 export class MemberWelcomeEmailsSection extends BasePage {
     readonly section: Locator;
     readonly freeWelcomeEmailToggle: Locator;
-    readonly paidWelcomeEmailToggle: Locator;
     readonly freeWelcomeEmailEditButton: Locator;
-    readonly paidWelcomeEmailEditButton: Locator;
 
     // Customize button and modal
     readonly customizeButton: Locator;
@@ -51,9 +49,7 @@ export class MemberWelcomeEmailsSection extends BasePage {
         super(page, '/ghost/#/settings/memberemails');
         this.section = page.getByTestId('memberemails');
         this.freeWelcomeEmailToggle = this.section.getByTestId('free-welcome-email-row').getByRole('switch');
-        this.paidWelcomeEmailToggle = this.section.getByTestId('paid-welcome-email-row').getByRole('switch');
         this.freeWelcomeEmailEditButton = this.section.getByTestId('free-welcome-email-row').getByRole('button', {name: 'Edit'});
-        this.paidWelcomeEmailEditButton = this.section.getByTestId('paid-welcome-email-row').getByRole('button', {name: 'Edit'});
 
         // Customize button and modal
         this.customizeButton = this.section.getByRole('button', {name: 'Customize'});
@@ -109,48 +105,20 @@ export class MemberWelcomeEmailsSection extends BasePage {
         }
     }
 
-    async enablePaidWelcomeEmail(): Promise<void> {
-        if (!await this.isPaidWelcomeEmailEnabled()) {
-            await this.paidWelcomeEmailToggle.click();
-            await this.waitForPaidToggle(true);
-        }
-    }
-
-    async disablePaidWelcomeEmail(): Promise<void> {
-        if (await this.isPaidWelcomeEmailEnabled()) {
-            await this.paidWelcomeEmailToggle.click();
-            await this.waitForPaidToggle(false);
-        }
-    }
-
     async isFreeWelcomeEmailEnabled(): Promise<boolean> {
         const ariaChecked = await this.freeWelcomeEmailToggle.getAttribute('aria-checked');
         return ariaChecked === 'true';
     }
 
-    async isPaidWelcomeEmailEnabled(): Promise<boolean> {
-        const ariaChecked = await this.paidWelcomeEmailToggle.getAttribute('aria-checked');
-        return ariaChecked === 'true';
-    }
-
     private async waitForFreeToggle(checked: boolean): Promise<void> {
         const toggle = this.section.getByTestId('free-welcome-email-row').getByRole('switch', {checked});
         await toggle.waitFor({state: 'visible'});
     }
 
-    private async waitForPaidToggle(checked: boolean): Promise<void> {
-        const toggle = this.section.getByTestId('paid-welcome-email-row').getByRole('switch', {checked});
-        await toggle.waitFor({state: 'visible'});
-    }
-
     async openFreeWelcomeEmailModal(): Promise<void> {
         await this.openWelcomeEmailModal(this.freeWelcomeEmailEditButton);
     }
 
-    async openPaidWelcomeEmailModal(): Promise<void> {
-        await this.openWelcomeEmailModal(this.paidWelcomeEmailEditButton);
-    }
-
     async saveWelcomeEmail(): Promise<void> {
         await this.modalSaveButton.click();
         await this.modalSavedButton.waitFor({state: 'visible'});
diff --git a/e2e/helpers/pages/admin/settings/settings-page.ts b/e2e/helpers/pages/admin/settings/settings-page.ts
index a0e0a0643b5..36a75bb6cbc 100644
--- a/e2e/helpers/pages/admin/settings/settings-page.ts
+++ b/e2e/helpers/pages/admin/settings/settings-page.ts
@@ -1,36 +1,24 @@
 import {BasePage} from '@/helpers/pages';
-import {CustomFieldsSection, DangerZoneSection, IntegrationsSection, LabsSection, PortalSection, TiersSection} from './sections';
+import {CustomFieldsSection, DangerZoneSection, IntegrationsSection, PortalSection, TiersSection} from './sections';
 import {Locator, Page} from '@playwright/test';
 import {StaffSection} from './sections/staff-section';
 
 export class SettingsPage extends BasePage {
-    readonly searchInput: Locator;
-    readonly searchClearButton: Locator;
-
     readonly integrationsSection: IntegrationsSection;
     readonly portalSection: PortalSection;
-    readonly labsSection: LabsSection;
     readonly staffSection: StaffSection;
     readonly tiersSection: TiersSection;
     readonly customFieldsSection: CustomFieldsSection;
     readonly dangerZoneSection: DangerZoneSection;
 
     readonly sidebar: Locator;
-    readonly labsSidebarLink: Locator;
-    readonly staffSidebarLink: Locator;
 
     constructor(page: Page) {
         super(page, '/ghost/#/settings');
 
         this.sidebar = page.getByTestId('sidebar');
-        this.labsSidebarLink = this.sidebar.getByText('Labs');
-        this.staffSidebarLink = this.sidebar.getByText('Staff');
-
-        this.searchInput = page.locator('input[placeholder="Search settings"]');
-        this.searchClearButton = page.locator('button[aria-label="close"]').first();
 
         this.portalSection = new PortalSection(page);
-        this.labsSection = new LabsSection(page);
         this.integrationsSection = new IntegrationsSection(page);
         this.staffSection = new StaffSection(page);
         this.tiersSection = new TiersSection(page);
@@ -38,10 +26,6 @@ export class SettingsPage extends BasePage {
         this.dangerZoneSection = new DangerZoneSection(page);
     }
 
-    async searchByInput(text: string) {
-        await this.searchInput.fill(text);
-    }
-
     async goto() {
         const result = await super.goto();
         await this.sidebar.waitFor({state: 'visible'});
diff --git a/e2e/tests/admin/settings/custom-fields-lifecycle.test.ts b/e2e/tests/admin/settings/custom-fields-lifecycle.test.ts
deleted file mode 100644
index 34e6587c17d..00000000000
--- a/e2e/tests/admin/settings/custom-fields-lifecycle.test.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import {SettingsPage} from '@/admin-pages';
-import {expect, test} from '@/helpers/playwright';
-import {usePerTestIsolation} from '@/helpers/playwright/isolation';
-
-/**
- * The full definition lifecycle of a custom field, driven entirely through
- * Settings against a real backend: define -> rename -> archive -> reactivate ->
- * archive -> permanently delete. The acceptance tests cover each step against a
- * fake API; this pins the whole journey end to end, including the tab a field
- * moves between and its disappearance once deleted.
- *
- * The whole section is behind the membersCustomFields flag.
- */
-usePerTestIsolation();
-
-test.describe('Ghost Admin - Custom field lifecycle', () => {
-    test.use({labs: {membersCustomFields: true}});
-
-    test('a field can be defined, renamed, archived, reactivated and permanently deleted', async ({page}) => {
-        const original = `Delivery address ${Date.now()}`;
-        const renamed = `Shipping address ${Date.now()}`;
-
-        const settingsPage = new SettingsPage(page);
-        const customFields = settingsPage.customFieldsSection;
-
-        await settingsPage.goto();
-
-        // Define
-        await customFields.createShortTextField(original);
-        await expect(customFields.listItem(original)).toBeVisible();
-
-        // Rename
-        await customFields.renameField(original, renamed);
-        await expect(customFields.listItem(renamed)).toBeVisible();
-
-        // Archive: leaves the Active tab, appears under Archived
-        await customFields.archiveField(renamed);
-        await expect(customFields.listItem(renamed)).toHaveCount(0);
-        await customFields.openTab('Archived');
-        await expect(customFields.listItem(renamed)).toBeVisible();
-
-        // Reactivate: leaves Archived, back under Active
-        await customFields.reactivateField(renamed);
-        await expect(customFields.listItem(renamed)).toHaveCount(0);
-        await customFields.openTab('Active');
-        await expect(customFields.listItem(renamed)).toBeVisible();
-
-        // Archive again, then permanently delete from the Archived tab
-        await customFields.archiveField(renamed);
-        await customFields.openTab('Archived');
-        await expect(customFields.listItem(renamed)).toBeVisible();
-
-        await customFields.deleteField(renamed);
-        await expect(customFields.listItem(renamed)).toHaveCount(0);
-    });
-});
diff --git a/e2e/tests/admin/settings/paid-member-welcome-emails.test.ts b/e2e/tests/admin/settings/paid-member-welcome-emails.test.ts
deleted file mode 100644
index 40747983d72..00000000000
--- a/e2e/tests/admin/settings/paid-member-welcome-emails.test.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import {MemberWelcomeEmailsSection} from '@/admin-pages';
-import {expect, test} from '@/helpers/playwright';
-
-interface AutomatedEmail {
-    id?: string;
-    name?: string;
-    slug: string;
-    status: string;
-    subject?: string;
-    lexical?: string | null;
-    sender_name?: string | null;
-    sender_email?: string | null;
-    sender_reply_to?: string | null;
-    created_at?: string;
-    updated_at?: string | null;
-}
-
-interface AutomatedEmailsResponse {
-    automated_emails: AutomatedEmail[];
-}
-
-test.describe('Ghost Admin - Paid Member Welcome Emails', () => {
-    test.use({stripeEnabled: true});
-
-    test('paid welcome emails toggle - enables paid welcome emails', async ({page}) => {
-        const welcomeEmailsSection = new MemberWelcomeEmailsSection(page);
-
-        await welcomeEmailsSection.goto();
-        await welcomeEmailsSection.enablePaidWelcomeEmail();
-
-        await expect(welcomeEmailsSection.paidWelcomeEmailToggle).toHaveAttribute('aria-checked', 'true');
-        await expect(welcomeEmailsSection.paidWelcomeEmailEditButton).toBeVisible();
-
-        // TODO: Update test once full E2E functionality is added for welcome emails
-        // We shouldn't assert via API directly, but for now this verifies the toggle works as expected
-        const response = await page.request.get('/ghost/api/admin/automated_emails/');
-        expect(response.ok()).toBe(true);
-
-        const data = await response.json() as AutomatedEmailsResponse;
-        const paidWelcomeEmail = data.automated_emails.find(email => email.slug === 'member-welcome-email-paid');
-        expect(paidWelcomeEmail).toBeDefined();
-        expect(paidWelcomeEmail?.status).toBe('active');
-    });
-});
diff --git a/e2e/tests/admin/settings/settings-search.test.ts b/e2e/tests/admin/settings/settings-search.test.ts
deleted file mode 100644
index e8d6631f68c..00000000000
--- a/e2e/tests/admin/settings/settings-search.test.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import {SettingsPage} from '@/admin-pages';
-import {expect, test} from '@/helpers/playwright';
-
-test.describe('Ghost Admin - settings search sidebar', () => {
-    test('displays all section when not searching', async ({page}) => {
-        const settingsPage = new SettingsPage(page);
-        await settingsPage.goto();
-
-        await expect(settingsPage.labsSection.section).toBeVisible();
-        await expect(settingsPage.labsSection.openButton).toBeVisible();
-    });
-
-    test('displays only searched section', async ({page}) => {
-        const settingsPage = new SettingsPage(page);
-        await settingsPage.goto();
-        
-        await settingsPage.searchByInput('lab');
-        await expect(settingsPage.labsSidebarLink).toBeVisible();
-        await expect(settingsPage.labsSection.section).toBeVisible();
-        await expect(settingsPage.labsSection.closeButton).toBeVisible();
-
-        await settingsPage.searchByInput('staff');
-        await expect(settingsPage.staffSidebarLink).toBeVisible();
-        await expect(settingsPage.labsSection.section).toBeHidden();
-    });
-
-    test('displays all searched sections when no sections found', async ({page}) => {
-        const settingsPage = new SettingsPage(page);
-        await settingsPage.goto();
-
-        await settingsPage.searchByInput('returnNoResultsInSearch');
-        await expect(settingsPage.labsSidebarLink).toBeHidden();
-        await expect(settingsPage.labsSection.section).toBeVisible();
-    });
-});

From f46af8a075e33b89a7daf5ae6a46e29960b37d1a Mon Sep 17 00:00:00 2001
From: Steve Larson <9larsons@gmail.com>
Date: Mon, 10 Aug 2026 09:49:12 -0500
Subject: [PATCH 6/9] Changed devcontainer dev stack to match Admin + Portal
 default (#29106)

no ref

Some minor updates to fix the devcontainer construction to match changes in the repo from some weeks ago. We're still not actively utilizing the devcontainer setup. This change is largely to shore up future debt/mismatches.
---
 .devcontainer/compose.devcontainer.yaml | 48 +++++++++++++++++++------
 .devcontainer/devcontainer.json         | 32 +++++++++--------
 .devcontainer/postCreate.sh             |  5 ++-
 .devcontainer/start-dev-stack.sh        | 42 +++++++++++++++++++++-
 docker/dev-gateway/Dockerfile           | 12 +++----
 docker/dev-gateway/README.md            | 18 +++-------
 docker/ghost-dev/Dockerfile             | 12 +++++--
 package.json                            |  4 +--
 8 files changed, 122 insertions(+), 51 deletions(-)

diff --git a/.devcontainer/compose.devcontainer.yaml b/.devcontainer/compose.devcontainer.yaml
index b9f792c02b5..6f5a50eab23 100644
--- a/.devcontainer/compose.devcontainer.yaml
+++ b/.devcontainer/compose.devcontainer.yaml
@@ -2,10 +2,18 @@ services:
   mysql:
     # Smaller InnoDB buffer pool than the baseline compose.dev.yaml (1G).
     # Lets the dev stack stay within a 2-core / 8 GB Codespace's budget
-    # after Ghost + 6 Vite dev servers are running. 256 MB is plenty for
-    # dev data volumes.
+    # after Ghost + the default Admin/Portal dev watchers are running.
+    # 256 MB is plenty for dev data volumes.
     command: --innodb-buffer-pool-size=256M --innodb-log-buffer-size=64M --innodb-flush-log-at-trx_commit=0 --innodb-flush-method=O_DIRECT
-    mem_limit: 512m
+    # mem_limit is a hard cgroup ceiling, separate from the buffer pool size
+    # above. Measured via `docker stats` under real usage: actual RSS sits
+    # around 440-460MiB, so the previous 512m cap left MySQL pinned at
+    # 85-90% of its ceiling continuously (real, not just at boot) -- more
+    # memory-management overhead on every query than the buffer pool size
+    # alone would suggest. 1g (matching host-hybrid's unconstrained default)
+    # gives real headroom above the actual working set, still a small slice
+    # even on the 2-core/8GB minimum tier.
+    mem_limit: 1g
     restart: unless-stopped
 
   redis:
@@ -19,8 +27,28 @@ services:
     # The original ./ghost:/home/ghost/ghost mount from compose.dev.yaml is
     # preserved via merge semantics so nodemon hot-reload still works for anyone
     # running the backend the original way.
+    #
+    # pnpm-store is a separate named volume, NOT under /workspaces/Ghost, so
+    # it survives the bind mount above (which fully shadows anything baked
+    # into the image at that path with the host's — node_modules-less — repo
+    # checkout). Because the source is live-mounted, onCreateCommand still has
+    # to run a real `pnpm install` every time, but with the store already warm
+    # it's linking already-fetched content instead of
+    # re-downloading and recompiling native deps (better-sqlite3, sharp, etc.)
+    # from scratch.
     volumes:
       - ./:/workspaces/Ghost:cached
+      - pnpm-store:/pnpm-store
+    environment:
+      pnpm_config_store_dir: /pnpm-store
+    # Prefer the prebuilt image (docker/ghost-dev/Dockerfile, published by
+    # .github/workflows/devcontainer-build.yml) over a local build. cache_from
+    # makes a local `docker compose build` (e.g. after a Dockerfile edit)
+    # reuse those layers too, rather than starting from zero.
+    image: ghcr.io/tryghost/ghost-devcontainer:latest
+    build:
+      cache_from:
+        - ghcr.io/tryghost/ghost-devcontainer:latest
     # Override the default `pnpm dev` command. VS Code controls startup and the
     # user runs backend/frontend dev servers as tasks (see .vscode/tasks.json).
     command: ["sleep", "infinity"]
@@ -38,15 +66,15 @@ services:
   ghost-dev-gateway:
     # Point Caddy at the dev servers running inside the ghost-dev container
     # instead of host.docker.internal (which is the default for the hybrid
-    # host/container dev setup).
+    # host/container dev setup). Public apps (Portal, Comments UI, Signup
+    # Form, Sodo Search, Announcement Bar, Admin Toolbar) have no entry here
+    # — Caddy serves their umd/ build output directly via file_server, so
+    # there's no dev-server host:port to point at.
     environment:
       GHOST_BACKEND: ghost-dev:2368
       ADMIN_DEV_SERVER: ghost-dev:5174
       ADMIN_LIVE_RELOAD_SERVER: ghost-dev:4200
-      PORTAL_DEV_SERVER: ghost-dev:4175
-      COMMENTS_DEV_SERVER: ghost-dev:7173
-      SIGNUP_DEV_SERVER: ghost-dev:6174
-      SEARCH_DEV_SERVER: ghost-dev:4178
-      ANNOUNCEMENT_DEV_SERVER: ghost-dev:4177
-      ADMIN_TOOLBAR_DEV_SERVER: ghost-dev:4176
       LEXICAL_DEV_SERVER: ghost-dev:4173
+
+volumes:
+  pnpm-store:
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index b260a719efb..82eb626fc94 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -23,13 +23,21 @@
     // dev containers where the host is the developer's own machine, but do
     // NOT replicate this pattern in shared build agents, CI runners, or
     // environments where untrusted code runs in the container.
+    // sshd enables `gh codespace ssh`/`logs` for direct diagnosis (top,
+    // free, docker stats) instead of only being able to probe over HTTP.
+    // Same trust boundary as docker-outside-of-docker below — standard for
+    // a Codespace/local dev container where the host is your own machine.
     "features": {
-        "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
+        "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {},
+        "ghcr.io/devcontainers/features/sshd:1": {}
     },
 
-    // Codespaces prebuild step — runs once when the image is built.
-    // Primes the pnpm store so first-open is fast.
-    "onCreateCommand": "corepack enable && corepack prepare --activate && cd /workspaces/Ghost && pnpm install --prefer-offline || true",
+    // Runs once the workspace mount is ready, after the container is created.
+    // Note: no Codespaces prebuild is configured for this repo, so this runs
+    // live on every creation rather than being baked into a snapshot ahead of
+    // time. A failed install must stop setup because postCreateCommand assumes
+    // workspace dependencies are available.
+    "onCreateCommand": "corepack enable && corepack prepare --activate && cd /workspaces/Ghost && pnpm install --prefer-offline",
 
     // Runs after the workspace mount is ready on every container create.
     "postCreateCommand": ".devcontainer/postCreate.sh",
@@ -40,6 +48,10 @@
     // The script guards against double-starting if the stack is already up.
     "postAttachCommand": "bash .devcontainer/start-dev-stack.sh",
 
+    // Portal, Comments UI, Signup Form, Sodo Search, Announcement Bar, and
+    // Admin Toolbar are NOT listed here — since the Caddy file_server switch
+    // (#28970) they build to disk (`vite build --watch`) instead of running
+    // a dev server, so there's no port to forward for them.
     "forwardPorts": [
         2368,
         3306,
@@ -48,11 +60,6 @@
         8025,
         5174,
         4200,
-        4175,
-        7173,
-        6174,
-        4178,
-        4177,
         4173
     ],
     "portsAttributes": {
@@ -63,12 +70,7 @@
         "8025": {"label": "Mailpit Web"},
         "5174": {"label": "Admin (Vite)"},
         "4200": {"label": "Ember live-reload"},
-        "4175": {"label": "Portal"},
-        "7173": {"label": "Comments UI"},
-        "6174": {"label": "Signup Form"},
-        "4178": {"label": "Sodo Search"},
-        "4177": {"label": "Announcement Bar"},
-        "4173": {"label": "Koenig Lexical"}
+        "4173": {"label": "Koenig Lexical (optional)"}
     },
 
     "customizations": {
diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh
index 6d74af239e1..df82d4aadbf 100755
--- a/.devcontainer/postCreate.sh
+++ b/.devcontainer/postCreate.sh
@@ -8,7 +8,10 @@ corepack prepare --activate
 
 git submodule update --init --recursive
 
-pnpm install --prefer-offline
+# pnpm install already ran in onCreateCommand against this same fully-mounted
+# workspace (submodules are theme content, not workspace packages, so their
+# absence above didn't affect that install) — a second pass here would just
+# re-walk the whole dependency graph for nothing.
 
 # Build workspace packages that ghost/core imports at runtime with build
 # outputs (not source). @tryghost/parse-email-address is the only one today
diff --git a/.devcontainer/start-dev-stack.sh b/.devcontainer/start-dev-stack.sh
index 40792931c6f..ed5ef2e15d4 100755
--- a/.devcontainer/start-dev-stack.sh
+++ b/.devcontainer/start-dev-stack.sh
@@ -13,6 +13,38 @@ fi
 
 echo "Starting Ghost dev stack..."
 
+# Ghost's own `url` config (default http://localhost:2368) is what session
+# CSRF checks compare the browser's Origin header against (see
+# cookieCsrfProtection in ghost/core/core/server/services/auth/session/
+# session-service.js). Codespaces serves everything through a forwarded
+# https://<name>-2368.<domain> origin instead, so without this every
+# authenticated admin request fails that origin check and bounces back to
+# login. `url` is a top-level nconf key, so a bare `url` env var overrides
+# it (see ghost/core/core/shared/config/loader.js's nconf.env() call).
+# Local (non-Codespaces) VS Code Dev Containers forward to genuine
+# localhost, so this only applies inside Codespaces itself.
+if [ -n "${CODESPACES:-}" ] && [ -n "${CODESPACE_NAME:-}" ]; then
+    export url="https://${CODESPACE_NAME}-2368.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN:-app.github.dev}"
+    echo "Codespaces detected: setting Ghost url=$url so admin session origin checks match the forwarded tunnel" >> /tmp/ghost-backend.log
+
+    # Once url above is HTTPS, Ghost's url-redirects middleware
+    # (getAdminRedirectUrl in ghost/core/core/server/web/shared/middleware/
+    # url-redirects.js) 301s any request it sees as insecure (protocol
+    # mismatch) to that HTTPS url. Real browser traffic is fine — Caddy sets
+    # X-Forwarded-Proto: https, so Express's req.secure is true. But
+    # apps/admin's own vite dev server bootstraps itself by fetching
+    # GHOST_URL + ghost/api/admin/site/ directly (vite-backend-proxy.ts),
+    # bypassing Caddy entirely by default (http://localhost:2368) — Express
+    # sees that as insecure, 301s it to the public tunnel URL, and since
+    # that's an external, GitHub-auth-gated address, Vite's plain fetch()
+    # can't complete the login flow and crashes on the HTML it gets back
+    # instead of JSON. Routing GHOST_URL through the gateway container
+    # instead keeps the request on the internal Docker network (still gets
+    # X-Forwarded-Proto: https from Caddy, so no redirect) while never
+    # touching the external, auth-gated tunnel at all.
+    export GHOST_URL="http://ghost-dev-gateway:80/"
+fi
+
 # Append to log files (don't truncate) so previous crash tails survive a
 # restart and the user can still tail them for context.
 { echo "=== $(date -Is) starting backend ==="; } >> /tmp/ghost-backend.log
@@ -20,8 +52,12 @@ nohup pnpm --filter ghost dev >> /tmp/ghost-backend.log 2>&1 &
 disown
 
 { echo "=== $(date -Is) starting frontends ==="; } >> /tmp/ghost-frontends.log
+# Matches root `pnpm dev`'s default fan-out (Admin + Portal only) — most
+# devcontainer sessions never touch the public UMD apps, and those watchers
+# are the heaviest processes in the stack. To also start them, run e.g.:
+#   pnpm nx run-many -t dev --projects=@tryghost/comments-ui,@tryghost/signup-form,@tryghost/sodo-search,@tryghost/announcement-bar,@tryghost/admin-toolbar
 nohup pnpm nx run-many -t dev \
-    --projects=@tryghost/admin,@tryghost/portal,@tryghost/comments-ui,@tryghost/signup-form,@tryghost/sodo-search,@tryghost/announcement-bar \
+    --projects=@tryghost/admin,@tryghost/portal \
     >> /tmp/ghost-frontends.log 2>&1 &
 disown
 
@@ -33,4 +69,8 @@ Ghost dev stack starting in the background.
   Gateway:      http://localhost:2368/
 
 Give it ~30-60s, then open http://localhost:2368/ghost/ for admin.
+
+Only Admin + Portal dev watchers start by default. To add the public UMD
+apps (Comments, Signup Form, Sodo Search, Announcement Bar, Admin Toolbar):
+  pnpm nx run-many -t dev --projects=@tryghost/comments-ui,@tryghost/signup-form,@tryghost/sodo-search,@tryghost/announcement-bar,@tryghost/admin-toolbar
 MSG
diff --git a/docker/dev-gateway/Dockerfile b/docker/dev-gateway/Dockerfile
index 2433e43b77f..490e03839a5 100644
--- a/docker/dev-gateway/Dockerfile
+++ b/docker/dev-gateway/Dockerfile
@@ -6,16 +6,14 @@ FROM caddy:2-alpine@sha256:5f5c8640aae01df9654968d946d8f1a56c497f1dd5c5cda4cf95a
 
 COPY --from=builder /usr/bin/caddy /usr/bin/caddy
 
-# Default proxy targets (can be overridden via environment variables)
+# Default proxy targets (can be overridden via environment variables).
+# Public apps (portal, comments-ui, signup-form, sodo-search,
+# announcement-bar, admin-toolbar) are served directly from their umd/
+# build output via the Caddyfile's file_server block, not proxied to a
+# dev server — they have no *_DEV_SERVER entry here.
 ENV GHOST_BACKEND=ghost-dev:2368 \
     ADMIN_DEV_SERVER=host.docker.internal:5174 \
     ADMIN_LIVE_RELOAD_SERVER=host.docker.internal:4200 \
-    PORTAL_DEV_SERVER=host.docker.internal:4175 \
-    COMMENTS_DEV_SERVER=host.docker.internal:7173 \
-    SIGNUP_DEV_SERVER=host.docker.internal:6174 \
-    SEARCH_DEV_SERVER=host.docker.internal:4178 \
-    ANNOUNCEMENT_DEV_SERVER=host.docker.internal:4177 \
-    ADMIN_TOOLBAR_DEV_SERVER=host.docker.internal:4176 \
     LEXICAL_DEV_SERVER=host.docker.internal:4173 \
     ANALYTICS_PROXY_TARGET=analytics:3000 \
     ACTIVITYPUB_PROXY_TARGET=host.docker.internal:8080
diff --git a/docker/dev-gateway/README.md b/docker/dev-gateway/README.md
index 7a69c6706a6..6f6ba2c4abe 100644
--- a/docker/dev-gateway/README.md
+++ b/docker/dev-gateway/README.md
@@ -4,8 +4,9 @@ This directory contains the Caddy reverse proxy configuration for the Ghost deve
 ## Purpose
 The Caddy reverse proxy container:
 1. **Routes Ghost requests** to the Ghost container backend
-2. **Proxies asset requests** to local dev servers running on the host
-3. **Enables hot-reload** for frontend development without rebuilding Ghost
+2. **Proxies asset requests** to local dev servers running on the host (Admin, Lexical)
+3. **Serves public app assets** (Portal, Comments UI, Signup Form, Sodo Search, Announcement Bar, Admin Toolbar) directly from their `umd/` build output via `file_server` — no dev server involved
+4. **Enables hot-reload** for frontend development without rebuilding Ghost
 
 ## Configuration
 ### Environment Variables
@@ -14,11 +15,6 @@ Caddy uses environment variables (set in `compose.dev.yaml`) to configure proxy
 - `GHOST_BACKEND` - Ghost container hostname (e.g., `ghost-dev:2368`)
 - `ADMIN_DEV_SERVER` - React admin dev server (e.g., `host.docker.internal:5174`)
 - `ADMIN_LIVE_RELOAD_SERVER` - Ember live reload WebSocket (e.g., `host.docker.internal:4200`)
-- `PORTAL_DEV_SERVER` - Portal dev server (e.g., `host.docker.internal:4175`)
-- `COMMENTS_DEV_SERVER` - Comments UI (e.g., `host.docker.internal:7173`)
-- `SIGNUP_DEV_SERVER` - Signup form (e.g., `host.docker.internal:6174`)
-- `SEARCH_DEV_SERVER` - Sodo search (e.g., `host.docker.internal:4178`)
-- `ANNOUNCEMENT_DEV_SERVER` - Announcement bar (e.g., `host.docker.internal:4177`)
 - `LEXICAL_DEV_SERVER` - *Optional:* Koenig Lexical editor preview server (e.g., `host.docker.internal:4173`)
   - Started by `pnpm dev:lexical` at the repo root, which runs `koenig/koenig-lexical`'s `dev:integrated` target (editor rebuild watcher + `vite preview` on port 4173) and sets Admin's `EDITOR_URL` to point at it
   - Automatically falls back to Ghost backend (built package) if dev server is not running
@@ -42,15 +38,11 @@ The Caddyfile defines these routing rules:
 | `/.well-known/webfinger`             | ActivityPub server (port 8080)      | *Optional:* WebFinger for federation                                   |
 | `/.well-known/nodeinfo`              | ActivityPub server (port 8080)      | *Optional:* NodeInfo for federation                                    |
 | `/ghost/assets/koenig-lexical/*`     | Lexical dev server (port 4173)      | *Optional:* Koenig editor via `pnpm dev:lexical` (falls back to Ghost) |
-| `/ghost/assets/portal/*`             | Portal dev server (port 4175)       | Membership UI                                                          |
-| `/ghost/assets/comments-ui/*`        | Comments dev server (port 7173)     | Comments widget                                                        |
-| `/ghost/assets/signup-form/*`        | Signup dev server (port 6174)       | Signup form widget                                                     |
-| `/ghost/assets/sodo-search/*`        | Search dev server (port 4178)       | Search widget (JS + CSS)                                               |
-| `/ghost/assets/announcement-bar/*`   | Announcement dev server (port 4177) | Announcement widget                                                    |
+| `/ghost/assets/{portal,comments-ui,signup-form,sodo-search,announcement-bar,admin-toolbar}/*` | `apps/<name>/umd` (file_server) | Public app widgets — served from disk, rebuilt on change by each app's `vite build --watch` |
 | `/ghost/assets/*`                    | Admin dev server (port 5174)        | Other admin assets — rewritten to `/__admin-dev__/assets/*`            |
 | `/__admin-dev__/*`                   | Admin dev server (port 5174)        | Vite internals (HMR, modules, refresh runtime, dev-only assets)        |
 | `/ghost`, `/ghost/`                  | Admin dev server (port 5174)        | Admin HTML entry — rewritten to `/__admin-dev__/`                      |
 | `/ghost/*` (deep links)              | Ghost backend                       | Express middleware redirects deep links to `/ghost/#/<path>`           |
 | Everything else                      | Ghost backend                       | Main Ghost application                                                 |
 
-**Note:** All port numbers listed are the host ports where dev servers run by default.
+**Note:** Port numbers listed for Admin and Lexical are the host ports where those dev servers run by default. Public apps have no dev-server port — Caddy reads their build output straight off disk.
diff --git a/docker/ghost-dev/Dockerfile b/docker/ghost-dev/Dockerfile
index d0bf23ae75e..8d4d1fff3a3 100644
--- a/docker/ghost-dev/Dockerfile
+++ b/docker/ghost-dev/Dockerfile
@@ -6,13 +6,21 @@ ARG NODE_VERSION=22.23.1
 
 FROM node:$NODE_VERSION-bullseye-slim
 
-# Install system dependencies needed for building native modules
+# Install system dependencies needed for building native modules.
+# watchman: ember-cli (ghost/admin's dev server) auto-detects and prefers it
+# over its default Node-based file watcher, which is far less efficient over
+# a large tree like this bind-mounted monorepo -- without it, ember serve's
+# idle watch mode pegs multiple CPU cores continuously (observed: ~240% CPU
+# at idle, not during an active build). Only benefits ghost-dev's own
+# container; the host-hybrid flow runs ember-cli on the developer's own
+# machine, not in this image, so this has no effect there either way.
 RUN apt-get update && \
     apt-get install -y \
     build-essential \
     curl \
     python3 \
-    git && \
+    git \
+    watchman && \
     rm -rf /var/lib/apt/lists/* && \
     apt clean
 
diff --git a/package.json b/package.json
index 742f6a178a5..180d7a19ddd 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
       "docker:up": {
         "executor": "nx:run-commands",
         "options": {
-          "command": "docker compose -f compose.dev.yaml ${DEV_COMPOSE_FILES} up -d --force-recreate --wait --quiet-pull"
+          "command": "if [ -n \"$CODESPACES$REMOTE_CONTAINERS\" ]; then echo 'Skipping docker compose up --force-recreate: already running inside a devcontainer, whose own compose lifecycle brought these services up.'; else docker compose -f compose.dev.yaml ${DEV_COMPOSE_FILES} up -d --force-recreate --wait --quiet-pull; fi"
         },
         "dependsOn": [
           "docker:build"
@@ -136,7 +136,7 @@
       "docker:build": {
         "executor": "nx:run-commands",
         "options": {
-          "command": "docker compose -f compose.dev.yaml ${DEV_COMPOSE_FILES} build"
+          "command": "if [ -n \"$CODESPACES$REMOTE_CONTAINERS\" ]; then echo 'Skipping docker compose build: already running inside a devcontainer, whose own compose lifecycle built/pulled these images.'; else docker compose -f compose.dev.yaml ${DEV_COMPOSE_FILES} build; fi"
         }
       },
       "docker:dev": {

From 98bcfb595e40848d99509f2f3438249b1b5d0fc5 Mon Sep 17 00:00:00 2001
From: Evan Hahn <evan@ghost.org>
Date: Mon, 10 Aug 2026 10:29:12 -0500
Subject: [PATCH 7/9] TypeScriptified email analytics queries module (#29819)

no ref

This change should have no user impact.

Co-authored-by: Troy Ciesco <tmciesco@gmail.com>
---
 .../email-analytics-service-wrapper.js        |   2 +-
 .../email-analytics-service.js                |   5 +-
 .../server/services/email-analytics/index.ts  |   3 +-
 .../lib/{queries.js => queries.ts}            | 151 ++++++++++--------
 .../automation-email-analytics.test.js        |   2 +-
 .../newsletter-email-event-storage.test.js    |   2 +-
 .../mailgun-email-suppression-list.test.js    |   2 +-
 ghost/core/test/utils/fixture-utils.js        |   2 +-
 8 files changed, 90 insertions(+), 79 deletions(-)
 rename ghost/core/core/server/services/email-analytics/lib/{queries.js => queries.ts} (70%)

diff --git a/ghost/core/core/server/services/email-analytics/email-analytics-service-wrapper.js b/ghost/core/core/server/services/email-analytics/email-analytics-service-wrapper.js
index 2f828d4889a..243295fea4a 100644
--- a/ghost/core/core/server/services/email-analytics/email-analytics-service-wrapper.js
+++ b/ghost/core/core/server/services/email-analytics/email-analytics-service-wrapper.js
@@ -49,7 +49,7 @@ class EmailAnalyticsServiceWrapper {
         const EmailAnalyticsService = require('./email-analytics-service');
         const MailgunProvider = require('./email-analytics-provider-mailgun');
         const settings = require('../../../shared/settings-cache');
-        const queries = require('./lib/queries');
+        const {queries} = require('./lib/queries');
 
         this.service = new EmailAnalyticsService({
             provider: new MailgunProvider({config, settings, tags: mailgunTags}),
diff --git a/ghost/core/core/server/services/email-analytics/email-analytics-service.js b/ghost/core/core/server/services/email-analytics/email-analytics-service.js
index f5427122a27..b8c87274f23 100644
--- a/ghost/core/core/server/services/email-analytics/email-analytics-service.js
+++ b/ghost/core/core/server/services/email-analytics/email-analytics-service.js
@@ -3,6 +3,7 @@ const logging = require('@tryghost/logging');
 const errors = require('@tryghost/errors');
 /** @import {PrometheusClient} from '@tryghost/prometheus-metrics' */
 /** @import {BatchEventProcessor} from './batch-event-processor' */
+/** @import {Queries} from './lib/queries' */
 
 /**
  * @typedef {object} FetchData
@@ -74,7 +75,7 @@ function createEmptyResult() {
 }
 
 module.exports = class EmailAnalyticsService {
-    queries;
+    /** @type {Queries} */ queries;
     provider;
     #createEventProcessor;
 
@@ -103,7 +104,7 @@ module.exports = class EmailAnalyticsService {
 
     /**
      * @param {object} dependencies
-     * @param {object} dependencies.queries
+     * @param {Queries} dependencies.queries
      * @param {object} dependencies.provider
      * @param {PrometheusClient} [dependencies.prometheusClient]
      * @param {() => BatchEventProcessor} dependencies.createEventProcessor
diff --git a/ghost/core/core/server/services/email-analytics/index.ts b/ghost/core/core/server/services/email-analytics/index.ts
index 2a0b4d1d465..34da53958d3 100644
--- a/ghost/core/core/server/services/email-analytics/index.ts
+++ b/ghost/core/core/server/services/email-analytics/index.ts
@@ -18,8 +18,7 @@ import {EmailRecipientFailure, EmailSpamComplaintEvent, Email} from '../../model
 import domainEvents from '@tryghost/domain-events';
 // @ts-expect-error This module lacks type definitions.
 import prometheusClient from '../../../shared/prometheus-client';
-// @ts-expect-error This module lacks type definitions.
-import queries from './lib/queries';
+import {queries} from './lib/queries';
 import {StartEmailAnalyticsJobEvent} from './events/start-email-analytics-job-event';
 import {StartAutomationEmailAnalyticsJobEvent} from './events/start-automation-email-analytics-job-event';
 import {AUTOMATION_EMAIL_TAG} from '../member-welcome-emails/constants';
diff --git a/ghost/core/core/server/services/email-analytics/lib/queries.js b/ghost/core/core/server/services/email-analytics/lib/queries.ts
similarity index 70%
rename from ghost/core/core/server/services/email-analytics/lib/queries.js
rename to ghost/core/core/server/services/email-analytics/lib/queries.ts
index ab52fcac8fd..cc6cf0844c3 100644
--- a/ghost/core/core/server/services/email-analytics/lib/queries.js
+++ b/ghost/core/core/server/services/email-analytics/lib/queries.ts
@@ -1,25 +1,26 @@
-const _ = require('lodash');
-const debug = require('@tryghost/debug')('services:email-analytics');
-const db = require('../../../data/db');
-const logging = require('@tryghost/logging');
-const {default: ObjectID} = require('bson-objectid');
+import _ from 'lodash';
+import debugFactory from '@tryghost/debug';
+// @ts-expect-error This module lacks type definitions.
+import db from '../../../data/db';
+import logging from '@tryghost/logging';
+import ObjectID from 'bson-objectid';
+
+const debug = debugFactory('services:email-analytics');
 
 const MIN_EMAIL_COUNT_FOR_OPEN_RATE = 5;
 
-/** @typedef {string} EmailAnalyticsJobName */
-/** @typedef {'delivered'|'opened'|'failed'} EmailAnalyticsEvent */
-/**
- * @typedef {object} CursorSeed
- * @prop {string} tableName
- * @prop {Partial<Record<EmailAnalyticsEvent, string>>} eventColumns
- */
+type EmailAnalyticsJobName = string;
+type EmailAnalyticsEvent = 'delivered' | 'opened' | 'failed';
+type CursorSeed = {
+    tableName: string;
+    eventColumns: Partial<Record<EmailAnalyticsEvent, string>>;
+};
 
 /**
  * Creates a job in the jobs table if it does not already exist.
- * @param {EmailAnalyticsJobName} jobName - The name of the job to create.
- * @returns {Promise<void>}
+ * @param jobName - The name of the job to create.
  */
-async function createJobIfNotExists(jobName) {
+async function createJobIfNotExists(jobName: EmailAnalyticsJobName): Promise<void> {
     await db.knex('jobs').insert({
         id: new ObjectID().toHexString(),
         name: jobName,
@@ -29,18 +30,22 @@ async function createJobIfNotExists(jobName) {
     }).onConflict('name').ignore();
 }
 
-module.exports = {
+export const queries = {
     /**
      * Retrieves the timestamp of the last seen event for the specified email analytics events.
-     * @param {EmailAnalyticsJobName} jobName - The name of the job to update.
-     * @param {EmailAnalyticsEvent[]} events - The email analytics events to consider.
-     * @param {CursorSeed} cursorSeed - Recipient table and timestamp columns to read the initial cursor from. Used when the job has no stored timestamp yet.
-     * @returns {Promise<Date|null>} The timestamp of the last seen event, or null if no events are found.
+     * @param jobName - The name of the job to update.
+     * @param events - The email analytics events to consider.
+     * @param cursorSeed - Recipient table and timestamp columns to read the initial cursor from. Used when the job has no stored timestamp yet.
+     * @returns The timestamp of the last seen event, or null if no events are found.
      */
-    async getLastEventTimestamp(jobName, events, cursorSeed) {
+    async getLastEventTimestamp(
+        jobName: EmailAnalyticsJobName,
+        events: EmailAnalyticsEvent[],
+        cursorSeed: CursorSeed
+    ): Promise<Date | null> {
         const startDate = new Date();
 
-        let timestamps = [];
+        let timestamps: (Date | string | null)[] = [];
         const lastJobRunTimestamp = await this.getLastJobRunTimestamp(jobName);
 
         if (lastJobRunTimestamp) {
@@ -65,46 +70,48 @@ module.exports = {
         }
 
         // Convert string dates to Date objects for SQLite compatibility
-        timestamps = timestamps.map(date => (
-            date && !(date instanceof Date) ? new Date(date) : date
-        ));
+        const normalizedTimestamps = timestamps.map(date => {
+            if (!date) {
+                return null;
+            }
+            return date instanceof Date ? date : new Date(date);
+        });
 
-        const lastSeenEventTimestamp = _.max(timestamps);
-        debug(`getLastEventTimestamp: finished in ${Date.now() - startDate}ms`);
+        const lastSeenEventTimestamp = _.max(normalizedTimestamps) ?? null;
+        debug(`getLastEventTimestamp: finished in ${Date.now() - startDate.getTime()}ms`);
 
         return lastSeenEventTimestamp;
     },
 
     /**
      * Retrieves the job data for the specified job name.
-     * @param {EmailAnalyticsJobName} jobName - The name of the job to retrieve data for.
-     * @returns {Promise<Object|null>} The job data, or null if no job data is found.
+     * @param jobName - The name of the job to retrieve data for.
+     * @returns The job data, or null if no job data is found.
      */
-    async getJobData(jobName) {
+    async getJobData(jobName: EmailAnalyticsJobName) {
         return await db.knex('jobs').select('finished_at', 'started_at', 'metadata').where('name', jobName).first();
     },
 
     /**
      * Retrieves the timestamp of the last job run for the specified job name.
-     * @param {EmailAnalyticsJobName} jobName - The name of the job to retrieve the last run timestamp for.
-     * @returns {Promise<Date|null>} The timestamp of the last job run, or null if no job data is found.
+     * @param jobName - The name of the job to retrieve the last run timestamp for.
+     * @returns The timestamp of the last job run, or null if no job data is found.
      */
-    async getLastJobRunTimestamp(jobName) {
+    async getLastJobRunTimestamp(jobName: EmailAnalyticsJobName): Promise<Date | null> {
         const jobData = await this.getJobData(jobName);
         return jobData ? jobData.finished_at || jobData.started_at : null;
     },
 
     /**
      * Sets the timestamp of the last seen event for the specified email analytics events.
-     * @param {EmailAnalyticsJobName} jobName - The name of the job to update.
-     * @param {'finished'|'started'} field - The field to update.
-     * @param {Date} date - The timestamp of the last seen event.
-     * @returns {Promise<void>}
+     * @param jobName - The name of the job to update.
+     * @param field - The field to update.
+     * @param date - The timestamp of the last seen event.
      * @description
      * Updates the `finished_at` or `started_at` column of the specified job in the `jobs` table with the provided timestamp.
      * This is used to keep track of the last time the job was run to avoid expensive queries following reboot.
      */
-    async setJobTimestamp(jobName, field, date) {
+    async setJobTimestamp(jobName: EmailAnalyticsJobName, field: 'finished' | 'started', date: Date): Promise<void> {
         // Convert string dates to Date objects for SQLite compatibility
         try {
             debug(`Setting ${field} timestamp for job ${jobName} to ${date}`);
@@ -120,38 +127,39 @@ module.exports = {
                     status: status
                 });
             }
-        } catch (err) {
-            debug(`Error setting ${field} timestamp for job ${jobName}: ${err.message}`);
+        } catch (err: unknown) {
+            const message = err instanceof Error ? err.message : String(err);
+            debug(`Error setting ${field} timestamp for job ${jobName}: ${message}`);
         }
     },
 
     /**
      * Retrieves and parses the metadata JSON for the specified job.
-     * @param {EmailAnalyticsJobName} jobName - The name of the job.
-     * @returns {Promise<Object|null>} The parsed metadata object, or null.
+     * @param jobName - The name of the job.
+     * @returns The parsed metadata object, or null.
      */
-    async getJobMetadata(jobName) {
+    async getJobMetadata(jobName: EmailAnalyticsJobName): Promise<object | null> {
         try {
             const row = await db.knex('jobs').select('metadata').where('name', jobName).first();
             if (row && row.metadata) {
                 return JSON.parse(row.metadata);
             }
-        } catch (err) {
-            logging.error(`Error reading metadata for job ${jobName}: ${err.message}`);
+        } catch (err: unknown) {
+            const message = err instanceof Error ? err.message : String(err);
+            logging.error(`Error reading metadata for job ${jobName}: ${message}`);
         }
         return null;
     },
 
     /**
      * Writes metadata JSON for the specified job.
-     * @param {EmailAnalyticsJobName} jobName - The name of the job.
-     * @param {Object|null} metadata - The metadata to store, or null to clear.
-     * @returns {Promise<void>}
+     * @param jobName - The name of the job.
+     * @param metadata - The metadata to store, or null to clear.
      */
-    async setJobMetadata(jobName, metadata) {
+    async setJobMetadata(jobName: EmailAnalyticsJobName, metadata: object | null): Promise<void> {
         try {
             const value = metadata ? JSON.stringify(metadata) : null;
-            await db.knex.transaction(async (trx) => {
+            await db.knex.transaction(async (trx: typeof db.knex) => {
                 const result = await trx('jobs').update({metadata: value, updated_at: new Date()}).where('name', jobName);
                 if (result === 0 && metadata) {
                     await trx('jobs').insert({
@@ -163,21 +171,21 @@ module.exports = {
                     });
                 }
             });
-        } catch (err) {
-            logging.error(`Error setting metadata for job ${jobName}: ${err.message}`);
+        } catch (err: unknown) {
+            const message = err instanceof Error ? err.message : String(err);
+            logging.error(`Error setting metadata for job ${jobName}: ${message}`);
         }
     },
 
     /**
      * Sets the status of the specified email analytics job.
-     * @param {EmailAnalyticsJobName} jobName - The name of the job to update.
-     * @param {'started'|'finished'|'failed'} status - The new status of the job.
-     * @returns {Promise<void>}
+     * @param jobName - The name of the job to update.
+     * @param status - The new status of the job.
      * @description
      * Updates the `status` column of the specified job in the `jobs` table with the provided status.
      * This is used to keep track of the current state of the job.
      */
-    async setJobStatus(jobName, status) {
+    async setJobStatus(jobName: EmailAnalyticsJobName, status: 'started' | 'finished' | 'failed'): Promise<void> {
         debug(`Setting status for job ${jobName} to ${status}`);
         try {
             const result = await db.knex('jobs')
@@ -196,17 +204,18 @@ module.exports = {
                     updated_at: new Date()
                 });
             }
-        } catch (err) {
-            debug(`Error setting status for job ${jobName}: ${err.message}`);
+        } catch (err: unknown) {
+            const message = err instanceof Error ? err.message : String(err);
+            debug(`Error setting status for job ${jobName}: ${message}`);
             throw err;
         }
     },
 
-    async aggregateEmailStats(emailId, updateOpenedCount) {
+    async aggregateEmailStats(emailId: string, updateOpenedCount: boolean): Promise<void> {
         const [deliveredCount] = await db.knex('email_recipients').count('id as count').whereRaw('email_id = ? AND delivered_at IS NOT NULL', [emailId]);
         const [failedCount] = await db.knex('email_recipients').count('id as count').whereRaw('email_id = ? AND failed_at IS NOT NULL', [emailId]);
 
-        const updateData = {
+        const updateData: Record<string, string | number> = {
             delivered_count: deliveredCount.count,
             failed_count: failedCount.count
         };
@@ -219,7 +228,7 @@ module.exports = {
         await db.knex('emails').update(updateData).where('id', emailId);
     },
 
-    async aggregateMemberStats(memberId) {
+    async aggregateMemberStats(memberId: string): Promise<void> {
         const {trackedEmailCount} = await db.knex('email_recipients')
             .select(db.knex.raw('COUNT(email_recipients.id) as trackedEmailCount'))
             .leftJoin('emails', 'email_recipients.email_id', 'emails.id')
@@ -230,7 +239,7 @@ module.exports = {
         const [emailCount] = await db.knex('email_recipients').count('id as count').whereRaw('member_id = ?', [memberId]);
         const [emailOpenedCount] = await db.knex('email_recipients').count('id as count').whereRaw('member_id = ? AND opened_at IS NOT NULL', [memberId]);
 
-        const updateQuery = {
+        const updateQuery: Record<string, string | number> = {
             email_count: emailCount.count,
             email_opened_count: emailOpenedCount.count
         };
@@ -244,7 +253,7 @@ module.exports = {
             .where('id', memberId);
     },
 
-    async aggregateMemberStatsBatch(memberIds) {
+    async aggregateMemberStatsBatch(memberIds: string[]): Promise<void> {
         if (!memberIds || memberIds.length === 0) {
             return;
         }
@@ -262,7 +271,7 @@ module.exports = {
             .groupBy('email_recipients.member_id');
 
         // Build update data for each member
-        const memberStatsMap = new Map();
+        const memberStatsMap = new Map<string, {email_count: number; email_opened_count: number; email_open_rate: number | null}>();
         for (const stat of stats) {
             const emailOpenRate = stat.tracked_count >= MIN_EMAIL_COUNT_FOR_OPEN_RATE
                 ? Math.round((stat.email_opened_count / stat.tracked_count) * 100)
@@ -276,12 +285,12 @@ module.exports = {
         }
 
         // Build CASE statements for batch update
-        const emailCountCases = [];
-        const emailOpenedCountCases = [];
-        const emailOpenRateCases = [];
-        const emailCountBindings = [];
-        const emailOpenedCountBindings = [];
-        const emailOpenRateBindings = [];
+        const emailCountCases: string[] = [];
+        const emailOpenedCountCases: string[] = [];
+        const emailOpenRateCases: string[] = [];
+        const emailCountBindings: (string | number)[] = [];
+        const emailOpenedCountBindings: (string | number)[] = [];
+        const emailOpenRateBindings: (string | number)[] = [];
 
         for (const memberId of memberIds) {
             const memberStats = memberStatsMap.get(memberId) || {
@@ -328,3 +337,5 @@ module.exports = {
         `, bindings);
     }
 };
+
+export type Queries = typeof queries;
diff --git a/ghost/core/test/integration/services/email-analytics/automation-email-analytics.test.js b/ghost/core/test/integration/services/email-analytics/automation-email-analytics.test.js
index 359008374b1..582d78d9e5e 100644
--- a/ghost/core/test/integration/services/email-analytics/automation-email-analytics.test.js
+++ b/ghost/core/test/integration/services/email-analytics/automation-email-analytics.test.js
@@ -7,7 +7,7 @@ const {agentProvider} = require('../../../utils/e2e-framework');
 const testUtils = require('../../../utils');
 const MailgunClient = require('../../../../core/server/services/lib/mailgun-client');
 const {AUTOMATION_EMAIL_TAG, DEFAULT_EMAIL_DESIGN_SETTING_SLUG} = require('../../../../core/server/services/member-welcome-emails/constants');
-const queries = require('../../../../core/server/services/email-analytics/lib/queries');
+const {queries} = require('../../../../core/server/services/email-analytics/lib/queries');
 const emailAnalytics = require('../../../../core/server/services/email-analytics');
 const automationsApi = require('../../../../core/server/services/automations/automations-api');
 
diff --git a/ghost/core/test/integration/services/email-service/newsletter-email-event-storage.test.js b/ghost/core/test/integration/services/email-service/newsletter-email-event-storage.test.js
index d58ac83e076..e36491e7a59 100644
--- a/ghost/core/test/integration/services/email-service/newsletter-email-event-storage.test.js
+++ b/ghost/core/test/integration/services/email-service/newsletter-email-event-storage.test.js
@@ -35,7 +35,7 @@ processingModes.forEach(({name, batchProcessing}) => {
             configUtils.set('emailAnalytics:batchProcessing', batchProcessing);
 
             // Stub queries before boot
-            const queries = require('../../../../core/server/services/email-analytics/lib/queries');
+            const {queries} = require('../../../../core/server/services/email-analytics/lib/queries');
             sinon.stub(queries, 'getLastEventTimestamp').callsFake(async function () {
                 // This is required because otherwise the last event timestamp will be now, and that is too close to NOW to start fetching new events
                 return new Date(2000, 0, 1);
diff --git a/ghost/core/test/integration/services/mailgun-email-suppression-list.test.js b/ghost/core/test/integration/services/mailgun-email-suppression-list.test.js
index afc7e36b6e6..1d70a749f5e 100644
--- a/ghost/core/test/integration/services/mailgun-email-suppression-list.test.js
+++ b/ghost/core/test/integration/services/mailgun-email-suppression-list.test.js
@@ -18,7 +18,7 @@ describe('MailgunEmailSuppressionList', function () {
         // fetched, so no suppression is created. The suite previously passed only
         // by free-riding on an earlier file's timestamp state, which breaks under
         // per-file isolation. Mirrors newsletter-email-event-storage.test.js.
-        const queries = require('../../../core/server/services/email-analytics/lib/queries');
+        const {queries} = require('../../../core/server/services/email-analytics/lib/queries');
         sinon.stub(queries, 'getLastEventTimestamp').callsFake(async function () {
             return new Date(2000, 0, 1);
         });
diff --git a/ghost/core/test/utils/fixture-utils.js b/ghost/core/test/utils/fixture-utils.js
index f9da40bc7bf..ae0743b42e7 100644
--- a/ghost/core/test/utils/fixture-utils.js
+++ b/ghost/core/test/utils/fixture-utils.js
@@ -716,7 +716,7 @@ const fixtures = {
 
     insertEmailsAndRecipients: async function insertEmailsAndRecipients(withFailed = false) {
         // NOTE: This require touches the database, so it can't be done at the top of the file as test setup is being performed.
-        const emailAnalyticsQueries = require('../../core/server/services/email-analytics/lib/queries');
+        const {queries: emailAnalyticsQueries} = require('../../core/server/services/email-analytics/lib/queries');
 
         for (const email of _.cloneDeep(DataGenerator.forKnex.emails)) {
             await models.Email.add(email, context.internal);

From e8c695c2c460c4de1d4e4899c3eb095ec5ea415e Mon Sep 17 00:00:00 2001
From: Evan Hahn <evan@ghost.org>
Date: Mon, 10 Aug 2026 10:51:35 -0500
Subject: [PATCH 8/9] Removed IndexNow pings in development (#29781)

no ref

This change should have no user impact.

I noticed that I was getting 429s from IndexNow in development. Let's
stop hitting it in development entirely, as it's never going to work
there.
---
 .../services/indexnow-ping/indexnow-ping-service.ts  |  6 ++++++
 .../indexnow-ping/indexnow-ping-service.test.js      | 12 +++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ghost/core/core/server/services/indexnow-ping/indexnow-ping-service.ts b/ghost/core/core/server/services/indexnow-ping/indexnow-ping-service.ts
index 4448c60729f..febe80dd886 100644
--- a/ghost/core/core/server/services/indexnow-ping/indexnow-ping-service.ts
+++ b/ghost/core/core/server/services/indexnow-ping/indexnow-ping-service.ts
@@ -36,6 +36,7 @@ type SettingsCache = {
 };
 
 type Config = {
+    get(key: string): unknown;
     isPrivacyDisabled(key: string): boolean;
 };
 
@@ -137,6 +138,11 @@ export class IndexNowPingService {
      * Ping IndexNow with a URL.
      */
     async ping(post: Post): Promise<void> {
+        // Skip if in development
+        if (this.config.get('env') === 'development') {
+            return;
+        }
+
         // Skip pages - only ping for posts
         if (post.type === 'page') {
             return;
diff --git a/ghost/core/test/unit/server/services/indexnow-ping/indexnow-ping-service.test.js b/ghost/core/test/unit/server/services/indexnow-ping/indexnow-ping-service.test.js
index 663ffc06474..09be709cbb5 100644
--- a/ghost/core/test/unit/server/services/indexnow-ping/indexnow-ping-service.test.js
+++ b/ghost/core/test/unit/server/services/indexnow-ping/indexnow-ping-service.test.js
@@ -16,7 +16,7 @@ function createService() {
     settingsCache.get.withArgs('is_private').returns(false);
     settingsCache.get.withArgs('indexnow_api_key').returns(VALID_API_KEY);
 
-    const config = {isPrivacyDisabled: sinon.stub()};
+    const config = {get: sinon.stub(), isPrivacyDisabled: sinon.stub()};
     config.isPrivacyDisabled.withArgs('useIndexNow').returns(false);
 
     const labs = {isSet: sinon.stub()};
@@ -266,6 +266,16 @@ describe('IndexNow', function () {
     });
 
     describe('ping()', function () {
+        it('does not ping in development', async function () {
+            const {service, deps} = createService();
+            deps.config.get.withArgs('env').returns('development');
+            const testPost = _.clone(testUtils.DataGenerator.Content.posts[2]);
+
+            await service.ping(testPost);
+
+            sinon.assert.notCalled(deps.urlService.facade.getUrlForResource);
+        });
+
         it('with a post should execute ping', async function () {
             const {service, deps} = createService();
             nock('https://api.indexnow.org')

From ce786e299adb8b8ad99a65e7b07f21e69d652c45 Mon Sep 17 00:00:00 2001
From: Hannah Wolfe <github.erisds@gmail.com>
Date: Mon, 10 Aug 2026 16:52:48 +0100
Subject: [PATCH 9/9] Removed the IndexNow labs flag (#29841)

Indexnow is GA and generally working well. This does the final cleanup around the labs flag.
---
 .../web/middleware/serve-indexnow-key.js      |  8 +-------
 .../server/services/indexnow-ping/index.ts    |  2 --
 .../indexnow-ping/indexnow-ping-service.ts    | 14 +-------------
 ghost/core/core/shared/labs.js                |  1 -
 .../admin/__snapshots__/config.test.js.snap   |  1 -
 .../admin/__snapshots__/settings.test.js.snap |  2 +-
 .../indexnow-ping-service.test.js             | 19 +------------------
 7 files changed, 4 insertions(+), 43 deletions(-)

diff --git a/ghost/core/core/frontend/web/middleware/serve-indexnow-key.js b/ghost/core/core/frontend/web/middleware/serve-indexnow-key.js
index 95dec743da4..950f5896ccc 100644
--- a/ghost/core/core/frontend/web/middleware/serve-indexnow-key.js
+++ b/ghost/core/core/frontend/web/middleware/serve-indexnow-key.js
@@ -10,7 +10,7 @@
  * Security considerations:
  * - Only serves keys that exactly match the configured key
  * - Only responds to 32-character hex patterns (valid IndexNow key format)
- * - Returns 404 (via next()) if IndexNow is disabled or no key configured
+ * - Returns 404 (via next()) if no key is configured
  *
  * Route collision note:
  * The pattern /[a-f0-9]{32}.txt is unlikely to collide with user content
@@ -23,7 +23,6 @@
  */
 
 const settingsCache = require('../../../shared/settings-cache');
-const labs = require('../../../shared/labs');
 
 /**
  * Middleware to serve the IndexNow API key verification file
@@ -34,11 +33,6 @@ function serveIndexNowKey(req, res, next) {
         return next();
     }
 
-    // Check if IndexNow is enabled
-    if (!labs.isSet('indexnow')) {
-        return next();
-    }
-
     const apiKey = settingsCache.get('indexnow_api_key');
 
     // No key configured
diff --git a/ghost/core/core/server/services/indexnow-ping/index.ts b/ghost/core/core/server/services/indexnow-ping/index.ts
index b932657ff00..092f9d8132e 100644
--- a/ghost/core/core/server/services/indexnow-ping/index.ts
+++ b/ghost/core/core/server/services/indexnow-ping/index.ts
@@ -12,7 +12,6 @@ class IndexNowPingServiceWrapper {
         // Wire up all the dependencies
         const settingsCache = require('../../../shared/settings-cache');
         const config = require('../../../shared/config');
-        const labs = require('../../../shared/labs');
         const urlService = require('../url');
         const urlUtils = require('../../../shared/url-utils').default;
         const request = require('@tryghost/request');
@@ -22,7 +21,6 @@ class IndexNowPingServiceWrapper {
         this.service = new IndexNowPingService({
             settingsCache,
             config,
-            labs,
             urlService,
             urlUtils,
             request,
diff --git a/ghost/core/core/server/services/indexnow-ping/indexnow-ping-service.ts b/ghost/core/core/server/services/indexnow-ping/indexnow-ping-service.ts
index febe80dd886..5b4da264f0b 100644
--- a/ghost/core/core/server/services/indexnow-ping/indexnow-ping-service.ts
+++ b/ghost/core/core/server/services/indexnow-ping/indexnow-ping-service.ts
@@ -40,10 +40,6 @@ type Config = {
     isPrivacyDisabled(key: string): boolean;
 };
 
-type Labs = {
-    isSet(flag: string): boolean;
-};
-
 type UrlService = {
     getUrlForResource(resource: Record<string, unknown>, options: {absolute: boolean}): string | null;
 };
@@ -85,7 +81,6 @@ type Post = {
 export type IndexNowPingServiceDeps = {
     settingsCache: SettingsCache;
     config: Config;
-    labs: Labs;
     urlService: UrlService;
     urlUtils: UrlUtils;
     request: RequestFn;
@@ -96,7 +91,6 @@ export type IndexNowPingServiceDeps = {
 export class IndexNowPingService {
     settingsCache: SettingsCache;
     config: Config;
-    labs: Labs;
     urlService: UrlService;
     urlUtils: UrlUtils;
     request: RequestFn;
@@ -104,10 +98,9 @@ export class IndexNowPingService {
     events: ModelEvents;
     listener: ModelEventListener;
 
-    constructor({settingsCache, config, labs, urlService, urlUtils, request, logging, events}: IndexNowPingServiceDeps) {
+    constructor({settingsCache, config, urlService, urlUtils, request, logging, events}: IndexNowPingServiceDeps) {
         this.settingsCache = settingsCache;
         this.config = config;
-        this.labs = labs;
         this.urlService = urlService;
         this.urlUtils = urlUtils;
         this.request = request;
@@ -158,11 +151,6 @@ export class IndexNowPingService {
             return;
         }
 
-        // Skip if IndexNow is not enabled in labs
-        if (!this.labs.isSet('indexnow')) {
-            return;
-        }
-
         // Don't ping for the default posts
         if (post.slug && defaultPostSlugs.indexOf(post.slug) > -1) {
             return;
diff --git a/ghost/core/core/shared/labs.js b/ghost/core/core/shared/labs.js
index 0610c96d901..1f90304d88e 100644
--- a/ghost/core/core/shared/labs.js
+++ b/ghost/core/core/shared/labs.js
@@ -34,7 +34,6 @@ const GA_FEATURES = [
     'commentsPinning',
     'featurebaseFeedback',
     'dangerZoneResetAuth',
-    'indexnow',
     'llmsTxt'
 ];
 
diff --git a/ghost/core/test/e2e-api/admin/__snapshots__/config.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/config.test.js.snap
index 490ad169638..88f1f07547d 100644
--- a/ghost/core/test/e2e-api/admin/__snapshots__/config.test.js.snap
+++ b/ghost/core/test/e2e-api/admin/__snapshots__/config.test.js.snap
@@ -30,7 +30,6 @@ Object {
       "getHelperDeduplication": true,
       "giftSubCustomization": true,
       "importMemberTier": true,
-      "indexnow": true,
       "lexicalIndicators": true,
       "llmsTxt": true,
       "memberDetailsReact": true,
diff --git a/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap
index 0f4f85de35f..348aec0b25a 100644
--- a/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap
+++ b/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap
@@ -2253,7 +2253,7 @@ exports[`Settings API Edit can edit Stripe settings when Stripe Connect limit is
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "5495",
+  "content-length": "5477",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
diff --git a/ghost/core/test/unit/server/services/indexnow-ping/indexnow-ping-service.test.js b/ghost/core/test/unit/server/services/indexnow-ping/indexnow-ping-service.test.js
index 09be709cbb5..ba095f41cda 100644
--- a/ghost/core/test/unit/server/services/indexnow-ping/indexnow-ping-service.test.js
+++ b/ghost/core/test/unit/server/services/indexnow-ping/indexnow-ping-service.test.js
@@ -19,9 +19,6 @@ function createService() {
     const config = {get: sinon.stub(), isPrivacyDisabled: sinon.stub()};
     config.isPrivacyDisabled.withArgs('useIndexNow').returns(false);
 
-    const labs = {isSet: sinon.stub()};
-    labs.isSet.withArgs('indexnow').returns(true);
-
     const urlService = {
         getUrlForResource: sinon.stub().returns('https://example.com/my-post/')
     };
@@ -36,7 +33,7 @@ function createService() {
     // Chainable so `events.removeListener(...).on(...)` works.
     const events = {removeListener: sinon.stub().returnsThis(), on: sinon.stub().returnsThis()};
 
-    const deps = {settingsCache, config, labs, urlService, urlUtils, request, logging, events};
+    const deps = {settingsCache, config, urlService, urlUtils, request, logging, events};
     const service = new IndexNowPingService(deps);
 
     return {service, deps};
@@ -335,20 +332,6 @@ describe('IndexNow', function () {
             assert.equal(pingRequest.isDone(), false);
         });
 
-        it('when labs.indexnow is false should not execute ping', async function () {
-            const {service, deps} = createService();
-            deps.labs.isSet.withArgs('indexnow').returns(false);
-
-            const pingRequest = nock('https://api.indexnow.org')
-                .get(/\/indexnow/)
-                .reply(200);
-            const testPost = _.clone(testUtils.DataGenerator.Content.posts[2]);
-
-            await service.ping(testPost);
-
-            assert.equal(pingRequest.isDone(), false);
-        });
-
         it('when privacy.useIndexNow is disabled should not execute ping', async function () {
             const {service, deps} = createService();
             deps.config.isPrivacyDisabled.withArgs('useIndexNow').returns(true);