@bobfrankston/rmfmail 1.2.285 → 1.2.287

package/client/components/message-viewer.ts

@@ -1665,33 +1665,59 @@ export async function showMessage(accountId: string, uid: number, folderId?: num
         // prompted all of this scored 2.7 against 4.5 and was delivered
         // unflagged, so showing only the flagged ones would miss exactly the
         // case worth showing.
-        const spam = (msg as any).spamScore as { score: number; threshold: number; flagged: boolean };
+        //
+        // The COLOUR comes from what the rules that scored are evidence of, not
+        // from the number (Claude Code 2026-08-27): a newsletter DMARC proved,
+        // or one whose whole score is bulk-mail rules, gets the neutral chip
+        // however high it climbed. Blue Orchestra scored 10.9 on a Spamhaus
+        // listing of a linked advocacy site and a bulk-mail hit; painting that
+        // the same red as a forged sender is what teaches a reader to ignore
+        // the chip. The floor stays at half the server's own threshold —
+        // see docs/spam-false-positives.md on why tuning it is not the fix.
+        const spam = (msg as any).spamScore as {
+            score: number; threshold: number; flagged: boolean;
+            kind?: string; proved?: boolean; reasons?: string[];
+        };
         if (spam && Number.isFinite(spam.score) && (spam.flagged || spam.score >= spam.threshold / 2)) {
-            const level = spam.flagged ? "high" : "mid";
+            const benign = !!spam.proved || spam.kind === "bulk";
+            const level = benign ? "bulk" : spam.flagged ? "high" : "mid";
             const chip = document.createElement("div");
             chip.className = `mv-spamscore mv-spamscore-${level}`;
-            chip.title = level === "high"
-                ? "Your mail server scored this at or above its spam threshold and flagged it."
-                : "Below your server's spam threshold, but more than halfway to it.";
+            const why = (spam.reasons || []).length ? "\n\n" + spam.reasons.join("\n") : "";
+            chip.title = (level === "bulk"
+                ? (spam.proved
+                    ? "Scored by bulk-mail or blocklist rules; the sending domain passed DMARC, so the sender is proved."
+                    : "Every rule that scored is a bulk-mail test — none of them test who sent this.")
+                : level === "high"
+                    ? "Your mail server scored this at or above its spam threshold and flagged it."
+                    : "Below your server's spam threshold, but more than halfway to it.") + why;
             chip.textContent = `spam score ${spam.score} of ${spam.threshold}`;
             bodyEl.appendChild(chip);
         }
 
         const trust = ((msg as any).trust || []) as { id: string; severity: string; text: string; detail: string }[];
         if (trust.length) {
-            const worst = trust.some(f => f.severity === "danger") ? "danger" : "caution";
+            // An `info` finding is not an accusation, so it gets neither the
+            // headline nor the "do not open anything" footer — it renders as a
+            // plain note in the register of the remote-content banner. A single
+            // danger or caution finding anywhere in the set still sets the
+            // whole banner, because the worst evidence is the one that matters.
+            // (Claude Code 2026-08-27)
+            const worst = trust.some(f => f.severity === "danger") ? "danger"
+                : trust.some(f => f.severity === "caution") ? "caution" : "info";
+            const head = worst === "danger" ? "This message is not what it says it is"
+                : worst === "caution" ? "Check this message before acting on it" : "";
             const warn = document.createElement("div");
             warn.className = `mv-trust mv-trust-${worst}`;
             warn.innerHTML =
-                `<div class="mv-trust-head">${worst === "danger"
-                    ? "This message is not what it says it is"
-                    : "Check this message before acting on it"}</div>` +
+                (head ? `<div class="mv-trust-head">${head}</div>` : "") +
                 trust.map(f =>
                     `<div class="mv-trust-item mv-trust-${escapeText(f.severity)}">` +
                         `<div class="mv-trust-text">${escapeText(f.text)}</div>` +
                         `<div class="mv-trust-detail">${escapeText(f.detail)}</div>` +
                     `</div>`).join("") +
-                `<div class="mv-trust-foot">Links and attachments here should not be opened.</div>`;
+                (worst === "info" ? ""
+                    : `<div class="mv-trust-foot">Links and attachments here should not be opened.</div>`);
             bodyEl.appendChild(warn);
         }
 

package/client/compose/compose.bundle.js

@@ -3710,7 +3710,13 @@ var init_spellcheck = __esm({
 // client/compose/harper-lint.js
 var harper_lint_exports = {};
 __export(harper_lint_exports, {
-  initHarperLint: () => initHarperLint
+  blockText: () => blockText,
+  caretOffset: () => caretOffset,
+  collectBlocks: () => collectBlocks,
+  initHarperLint: () => initHarperLint,
+  lineBox: () => lineBox,
+  sentenceStart: () => sentenceStart,
+  spanToRange: () => spanToRange
 });
 function initHarperLint(ed) {
   let disposed = false;
@@ -3735,42 +3741,6 @@ function initHarperLint(ed) {
     doc.getElementById(OVERLAY_ID2)?.remove();
     doc.getElementById(POPUP_ID)?.remove();
   };
-  const collectBlocks = (root) => {
-    const kids = Array.from(root.children).filter((c) => c instanceof HTMLElement);
-    const blocks = (kids.length ? kids : [root]).filter((b) => b.tagName !== "BLOCKQUOTE" && !b.closest("blockquote") && !b.querySelector("blockquote"));
-    return blocks;
-  };
-  const blockText = (block, doc) => {
-    const walker = doc.createTreeWalker(block, NodeFilter.SHOW_TEXT);
-    const nodes = [];
-    let text = "";
-    for (let n = walker.nextNode(); n; n = walker.nextNode()) {
-      nodes.push({ node: n, from: text.length });
-      text += n.data;
-    }
-    return { text, nodes };
-  };
-  const spanToRange = (doc, nodes, start, end) => {
-    let a = null;
-    let b = null;
-    for (const e of nodes) {
-      const len = e.node.data.length;
-      if (!a && start >= e.from && start <= e.from + len)
-        a = { node: e.node, off: start - e.from };
-      if (end >= e.from && end <= e.from + len)
-        b = { node: e.node, off: end - e.from };
-    }
-    if (!a || !b)
-      return null;
-    try {
-      const r = doc.createRange();
-      r.setStart(a.node, a.off);
-      r.setEnd(b.node, b.off);
-      return r;
-    } catch {
-      return null;
-    }
-  };
   const paint = () => {
     if (disposed)
       return;
@@ -3834,9 +3804,13 @@ function initHarperLint(ed) {
       const tx = texts[i];
       if (!tx)
         return;
+      const caret = caretOffset(t.doc, tx.nodes);
+      const writingFrom = caret < 0 ? -1 : sentenceStart(tx.text, caret);
       for (const l of lints || []) {
         if (SKIP_KINDS.has(l.kind))
           continue;
+        if (writingFrom >= 0 && l.end > writingFrom && l.start <= caret)
+          continue;
         const range = spanToRange(t.doc, tx.nodes, l.start, l.end);
         if (range)
           next.push({ lint: l, range });
@@ -3966,7 +3940,7 @@ function initHarperLint(ed) {
     }
   };
 }
-var DEBOUNCE_MS, OVERLAY_ID2, POPUP_ID, SKIP_KINDS;
+var DEBOUNCE_MS, OVERLAY_ID2, POPUP_ID, SKIP_KINDS, collectBlocks, LINE_BREAKING, blockText, lineBox, caretOffset, sentenceStart, spanToRange;
 var init_harper_lint = __esm({
   "client/compose/harper-lint.js"() {
     "use strict";
@@ -3975,6 +3949,100 @@ var init_harper_lint = __esm({
     OVERLAY_ID2 = "harper-overlay";
     POPUP_ID = "harper-popup";
     SKIP_KINDS = /* @__PURE__ */ new Set(["Spelling"]);
+    collectBlocks = (root) => {
+      const kids = Array.from(root.children).filter((c) => c instanceof HTMLElement);
+      const blocks = (kids.length ? kids : [root]).filter((b) => b.tagName !== "BLOCKQUOTE" && !b.closest("blockquote") && !b.querySelector("blockquote"));
+      return blocks;
+    };
+    LINE_BREAKING = /* @__PURE__ */ new Set([
+      "BR",
+      "P",
+      "DIV",
+      "LI",
+      "UL",
+      "OL",
+      "TR",
+      "TD",
+      "TH",
+      "TABLE",
+      "PRE",
+      "HR",
+      "BLOCKQUOTE",
+      "H1",
+      "H2",
+      "H3",
+      "H4",
+      "H5",
+      "H6",
+      "SECTION",
+      "ARTICLE",
+      "FIGURE"
+    ]);
+    blockText = (block, doc) => {
+      const walker = doc.createTreeWalker(block, NodeFilter.SHOW_TEXT | NodeFilter.SHOW_ELEMENT);
+      const nodes = [];
+      let text = "";
+      let pendingBreak = false;
+      for (let n = walker.nextNode(); n; n = walker.nextNode()) {
+        if (n.nodeType === Node.ELEMENT_NODE) {
+          if (LINE_BREAKING.has(n.tagName))
+            pendingBreak = true;
+          continue;
+        }
+        const data = n.data;
+        if (!data)
+          continue;
+        if (pendingBreak && text)
+          text += "\n";
+        pendingBreak = false;
+        nodes.push({ node: n, from: text.length });
+        text += data;
+      }
+      return { text, nodes };
+    };
+    lineBox = (node) => {
+      for (let e = node; e; e = e.parentNode)
+        if (e.nodeType === Node.ELEMENT_NODE && LINE_BREAKING.has(e.tagName))
+          return e;
+      return null;
+    };
+    caretOffset = (doc, nodes) => {
+      const sel = doc.getSelection?.();
+      if (!sel || !sel.focusNode)
+        return -1;
+      for (const e of nodes)
+        if (e.node === sel.focusNode)
+          return e.from + sel.focusOffset;
+      return -1;
+    };
+    sentenceStart = (text, caret) => {
+      const before = text.slice(0, caret);
+      const m = before.match(/[.!?…\n][^.!?…\n]*$/);
+      return m ? caret - (m[0].length - 1) : 0;
+    };
+    spanToRange = (doc, nodes, start, end) => {
+      let a = null;
+      let b = null;
+      for (const e of nodes) {
+        const len = e.node.data.length;
+        if (!a && start >= e.from && start <= e.from + len)
+          a = { node: e.node, off: start - e.from };
+        if (end >= e.from && end <= e.from + len)
+          b = { node: e.node, off: end - e.from };
+      }
+      if (!a || !b)
+        return null;
+      if (lineBox(a.node) !== lineBox(b.node))
+        return null;
+      try {
+        const r = doc.createRange();
+        r.setStart(a.node, a.off);
+        r.setEnd(b.node, b.off);
+        return r;
+      } catch {
+        return null;
+      }
+    };
   }
 });