ghost 6.68.0 → 6.69.0

package/core/server/services/email-service/sending-status-service.js

@@ -35,6 +35,19 @@ class SendingStatusService {
             }, batches),
         };
     }
+    /** The retry decision statusFor reports, without the recipient counts its progress needs. */
+    async retryEligibilityFor(emailId) {
+        const email = await this.#knex('emails').select('status').where('id', emailId).first();
+        if (!email) {
+            return 'not-failed';
+        }
+        if (sending_status_schema_1.StoredSendingStatus.parse(email.status) !== 'failed') {
+            return 'not-failed';
+        }
+        const batches = await this.#knex('email_batches').distinct('status').where('email_id', emailId);
+        const statuses = batches.map((batch) => sending_status_schema_1.StoredSendingStatus.parse(batch.status));
+        return (0, sending_status_1.isRetryable)(statuses) ? 'retryable' : 'unknown-outcome';
+    }
     async #batchesFor(emailId, recipientAccounting) {
         if (recipientAccounting) {
             const rows = await this.#knex('email_batches')

package/core/server/services/email-service/sending-status.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmailSendingStatus = exports.SendingStatus = exports.SendingProgress = exports.SendingPhase = void 0;
 exports.buildSendingStatus = buildSendingStatus;
+exports.isRetryable = isRetryable;
 const zod_1 = require("zod");
 const ETA_WINDOW_MS = 60_000;
 const ETA_MIN_INTERVALS = 2;
@@ -14,7 +15,12 @@ exports.SendingProgress = zod_1.z.object({
 exports.SendingStatus = zod_1.z.discriminatedUnion('status', [
     zod_1.z.object({ status: exports.SendingPhase, progress: exports.SendingProgress }),
     zod_1.z.object({ status: zod_1.z.literal('submitted'), progress: exports.SendingProgress }),
-    zod_1.z.object({ status: zod_1.z.literal('failed'), progress: exports.SendingProgress, failedDuring: exports.SendingPhase }),
+    zod_1.z.object({
+        status: zod_1.z.literal('failed'),
+        progress: exports.SendingProgress,
+        failedDuring: exports.SendingPhase,
+        retryable: zod_1.z.boolean(),
+    }),
 ]);
 exports.EmailSendingStatus = zod_1.z.object({
     id: zod_1.z.string(),
@@ -49,6 +55,7 @@ function buildSendingStatus(email, batches) {
             status: 'failed',
             progress: { completed, total, estimatedSecondsRemaining: null },
             failedDuring: phase,
+            retryable: isRetryable(batches.map((batch) => batch.status)),
         };
     }
     const failedThisAttempt = batches.filter((batch) => failedDuringAttempt(batch, attemptStartedAt));
@@ -70,6 +77,10 @@ function buildSendingStatus(email, batches) {
         },
     };
 }
+// A submitting batch may already have been accepted by the provider.
+function isRetryable(batchStatuses) {
+    return !batchStatuses.includes('submitting');
+}
 function sumRecipients(batches) {
     return batches.reduce((sum, batch) => sum + (batch.recipientCount ?? 0), 0);
 }

package/core/server/services/members/members-api/repositories/member-repository.js

@@ -17,6 +17,7 @@ const { NotFoundError } = require('@tryghost/errors');
 const validator = require('@tryghost/validator');
 const crypto = require('crypto');
 const { hasActiveOffer } = require('../utils/has-active-offer');
+const { afterCommit } = require('../../../../lib/after-commit');
 const {
   StartAutomationsPollEvent,
 } = require('../../../automations/events/start-automations-poll-event');
@@ -239,25 +240,6 @@ module.exports = class MemberRepository {
     );
   }
 
-  /**
-   * Runs `fn` once the work it follows has committed.
-   *
-   * Without a transaction each query commits as it runs, so `fn` runs now, and whatever it
-   * throws or returns is the caller's. Inside `options.transacting` it runs when that
-   * transaction commits, after the caller has moved on, and not at all if it rolls back;
-   * a rollback, or a failure in `fn`, goes to `onFailure`.
-   *
-   * @param {{transacting?: {executionPromise: Promise<unknown>}}} options
-   * @param {() => unknown} fn
-   * @param {(err: unknown) => void} onFailure
-   */
-  afterCommit(options, fn, onFailure) {
-    if (!options?.transacting) {
-      return fn();
-    }
-    options.transacting.executionPromise.then(() => fn()).catch(onFailure);
-  }
-
   /**
    * @param {Parameters<typeof DomainEvents.dispatch>[0]} event
    * @param {object} options
@@ -266,8 +248,8 @@ module.exports = class MemberRepository {
    * @returns {void}
    */
   dispatchEvent(event, options) {
-    this.afterCommit(
-      options,
+    afterCommit(
+      options?.transacting,
       () => DomainEvents.dispatch(event),
       (err) => {
         let memberMessageFragment = '';
@@ -1104,8 +1086,8 @@ module.exports = class MemberRepository {
 
     if (this._stripeAPIService.configured && member._changed.email) {
       // Stripe can't be rolled back, so it only hears about an address Ghost has saved.
-      await this.afterCommit(
-        options,
+      await afterCommit(
+        options?.transacting,
         () => this.updateStripeCustomerEmails(member),
         (err) => {
           logging.error(

package/core/server/services/posts/post-email-handler.js

@@ -1,5 +1,10 @@
 const { BadRequestError } = require('@tryghost/errors');
+const logging = require('@tryghost/logging');
 const tpl = require('@tryghost/tpl');
+const {
+  RETRY_UNKNOWN_OUTCOME_CODE,
+  RETRY_NOT_FAILED_CODE,
+} = require('../email-service/email-service');
 
 const messages = {
   invalidEmailSegment: "The email segment parameter doesn't contain a valid filter",
@@ -22,7 +27,7 @@ class PostEmailHandler {
    * Validates email can be sent before saving the post (if an email will be sent)
    *
    * @param {import('@tryghost/api-framework').Frame} frame
-   * @returns {Promise<{newsletter: Object, emailRecipientFilter: string, emailCount: number}|null>}
+   * @returns {Promise<import('../email-service/email-service').EmailPreflight|null>}
    */
   async validateBeforeSave(frame) {
     const newStatus = frame.data.posts[0].status;
@@ -33,30 +38,36 @@ class PostEmailHandler {
 
     const existingPost = await this.models.Post.findOne(
       { id: frame.options.id, status: 'all' },
-      { columns: ['id', 'status', 'newsletter_id', 'email_recipient_filter'] },
+      {
+        columns: ['id', 'status', 'newsletter_id', 'email_recipient_filter'],
+        transacting: frame.options.transacting,
+      },
     );
     const previousStatus = existingPost?.get('status');
+    const existingNewsletterId = existingPost?.get('newsletter_id');
 
-    const hasNewsletter = frame.options.newsletter || existingPost?.get('newsletter_id');
+    const hasNewsletter = frame.options.newsletter || existingNewsletterId;
     const sendingEmail = hasNewsletter && this.shouldSendEmail(newStatus, previousStatus);
 
     if (!sendingEmail) {
       return null;
     }
 
-    const emailRecipientFilter =
-      frame.options.email_segment || existingPost?.get('email_recipient_filter') || 'all';
+    // A post keeps the newsletter and audience it already has, as the Post model does on save
+    const emailRecipientFilter = existingNewsletterId
+      ? existingPost.get('email_recipient_filter')
+      : frame.options.email_segment || 'all';
 
     await this.validateEmailRecipientFilter(emailRecipientFilter);
 
     const newsletter = await this.getNewsletter(frame, existingPost);
 
-    const { emailCount } = await this.emailService.checkCanSendEmail(
+    const { emailCount, csdEmailCount } = await this.emailService.checkCanSendEmail(
       newsletter,
       emailRecipientFilter,
     );
 
-    return { newsletter, emailRecipientFilter, emailCount };
+    return { newsletter, emailRecipientFilter, emailCount, csdEmailCount };
   }
 
   /**
@@ -81,36 +92,42 @@ class PostEmailHandler {
   }
 
   /**
-   * Retrieves the newsletter for the post
+   * Retrieves the newsletter the post will be saved with: the one it has, otherwise the one requested
    *
    * @param {import('@tryghost/api-framework').Frame} frame
    * @param {Object|null} existingPost
    * @returns {Promise<Object|null>}
    */
   async getNewsletter(frame, existingPost) {
-    if (frame.options.newsletter) {
-      return this.models.Newsletter.findOne({ slug: frame.options.newsletter });
+    if (frame.options.newsletter && !existingPost?.get('newsletter_id')) {
+      return this.models.Newsletter.findOne(
+        { slug: frame.options.newsletter },
+        { transacting: frame.options.transacting },
+      );
     }
 
     if (existingPost?.get('newsletter_id')) {
-      return this.models.Newsletter.findOne({ id: existingPost.get('newsletter_id') });
+      return this.models.Newsletter.findOne(
+        { id: existingPost.get('newsletter_id') },
+        { transacting: frame.options.transacting },
+      );
     }
 
     return null;
   }
 
   /**
-   * Handles creating or retrying the newsletter email after post is saved
+   * Creates a new newsletter email inside the transaction that publishes the post, so the post
+   * is only published if its email is created. Sending, or retrying a failed email, waits for
+   * the commit.
    *
-   * @param {Object} model - The post model
+   * @param {Object} model - The saved post model
    * @param {Object} [options]
-   * @param {Object} [options.preflight] - Validation result from validateBeforeSave, passed through to createEmail
-   * @param {Object} [options.preflight.newsletter]
-   * @param {string} [options.preflight.emailRecipientFilter]
-   * @param {number} [options.preflight.emailCount]
-   * @returns {Promise<void>}
+   * @param {import('../email-service/email-service').EmailPreflight|null} [options.preflight] - Result of validateBeforeSave, passed through to createEmail
+   * @param {object} [options.transacting]
+   * @returns {Promise<(() => Promise<void>)|undefined>} Sends the email; call it once the transaction has committed
    */
-  async createOrRetryEmail(model, { preflight } = {}) {
+  async createOrRetryEmail(model, { preflight, transacting } = {}) {
     if (!model.get('newsletter_id')) {
       return;
     }
@@ -123,25 +140,41 @@ class PostEmailHandler {
     }
 
     const postEmail = model.relations.email;
-    let email;
 
     if (!postEmail) {
-      email = await this.emailService.createEmail(model, { preflight });
-    } else if (postEmail.get('status') === 'failed') {
-      email = await this.#retryEmail(postEmail);
-    }
-
-    if (email) {
+      const email = await this.emailService.createEmail(model, { preflight, transacting });
       model.relations.email = email;
       model.set('email', email);
+      return async () => {
+        await this.emailService.scheduleEmail(email);
+      };
+    }
+
+    if (postEmail.get('status') === 'failed') {
+      // Retrying reads the post outside the transaction, so it must be published first.
+      return async () => {
+        const email = await this.#retryEmail(postEmail, model.id);
+        if (email) {
+          model.relations.email = email;
+          model.set('email', email);
+        }
+      };
     }
   }
 
-  async #retryEmail(email) {
+  async #retryEmail(email, postId) {
     try {
       return await this.emailService.retryEmail(email);
     } catch (err) {
-      if (err.code !== 'BULK_EMAIL_RETRY_NOT_FAILED') {
+      if (err.code === RETRY_UNKNOWN_OUTCOME_CODE) {
+        // The post is already saved. An unknown delivery outcome only withholds
+        // the resend, leaving the email failed.
+        logging.warn(
+          `Post ${postId} was saved without retrying email ${email.id}: delivery outcome is unknown`,
+        );
+        return;
+      }
+      if (err.code !== RETRY_NOT_FAILED_CODE) {
         throw err;
       }
       // Publishing is already committed. A concurrent retry that claimed the

package/core/server/services/posts/posts-service.js

@@ -6,6 +6,8 @@ const ObjectId = require('bson-objectid').default;
 const pick = require('lodash/pick');
 const DomainEvents = require('@tryghost/domain-events');
 const PostEmailHandler = require('./post-email-handler');
+const { afterCommit } = require('../../lib/after-commit');
+const logging = require('@tryghost/logging');
 const {
   validateAdminApiBulkFilterTransformer,
 } = require('../../api/endpoints/utils/api-filter-utils');
@@ -75,9 +77,32 @@ class PostsService {
   async editPost(frame, options) {
     const preflight = await this.postEmailHandler.validateBeforeSave(frame);
 
-    const model = await this.models.Post.edit(frame.data.posts[0], frame.options);
+    const save = async (transacting) => {
+      const model = await this.models.Post.edit(frame.data.posts[0], {
+        ...frame.options,
+        transacting,
+      });
+      const sendEmail = await this.postEmailHandler.createOrRetryEmail(model, {
+        preflight,
+        transacting,
+      });
+      return { model, sendEmail };
+    };
+
+    const { model, sendEmail } = frame.options.transacting
+      ? await save(frame.options.transacting)
+      : await this.models.Post.transaction(save);
 
-    await this.postEmailHandler.createOrRetryEmail(model, { preflight });
+    if (sendEmail && frame.options.transacting) {
+      // The caller commits later. Rolling back leaves nothing to send.
+      afterCommit(
+        frame.options.transacting,
+        () => sendEmail().catch((err) => logging.error(err)),
+        () => {},
+      );
+    } else {
+      await sendEmail?.();
+    }
 
     const dto = model.toJSON(frame.options);
 

package/core/server/services/service-inventory.yaml

@@ -154,6 +154,50 @@ services:
       - >-
         Add same-instance settings-change and root export characterization before moving
         construction to boot.
+  app-installations:
+    kind: directory
+    disposition: retain
+    status: auditing
+    entryPoints:
+      - app-installations/index.ts
+    notes: >-
+      Composition-only service over a table that is still in development; preserve the
+      availability check that keeps it dormant wherever the table does not exist.
+    contracts:
+      exports:
+        summary: >-
+          Named exports are init, the mutable service binding, isAvailable and
+          actingContext. The service binding is undefined before init. The Express guard
+          that asks isAvailable lives with the Admin API routes in server/web.
+        sources:
+          - core/server/services/app-installations/index.ts
+        tests:
+          - test/e2e-api/admin/app-installations.test.ts
+      construction:
+        summary: >-
+          Boot calls synchronous init after database setup. It constructs one
+          AppInstallationsService from knex, the Action model and a manifest-rules getter;
+          repeated init returns once the binding exists.
+        sources:
+          - core/server/services/app-installations/index.ts
+          - core/boot.js
+        tests: []
+      configuration:
+        summary: >-
+          The site and Admin URLs and the development flag are read on every install, not
+          captured at construction. Availability is read per request from config.
+        sources:
+          - core/server/services/app-installations/index.ts
+          - core/server/data/schema/in-development.ts
+        tests:
+          - test/e2e-api/admin/app-installations.test.ts
+    unverified:
+      - consumers
+      - startup
+      - lifetime
+      - resources
+      - failures
+    blockers: []
   audience-feedback:
     kind: directory
     disposition: retain
@@ -754,9 +798,26 @@ services:
           - core/server/services/email-service/email-service-wrapper.js
           - core/boot.js
         tests: []
+      startup:
+        summary: >-
+          Boot initializes the wrapper, registers its send-email handler and starts jobs
+          before readiness. Outside test environments, interrupted-send recovery runs after
+          the app is mounted and readiness is signalled. Recovery is awaited within the
+          background sequence, but pending recovery does not delay the boot return or HTTP
+          availability; later background initialization continues after it resolves.
+          Unit orchestration tests cover initialization order, the test-environment gate
+          and sequencing after recovery. Handler-registration tests cover send-email
+          routing and its queue; real-boot HTTP tests cover jobs readiness and pending recovery.
+        sources:
+          - core/boot.js
+          - core/server/services/email-service/email-service-wrapper.js
+        tests:
+          - test/unit/boot-email-analytics.test.ts
+          - test/unit/server/services/jobs-service/register-job-handlers.test.ts
+          - test/e2e-server/boot-readiness.isolated.test.ts
+          - test/e2e-server/boot-background.isolated.test.ts
     unverified:
       - consumers
-      - startup
       - lifetime
       - configuration
       - resources
@@ -768,6 +829,10 @@ services:
       - >-
         Audit locale-listener disposal and retained batch-sender state across restart, plus
         the final status write after tracked batch work.
+      - >-
+        The boot test controls interrupted-send recovery and subsequent external effects.
+        It does not characterize recovery work, background failure handling, recurring
+        scheduling or background completion during shutdown.
   email-suppression-list:
     kind: directory
     disposition: retain
@@ -2777,17 +2842,31 @@ services:
           - core/server/services/route-settings/dynamic-routing-service.js
           - core/boot.js
         tests: []
+      startup:
+        summary: >-
+          Boot configures routing in backend-only and frontend-only modes. The isolated HTTP
+          tests cover configured post/tag URLs without a frontend, routes upload refreshing
+          URLs through the same Content API consumer, and frontend rendering with the
+          configured canonical URL. These exercise FileStore and normal boot wiring.
+          Unit orchestration tests separately assert that initDynamicRouting waits for
+          route-settings start and propagates its original error in both frontend modes.
+        sources:
+          - core/boot.js
+          - core/server/services/route-settings/dynamic-routing-service.js
+        tests:
+          - test/unit/boot-dynamic-routing.test.ts
+          - test/e2e-server/boot-backend-only.isolated.test.ts
+          - test/e2e-server/boot-frontend-only.isolated.test.ts
     unverified:
       - consumers
-      - startup
       - lifetime
       - configuration
       - resources
       - failures
     blockers:
       - >-
-        Characterize repeated configuration/start and upload reload with actual boot and
-        adapter ownership; parser helpers are independently consumed before service startup.
+        Characterize repeated configuration/start, reload failure paths and adapter ownership;
+        parser helpers are independently consumed before service startup.
   settings:
     kind: directory
     disposition: retain
@@ -3595,12 +3674,19 @@ services:
         tests: []
       startup:
         summary: >-
-          initDynamicRouting gives the shared URL service to RouterManager even without a
-          frontend, then awaits route-settings start.
+          Unit orchestration tests assert that initDynamicRouting gives the shared URL
+          service to RouterManager without a frontend, passes the same router and URL
+          instances to route-settings start, and waits for it in both frontend modes.
+          They also assert propagation of the original startup error. The HTTP tests cover
+          configured post/tag URLs in backend-only mode, URLs after upload through the same
+          Content API consumer, and canonical URLs rendered by the frontend.
         sources:
           - core/boot.js
           - core/server/services/route-settings/dynamic-routing-service.js
-        tests: []
+        tests:
+          - test/unit/boot-dynamic-routing.test.ts
+          - test/e2e-server/boot-backend-only.isolated.test.ts
+          - test/e2e-server/boot-frontend-only.isolated.test.ts
     unverified:
       - consumers
       - lifetime

package/core/server/services/stats/stats-service.js

@@ -246,14 +246,10 @@ class StatsService {
     const request = deps.request || require('../../lib/request-external');
     const settingsCache = deps.settingsCache || require('../../../shared/settings-cache');
 
-    const labs = deps.labs || require('../../../shared/labs');
     const webAnalyticsEnabled = settingsCache.get('web_analytics_enabled');
     const TinybirdServiceWrapper = require('../tinybird');
 
-    if (
-      webAnalyticsEnabled ||
-      (labs.isSet('automationsTinybirdSync') && config.get('tinybird:stats'))
-    ) {
+    if (webAnalyticsEnabled || config.get('tinybird:stats')) {
       TinybirdServiceWrapper.init();
     }
 

package/core/server/services/tinybird-sync/index.js

@@ -8,15 +8,12 @@ const bson_objectid_1 = __importDefault(require("bson-objectid"));
 const logging_1 = __importDefault(require("@tryghost/logging"));
 const config_1 = __importDefault(require("../../../shared/config"));
 // @ts-expect-error This module lacks type definitions.
-const labs_1 = __importDefault(require("../../../shared/labs"));
-// @ts-expect-error This module lacks type definitions.
 const settings_cache_1 = __importDefault(require("../../../shared/settings-cache"));
 const db_1 = require("../../data/db");
 const tinybird_sync_service_1 = require("./tinybird-sync-service");
 const service = (0, tinybird_sync_service_1.createTinybirdSyncService)({
     config: config_1.default,
     settingsCache: settings_cache_1.default,
-    labs: labs_1.default,
     knex: db_1.knex,
     logging: logging_1.default,
     random: Math.random,

package/core/server/services/tinybird-sync/tinybird-sync-service.js

@@ -15,7 +15,7 @@ const BATCH_SIZE = 5000;
 const MAX_PAYLOAD_BYTES = 9 * 1024 * 1024;
 const MAX_PAYLOAD_MESSAGES = 1000;
 const REQUEST_TIMEOUT_MS = 5 * 60 * 1000;
-function createTinybirdSyncService({ config, settingsCache, labs, knex, logging, random, now, fetch, createId, }) {
+function createTinybirdSyncService({ config, settingsCache, knex, logging, random, now, fetch, createId, }) {
     let scheduled = false;
     const syncAll = async (ingest) => {
         const results = await Promise.allSettled(sync_table_to_tinybird_1.AUTOMATION_SYNC_TARGETS.map(async (target) => {
@@ -39,9 +39,6 @@ function createTinybirdSyncService({ config, settingsCache, labs, knex, logging,
         }
     };
     const sync = async () => {
-        if (!labs.isSet('automationsTinybirdSync')) {
-            return;
-        }
         const ingest = (0, get_ingest_config_1.getIngestConfig)({ config, settingsCache });
         if (!ingest) {
             return;
@@ -59,8 +56,7 @@ function createTinybirdSyncService({ config, settingsCache, labs, knex, logging,
             return;
         }
         scheduled = true;
-        const isSyncEnabled = labs.isSet('automationsTinybirdSync');
-        logging.info({ system: { event: 'tinybird.sync.started' } }, `[Tinybird sync] Started: sync ${isSyncEnabled ? 'enabled' : 'disabled'} by labs flag (but may change)`);
+        logging.info({ system: { event: 'tinybird.sync.started' } }, '[Tinybird sync] Started');
         const at = (0, cron_1.randomFiveMinuteCron)(random);
         logging.info(`[Background Job] ${tinybird_sync_job_1.default.type} scheduled at ${at}`);
         try {

package/core/server/web/api/endpoints/admin/routes.js

@@ -1,3 +1,4 @@
+const errors = require('@tryghost/errors');
 const express = require('../../../../../shared/express');
 const api = require('../../../../api').endpoints;
 const { http } = require('@tryghost/api-framework');
@@ -6,6 +7,7 @@ const apiMw = require('../../middleware');
 const mw = require('./middleware');
 const labs = require('../../../../../shared/labs');
 const limits = require('../../../../services/limits');
+const appInstallations = require('../../../../services/app-installations');
 
 const shared = require('../../../shared');
 
@@ -232,6 +234,27 @@ module.exports = function apiRoutes() {
   metafieldsRouter.put('/:namespace/:key', http(api.membersMetafields.edit));
   metafieldsRouter.delete('/:namespace/:key', http(api.membersMetafields.destroy));
 
+  // ## Apps
+  // Everything about apps sits behind the private `apps` flag, asked once here so a route
+  // added below is guarded by being there. The table is still in development, so it only
+  // exists in development and testing databases: anywhere else the routes answer as if
+  // the flag were off, whatever the flag says.
+  //
+  // Authenticated as a route here rather than inside the mount, for the same reason as
+  // the members metafields router above.
+  const appsRouter = express.Router('admin api apps');
+  router.all(['/apps', '/apps/*'], mw.authAdminApi);
+  router.use('/apps', appsRouter);
+  appsRouter.use(labs.enabledMiddleware('apps'));
+  // Answers as if apps did not exist wherever the table does not.
+  appsRouter.use((req, res, next) => {
+    next(appInstallations.isAvailable() ? undefined : new errors.NotFoundError());
+  });
+
+  appsRouter.get('/installations', http(api.appInstallations.browse));
+  appsRouter.get('/installations/:id', http(api.appInstallations.read));
+  appsRouter.delete('/installations/:id', http(api.appInstallations.destroy));
+
   router.get('/members/:id', mw.authAdminApi, http(api.members.read));
   router.put('/members/:id', mw.authAdminApi, http(api.members.edit));
   router.delete('/members/:id', mw.authAdminApi, http(api.members.destroy));
@@ -396,18 +419,8 @@ module.exports = function apiRoutes() {
   router.post('/db/media/inline', mw.authAdminApi, http(api.db.inlineMedia));
 
   // ## Exports
-  router.get(
-    '/exports/download',
-    mw.authAdminApi,
-    labs.enabledMiddleware('selfServeArchives'),
-    http(api.exports.download),
-  );
-  router.post(
-    '/exports',
-    mw.authAdminApi,
-    labs.enabledMiddleware('selfServeArchives'),
-    http(api.exports.add),
-  );
+  router.get('/exports/download', mw.authAdminApi, http(api.exports.download));
+  router.post('/exports', mw.authAdminApi, http(api.exports.add));
 
   // ## Slack
   router.post('/slack/test', mw.authAdminApi, http(api.slack.sendTest));

package/core/shared/labs.js

@@ -27,15 +27,16 @@ const messages = {
 };
 
 // flags in this list always return `true`, allows quick global enable prior to full flag removal
-// Admin no longer reads admin7Pill, postsListReact or membersActivityReact; they stay enabled
-// for older Admin builds during independent deployments.
+// Admin no longer reads admin7Pill, postsListReact, membersActivityReact or selfServeArchives;
+// they stay enabled for older Admin builds during independent deployments.
 const GA_FEATURES = [
   'automationAnalytics',
+  'automationRunAnalytics',
   'admin7Pill',
   'globalSearchReact',
   'postsListReact',
   'membersActivityReact',
-  'dunningWarnings',
+  'selfServeArchives',
 ];
 
 // These features are considered publicly available and can be enabled/disabled by users
@@ -51,8 +52,6 @@ const PUBLIC_BETA_FEATURES = [
 const PRIVATE_FEATURES = [
   'automations',
   'automationsPerTier',
-  'automationRunAnalytics',
-  'automationsTinybirdSync',
   'stripeAutomaticTax',
   'importMemberTier',
   'csvContentImporter',
@@ -64,7 +63,6 @@ const PRIVATE_FEATURES = [
   'membersCustomFields',
   'stripeCheckoutCollection',
   'paywallImprovements',
-  'selfServeArchives',
   'machinePayments',
   'editorReact',
   'authReact',