@bobfrankston/rmfmail 1.1.174 → 1.1.180

package/client/compose/editor.ts

@@ -268,6 +268,85 @@ function createQuillEditor(container: HTMLElement): MailxEditor {
     // - Anything else: default Quill behavior (verbatim plain or HTML).
     // C36: AI proofread on right-click → "Proofread selection" item.
     // Uses the existing aiTransform IPC. Gated by autocomplete.proofreadEnabled.
+    // ── Spell-check right-click handler (Quill) ──
+    // Runs FIRST so a right-click on a misspelled word shows our suggestions
+    // menu (Add to dictionary / Ignore / replace) instead of falling through
+    // to the WebView2 native menu (which on msger-hosted compose iframes was
+    // unreliable for "Add to dictionary" — Bob 2026-05-27 "can't ignore nor
+    // add an entry"). Shares the nspell dictionary + user-dict-mirror with
+    // the TinyMCE editor's spellcheck.ts via spellcheck-core.ts — same
+    // dictionary, same persistence, same suggestion ranking.
+    //
+    // Decoration (red wavy underlines) is NOT wired here yet — Quill's
+    // MutationObserver-based delta tracking interferes with arbitrary
+    // span-wrapping. The visible-on-hover suggestion is left to native
+    // (WebView2 still shows red squiggles via OS spell-check on
+    // spellcheck="true"); we just take over the right-click flow so the
+    // user can ACT on a flagged word with persistence that actually works.
+    let _spellSp: any = null;
+    import("./spellcheck-core.js").then(m => m.getSpell()).then(sp => { _spellSp = sp; }).catch(() => { /* dict unavailable */ });
+    q.root.addEventListener("contextmenu", async (e: MouseEvent) => {
+        try {
+            if (!_spellSp) return;       // dict still loading
+            const sel = q.getSelection();
+            if (sel && sel.length > 0) return; // selection path handled below
+            const core = await import("./spellcheck-core.js");
+            const hit = core.getWordAtPoint(q.root as HTMLElement, e.clientX, e.clientY);
+            if (!hit) return;
+            const { word, node, start, end } = hit;
+            if (_spellSp.correct(word)) return; // word is fine — let native menu fire
+            e.preventDefault();
+            e.stopPropagation();
+            const sugs = core.buildSuggestionList(word, _spellSp);
+            const items: Array<{ label: string; action: () => void; emphasized?: boolean; separator?: boolean }> = [];
+            if (sugs.length === 0) {
+                items.push({ label: "(no suggestions)", action: () => { /* */ } });
+            } else {
+                for (const s of sugs) {
+                    items.push({
+                        label: s,
+                        emphasized: true,
+                        action: () => {
+                            // Replace via Range so the browser's text-edit
+                            // handling kicks in and Quill sees it as a normal
+                            // edit (undoable, Delta-tracked). Going through
+                            // q.deleteText/insertText needs character offsets
+                            // from the Quill index space — possible but more
+                            // arithmetic; Range is simpler and works for the
+                            // text-node case the misspelling always lives in.
+                            try {
+                                const range = document.createRange();
+                                range.setStart(node, start);
+                                range.setEnd(node, end);
+                                const docSel = document.getSelection();
+                                if (docSel) {
+                                    docSel.removeAllRanges();
+                                    docSel.addRange(range);
+                                    if (!document.execCommand("insertText", false, s)) {
+                                        range.deleteContents();
+                                        range.insertNode(document.createTextNode(s));
+                                    }
+                                }
+                            } catch { /* */ }
+                        },
+                    });
+                }
+            }
+            items.push({ label: "", action: () => {}, separator: true });
+            items.push({
+                label: `Add "${word}" to dictionary`,
+                action: () => core.addToUserDict(word, _spellSp),
+            });
+            items.push({
+                label: "Ignore (this session)",
+                action: () => _spellSp.add(word),
+            });
+            core.showSuggestionsMenu(document, e.clientX, e.clientY, items);
+        } catch (err: any) {
+            console.warn("[spellcheck] right-click handler error:", err?.message || err);
+        }
+    });
+
     q.root.addEventListener("contextmenu", async (e: MouseEvent) => {
         try {
             const sel = q.getSelection();

package/client/compose/spellcheck-core.js

@@ -0,0 +1,253 @@
+/**
+ * Editor-agnostic spell-check core.
+ *
+ * The pieces that are NOT tied to a specific editor:
+ *   - Dictionary load (nspell + hunspell en.aff/en.dic + user-dict from cloud).
+ *   - addToUserDict (write-through cache + cloud round-trip).
+ *   - showSuggestionsMenu (renders a floating menu in any document).
+ *   - getWordAtPoint (finds the word under a click in a contenteditable).
+ *   - buildSuggestionList (transposition-first list + nspell.suggest, capped).
+ *
+ * The pieces that ARE editor-specific (separate per editor):
+ *   - DOM walking for live decoration.
+ *   - replaceWord — needs the editor's selection model so undo works.
+ *   - Serializer filter that strips marker spans (depends on the editor's
+ *     output API).
+ *
+ * spellcheck.ts (TinyMCE) and spellcheck-quill.ts (Quill) both consume
+ * this module. Adding a new editor means writing a thin adapter for the
+ * editor-specific bits and reusing everything else here.
+ */
+// @ts-expect-error — nspell ships no type defs.
+import NSpell from "nspell";
+import { getUserDict, addUserDictWord, addUserDictWords } from "../lib/api-client.js";
+export const USER_DICT_KEY = "mailx-user-dict";
+export const MARKER_ATTR = "data-mailx-spellerror";
+export const MIN_WORD_LEN = 3;
+export const SKIP_TAGS = new Set(["BLOCKQUOTE", "CODE", "PRE", "A", "SCRIPT", "STYLE", "KBD", "SAMP", "VAR"]);
+let spellPromise = null;
+/** Resolve the shared nspell instance. Loads the en.aff/en.dic Hunspell
+ *  files once, layers in the user's dictionary from localStorage + GDrive,
+ *  and reconciles any local-only additions back up to the cloud. */
+export async function getSpell() {
+    if (spellPromise)
+        return spellPromise;
+    spellPromise = (async () => {
+        const [affRes, dicRes] = await Promise.all([
+            fetch("../lib/dict/en.aff"),
+            fetch("../lib/dict/en.dic"),
+        ]);
+        if (!affRes.ok || !dicRes.ok) {
+            throw new Error(`spellcheck: dict fetch failed (aff=${affRes.status} dic=${dicRes.status})`);
+        }
+        const [aff, dic] = await Promise.all([affRes.text(), dicRes.text()]);
+        const sp = new NSpell({ aff, dic });
+        try {
+            const raw = localStorage.getItem(USER_DICT_KEY);
+            if (raw)
+                for (const w of JSON.parse(raw))
+                    sp.add(w);
+        }
+        catch { /* corrupt cache */ }
+        getUserDict().then(cloud => {
+            const cloudArr = Array.isArray(cloud) ? cloud : [];
+            for (const w of cloudArr)
+                sp.add(w);
+            let local = [];
+            try {
+                const raw = localStorage.getItem(USER_DICT_KEY);
+                local = raw ? JSON.parse(raw) : [];
+            }
+            catch {
+                local = [];
+            }
+            const cloudSet = new Set(cloudArr);
+            const localOnly = local.filter(w => !cloudSet.has(w));
+            if (localOnly.length > 0) {
+                addUserDictWords(localOnly).catch(e => console.error("[spell] reconcile:", e));
+            }
+            try {
+                const merged = [...new Set([...local, ...cloudArr])];
+                localStorage.setItem(USER_DICT_KEY, JSON.stringify(merged));
+            }
+            catch { /* */ }
+        }).catch(() => { });
+        return sp;
+    })();
+    return spellPromise;
+}
+/** Persist a word to the user dictionary. Synchronous local-cache write +
+ *  in-memory nspell.add for immediate effect, plus a fire-and-forget cloud
+ *  round-trip so the userdict.csv on GDrive picks it up too. */
+export function addToUserDict(word, sp) {
+    try {
+        const raw = localStorage.getItem(USER_DICT_KEY);
+        const arr = raw ? JSON.parse(raw) : [];
+        if (!arr.includes(word)) {
+            arr.push(word);
+            localStorage.setItem(USER_DICT_KEY, JSON.stringify(arr));
+        }
+    }
+    catch { /* */ }
+    sp.add(word);
+    addUserDictWord(word).catch(e => console.error("[spell] addUserDictWord:", e));
+}
+/** Build a suggestion list: transpositions first (the single most common
+ *  English typo class — "hte"→"the"), then nspell.suggest, deduped, capped at 7. */
+export function buildSuggestionList(word, sp) {
+    const transposed = [];
+    for (let i = 0; i < word.length - 1; i++) {
+        const swapped = word.slice(0, i) + word[i + 1] + word[i] + word.slice(i + 2);
+        if (swapped !== word && sp.correct(swapped) && !transposed.includes(swapped)) {
+            transposed.push(swapped);
+        }
+    }
+    const nspellSugs = sp.suggest(word);
+    const sugs = [];
+    for (const s of [...transposed, ...nspellSugs]) {
+        if (!sugs.includes(s))
+            sugs.push(s);
+        if (sugs.length >= 7)
+            break;
+    }
+    return sugs;
+}
+/** Render a floating suggestions menu at (x,y) in the given document.
+ *  Dismisses on Escape, on mousedown outside the menu, or after the user
+ *  picks an item. Listeners attached to every document the user could
+ *  plausibly click into so the menu can't get stuck. */
+export function showSuggestionsMenu(parentDoc, x, y, items, extraDismissDocs = []) {
+    parentDoc.getElementById("mailx-spell-menu")?.remove();
+    const menu = parentDoc.createElement("div");
+    menu.id = "mailx-spell-menu";
+    menu.style.cssText = `
+        position: fixed;
+        left: ${x}px; top: ${y}px;
+        z-index: 10000;
+        background: var(--color-bg, #fff);
+        color: var(--color-text, #222);
+        border: 1px solid var(--color-border, #ccc);
+        border-radius: 6px;
+        box-shadow: 0 4px 16px rgba(0,0,0,0.18);
+        padding: 4px 0;
+        font: 13px system-ui, sans-serif;
+        min-width: 180px;
+        max-width: 320px;
+    `;
+    for (const it of items) {
+        if (it.separator) {
+            const sep = parentDoc.createElement("div");
+            sep.style.cssText = "border-top:1px solid var(--color-border,#ddd); margin: 4px 0;";
+            menu.appendChild(sep);
+            continue;
+        }
+        const btn = parentDoc.createElement("button");
+        btn.type = "button";
+        btn.textContent = it.label;
+        btn.style.cssText = `
+            display: block; width: 100%; text-align: left;
+            padding: 5px 12px; border: none; background: none;
+            color: inherit; cursor: pointer; font: inherit;
+            ${it.emphasized ? "font-weight: 600;" : ""}
+        `;
+        btn.addEventListener("mouseenter", () => { btn.style.background = "var(--color-bg-hover, #eef)"; });
+        btn.addEventListener("mouseleave", () => { btn.style.background = "none"; });
+        btn.addEventListener("click", () => {
+            try {
+                it.action();
+            }
+            finally {
+                menu.remove();
+            }
+        });
+        menu.appendChild(btn);
+    }
+    parentDoc.body.appendChild(menu);
+    const r = menu.getBoundingClientRect();
+    if (r.right > window.innerWidth)
+        menu.style.left = `${Math.max(8, window.innerWidth - r.width - 8)}px`;
+    if (r.bottom > window.innerHeight)
+        menu.style.top = `${Math.max(8, window.innerHeight - r.height - 8)}px`;
+    const docs = [parentDoc, ...extraDismissDocs];
+    const dismiss = (e) => {
+        if (e.type === "keydown" && e.key !== "Escape")
+            return;
+        if (e.type === "mousedown" && menu.contains(e.target))
+            return;
+        menu.remove();
+        for (const d of docs) {
+            d.removeEventListener("mousedown", dismiss, true);
+            d.removeEventListener("keydown", dismiss, true);
+        }
+    };
+    setTimeout(() => {
+        for (const d of docs) {
+            d.addEventListener("mousedown", dismiss, true);
+            d.addEventListener("keydown", dismiss, true);
+        }
+    }, 0);
+}
+/** Find the word at the given client (x,y) inside `root`. Returns null if
+ *  there's no word there (whitespace, link, code, etc). Works in any
+ *  contenteditable in the same document — used by the Quill adapter for
+ *  the right-click-on-misspelling path where there's no marker span to
+ *  hang off of (Quill doesn't decorate).
+ *
+ *  Uses caretPositionFromPoint where available (Firefox), falls back to
+ *  caretRangeFromPoint (Chromium/WebView2). Both give us the text node +
+ *  offset under the click; we then expand to word boundaries. */
+export function getWordAtPoint(root, x, y) {
+    const doc = root.ownerDocument || document;
+    let node = null;
+    let offset = 0;
+    const winAny = doc.defaultView;
+    if (typeof doc.caretPositionFromPoint === "function") {
+        const pos = doc.caretPositionFromPoint(x, y);
+        if (pos) {
+            node = pos.offsetNode;
+            offset = pos.offset;
+        }
+    }
+    else if (typeof doc.caretRangeFromPoint === "function") {
+        const range = doc.caretRangeFromPoint(x, y);
+        if (range) {
+            node = range.startContainer;
+            offset = range.startOffset;
+        }
+    }
+    if (!node || node.nodeType !== Node.TEXT_NODE)
+        return null;
+    // Make sure the text node is inside `root` — caretPositionFromPoint
+    // can land outside if the click is in a sibling.
+    let walk = node;
+    while (walk && walk !== root)
+        walk = walk.parentNode;
+    if (!walk)
+        return null;
+    // Reject if the click is inside a skipped tag (link, code, blockquote).
+    let p = node.parentNode;
+    while (p && p !== root) {
+        if (p.nodeType === Node.ELEMENT_NODE && SKIP_TAGS.has(p.tagName))
+            return null;
+        p = p.parentNode;
+    }
+    const text = node.data;
+    if (offset > text.length)
+        offset = text.length;
+    // Word boundary: letters, apostrophes, hyphens. Same regex as the
+    // walker in spellcheck.ts so both editors flag the same tokens.
+    const isWordChar = (c) => /[\p{L}'’\-]/u.test(c);
+    let start = offset;
+    while (start > 0 && isWordChar(text[start - 1]))
+        start--;
+    let end = offset;
+    while (end < text.length && isWordChar(text[end]))
+        end++;
+    if (end - start < MIN_WORD_LEN)
+        return null;
+    const word = text.slice(start, end);
+    if (!/^[\p{L}]/u.test(word))
+        return null; // must start with a letter
+    return { word, node: node, start, end };
+}
+//# sourceMappingURL=spellcheck-core.js.map

package/client/compose/spellcheck-core.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"spellcheck-core.js","sourceRoot":"","sources":["spellcheck-core.ts"],"names":[],"mappings":"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"}

package/client/compose/spellcheck-core.ts

@@ -0,0 +1,242 @@
+/**
+ * Editor-agnostic spell-check core.
+ *
+ * The pieces that are NOT tied to a specific editor:
+ *   - Dictionary load (nspell + hunspell en.aff/en.dic + user-dict from cloud).
+ *   - addToUserDict (write-through cache + cloud round-trip).
+ *   - showSuggestionsMenu (renders a floating menu in any document).
+ *   - getWordAtPoint (finds the word under a click in a contenteditable).
+ *   - buildSuggestionList (transposition-first list + nspell.suggest, capped).
+ *
+ * The pieces that ARE editor-specific (separate per editor):
+ *   - DOM walking for live decoration.
+ *   - replaceWord — needs the editor's selection model so undo works.
+ *   - Serializer filter that strips marker spans (depends on the editor's
+ *     output API).
+ *
+ * spellcheck.ts (TinyMCE) and spellcheck-quill.ts (Quill) both consume
+ * this module. Adding a new editor means writing a thin adapter for the
+ * editor-specific bits and reusing everything else here.
+ */
+
+// @ts-expect-error — nspell ships no type defs.
+import NSpell from "nspell";
+import { getUserDict, addUserDictWord, addUserDictWords } from "../lib/api-client.js";
+
+export type NSpellInstance = any;
+
+export const USER_DICT_KEY = "mailx-user-dict";
+export const MARKER_ATTR = "data-mailx-spellerror";
+export const MIN_WORD_LEN = 3;
+export const SKIP_TAGS = new Set(["BLOCKQUOTE", "CODE", "PRE", "A", "SCRIPT", "STYLE", "KBD", "SAMP", "VAR"]);
+
+let spellPromise: Promise<NSpellInstance> | null = null;
+
+/** Resolve the shared nspell instance. Loads the en.aff/en.dic Hunspell
+ *  files once, layers in the user's dictionary from localStorage + GDrive,
+ *  and reconciles any local-only additions back up to the cloud. */
+export async function getSpell(): Promise<NSpellInstance> {
+    if (spellPromise) return spellPromise;
+    spellPromise = (async () => {
+        const [affRes, dicRes] = await Promise.all([
+            fetch("../lib/dict/en.aff"),
+            fetch("../lib/dict/en.dic"),
+        ]);
+        if (!affRes.ok || !dicRes.ok) {
+            throw new Error(`spellcheck: dict fetch failed (aff=${affRes.status} dic=${dicRes.status})`);
+        }
+        const [aff, dic] = await Promise.all([affRes.text(), dicRes.text()]);
+        const sp = new (NSpell as any)({ aff, dic });
+        try {
+            const raw = localStorage.getItem(USER_DICT_KEY);
+            if (raw) for (const w of JSON.parse(raw) as string[]) sp.add(w);
+        } catch { /* corrupt cache */ }
+        getUserDict().then(cloud => {
+            const cloudArr = Array.isArray(cloud) ? cloud : [];
+            for (const w of cloudArr) sp.add(w);
+            let local: string[] = [];
+            try {
+                const raw = localStorage.getItem(USER_DICT_KEY);
+                local = raw ? (JSON.parse(raw) as string[]) : [];
+            } catch { local = []; }
+            const cloudSet = new Set(cloudArr);
+            const localOnly = local.filter(w => !cloudSet.has(w));
+            if (localOnly.length > 0) {
+                addUserDictWords(localOnly).catch(e => console.error("[spell] reconcile:", e));
+            }
+            try {
+                const merged = [...new Set([...local, ...cloudArr])];
+                localStorage.setItem(USER_DICT_KEY, JSON.stringify(merged));
+            } catch { /* */ }
+        }).catch(() => { /* offline */ });
+        return sp;
+    })();
+    return spellPromise;
+}
+
+/** Persist a word to the user dictionary. Synchronous local-cache write +
+ *  in-memory nspell.add for immediate effect, plus a fire-and-forget cloud
+ *  round-trip so the userdict.csv on GDrive picks it up too. */
+export function addToUserDict(word: string, sp: NSpellInstance): void {
+    try {
+        const raw = localStorage.getItem(USER_DICT_KEY);
+        const arr = raw ? (JSON.parse(raw) as string[]) : [];
+        if (!arr.includes(word)) {
+            arr.push(word);
+            localStorage.setItem(USER_DICT_KEY, JSON.stringify(arr));
+        }
+    } catch { /* */ }
+    sp.add(word);
+    addUserDictWord(word).catch(e => console.error("[spell] addUserDictWord:", e));
+}
+
+/** Build a suggestion list: transpositions first (the single most common
+ *  English typo class — "hte"→"the"), then nspell.suggest, deduped, capped at 7. */
+export function buildSuggestionList(word: string, sp: NSpellInstance): string[] {
+    const transposed: string[] = [];
+    for (let i = 0; i < word.length - 1; i++) {
+        const swapped = word.slice(0, i) + word[i + 1] + word[i] + word.slice(i + 2);
+        if (swapped !== word && sp.correct(swapped) && !transposed.includes(swapped)) {
+            transposed.push(swapped);
+        }
+    }
+    const nspellSugs: string[] = sp.suggest(word) as string[];
+    const sugs: string[] = [];
+    for (const s of [...transposed, ...nspellSugs]) {
+        if (!sugs.includes(s)) sugs.push(s);
+        if (sugs.length >= 7) break;
+    }
+    return sugs;
+}
+
+export type MenuItem = {
+    label: string;
+    action: () => void;
+    emphasized?: boolean;
+    separator?: boolean;
+};
+
+/** Render a floating suggestions menu at (x,y) in the given document.
+ *  Dismisses on Escape, on mousedown outside the menu, or after the user
+ *  picks an item. Listeners attached to every document the user could
+ *  plausibly click into so the menu can't get stuck. */
+export function showSuggestionsMenu(
+    parentDoc: Document,
+    x: number,
+    y: number,
+    items: MenuItem[],
+    extraDismissDocs: Document[] = [],
+): void {
+    parentDoc.getElementById("mailx-spell-menu")?.remove();
+    const menu = parentDoc.createElement("div");
+    menu.id = "mailx-spell-menu";
+    menu.style.cssText = `
+        position: fixed;
+        left: ${x}px; top: ${y}px;
+        z-index: 10000;
+        background: var(--color-bg, #fff);
+        color: var(--color-text, #222);
+        border: 1px solid var(--color-border, #ccc);
+        border-radius: 6px;
+        box-shadow: 0 4px 16px rgba(0,0,0,0.18);
+        padding: 4px 0;
+        font: 13px system-ui, sans-serif;
+        min-width: 180px;
+        max-width: 320px;
+    `;
+    for (const it of items) {
+        if (it.separator) {
+            const sep = parentDoc.createElement("div");
+            sep.style.cssText = "border-top:1px solid var(--color-border,#ddd); margin: 4px 0;";
+            menu.appendChild(sep);
+            continue;
+        }
+        const btn = parentDoc.createElement("button");
+        btn.type = "button";
+        btn.textContent = it.label;
+        btn.style.cssText = `
+            display: block; width: 100%; text-align: left;
+            padding: 5px 12px; border: none; background: none;
+            color: inherit; cursor: pointer; font: inherit;
+            ${it.emphasized ? "font-weight: 600;" : ""}
+        `;
+        btn.addEventListener("mouseenter", () => { btn.style.background = "var(--color-bg-hover, #eef)"; });
+        btn.addEventListener("mouseleave", () => { btn.style.background = "none"; });
+        btn.addEventListener("click", () => {
+            try { it.action(); } finally { menu.remove(); }
+        });
+        menu.appendChild(btn);
+    }
+    parentDoc.body.appendChild(menu);
+    const r = menu.getBoundingClientRect();
+    if (r.right > window.innerWidth) menu.style.left = `${Math.max(8, window.innerWidth - r.width - 8)}px`;
+    if (r.bottom > window.innerHeight) menu.style.top  = `${Math.max(8, window.innerHeight - r.height - 8)}px`;
+    const docs: Document[] = [parentDoc, ...extraDismissDocs];
+    const dismiss = (e: Event) => {
+        if (e.type === "keydown" && (e as KeyboardEvent).key !== "Escape") return;
+        if (e.type === "mousedown" && menu.contains(e.target as Node)) return;
+        menu.remove();
+        for (const d of docs) {
+            d.removeEventListener("mousedown", dismiss, true);
+            d.removeEventListener("keydown", dismiss, true);
+        }
+    };
+    setTimeout(() => {
+        for (const d of docs) {
+            d.addEventListener("mousedown", dismiss, true);
+            d.addEventListener("keydown", dismiss, true);
+        }
+    }, 0);
+}
+
+/** Find the word at the given client (x,y) inside `root`. Returns null if
+ *  there's no word there (whitespace, link, code, etc). Works in any
+ *  contenteditable in the same document — used by the Quill adapter for
+ *  the right-click-on-misspelling path where there's no marker span to
+ *  hang off of (Quill doesn't decorate).
+ *
+ *  Uses caretPositionFromPoint where available (Firefox), falls back to
+ *  caretRangeFromPoint (Chromium/WebView2). Both give us the text node +
+ *  offset under the click; we then expand to word boundaries. */
+export function getWordAtPoint(
+    root: HTMLElement,
+    x: number,
+    y: number,
+): { word: string; node: Text; start: number; end: number } | null {
+    const doc = root.ownerDocument || document;
+    let node: Node | null = null;
+    let offset = 0;
+    const winAny = doc.defaultView as any;
+    if (typeof (doc as any).caretPositionFromPoint === "function") {
+        const pos = (doc as any).caretPositionFromPoint(x, y);
+        if (pos) { node = pos.offsetNode; offset = pos.offset; }
+    } else if (typeof (doc as any).caretRangeFromPoint === "function") {
+        const range = (doc as any).caretRangeFromPoint(x, y);
+        if (range) { node = range.startContainer; offset = range.startOffset; }
+    }
+    if (!node || node.nodeType !== Node.TEXT_NODE) return null;
+    // Make sure the text node is inside `root` — caretPositionFromPoint
+    // can land outside if the click is in a sibling.
+    let walk: Node | null = node;
+    while (walk && walk !== root) walk = walk.parentNode;
+    if (!walk) return null;
+    // Reject if the click is inside a skipped tag (link, code, blockquote).
+    let p: Node | null = node.parentNode;
+    while (p && p !== root) {
+        if (p.nodeType === Node.ELEMENT_NODE && SKIP_TAGS.has((p as Element).tagName)) return null;
+        p = p.parentNode;
+    }
+    const text = (node as Text).data;
+    if (offset > text.length) offset = text.length;
+    // Word boundary: letters, apostrophes, hyphens. Same regex as the
+    // walker in spellcheck.ts so both editors flag the same tokens.
+    const isWordChar = (c: string) => /[\p{L}'’\-]/u.test(c);
+    let start = offset;
+    while (start > 0 && isWordChar(text[start - 1])) start--;
+    let end = offset;
+    while (end < text.length && isWordChar(text[end])) end++;
+    if (end - start < MIN_WORD_LEN) return null;
+    const word = text.slice(start, end);
+    if (!/^[\p{L}]/u.test(word)) return null; // must start with a letter
+    return { word, node: node as Text, start, end };
+}