@dxv-systems/helpdesk 0.1.0 → 0.3.0

package/dist/bounce.d.ts

@@ -1,5 +1,11 @@
 import type { HelpdeskStore, Thread } from "./types";
 export declare function bouncedReplyRefs(bodyText: string): string[];
+export interface BounceReport {
+    recipient: string | null;
+    statusCode: string | null;
+    diagnostic: string;
+}
+export declare function readBounceReport(text: string): BounceReport;
 export declare function matchBounce(store: HelpdeskStore, input: {
     mailbox: string;
     refs: string[];

package/dist/bounce.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bouncedReplyRefs = bouncedReplyRefs;
+exports.readBounceReport = readBounceReport;
 exports.matchBounce = matchBounce;
 const threading_1 = require("./threading");
 const QUOTED_HEADER = /^(?:in-reply-to|references)[ \t]*:[ \t]*(.*(?:\r?\n[ \t]+.*)*)/gim;
@@ -15,6 +16,43 @@ function bouncedReplyRefs(bodyText) {
     }
     return [...ids];
 }
+const MAX_DIAGNOSTIC_CHARS = 2000;
+const ADDRESS = String.raw `<?([^\s<>;:()"',]+@[^\s<>;:()"',]+)>?`;
+const RECIPIENT_PATTERNS = [
+    new RegExp(String.raw `^(?:final|original)-recipient:[ \t]*(?:rfc822;)?[ \t]*${ADDRESS}[ \t]*$`, "im"),
+    new RegExp(String.raw `^recipient:[ \t]*${ADDRESS}[ \t]*$`, "im"),
+    new RegExp(String.raw `(?:your message to|je bericht aan|uw bericht aan)[ \t]+${ADDRESS}(?=[\s.,]|$)`, "i"),
+    new RegExp(String.raw `(?:delivery has failed to these recipients or groups|bezorging is mislukt voor deze ontvangers of groepen):\s*${ADDRESS}(?=[\s.,]|$)`, "i"),
+];
+const CODE_PATTERNS = [/\b[245]\d\d[ -]#?([245]\.\d{1,3}\.\d{1,3})\b/, /(?:status:|#)[ \t]*([245]\.\d{1,3}\.\d{1,3})\b/i, /\b([45]\.\d{1,3}\.\d{1,3})\b/];
+const DIAGNOSTIC_START = /(?:diagnostic information for administrators|diagnostische gegevens voor beheerders)\s*:/i;
+const DIAGNOSTIC_END = /(?:original message headers|oorspronkelijke berichtkoppen)\s*:/i;
+function readBounceReport(text) {
+    const body = text.replace(/\r\n?/g, "\n");
+    let recipient = null;
+    for (const re of RECIPIENT_PATTERNS) {
+        const found = re.exec(body)?.[1];
+        if (found) {
+            recipient = found.replace(/[.]+$/, "").toLowerCase();
+            break;
+        }
+    }
+    let statusCode = null;
+    for (const re of CODE_PATTERNS) {
+        const found = re.exec(body)?.[1];
+        if (found) {
+            statusCode = found;
+            break;
+        }
+    }
+    const start = DIAGNOSTIC_START.exec(body);
+    const rest = start ? body.slice(start.index + start[0].length) : body;
+    const end = DIAGNOSTIC_END.exec(rest);
+    let diagnostic = (end ? rest.slice(0, end.index) : rest).replace(/\n{3,}/g, "\n\n").trim();
+    if (diagnostic.length > MAX_DIAGNOSTIC_CHARS)
+        diagnostic = `${diagnostic.slice(0, MAX_DIAGNOSTIC_CHARS).trimEnd()}…`;
+    return { recipient, statusCode, diagnostic };
+}
 const awaitsDelivery = (t) => t.state === "sent" || t.state === "waiting";
 async function matchBounce(store, input) {
     const { mailbox, refs, conversationId } = input;

package/dist/controls.js

@@ -10,8 +10,7 @@ const errors_1 = require("./errors");
 exports.DEFAULT_WRITE_MODE = "read_only";
 const ALLOWED_WRITES = {
     read_only: [],
-    drafts_in_app: ["createReply", "updateDraftBody", "addAttachment", "sendDraft"],
-    drafts_in_outlook: ["createReply", "updateDraftBody", "addAttachment", "sendDraft", "deleteDraft"],
+    approve_and_send: ["createReply", "updateDraftBody", "addAttachment", "sendDraft"],
 };
 const norm = (address) => address.trim().toLowerCase();
 const paused = () => ({ status: "paused" });
@@ -79,9 +78,5 @@ function guardedGateway(deps, mailbox, mode) {
             allow("sendDraft");
             return gw.sendDraft(id);
         },
-        async deleteDraft(id) {
-            allow("deleteDraft");
-            return gw.deleteDraft(id);
-        },
     };
 }

package/dist/draft-body.d.ts

@@ -1,5 +1,4 @@
 export declare function renderCommentHtml(text: string): string;
 export declare function findQuoteStart(html: string): number;
 export declare function hasQuotedHistory(html: string): boolean;
-export declare function replaceDraftComment(placedBodyHtml: string, newComment: string): string;
 export declare function prependToDraftBody(bodyHtml: string, text: string): string;

package/dist/draft-body.js

@@ -3,9 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderCommentHtml = renderCommentHtml;
 exports.findQuoteStart = findQuoteStart;
 exports.hasQuotedHistory = hasQuotedHistory;
-exports.replaceDraftComment = replaceDraftComment;
 exports.prependToDraftBody = prependToDraftBody;
-const errors_1 = require("./errors");
 const QUOTE_MARKERS = [
     /<div[^>]*\bid=["']appendonsend["']/i,
     /<div[^>]*\bid=["']divRplyFwdMsg["']/i,
@@ -33,18 +31,6 @@ function findQuoteStart(html) {
 function hasQuotedHistory(html) {
     return findQuoteStart(html) >= 0;
 }
-function replaceDraftComment(placedBodyHtml, newComment) {
-    const quoteAt = findQuoteStart(placedBodyHtml);
-    if (quoteAt < 0)
-        throw new errors_1.QuoteNotFoundError();
-    const bodyTag = /<body\b[^>]*>/i.exec(placedBodyHtml);
-    const commentAt = bodyTag ? bodyTag.index + bodyTag[0].length : 0;
-    if (commentAt > quoteAt)
-        throw new errors_1.QuoteNotFoundError();
-    return (placedBodyHtml.slice(0, commentAt) +
-        renderCommentHtml(newComment) +
-        placedBodyHtml.slice(quoteAt));
-}
 function prependToDraftBody(bodyHtml, text) {
     const bodyTag = /<body\b[^>]*>/i.exec(bodyHtml);
     const at = bodyTag ? bodyTag.index + bodyTag[0].length : 0;

package/dist/drafting.d.ts

@@ -1,4 +1,4 @@
-import type { DraftResult, DraftRun, HelpdeskDeps, Paused, StoredMessage, Thread, WriteBlocked } from "./types";
+import type { DraftResult, DraftRun, HelpdeskDeps, Paused, StoredMessage, Thread } from "./types";
 export declare function currentReplyRun(deps: HelpdeskDeps, thread: Thread, run: DraftRun | null): DraftRun | null;
 export type EnsureDraftOutcome = "started" | "exists" | "busy" | "not_needed" | "no_drafter" | "paused";
 export declare function ensureDraft(deps: HelpdeskDeps, threadId: string, message: StoredMessage): Promise<EnsureDraftOutcome>;
@@ -14,6 +14,5 @@ export declare function editDraft(deps: HelpdeskDeps, input: {
     threadId: string;
     text: string;
 }): Promise<DraftRun | Paused>;
-export declare function retryPlacement(deps: HelpdeskDeps, threadId: string): Promise<DraftRun | Paused | WriteBlocked>;
 export declare function sweepStuckDrafts(deps: HelpdeskDeps, mailbox: string): Promise<number | Paused>;
 export declare function unignoreThread(deps: HelpdeskDeps, threadId: string): Promise<Thread | Paused>;

package/dist/drafting.js

@@ -6,12 +6,9 @@ exports.startDraftFor = startDraftFor;
 exports.completeDraft = completeDraft;
 exports.regenerateDraft = regenerateDraft;
 exports.editDraft = editDraft;
-exports.retryPlacement = retryPlacement;
 exports.sweepStuckDrafts = sweepStuckDrafts;
 exports.unignoreThread = unignoreThread;
-const cleanup_1 = require("./cleanup");
 const controls_1 = require("./controls");
-const draft_body_1 = require("./draft-body");
 const errors_1 = require("./errors");
 const internal_1 = require("./internal");
 const states_1 = require("./states");
@@ -29,8 +26,6 @@ function currentReplyRun(deps, thread, run) {
 function reviewReasonFor(deps, thread, run) {
     if (run.status === "failed")
         return "drafter_failed";
-    if (run.placementError)
-        return "placement_failed";
     if (thread.latestInboundId !== run.inboundMessageId)
         return "stale_draft";
     if ((run.confidence ?? 0) < (deps.config.minConfidence ?? DEFAULT_MIN_CONFIDENCE)) {
@@ -88,8 +83,6 @@ function newRun(deps, thread, messageId, generation) {
         placedDraftId: null,
         placedBodyHtml: null,
         commentText: null,
-        placementError: null,
-        draftCleanupError: null,
     };
 }
 async function ensureDraft(deps, threadId, message) {
@@ -132,31 +125,10 @@ async function startDraftFor(deps, threadId, message) {
     await startRun(deps, run, message);
     return "started";
 }
-async function place(deps, access, run, text) {
-    let placed;
-    try {
-        const draft = await access.gateway().createReply(run.inboundMessageId, { comment: text });
-        placed = await deps.store.updateDraftRun(run.idempotencyKey, {
-            placedDraftId: draft.id,
-            placedBodyHtml: draft.body.content,
-            placementError: null,
-        });
-    }
-    catch (err) {
-        return deps.store.updateDraftRun(run.idempotencyKey, { placementError: (0, internal_1.errorText)(err) });
-    }
-    const previous = run.generation > 1
-        ? await deps.store.getDraftRunGeneration(run.mailbox, run.inboundMessageId, run.generation - 1)
-        : null;
-    if (previous)
-        await (0, cleanup_1.discardPlacedDraft)(deps, previous, access, run.threadId);
-    return placed;
-}
 async function completeDraft(deps, input) {
-    const controls = await (0, controls_1.loadControls)(deps);
-    if (controls.paused)
+    if ((await (0, controls_1.loadControls)(deps)).paused)
         return (0, controls_1.paused)();
-    const access = (0, controls_1.mailboxAccess)(deps, controls, input.mailbox);
+    (0, controls_1.assertInScope)(deps.config, input.mailbox);
     const run = await deps.store.getLatestDraftRun(input.mailbox, input.inboundMessageId);
     if (!run)
         throw new errors_1.DraftNotReadyError(input.inboundMessageId, "no draft run recorded");
@@ -169,7 +141,7 @@ async function completeDraft(deps, input) {
         await failRun(deps, run, result.error);
         return deps.store.updateDraftRun(run.idempotencyKey, {});
     }
-    let current = await deps.store.updateDraftRun(run.idempotencyKey, {
+    const current = await deps.store.updateDraftRun(run.idempotencyKey, {
         status: "succeeded",
         text: result.text,
         commentText: result.text,
@@ -177,8 +149,6 @@ async function completeDraft(deps, input) {
         reason: result.reason,
         category: result.category ?? null,
     });
-    if (access.mode === "drafts_in_outlook")
-        current = await place(deps, access, current, result.text);
     const thread = await (0, internal_1.loadThread)(deps, run.threadId);
     if (thread.state === "new" || thread.state === "drafted")
         await moveToReview(deps, thread, current);
@@ -203,7 +173,7 @@ async function regenerateDraft(deps, threadId) {
         await startRun(deps, run, message);
     return run;
 }
-async function writeStaffReply(deps, access, thread, text) {
+async function writeStaffReply(deps, thread, text) {
     const inboundId = thread.latestInboundId;
     if (!inboundId)
         throw new errors_1.DraftNotReadyError(thread.id, "no inbound message");
@@ -217,65 +187,27 @@ async function writeStaffReply(deps, access, thread, text) {
     });
     if (run.status !== "succeeded")
         throw new errors_1.DraftNotReadyError(thread.id, "a draft is being written");
-    let current = await deps.store.updateDraftRun(run.idempotencyKey, { commentText: text });
-    if (access.mode === "drafts_in_outlook")
-        current = await place(deps, access, current, text);
-    const reviewReason = current.placementError ? "placement_failed" : "staff_edited";
-    await (0, internal_1.applyEvents)(deps, thread, ["redraft", "needs_review"], { reviewReason });
+    const current = await deps.store.updateDraftRun(run.idempotencyKey, { commentText: text });
+    await (0, internal_1.applyEvents)(deps, thread, ["redraft", "needs_review"], { reviewReason: "staff_edited" });
     return current;
 }
 async function editDraft(deps, input) {
-    const controls = await (0, controls_1.loadControls)(deps);
-    if (controls.paused)
+    if ((await (0, controls_1.loadControls)(deps)).paused)
         return (0, controls_1.paused)();
     const thread = await (0, internal_1.loadThread)(deps, input.threadId);
-    const access = (0, controls_1.mailboxAccess)(deps, controls, thread.mailbox);
+    (0, controls_1.assertInScope)(deps.config, thread.mailbox);
     if (input.text.trim() === "")
         throw new errors_1.EmptyReplyError(thread.id);
     const run = currentReplyRun(deps, thread, await deps.store.getLatestDraftRunForThread(thread.id));
     if (!run)
-        return writeStaffReply(deps, access, thread, input.text);
-    if (access.mode !== "drafts_in_outlook") {
-        if (run?.status !== "succeeded")
-            throw new errors_1.DraftNotReadyError(thread.id, "no draft text to edit");
-        (0, states_1.transition)(thread.state, "redraft");
-        const updated = await deps.store.updateDraftRun(run.idempotencyKey, { commentText: input.text });
-        await (0, internal_1.applyEvents)(deps, thread, ["redraft", "needs_review"], { reviewReason: "staff_edited" });
-        return updated;
-    }
-    if (!run?.placedDraftId || run.placedBodyHtml === null) {
-        throw new errors_1.DraftNotReadyError(thread.id, "no placed draft to edit");
-    }
+        return writeStaffReply(deps, thread, input.text);
+    if (run.status !== "succeeded")
+        throw new errors_1.DraftNotReadyError(thread.id, "no draft text to edit");
     (0, states_1.transition)(thread.state, "redraft");
-    const body = (0, draft_body_1.replaceDraftComment)(run.placedBodyHtml, input.text);
-    await access.gateway().updateDraftBody(run.placedDraftId, { contentType: "html", content: body });
-    const updated = await deps.store.updateDraftRun(run.idempotencyKey, {
-        placedBodyHtml: body,
-        commentText: input.text,
-    });
+    const updated = await deps.store.updateDraftRun(run.idempotencyKey, { commentText: input.text });
     await (0, internal_1.applyEvents)(deps, thread, ["redraft", "needs_review"], { reviewReason: "staff_edited" });
     return updated;
 }
-async function retryPlacement(deps, threadId) {
-    const controls = await (0, controls_1.loadControls)(deps);
-    if (controls.paused)
-        return (0, controls_1.paused)();
-    const thread = await (0, internal_1.loadThread)(deps, threadId);
-    const access = (0, controls_1.mailboxAccess)(deps, controls, thread.mailbox);
-    if (access.mode !== "drafts_in_outlook")
-        return { status: "write_blocked", mode: access.mode };
-    const run = await deps.store.getLatestDraftRunForThread(thread.id);
-    const text = run?.status === "succeeded" ? (run.commentText ?? run.text) : null;
-    if (!run || text === null)
-        throw new errors_1.DraftNotReadyError(thread.id, "no stored draft text to place");
-    if (run.placedDraftId)
-        return run;
-    const placed = await place(deps, access, run, text);
-    if (!placed.placementError && thread.state === "review") {
-        await (0, internal_1.applyEvents)(deps, thread, ["redraft", "needs_review"], { reviewReason: "policy" });
-    }
-    return placed;
-}
 async function sweepStuckDrafts(deps, mailbox) {
     if ((await (0, controls_1.loadControls)(deps)).paused)
         return (0, controls_1.paused)();

package/dist/errors.d.ts

@@ -29,9 +29,6 @@ export declare class EmptyReplyError extends HelpdeskError {
 export declare class StaleDraftError extends HelpdeskError {
     constructor(threadId: string);
 }
-export declare class QuoteNotFoundError extends HelpdeskError {
-    constructor();
-}
 export declare class MailboxNotInScopeError extends HelpdeskError {
     readonly mailbox: string;
     constructor(mailbox: string);

package/dist/errors.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ThreadNotFoundError = exports.ReplyAttachmentNotFoundError = exports.AttachmentLimitError = exports.AttachmentsUnavailableError = exports.SendPendingError = exports.MailboxWriteBlockedError = exports.MailboxNotInScopeError = exports.QuoteNotFoundError = exports.StaleDraftError = exports.EmptyReplyError = exports.DraftNotReadyError = exports.DeltaLinkExpiredError = exports.InvalidDeltaPageError = exports.MailboxNotConnectedError = exports.StaleThreadError = exports.InvalidTransitionError = exports.HelpdeskError = void 0;
+exports.ThreadNotFoundError = exports.ReplyAttachmentNotFoundError = exports.AttachmentLimitError = exports.AttachmentsUnavailableError = exports.SendPendingError = exports.MailboxWriteBlockedError = exports.MailboxNotInScopeError = exports.StaleDraftError = exports.EmptyReplyError = exports.DraftNotReadyError = exports.DeltaLinkExpiredError = exports.InvalidDeltaPageError = exports.MailboxNotConnectedError = exports.StaleThreadError = exports.InvalidTransitionError = exports.HelpdeskError = void 0;
 exports.isDeltaLinkExpired = isDeltaLinkExpired;
 exports.isTransientMailError = isTransientMailError;
 class HelpdeskError extends Error {
@@ -61,12 +61,6 @@ class StaleDraftError extends HelpdeskError {
     }
 }
 exports.StaleDraftError = StaleDraftError;
-class QuoteNotFoundError extends HelpdeskError {
-    constructor() {
-        super("quote_not_found", "Cannot find the quoted history in the draft body; refusing to edit");
-    }
-}
-exports.QuoteNotFoundError = QuoteNotFoundError;
 class MailboxNotInScopeError extends HelpdeskError {
     constructor(mailbox) {
         super("mailbox_not_in_scope", `Mailbox ${mailbox} is not one of this helpdesk's mailboxes`);

package/dist/inbox/handlers.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MAX_ATTACHMENT_DOWNLOAD_BYTES = void 0;
 exports.contentDisposition = contentDisposition;
 exports.createHelpdeskHandlers = createHelpdeskHandlers;
-const cleanup_1 = require("../cleanup");
+const bounce_1 = require("../bounce");
 const controls_1 = require("../controls");
 const drafting_1 = require("../drafting");
 const errors_1 = require("../errors");
@@ -50,7 +50,6 @@ const DOMAIN_ERRORS = {
     draft_not_ready: [409, "draft_not_ready"],
     invalid_transition: [409, "invalid_transition"],
     stale_thread: [409, "stale_thread"],
-    quote_not_found: [422, "quote_not_found"],
     send_in_progress: [409, "send_in_progress"],
     send_outcome_unknown: [409, "send_outcome_unknown"],
     empty_reply: [422, "empty_reply"],
@@ -87,25 +86,27 @@ function summary(thread, assignee) {
         assignee,
     };
 }
+function bounceView(text) {
+    const report = (0, bounce_1.readBounceReport)(text);
+    return { ...report, reason: (0, messages_1.bounceReasonText)(report.statusCode, report.recipient) };
+}
 async function latestIntent(deps, run) {
     if (!run)
         return null;
-    const { perRun, perDraft } = (0, cleanup_1.sendIntentIds)(run);
-    const found = await Promise.all([perRun, perDraft].map((id) => (id ? deps.store.getSendIntent(id) : null)));
-    const intents = found.filter((i) => i !== null);
-    return intents.sort((a, b) => b.updatedAt.localeCompare(a.updatedAt))[0] ?? null;
+    return deps.store.getSendIntent((0, sending_1.sendIntentId)(run));
 }
 function draftView(thread, run) {
     if (!run)
         return null;
+    const text = run.status === "succeeded" ? (run.commentText ?? run.text) : null;
     return {
         generation: run.generation,
         status: run.status,
-        text: run.status === "succeeded" ? (run.commentText ?? run.text) : null,
+        text,
         confidence: run.confidence,
         category: run.category,
         stale: thread.latestInboundId !== run.inboundMessageId,
-        inOutlook: run.placedDraftId !== null,
+        fromDrafter: text !== null && run.text !== null && text === run.text,
     };
 }
 function allowedActions(thread, run, intent, paused, mode, hasDrafter, canAttach = false) {
@@ -113,22 +114,16 @@ function allowedActions(thread, run, intent, paused, mode, hasDrafter, canAttach
     const actions = [];
     const hasText = run?.status === "succeeded";
     const fresh = run === null && thread.latestInboundId !== null;
-    const placed = Boolean(run?.placedDraftId) && run?.placedBodyHtml !== null;
     const pending = intent !== null && ["sending", "unknown", "sent"].includes(intent.status);
     const sendUnderWay = intent !== null && ["sending", "unknown"].includes(intent.status);
     const bounced = s === "review" && thread.reviewReason === "delivery_failed";
     if (!paused) {
-        if (!bounced && (0, states_1.canTransition)(s, "redraft") && ((hasText && (mode !== "drafts_in_outlook" || placed)) || fresh)) {
+        if (!bounced && (0, states_1.canTransition)(s, "redraft") && (hasText || fresh))
             actions.push("edit");
-        }
         if (!bounced && (0, states_1.canTransition)(s, "redraft") && thread.latestInboundId && hasDrafter)
             actions.push("regenerate");
-        const sendable = mode === "drafts_in_app" ? hasText : mode === "drafts_in_outlook" && Boolean(run?.placedDraftId);
-        if (!bounced && (0, states_1.canTransition)(s, "approve") && (sendable || (fresh && mode !== "read_only")) && !pending)
+        if (!bounced && (0, states_1.canTransition)(s, "approve") && mode !== "read_only" && (hasText || fresh) && !pending)
             actions.push("send");
-        if (!bounced && (0, states_1.canTransition)(s, "approve") && mode === "drafts_in_outlook" && hasText && !run?.placedDraftId) {
-            actions.push("retry_placement");
-        }
         if ((0, states_1.canTransition)(s, "approve"))
             actions.push("replied_externally");
         if ((0, states_1.canTransition)(s, "unignore"))
@@ -209,10 +204,14 @@ function createHelpdeskHandlers(config) {
                 subject: m.subject,
                 receivedAt: m.receivedAt,
                 noise: m.noise.action === "ignore",
+                bounce: m.direction === "inbound" && m.noise.reason === "bounce",
                 removed: m.removedAt !== null,
+                outbound: m.direction === "outbound",
             })),
             draft: draftView(thread, run ?? (latestRun?.status === "failed" ? latestRun : null)),
-            send: intent ? { status: intent.status, at: intent.updatedAt } : null,
+            send: intent
+                ? { status: intent.status, at: intent.updatedAt, messageId: intent.status === "sent" ? intent.draftId : null }
+                : null,
             replyAttachments: await replyAttachmentViews(thread.id, intent),
             actions: allowedActions(thread, run, intent, controls.paused, mode, Boolean(deps.drafter), canAttach(thread.mailbox)),
         };
@@ -290,10 +289,10 @@ function createHelpdeskHandlers(config) {
             throw new RouteError(423, "paused");
         const thread = await loadThread(threadId);
         const messages = await inbox.listMessages(thread.id);
-        if (!messages.some((m) => m.id === messageId && m.threadId === thread.id)) {
+        const stored = messages.find((m) => m.id === messageId && m.threadId === thread.id);
+        if (!stored)
             throw new RouteError(404, "message_not_found");
-        }
-        return (0, controls_1.mailboxAccess)(deps, controls, thread.mailbox).gateway();
+        return { gateway: (0, controls_1.mailboxAccess)(deps, controls, thread.mailbox).gateway(), stored };
     }
     function attachmentView(threadId, messageId, a) {
         const unavailable = a.kind !== "file" ? a.kind : a.size > exports.MAX_ATTACHMENT_DOWNLOAD_BYTES ? "too_large" : null;
@@ -301,19 +300,20 @@ function createHelpdeskHandlers(config) {
         return { id: a.id, name: a.name, size: a.size, kind: a.kind, href: unavailable ? null : `${basePath}/threads/${path}`, unavailable };
     }
     async function messageBody({ threadId, messageId }) {
-        const gateway = await ticketMessage(threadId, messageId);
+        const { gateway, stored } = await ticketMessage(threadId, messageId);
         const message = await gateway.getMessage(messageId, { bodyType: "text" });
         if (!message)
             throw new RouteError(404, "message_unavailable");
         const { contentType, content } = message.body;
         const text = contentType === "html" ? (0, plain_text_1.htmlToPlainText)(content) : content.replace(/\r\n?/g, "\n").trim();
-        const listed = gateway.listAttachments && message.hasAttachments !== false ? await gateway.listAttachments(messageId) : [];
+        const isBounce = stored.direction === "inbound" && stored.noise.reason === "bounce";
+        const listed = !isBounce && gateway.listAttachments && message.hasAttachments !== false ? await gateway.listAttachments(messageId) : [];
         const attachments = listed.filter((a) => !a.isInline).map((a) => attachmentView(threadId, messageId, a));
-        const body = { id: messageId, text, attachments };
+        const body = { id: messageId, text, attachments, bounce: isBounce ? bounceView(text) : null };
         return json(200, body);
     }
     async function attachment({ threadId, messageId, attachmentId }) {
-        const gateway = await ticketMessage(threadId, messageId);
+        const { gateway } = await ticketMessage(threadId, messageId);
         if (!gateway.listAttachments || !gateway.downloadAttachment)
             throw new RouteError(404, "attachment_not_found");
         const found = (await gateway.listAttachments(messageId)).find((a) => a.id === attachmentId);
@@ -343,11 +343,11 @@ function createHelpdeskHandlers(config) {
         if (text === null || text.trim() === "" || text.length > MAX_DRAFT_CHARS)
             throw new RouteError(400, "invalid_input");
         const outcome = await (0, drafting_1.editDraft)(deps, { threadId: ctx.threadId, text });
-        return refused(outcome) ?? result(ctx, "Concept opgeslagen.");
+        return refused(outcome) ?? result(ctx, "Opgeslagen.");
     }
     async function regenerate(ctx) {
         const outcome = await (0, drafting_1.regenerateDraft)(deps, ctx.threadId);
-        return refused(outcome) ?? result(ctx, "Er wordt een nieuw concept geschreven.");
+        return refused(outcome) ?? result(ctx, "Er wordt een nieuw voorstel geschreven.");
     }
     async function send(ctx) {
         const body = await readJson(ctx.request);
@@ -363,14 +363,6 @@ function createHelpdeskHandlers(config) {
         const status = outcome.status;
         return result(ctx, SEND_MESSAGES[status], status, status === "in_progress" ? 202 : 200);
     }
-    async function retry(ctx) {
-        const outcome = await (0, drafting_1.retryPlacement)(deps, ctx.threadId);
-        const blocked = refused(outcome);
-        if (blocked)
-            return blocked;
-        const placed = outcome.placementError === null;
-        return result(ctx, placed ? "Het concept staat nu in Outlook." : "Het concept kon nog steeds niet in Outlook worden gezet.");
-    }
     async function assign(ctx) {
         await loadThread(ctx.threadId);
         await inbox.setAssignee(ctx.threadId, person(ctx.staff));
@@ -393,7 +385,7 @@ function createHelpdeskHandlers(config) {
     }
     async function unignore(ctx) {
         const outcome = await (0, drafting_1.unignoreThread)(deps, ctx.threadId);
-        const next = deps.drafter ? "Er wordt een concept geschreven." : "Schrijf zelf het antwoord.";
+        const next = deps.drafter ? "Er wordt een voorstel geschreven." : "Schrijf zelf het antwoord.";
         return refused(outcome) ?? result(ctx, `Ticket teruggezet. ${next}`);
     }
     async function repliedExternally(ctx) {
@@ -454,7 +446,6 @@ function createHelpdeskHandlers(config) {
         draft: { PUT: saveDraft },
         regenerate: { POST: regenerate },
         send: { POST: send },
-        "retry-placement": { POST: retry },
         assign: { POST: assign, DELETE: unassign },
         waiting: { POST: waiting },
         close: { POST: close },

package/dist/inbox/messages.d.ts

@@ -1,4 +1,4 @@
-import type { MailboxWriteMode, ReviewReason, TicketState } from "../types";
+import type { ReviewReason, TicketState } from "../types";
 export declare const HELPDESK_BASE_PATH = "/api/helpdesk";
 export declare const INBOX_ERROR_MESSAGES: {
     readonly not_production: "De helpdesk werkt alleen in de productieomgeving van de app.";
@@ -18,11 +18,10 @@ export declare const INBOX_ERROR_MESSAGES: {
     readonly paused: "De helpdesk staat op pauze. Er wordt niets opgehaald of verstuurd tot de pauze voorbij is.";
     readonly write_blocked: "Deze mailbox staat op alleen lezen. Antwoorden kan pas als de mailbox daarvoor is vrijgegeven.";
     readonly mailbox_not_in_scope: "Deze mailbox hoort niet bij de helpdesk.";
-    readonly stale_draft: "Er is een nieuwere mail van de klant binnengekomen na dit concept. Lees die eerst, of verstuur toch.";
-    readonly draft_not_ready: "Er is nog geen concept dat verstuurd of aangepast kan worden.";
+    readonly stale_draft: "Er is een nieuwere mail van de klant binnengekomen na dit antwoord. Lees die eerst, of verstuur toch.";
+    readonly draft_not_ready: "Er is nog geen antwoord dat verstuurd of aangepast kan worden.";
     readonly invalid_transition: "Dit kan niet in de huidige status van het ticket. Vernieuw de pagina.";
     readonly stale_thread: "Het ticket is net gewijzigd. Vernieuw de pagina en probeer het opnieuw.";
-    readonly quote_not_found: "De eerdere mail in het concept is niet terug te vinden, daarom is de wijziging niet opgeslagen. Pas het concept aan in Outlook.";
     readonly empty_reply: "Het antwoord is leeg. Schrijf eerst een antwoord; alleen de eerdere mail wordt nooit verstuurd.";
     readonly send_in_progress: "Er wordt net een antwoord verstuurd. Vernieuw zo de pagina en kijk of het nog nodig is.";
     readonly send_outcome_unknown: "Het is niet zeker of het vorige antwoord is verstuurd. Geef eerst aan wat je in Outlook bij Verzonden items ziet.";
@@ -32,4 +31,4 @@ export declare const INBOX_ERROR_MESSAGES: {
 export type InboxErrorCode = keyof typeof INBOX_ERROR_MESSAGES;
 export declare const STATE_LABELS: Record<TicketState, string>;
 export declare const REVIEW_REASON_LABELS: Record<ReviewReason, string>;
-export declare const WRITE_MODE_LABELS: Record<MailboxWriteMode, string>;
+export declare function bounceReasonText(statusCode: string | null, recipient: string | null): string;

package/dist/inbox/messages.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WRITE_MODE_LABELS = exports.REVIEW_REASON_LABELS = exports.STATE_LABELS = exports.INBOX_ERROR_MESSAGES = exports.HELPDESK_BASE_PATH = void 0;
+exports.REVIEW_REASON_LABELS = exports.STATE_LABELS = exports.INBOX_ERROR_MESSAGES = exports.HELPDESK_BASE_PATH = void 0;
+exports.bounceReasonText = bounceReasonText;
 exports.HELPDESK_BASE_PATH = "/api/helpdesk";
 exports.INBOX_ERROR_MESSAGES = {
     not_production: "De helpdesk werkt alleen in de productieomgeving van de app.",
@@ -20,11 +21,10 @@ exports.INBOX_ERROR_MESSAGES = {
     paused: "De helpdesk staat op pauze. Er wordt niets opgehaald of verstuurd tot de pauze voorbij is.",
     write_blocked: "Deze mailbox staat op alleen lezen. Antwoorden kan pas als de mailbox daarvoor is vrijgegeven.",
     mailbox_not_in_scope: "Deze mailbox hoort niet bij de helpdesk.",
-    stale_draft: "Er is een nieuwere mail van de klant binnengekomen na dit concept. Lees die eerst, of verstuur toch.",
-    draft_not_ready: "Er is nog geen concept dat verstuurd of aangepast kan worden.",
+    stale_draft: "Er is een nieuwere mail van de klant binnengekomen na dit antwoord. Lees die eerst, of verstuur toch.",
+    draft_not_ready: "Er is nog geen antwoord dat verstuurd of aangepast kan worden.",
     invalid_transition: "Dit kan niet in de huidige status van het ticket. Vernieuw de pagina.",
     stale_thread: "Het ticket is net gewijzigd. Vernieuw de pagina en probeer het opnieuw.",
-    quote_not_found: "De eerdere mail in het concept is niet terug te vinden, daarom is de wijziging niet opgeslagen. Pas het concept aan in Outlook.",
     empty_reply: "Het antwoord is leeg. Schrijf eerst een antwoord; alleen de eerdere mail wordt nooit verstuurd.",
     send_in_progress: "Er wordt net een antwoord verstuurd. Vernieuw zo de pagina en kijk of het nog nodig is.",
     send_outcome_unknown: "Het is niet zeker of het vorige antwoord is verstuurd. Geef eerst aan wat je in Outlook bij Verzonden items ziet.",
@@ -34,24 +34,33 @@ exports.INBOX_ERROR_MESSAGES = {
 exports.STATE_LABELS = {
     new: "Nieuw",
     ignored: "Genegeerd",
-    drafted: "Concept wordt gemaakt",
+    drafted: "Voorstel wordt geschreven",
     review: "Te beoordelen",
     sent: "Verstuurd",
     waiting: "Wacht op klant",
     closed: "Gesloten",
 };
 exports.REVIEW_REASON_LABELS = {
-    low_confidence: "Concept twijfelachtig",
-    policy: "Controle nodig",
-    stale_draft: "Nieuwe mail na concept",
-    drafter_failed: "Concept mislukt",
-    placement_failed: "Niet in Outlook gezet",
+    low_confidence: "Voorstel twijfelachtig",
+    policy: "Voorstel klaar",
+    stale_draft: "Nieuwe mail na voorstel",
+    drafter_failed: "Voorstel mislukt",
     staff_edited: "Aangepast",
     no_draft: "Zelf antwoorden",
     delivery_failed: "Niet afgeleverd",
 };
-exports.WRITE_MODE_LABELS = {
-    read_only: "Alleen lezen",
-    drafts_in_app: "Concepten in de app",
-    drafts_in_outlook: "Concepten in Outlook",
+const BOUNCE_REASONS = {
+    "5.1.1": "Dit adres bestaat niet.",
+    "5.1.10": "Dit adres bestaat niet.",
+    "5.2.2": "De mailbox van de ontvanger is vol.",
+    "5.7.708": "Microsoft blokkeert mail vanaf deze mailbox naar adressen buiten jullie organisatie.",
+    "5.7.750": "Microsoft blokkeert mail vanaf deze mailbox naar adressen buiten jullie organisatie.",
+    "5.7.1": "De ontvangende server weigert mail van deze afzender.",
 };
+function bounceReasonText(statusCode, recipient) {
+    const reason = statusCode ? BOUNCE_REASONS[statusCode] : undefined;
+    if (!recipient)
+        return reason ?? "De ontvangende server weigerde het bericht.";
+    const prefix = `De mailserver van ${recipient} weigerde het bericht.`;
+    return reason ? `${prefix} ${reason}` : prefix;
+}

package/dist/inbox/types.d.ts

@@ -43,12 +43,21 @@ export interface InboxMessageView {
     subject: string;
     receivedAt: string;
     noise: boolean;
+    bounce: boolean;
     removed: boolean;
+    outbound: boolean;
+}
+export interface InboxBounceView {
+    recipient: string | null;
+    statusCode: string | null;
+    reason: string;
+    diagnostic: string;
 }
 export interface InboxMessageBody {
     id: string;
     text: string;
     attachments: InboxAttachmentView[];
+    bounce: InboxBounceView | null;
 }
 export interface InboxReplyAttachmentView {
     id: string;
@@ -76,9 +85,9 @@ export interface InboxDraftView {
     confidence: number | null;
     category: string | null;
     stale: boolean;
-    inOutlook: boolean;
+    fromDrafter: boolean;
 }
-export type InboxAction = "edit" | "regenerate" | "send" | "retry_placement" | "replied_externally" | "mark_waiting" | "close" | "unignore" | "dismiss" | "resolve_send" | "attach";
+export type InboxAction = "edit" | "regenerate" | "send" | "replied_externally" | "mark_waiting" | "close" | "unignore" | "dismiss" | "resolve_send" | "attach";
 export interface InboxThreadDetail {
     viewer: InboxPerson;
     thread: InboxThreadSummary & {
@@ -96,6 +105,7 @@ export interface InboxThreadDetail {
     send: {
         status: SendStatus;
         at: string;
+        messageId: string | null;
     } | null;
     replyAttachments: InboxReplyAttachmentView[];
     actions: InboxAction[];