ghost 6.61.0 → 6.63.0

package/core/server/services/content-import/import/post-link.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.urlForImportedPost = urlForImportedPost;
+function urlForImportedPost(post, options) {
+    const data = post.toJSON();
+    if (data.status === 'draft') {
+        const editorType = data.type === 'page' ? 'page' : 'post';
+        return new URL(`#/editor/${editorType}/${post.id}`, options.adminUrl).href;
+    }
+    return options.publishedUrl(post);
+}

package/core/server/services/content-import/import/post-repository.js

@@ -12,7 +12,11 @@ class BookshelfPostsRepository {
     write(data, options, metadata = {}) {
         return this._models.Base.transaction(async (transacting) => {
             const writeOptions = { ...options, transacting };
-            const lookupOptions = { ...writeOptions, forUpdate: true };
+            const lookupOptions = {
+                ...writeOptions,
+                forUpdate: true,
+                ...(metadata.runTagName ? { withRelated: ['tags'] } : {}),
+            };
             let existingMatch;
             if (data.comment_id) {
                 const existing = await this._models.Post.findOne({ comment_id: data.comment_id, status: 'all' }, lookupOptions);
@@ -20,6 +24,7 @@ class BookshelfPostsRepository {
                     existingMatch = {
                         post: existing,
                         duplicateReason: `A post with the source ID "${data.comment_id}" already exists.`,
+                        matchedBy: 'source_id',
                     };
                 }
             }
@@ -29,13 +34,18 @@ class BookshelfPostsRepository {
                     existingMatch = {
                         post: existing,
                         duplicateReason: `A post with the slug "${data.slug}" already exists.`,
+                        matchedBy: 'slug',
                     };
                 }
             }
             if (existingMatch) {
-                const { post: existing, duplicateReason } = existingMatch;
+                const { post: existing, duplicateReason, matchedBy } = existingMatch;
+                const duplicate = {
+                    origin: hasRunTag(existing, metadata.runTagName) ? 'this_import' : 'pre_existing',
+                    matchedBy,
+                };
                 if (!metadata.sourceUpdatedAt) {
-                    return { status: 'skipped', reason: duplicateReason };
+                    return { status: 'skipped', reason: duplicateReason, duplicate };
                 }
                 const incomingInstant = new Date(metadata.sourceUpdatedAt).getTime();
                 const storedUpdatedAt = existing.toJSON().updated_at;
@@ -47,6 +57,7 @@ class BookshelfPostsRepository {
                     return {
                         status: 'skipped',
                         reason: 'The existing post is newer than or as recent as the imported row.',
+                        duplicate,
                     };
                 }
                 // Ghost's collision plugin treats updated_at as the client's version token.
@@ -76,3 +87,14 @@ class BookshelfPostsRepository {
     }
 }
 exports.BookshelfPostsRepository = BookshelfPostsRepository;
+function hasRunTag(post, runTagName) {
+    if (!runTagName) {
+        return false;
+    }
+    const tags = post.toJSON().tags;
+    return (Array.isArray(tags) &&
+        tags.some((tag) => typeof tag === 'object' &&
+            tag !== null &&
+            'name' in tag &&
+            tag.name === runTagName));
+}

package/core/server/services/content-import/import/reader.js

@@ -5,6 +5,13 @@ const csv_1 = require("../csv");
 const row_1 = require("./row");
 const FIELD_BY_HEADER = Object.fromEntries(row_1.EDITORIAL_POST_FIELDS.map((field) => [field, field]));
 async function readPostRows(path, mapping) {
-    const rows = await (0, csv_1.parse)(path, mapping ?? FIELD_BY_HEADER);
-    return rows.map((row) => row_1.postImportRowSchema.parse(row));
+    const parsed = await (0, csv_1.parseWithSource)(path, mapping ?? FIELD_BY_HEADER);
+    return {
+        columns: parsed.columns,
+        rows: parsed.rows.map(({ data, source, line }) => ({
+            data: row_1.postImportRowSchema.parse(data),
+            source,
+            line,
+        })),
+    };
 }

package/core/server/services/content-import/import/report.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = buildImportReport;
+const csv_1 = require("../csv");
+const REPORT_COLUMNS = [
+    'line',
+    'title',
+    'outcome',
+    'reason',
+    'duplicate_origin',
+    'matched_by',
+    'warnings',
+    'media_failures',
+    'post_url',
+];
+function formatMediaFailures(row) {
+    return (row.mediaFailures?.map(({ sourceUrl, reason }) => `${sourceUrl}: ${reason}`).join('\n') ?? '');
+}
+function buildImportReport(run) {
+    if (!run.rows.length) {
+        return undefined;
+    }
+    return (0, csv_1.serialize)(run.rows.map((row) => ({
+        line: row.line,
+        title: row.title ?? '',
+        outcome: row.duplicate ? 'duplicate' : row.status,
+        reason: row.reason ?? '',
+        duplicate_origin: row.duplicate?.origin ?? '',
+        matched_by: row.duplicate?.matchedBy ?? '',
+        warnings: row.warnings?.join('\n') ?? '',
+        media_failures: formatMediaFailures(row),
+        post_url: row.url ?? '',
+    })), { columns: REPORT_COLUMNS });
+}

package/core/server/services/content-import/import/row.js

@@ -36,7 +36,6 @@ exports.EDITORIAL_POST_FIELDS = [
     'custom_template',
     'codeinjection_head',
     'codeinjection_foot',
-    'frontmatter',
 ];
 // An empty cell (or the literal 'undefined') reads as absent, not as a value.
 const optionalCell = zod_1.z
@@ -82,7 +81,6 @@ exports.postImportRowSchema = zod_1.z
     custom_template: optionalCell,
     codeinjection_head: optionalCell,
     codeinjection_foot: optionalCell,
-    frontmatter: optionalCell,
 })
     .loose();
 const ENUM_FIELDS = {

package/core/server/services/content-import/import/schema.js

@@ -26,4 +26,5 @@ exports.importRequestSchema = zod_1.z.object({
     filePath: zod_1.z.string().min(1),
     fileName: zod_1.z.string().min(1),
     mapping: exports.mappingSchema.optional(),
+    requestUserEmail: zod_1.z.string().email().nullable().optional(),
 });

package/core/server/services/content-import/import/staged-file.js

@@ -0,0 +1,29 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createImportFileStager = createImportFileStager;
+const node_crypto_1 = __importDefault(require("node:crypto"));
+const node_os_1 = __importDefault(require("node:os"));
+const node_path_1 = __importDefault(require("node:path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+function createImportFileStager() {
+    return {
+        async stage({ filePath, fileName }) {
+            const stagedPath = node_path_1.default.join(node_os_1.default.tmpdir(), `content-csv-import-${node_crypto_1.default.randomUUID()}`);
+            try {
+                await fs_extra_1.default.copyFile(filePath, stagedPath, fs_extra_1.default.constants.COPYFILE_EXCL);
+                await fs_extra_1.default.chmod(stagedPath, 0o600);
+            }
+            catch (error) {
+                await fs_extra_1.default.remove(stagedPath).catch(() => { });
+                throw error;
+            }
+            return { path: stagedPath, name: fileName };
+        },
+        async remove(file) {
+            await fs_extra_1.default.remove(file.path);
+        },
+    };
+}

package/core/server/services/content-import/import/store.js

@@ -10,17 +10,19 @@ const MAX_RUN_AGE_MS = 60 * 60 * 1000;
 class ImportRunStore {
     // Insertion-ordered, so count-eviction drops the oldest run first.
     _runs = new Map();
+    _settledWaiters = new Set();
     _now;
     constructor({ now = () => new Date() } = {}) {
         this._now = now;
     }
-    create(id, total) {
+    create(id, total, sourceColumns = []) {
         this.evict();
         const run = {
             id,
             status: 'running',
             startedAt: this._now(),
             total,
+            sourceColumns,
             rows: [],
         };
         this._runs.set(id, run);
@@ -47,10 +49,31 @@ class ImportRunStore {
     get(id) {
         return this._runs.get(id);
     }
+    release(id) {
+        this._runs.delete(id);
+        this.resolveSettledWaiters();
+    }
+    allSettled() {
+        if (this._runs.size === 0) {
+            return Promise.resolve();
+        }
+        return new Promise((resolve) => {
+            this._settledWaiters.add(resolve);
+        });
+    }
+    resolveSettledWaiters() {
+        if (this._runs.size > 0) {
+            return;
+        }
+        for (const resolve of this._settledWaiters) {
+            resolve();
+        }
+        this._settledWaiters.clear();
+    }
     // A running run is never evicted, whatever its age: the job holds only the runId,
     // so evicting mid-import would silently turn its record()/finish() calls into
     // no-ops and lose the report. The count cap can briefly overshoot while several
-    // imports run at once; the inline job queue bounds how many that can be.
+    // imports run at once; the jobs backend bounds how many that can be.
     evict() {
         const cutoff = this._now().getTime() - MAX_RUN_AGE_MS;
         for (const [id, run] of this._runs) {

package/core/server/services/content-import/index.js

@@ -5,13 +5,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = init;
 exports.importCSV = importCSV;
+exports.handleJob = handleJob;
+exports.allSettled = allSettled;
 const zod_1 = require("zod");
 const importer_1 = __importDefault(require("./import/importer"));
+const completion_email_1 = __importDefault(require("./import/completion-email"));
 const post_repository_1 = require("./import/post-repository");
 const reader_1 = __importDefault(require("./import/reader"));
 const schema_1 = require("./import/schema");
 const store_1 = require("./import/store");
 const source_1 = require("./import/source");
+const media_1 = require("./import/media");
+const local_media_url_1 = require("./import/local-media-url");
+const post_link_1 = require("./import/post-link");
+const staged_file_1 = require("./import/staged-file");
+const jobs_service_1 = require("../jobs-service");
 // The request is built from HTTP upload metadata, so it is validated at the
 // service boundary rather than trusted.
 // A junk timezone setting falls back to UTC rather than mis-stamping the batch tag.
@@ -26,12 +34,16 @@ function makeImporter() {
     // are guaranteed loaded.
     const models = require('../../models');
     const lexicalLib = require('../../lib/lexical');
-    const jobsService = require('../jobs');
     const settingsCache = require('../../../shared/settings-cache');
     const urlService = require('../url');
+    const urlUtils = require('../../../shared/url-utils').default;
+    const mediaInlinerService = require('../media-inliner');
+    const config = require('../../../shared/config');
     const ObjectID = require('bson-objectid').default;
-    // Inline jobs never reach the job manager's Sentry handler, which is wired to the
-    // offloaded worker path only, so a throw here would be seen by nobody.
+    const { GhostMailer } = require('../mail');
+    const ghostMailer = new GhostMailer();
+    // Row aggregates and best-effort cleanup are intentionally reported without
+    // failing a run. Fatal handler errors are reported by the class-based jobs service.
     const report = (error) => {
         try {
             logging.error({ event: { name: 'content.import.error' }, err: error }, '[Background Job] content-import error');
@@ -41,6 +53,10 @@ function makeImporter() {
             // Callers report from catch blocks, so this must not throw.
         }
     };
+    const email = {
+        send: (run, recipient) => ghostMailer.send((0, completion_email_1.default)(run, recipient, urlUtils.urlFor('admin', true))),
+        getDefaultRecipient: async () => (await models.User.getOwnerUser()).get('email'),
+    };
     return new importer_1.default({
         readRows: reader_1.default,
         prepareSource: source_1.prepareImportSource,
@@ -48,11 +64,27 @@ function makeImporter() {
         getHtmlToLexical: () => lexicalLib.htmlToLexicalConverter,
         getMarkdownToHtml: () => require('@tryghost/kg-markdown-html-renderer').render,
         getCleanHTML: () => require('@tryghost/mg-clean-html').cleanHTML,
-        addJob: jobsService.addJob.bind(jobsService),
+        createMediaInliner: () => new media_1.PostMediaInliner({
+            media: mediaInlinerService.getInstance(),
+            isLocalMediaUrl: (sourceUrl) => (0, local_media_url_1.isLocalMediaUrl)(sourceUrl, {
+                siteUrl: config.getSiteUrl(),
+                subdir: config.getSubdir(),
+                assetBaseUrls: [
+                    config.get('urls:image'),
+                    config.get('urls:media'),
+                    config.get('urls:files'),
+                ],
+            }),
+        }),
+        email,
+        dispatchJob: (job) => (0, jobs_service_1.getInstance)().dispatch(job),
+        fileStager: (0, staged_file_1.createImportFileStager)(),
         report,
         store: new store_1.ImportRunStore(),
-        // Degrades to the 404 URL for a post the URL service cannot route yet (e.g. a draft).
-        urlForPost: (post) => urlService.getUrlForResource({ ...post.toJSON(), type: 'posts' }, { absolute: true }),
+        urlForPost: (post) => (0, post_link_1.urlForImportedPost)(post, {
+            adminUrl: urlUtils.urlFor('admin', true),
+            publishedUrl: (publishedPost) => urlService.getUrlForResource({ ...publishedPost.toJSON(), type: 'posts' }, { absolute: true }),
+        }),
         newRunId: () => new ObjectID().toHexString(),
         getTimezone: () => timezoneSchema.parse(settingsCache.get('timezone')),
     });
@@ -75,3 +107,17 @@ function importCSV(request) {
     }
     return importer.importCSV(parsedRequest.data);
 }
+function handleJob(job) {
+    if (!importer) {
+        throw new errors.InternalServerError({ message: 'Content import service used before init' });
+    }
+    return importer.handle(job);
+}
+// Test-facing parity with the legacy inline queue while the import run store
+// remains in memory. M8 removes this together with that store.
+function allSettled() {
+    if (!importer) {
+        return Promise.resolve();
+    }
+    return importer.allSettled();
+}

package/core/server/services/content-import/jobs/content-csv-import-job.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const job_1 = require("../../jobs-service/job");
+class ContentCSVImportJob extends job_1.Job {
+    static type = 'content-csv-import';
+    importId;
+    file;
+    mapping;
+    importTagNames;
+    emailRecipient;
+    constructor(data) {
+        super();
+        this.importId = data.importId;
+        this.file = data.file;
+        this.mapping = data.mapping;
+        this.importTagNames = data.importTagNames;
+        this.emailRecipient = data.emailRecipient;
+    }
+}
+exports.default = ContentCSVImportJob;

package/core/server/services/custom-redirects/redirect-config-parser.js

@@ -45,7 +45,7 @@ const messages = {
     jsonInvalid: 'JSON input must be an array of redirect objects.',
     yamlParse: 'Could not parse YAML: {context}.',
     yamlInvalid: 'YAML input is invalid. Check the contents of your YAML file.',
-    redirectsHelp: 'https://ghost.org/docs/themes/routing/#redirects',
+    redirectsHelp: 'https://docs.ghost.org/themes/routing/#redirects',
 };
 const parseJson = (content) => {
     let parsed;
@@ -124,7 +124,7 @@ const parseYaml = (content) => {
 exports.parseYaml = parseYaml;
 // Round-trips through parseYaml to []. Avoids a "download → save →
 // re-upload throws on empty body" footgun on fresh installs.
-const EMPTY_DOWNLOAD_TEMPLATE = '# See https://ghost.org/docs/themes/routing/#redirects\n301: {}\n302: {}\n';
+const EMPTY_DOWNLOAD_TEMPLATE = '# See https://docs.ghost.org/themes/routing/#redirects\n301: {}\n302: {}\n';
 const serializeToYaml = (redirects) => {
     const permanent = [];
     const temporary = [];

package/core/server/services/custom-redirects/redirects-service.js

@@ -44,7 +44,7 @@ const dynamic_redirect_manager_1 = __importDefault(require("../lib/dynamic-redir
 const errify_1 = require("../../../shared/errify");
 const messages = {
     redirectsRegister: 'Could not register custom redirects.',
-    redirectsHelp: 'https://ghost.org/docs/themes/routing/#redirects',
+    redirectsHelp: 'https://docs.ghost.org/themes/routing/#redirects',
     skippedInvalidRedirect: 'Skipped invalid redirect: {context}',
     rejectedRedirect: 'Could not register redirect: {from} -> {to}',
     allRedirectsSkipped: 'None of the {total} redirect(s) in the store could be activated. Check the logged errors above.',

package/core/server/services/custom-redirects/validation.js

@@ -5,7 +5,7 @@ const errors = require('@tryghost/errors');
 const messages = {
   redirectsWrongFormat: 'Incorrect redirects file format.',
   invalidRedirectsFromRegex: 'Incorrect RegEx in redirects file.',
-  redirectsHelp: 'https://ghost.org/docs/themes/routing/#redirects',
+  redirectsHelp: 'https://docs.ghost.org/themes/routing/#redirects',
 };
 
 /**

package/core/server/services/email-address/email-address-parser.js

@@ -1,53 +1,45 @@
-const addressparser = require('nodemailer/lib/addressparser');
-
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stringify = exports.parse = void 0;
+const addressparser_1 = __importDefault(require("nodemailer/lib/addressparser"));
 /**
- * @typedef {Object} EmailAddress
- * @property {string} address - The email address
- * @property {string} [name] - Optional name associated with the email
+ * Parse an email string into an EmailAddress object
+ * @param email Email string to parse
+ * @returns Parsed email or null if invalid
  */
-
-module.exports = class EmailAddressParser {
-  /**
-   * Parse an email string into an EmailAddress object
-   * @param {string} email - Email string to parse
-   * @returns {EmailAddress|null} Parsed email or null if invalid
-   */
-  static parse(email) {
+const parse = (email) => {
     if (!email || typeof email !== 'string' || !email.length) {
-      return null;
+        return null;
     }
-
-    const parsed = addressparser(email);
-
+    const parsed = (0, addressparser_1.default)(email);
     if (parsed.length !== 1) {
-      return null;
+        return null;
     }
     const first = parsed[0];
-
     // Check first has a group property
     if ('group' in first) {
-      // Unsupported format
-      return null;
+        // Unsupported format
+        return null;
     }
-
     return {
-      address: first.address,
-      name: first.name || undefined,
+        address: first.address,
+        name: first.name || undefined,
     };
-  }
-
-  /**
-   * Convert an EmailAddress object to a string representation
-   * @param {EmailAddress} email - Email object to stringify
-   * @returns {string} String representation of the email
-   */
-  static stringify(email) {
+};
+exports.parse = parse;
+/**
+ * Convert an EmailAddress object to a string representation
+ * @param email Email object to stringify
+ * @returns String representation of the email
+ */
+const stringify = (email) => {
     if (!email.name) {
-      return email.address;
+        return email.address;
     }
-
     const escapedName = email.name.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
-
     /**
      * https://linear.app/ghost/issue/ONC-969
      *
@@ -65,8 +57,8 @@ module.exports = class EmailAddressParser {
      * We remove these characters from the name.
      */
     const nameCleanedForGmail = escapedName
-      .replace(/[\u2705\u2713\u2714\u2611\u{1F5F8}]/gu, '')
-      .trim();
+        .replace(/[\u2705\u2713\u2714\u2611\u{1F5F8}]/gu, '')
+        .trim();
     return `"${nameCleanedForGmail}" <${email.address}>`;
-  }
 };
+exports.stringify = stringify;

package/core/server/services/email-address/email-address-service.js

@@ -1,11 +1,44 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmailAddressService = void 0;
 const logging_1 = __importDefault(require("@tryghost/logging"));
-const email_address_parser_js_1 = __importDefault(require("./email-address-parser.js"));
+const emailAddressParser = __importStar(require("./email-address-parser"));
 class EmailAddressService {
     #getManagedEmailEnabled;
     #getSendingDomain;
@@ -25,7 +58,7 @@ class EmailAddressService {
             if (!fallbackAddress) {
                 return null;
             }
-            return email_address_parser_js_1.default.parse(fallbackAddress);
+            return emailAddressParser.parse(fallbackAddress);
         };
         this.#isValidEmailAddress = dependencies.isValidEmailAddress;
     }
@@ -54,8 +87,8 @@ class EmailAddressService {
         return transformed.from.address;
     }
     getAddressFromString(from, replyTo) {
-        const parsedFrom = email_address_parser_js_1.default.parse(from);
-        const parsedReplyTo = replyTo ? email_address_parser_js_1.default.parse(replyTo) : undefined;
+        const parsedFrom = emailAddressParser.parse(from);
+        const parsedReplyTo = replyTo ? emailAddressParser.parse(replyTo) : undefined;
         return this.getAddress({
             from: parsedFrom ?? this.defaultFromEmail,
             replyTo: parsedReplyTo ?? undefined,

package/core/server/services/email-analytics/index.js

@@ -20,7 +20,6 @@ const constants_1 = require("../member-welcome-emails/constants");
 const automation_email_analytics_batch_processor_1 = require("./automation-email-analytics-batch-processor");
 const gift_email_analytics_batch_processor_1 = require("./gift-email-analytics-batch-processor");
 const start_gift_email_analytics_job_event_1 = require("./events/start-gift-email-analytics-job-event");
-const gifts_1 = require("../gifts");
 const constants_2 = require("../gifts/constants");
 exports.newsletters = new email_analytics_service_wrapper_1.EmailAnalyticsServiceWrapper({
     logName: 'newsletters',
@@ -31,7 +30,7 @@ exports.automations = new email_analytics_service_wrapper_1.EmailAnalyticsServic
 exports.gifts = new email_analytics_service_wrapper_1.EmailAnalyticsServiceWrapper({
     logName: 'gifts',
 });
-const init = ({ automationsApi, config, db, domainEvents, emailSuppressionList, membersRepository, models: { Email, EmailRecipientFailure, EmailSpamComplaintEvent }, metrics, prometheusClient, settingsCache, }) => {
+const init = ({ automationsApi, config, db, domainEvents, emailSuppressionList, giftDeliveryService, membersRepository, models: { Email, EmailRecipientFailure, EmailSpamComplaintEvent }, metrics, prometheusClient, settingsCache, }) => {
     const queries = new queries_1.Queries(db.knex);
     const newsletterEmailEventProcessor = new email_event_processor_1.default({
         domainEvents,
@@ -133,11 +132,7 @@ const init = ({ automationsApi, config, db, domainEvents, emailSuppressionList,
         },
         metrics,
         settingsCache,
-        createEventProcessor: () => new gift_email_analytics_batch_processor_1.GiftEmailAnalyticsBatchProcessor({
-            giftDeliveryService: {
-                recordOutcome: (data) => gifts_1.deliveryService.recordOutcome(data),
-            },
-        }),
+        createEventProcessor: () => new gift_email_analytics_batch_processor_1.GiftEmailAnalyticsBatchProcessor({ giftDeliveryService }),
     });
 };
 exports.init = init;

package/core/server/services/email-service/CONTEXT.md

@@ -0,0 +1,37 @@
+# Newsletter Email Sending
+
+Newsletter Email Sending covers the preparation and submission of newsletter emails to the configured email provider.
+
+## Language
+
+**Sending status**:
+The state of a newsletter email's send: preparing, submitting, submitted, or failed. It is separate from any later provider-reported outcome.
+_Avoid_: Delivery status, provider outcome
+
+**Sending phase**:
+The part of a send, before it is submitted or fails, that progress and failures are reported against: preparing or submitting.
+_Avoid_: Step, stage
+
+**Preparing**:
+The sending phase while none of a newsletter email's recipient batches has started submitting, including before any sending work has begun.
+_Avoid_: Pending, queued
+
+**Submitting**:
+The sending phase once at least one recipient batch has started submitting to the configured email provider and the send has not yet been submitted or failed.
+_Avoid_: Sending, delivering
+
+**Sending progress**:
+The completed and total recipient counts for the current sending phase.
+_Avoid_: Delivery progress, expected count
+
+**Submitted**:
+Every batch of a newsletter email has been accepted by the configured email provider. Submission does not mean that recipients have received the email.
+_Avoid_: Sent, delivered
+
+**Failed**:
+Sending stopped with an error and will not continue without a retry.
+_Avoid_: Bounced, rejected
+
+**Failed during**:
+The sending phase a failed newsletter email was in when sending stopped.
+_Avoid_: Failure step