@dawnlit/outlook-bridge 1.1.1 → 2.1.0

package/dist/mac/read.js

@@ -8,49 +8,32 @@ exports.openOutlookEmail = openOutlookEmail;
 // Reading mail on macOS: one folder, one item, a whole Inbox tree, or whatever
 // is selected in the running Outlook.
 //
-// Every reader here is two passes. Pass 1 indexes a folder with bulk property
-// reads (one Apple event each); pass 2 fetches the expensive fields — body,
+// Every reader is two passes. Pass 1 indexes a folder with bulk property reads
+// (one Apple event each); pass 2 fetches the expensive fields — body,
 // attachments, sender — only for the messages that survived. Reading
 // per-message in a loop costs an event per property and is unusably slow on a
 // real mailbox, which is the whole reason for the shape.
 const run_1 = require("./run");
+const profile_1 = require("./profile");
 const scripts_1 = require("./scripts");
-const mail_1 = require("../mail");
 const errors_1 = require("../errors");
-/** How much of a body readInboxEmails previews, matching the Windows reader. */
-const PREVIEW_CHARS = 600;
+const mail_1 = require("../mail");
 /**
- * Read recent messages for the given account, newest first.
- *
- * `entryId` here is Outlook for Mac's small integer message id (e.g. "779"), not
- * the MAPI EntryID string Windows returns. The two are not interchangeable, so
- * don't persist one and look it up on the other platform.
+ * Recent mail from the Inbox root or one folder, newest first. Entry ids here
+ * are Outlook for Mac's integer message ids, not Windows EntryIDs.
  */
-async function readInboxEmails(emailAccount, daysBack = 60, limit = 50, folder) {
-    const days = Math.max(0, Math.floor(daysBack));
-    const cap = Math.max(0, Math.floor(limit));
-    if (cap === 0)
-        return [];
-    const ref = folder ? (0, mail_1.mailFolderRef)(folder) : { rootId: 6, rootLabel: 'Inbox', segments: [] };
-    // A folder argument that trims away to nothing ("\\", "  ") would otherwise
-    // read the Inbox root and look like it had scoped — the exact silent
-    // mis-scoping this parameter exists to prevent. Mirrors the Windows check.
-    if (folder && folder.trim() && ref.segments.length === 0 && ref.rootId === 6
-        && folder.trim().toLowerCase() !== 'inbox') {
-        throw new errors_1.NotFoundError('folder', `Folder '${folder}' does not name a folder under the Inbox.`);
-    }
-    const resolveScope = (0, scripts_1.mailScopeSnippet)(ref, folder || '');
-    const folderPath = (0, scripts_1.macFolderPath)(emailAccount, ref.rootLabel, ref.segments);
-    const isOutgoing = (0, mail_1.isOutgoingRoot)(ref.rootId);
-    // Pass 1 — index the folder. Folder order isn't documented, so sort here
-    // rather than trusting Outlook to hand back newest-first.
-    const indexScript = `tell application "Microsoft Outlook"
-${(0, scripts_1.accountLookupSnippet)(emailAccount)}
-${resolveScope}
-    set cutoff to (current date) - (${days} * days)
+async function readInboxEmails(request) {
+    const acct = await (0, scripts_1.resolveMacAccount)(request.account);
+    const folderPath = (0, scripts_1.macFolderPath)(request.account, request.folder.rootLabel, request.folder.segments);
+    const outgoing = (0, mail_1.isOutgoingRoot)(request.folder.rootId);
+    // Pass 1 — index the folder. Its order isn't documented, so it is sorted here.
+    const index = (await (0, run_1.runOsaScript)(`tell application "Microsoft Outlook"
+${(0, scripts_1.accountLookupSnippet)(acct)}
+${(0, scripts_1.mailScopeSnippet)(acct, request.folder, request.folderLabel)}
+    set cutoff to (current date) - (${(0, run_1.asInt)(request.daysBack)} * days)
     set idList to id of every message of scopeFolder
     try
-        set timeList to ${(0, scripts_1.dateProperty)(ref.rootId)} of every message of scopeFolder
+        set timeList to ${(0, scripts_1.dateProperty)(request.folder.rootId)} of every message of scopeFolder
     on error
         set timeList to {}
     end try
@@ -59,16 +42,14 @@ ${resolveScope}
     repeat with i from 1 to (count of idList)
         set d to missing value
         if hasTimes then set d to item i of timeList
-        -- An item carrying no timestamp of its own (an unsent draft filed into a
-        -- mail folder) is skipped rather than crashing the walk, matching what the
-        -- Windows Restrict on the same property does with it.
+        -- An item with no timestamp of its own (an unsent draft filed into a
+        -- mail folder) is skipped, as the Windows date filter skips it.
         if d is not missing value and d is greater than or equal to cutoff then
             set out to out & (item i of idList as string) & tab & my isoDate(d) & linefeed
         end if
     end repeat
     return out
-end tell`;
-    const index = (await (0, run_1.runOsaScript)(indexScript, 60000))
+end tell`, 'standard'))
         .split('\n')
         .map(line => line.trim())
         .filter(Boolean)
@@ -76,59 +57,54 @@ end tell`;
         const [id, receivedTime] = line.split('\t');
         return { id, receivedTime: receivedTime || '' };
     });
-    // 'yyyy-MM-dd HH:mm' is lexicographically ordered, so plain string compare sorts it.
+    // 'yyyy-MM-dd HH:mm' sorts correctly as a string.
     index.sort((a, b) => b.receivedTime.localeCompare(a.receivedTime));
-    const chosen = index.slice(0, cap);
+    const chosen = index.slice(0, request.limit);
     if (chosen.length === 0)
         return [];
-    // Pass 2 — the expensive reads, only for messages we keep.
-    const detailScript = `tell application "Microsoft Outlook"
-    set wanted to {${chosen.map(c => c.id).join(', ')}}
+    // Pass 2 — the expensive reads, only for the messages kept.
+    const preview = request.previewChars > 0
+        ? `            set bodyText to ""
+            try
+                set bodyText to (plain text content of theMsg) as string
+            end try
+            if (length of bodyText) > ${(0, run_1.asInt)(request.previewChars)} then set bodyText to text 1 thru ${(0, run_1.asInt)(request.previewChars)} of bodyText`
+        : '            set bodyText to ""';
+    const raw = await (0, run_1.runOsaScript)(`tell application "Microsoft Outlook"
     set out to ""
-    repeat with k from 1 to (count of wanted)
+    repeat with theId in ${(0, run_1.asIdList)(chosen.map(c => c.id))}
         set theMsg to missing value
         try
-            set theMsg to message id (item k of wanted)
+            set theMsg to message id theId
         end try
         if theMsg is not missing value then
             set subj to ""
             try
                 set subj to (subject of theMsg) as string
             end try
-${isOutgoing ? (0, scripts_1.firstRecipientSnippet)('theMsg', '            ') : (0, scripts_1.senderSnippet)('theMsg', '            ')}
-            set bodyText to ""
-            try
-                set bodyText to (plain text content of theMsg) as string
-            end try
-            if (length of bodyText) > ${PREVIEW_CHARS} then set bodyText to text 1 thru ${PREVIEW_CHARS} of bodyText
+${outgoing ? (0, scripts_1.firstRecipientSnippet)('            ') : (0, scripts_1.senderSnippet)('            ')}
+${preview}
             set attNames to {}
             try
                 set attNames to name of every attachment of theMsg
             end try
-            set out to out & ${(0, run_1.asRow)([
-        '(id of theMsg as string)',
-        'subj',
-        'sndName',
-        'sndAddr',
-        'bodyText',
-        'my sanitizeList(attNames)',
-    ])}
+            set out to out & ${(0, run_1.asRow)(['(id of theMsg as string)', 'subj', 'sndName', 'sndAddr', 'bodyText', 'my sanitizePositionalList(attNames)'])}
         end if
     end repeat
     return out
-end tell`;
-    const byId = new Map(chosen.map(c => [c.id, c.receivedTime]));
-    return (0, run_1.splitRecords)(await (0, run_1.runOsaScript)(detailScript, 120000)).map(record => {
+end tell`, 'standard');
+    const receivedById = new Map(chosen.map(c => [c.id, c.receivedTime]));
+    return (0, run_1.splitRecords)(raw).map(record => {
         const parts = (0, run_1.splitFields)(record);
         const id = (0, run_1.field)(parts, 0);
-        const attachmentNames = (0, run_1.splitList)((0, run_1.field)(parts, 5));
+        const attachmentNames = (0, run_1.splitPositionalList)((0, run_1.field)(parts, 5));
         return {
             entryId: id,
-            storeId: '', // macOS AppleScript has no StoreID equivalent
+            storeId: '',
             subject: (0, run_1.field)(parts, 1).trim(),
             senderName: (0, run_1.field)(parts, 2),
             senderEmail: (0, run_1.field)(parts, 3),
-            receivedTime: byId.get(id) || '',
+            receivedTime: receivedById.get(id) || '',
             bodyPreview: (0, run_1.field)(parts, 4),
             attachmentNames,
             attachmentCount: attachmentNames.length,
@@ -137,216 +113,198 @@ end tell`;
     });
 }
 /**
- * Read one email's full plain-text body by message id.
- *
- * `storeId` is accepted for signature parity and ignored: macOS has no StoreID,
- * and `message id N` resolves against the application rather than one folder, so
- * the message is found wherever it currently sits — including a subfolder.
- *
- * Uses `plain text content`, matching the Windows reader's use of `.Body`: the
- * same tradeoff applies, so an HTML table's rows flatten and tabular figures are
- * better read from an attachment.
+ * One email's full plain-text body. `storeId` has no macOS meaning: `message id
+ * N` resolves against the application, wherever the message sits.
  */
-async function readEmailBody(entryId, _storeId, maxChars = 8000, includeQuoted = false) {
-    const id = (0, scripts_1.macMessageId)(entryId);
-    const script = `tell application "Microsoft Outlook"
+async function readEmailBody(email) {
+    const id = (0, scripts_1.macMessageId)(email.entryId);
+    const parts = (0, run_1.summaryFields)(await (0, run_1.runOsaScript)(`tell application "Microsoft Outlook"
 ${(0, scripts_1.messageLookupSnippet)(id)}
 ${(0, scripts_1.messageDetailSnippet)(true)}
     return ${(0, run_1.asRow)((0, scripts_1.messageDetailFields)(true))}
-end tell`;
-    // The body is emitted LAST so a stray separator in earlier fields can't shift it.
-    const parts = (0, run_1.summaryFields)(await (0, run_1.runOsaScript)(script, 60000));
-    const attachmentNames = (0, run_1.splitList)((0, run_1.field)(parts, scripts_1.MessageDetail.attachmentNames));
-    const { body, quoted, separator } = (0, mail_1.splitQuotedOriginal)((0, run_1.field)(parts, scripts_1.MessageDetail.body));
-    // The quoted thread is context, never the priced content, so it is capped
-    // harder than the reply itself — matching the Windows reader.
-    const quotedCap = Math.min(maxChars, 4000);
+end tell`, 'quick'));
     return {
         entryId: (0, run_1.field)(parts, scripts_1.MessageDetail.id) || id,
         subject: (0, run_1.field)(parts, scripts_1.MessageDetail.subject).trim(),
         senderName: (0, run_1.field)(parts, scripts_1.MessageDetail.senderName),
         senderEmail: (0, run_1.field)(parts, scripts_1.MessageDetail.senderEmail),
         receivedTime: (0, run_1.field)(parts, scripts_1.MessageDetail.receivedTime),
-        body: body.length > maxChars ? body.slice(0, maxChars) : body,
-        truncated: body.length > maxChars,
-        bodyLength: body.length,
-        quoteSeparator: separator,
-        quotedLength: quoted.length,
-        quotedOriginal: includeQuoted ? quoted.slice(0, quotedCap) : '',
-        attachmentNames,
-        attachmentCount: attachmentNames.length,
+        body: (0, run_1.field)(parts, scripts_1.MessageDetail.body),
+        attachmentNames: (0, run_1.splitPositionalList)((0, run_1.field)(parts, scripts_1.MessageDetail.attachmentNames)),
     };
 }
 /**
- * Translate a Restrict-style `like` pattern to a regex.
- *
- * Windows hands `subjectLike` to Outlook's server-side Restrict; AppleScript has
- * no equivalent, so the same pattern is applied here instead. `%` and `*` are
- * the any-run wildcards, `_` and `?` match one character, and the match is
- * anchored because that is what SQL `like` means.
- */
-function likePattern(pattern) {
-    let source = '';
-    for (const ch of pattern) {
-        if (ch === '%' || ch === '*')
-            source += '.*';
-        else if (ch === '_' || ch === '?')
-            source += '.';
-        else
-            source += ch.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-    }
-    return new RegExp(`^${source}$`, 'i');
-}
-/**
- * Walk every folder under the Inbox (recursively) for one account and return the
- * emails matching `filter` — full body included, attachments listed by name but
- * not saved.
+ * Walk every folder under the Inbox for the mail matching the request.
  *
- * The filtering happens here rather than in Outlook: `Items.Restrict` is a COM
- * facility with no AppleScript counterpart, so the folder walk indexes each
- * folder in two bulk reads and the subject/date tests run on the index. The
- * observable contract is the same; the cost profile is not, and a `daysBack` of
- * 0 over a large mailbox tree is correspondingly heavier here.
- *
- * `subjectPattern` is applied case-insensitively regardless of the RegExp's own
- * flags, matching PowerShell's `-match`.
+ * The filtering happens here rather than in Outlook: there is no AppleScript
+ * counterpart to COM's server-side `Items.Restrict`, so each folder is indexed in
+ * bulk reads and the subject and date tests run on the index. The results match
+ * Windows; the cost doesn't, and a wide window over a big tree is heavier here.
  */
-async function searchInboxByFilter(emailAccount, filter = {}, daysBack = 0) {
-    const days = Math.max(0, Math.floor(daysBack));
+async function searchInboxByFilter(request) {
+    const acct = await (0, scripts_1.resolveMacAccount)(request.account);
+    // AppleScript reaches a child folder by name, so a path entry narrows to its leaf.
+    const asNameList = (list) => `{${list.map(mail_1.folderLeafName).filter(Boolean).map(run_1.asString).join(', ')}}`;
+    const rootInScope = request.includeFolders.length === 0 ? 'true' : 'false';
+    // Sent, Drafts, Deleted and Junk hang UNDER the Inbox on an IMAP profile, so
+    // their ids are collected first and the walk never descends into them — by
+    // the profile's own id where it records one, through the account otherwise.
+    const skipIds = ['sent items', 'deleted items', 'drafts', 'junk mail']
+        .map(term => {
+        const id = acct.folderIds?.[term];
+        return id !== undefined
+            ? `    set end of skipIds to ${id}`
+            : `    try
+        set end of skipIds to (id of (${term} of targetAcct))
+    end try`;
+    })
+        .join('\n');
     // Pass 1 — index every folder under the Inbox: path, id, subject, received.
-    const indexScript = `on scanFolder(theFolder, prefix, cutoff, useCutoff)
+    const indexed = (0, run_1.splitRecords)(await (0, run_1.runOsaScript)(`on scanFolder(theFolder, prefix, cutoff, skipIds, skipNames, onlyNames, inScope)
     set out to ""
+    set idList to {}
+    set subjList to {}
+    set timeList to {}
+    -- A folder the walk only passes through is never read: the bulk reads are
+    -- the expensive part.
+    if inScope then
+        tell application "Microsoft Outlook"
+            set idList to id of every message of theFolder
+            set subjList to subject of every message of theFolder
+            try
+                set timeList to time received of every message of theFolder
+            on error
+                set timeList to {}
+            end try
+        end tell
+    end if
     tell application "Microsoft Outlook"
-        set idList to id of every message of theFolder
-        set subjList to subject of every message of theFolder
-        try
-            set timeList to time received of every message of theFolder
-        on error
-            set timeList to {}
-        end try
         set subs to mail folders of theFolder
     end tell
     set hasTimes to ((count of timeList) is (count of idList))
     repeat with i from 1 to (count of idList)
         set d to missing value
         if hasTimes then set d to item i of timeList
-        set keep to true
-        if d is missing value then
-            -- A folder whose items carry no readable receive time can only be
-            -- included when the caller isn't bounding by date; silently dropping
-            -- it would look exactly like an empty folder.
-            set keep to not useCutoff
-        else if useCutoff and d is less than cutoff then
-            set keep to false
-        end if
-        if keep then
-            set out to out & ${(0, run_1.asRow)([
-        'prefix',
-        '(item i of idList as string)',
-        '(item i of subjList)',
-        'my isoDate(d)',
-    ])}
+        -- An item with no readable receive time is kept whatever the window
+        -- says; dropping it would make a folder of them look empty.
+        if d is missing value or d is not less than cutoff then
+            set out to out & ${(0, run_1.asRow)(['prefix', '(item i of idList as string)', '(item i of subjList)', 'my isoDate(d)'])}
         end if
     end repeat
     repeat with f in subs
-        set childName to ""
+        set skipThis to false
+        try
+            if skipIds contains (id of f) then set skipThis to true
+        end try
         try
-            set childName to (name of f) as string
+            if skipNames contains ((name of f) as string) then set skipThis to true
         end try
-        set out to out & my scanFolder(f, prefix & ${run_1.AS_LIST_SEP} & childName, cutoff, useCutoff)
+        if not skipThis then
+            set childName to ""
+            try
+                set childName to (name of f) as string
+            end try
+            set childScope to (count of onlyNames) is 0
+            try
+                if onlyNames contains childName then set childScope to true
+            end try
+            set out to out & my scanFolder(f, prefix & ${run_1.AS_LIST_SEP} & childName, cutoff, skipIds, skipNames, onlyNames, childScope)
+        end if
     end repeat
     return out
 end scanFolder
 
 tell application "Microsoft Outlook"
-${(0, scripts_1.accountLookupSnippet)(emailAccount)}
-    set rootInbox to inbox of targetAcct
+${(0, scripts_1.accountLookupSnippet)(acct)}
+${(0, scripts_1.rootFolderSnippet)(acct, 'inbox', 'rootInbox')}
     set rootName to (name of rootInbox) as string
+    set skipIds to {}
+${skipIds}
+    set skipNames to ${asNameList(request.excludeFolders)}
+    set onlyNames to ${asNameList(request.includeFolders)}
 end tell
-set cutoff to (current date) - (${days} * days)
-return my scanFolder(rootInbox, rootName, cutoff, ${days > 0 ? 'true' : 'false'})`;
-    const likeRe = filter.subjectLike ? likePattern(filter.subjectLike) : null;
-    // PowerShell's -match is case-insensitive by default, so the pattern is
-    // rebuilt with `i` regardless of the flags the caller's RegExp carries.
-    const patternRe = filter.subjectPattern
-        ? new RegExp(filter.subjectPattern.source, 'i')
+set cutoff to (current date) - (${(0, run_1.asInt)(request.daysBack)} * days)
+return my scanFolder(rootInbox, rootName, cutoff, skipIds, skipNames, onlyNames, ${rootInScope})`, 'scan'));
+    const subjectFiltered = !!(request.subjectLike || request.subjectPattern || request.excludeReplies);
+    const likeRe = request.subjectLike ? new RegExp((0, mail_1.subjectGlobSource)(request.subjectLike), 'i') : null;
+    // PowerShell's -match is case-insensitive, so this test is too, whatever the
+    // caller's flags. Only u and v are kept: they decide how the source parses,
+    // and without u, /\p{L}/u would match the literal text "p{L}". Keeping g or y
+    // would carry lastIndex from one subject to the next.
+    const patternRe = request.subjectPattern
+        ? new RegExp(request.subjectPattern.source, 'i' + request.subjectPattern.flags.replace(/[^uv]/g, ''))
         : null;
-    const candidates = (0, run_1.splitRecords)(await (0, run_1.runOsaScript)(indexScript, 300000))
+    const candidates = indexed
         .map(record => {
         const parts = (0, run_1.splitFields)(record);
         const segments = (0, run_1.splitList)((0, run_1.field)(parts, 0));
         return {
-            folderPath: (0, scripts_1.macFolderPath)(emailAccount, segments[0] || 'Inbox', segments.slice(1)),
+            folderPath: (0, scripts_1.macFolderPath)(request.account, segments[0] || 'Inbox', segments.slice(1)),
             id: (0, run_1.field)(parts, 1),
             subject: (0, run_1.field)(parts, 2).trim(),
             receivedTime: (0, run_1.field)(parts, 3),
         };
     })
         .filter(candidate => {
-        if (!candidate.subject)
+        if (subjectFiltered && !candidate.subject)
             return false;
         if (likeRe && !likeRe.test(candidate.subject))
             return false;
         if (patternRe && !patternRe.test(candidate.subject))
             return false;
-        if (filter.excludeReplies && /^(re|fwd?)\s*:/i.test(candidate.subject))
+        if (request.excludeReplies && mail_1.REPLY_PREFIX.test(candidate.subject))
             return false;
         return true;
     });
     if (candidates.length === 0)
         return [];
-    // Pass 2 — bodies, senders and attachment names for the survivors only.
-    const detailScript = `tell application "Microsoft Outlook"
-    set wanted to {${candidates.map(c => c.id).join(', ')}}
+    // Pass 2 — senders, attachment names and (when asked) bodies, for the survivors only.
+    const body = request.includeBody
+        ? `            set bodyText to ""
+            try
+                set bodyText to (plain text content of theMsg) as string
+            end try`
+        : '            set bodyText to ""';
+    const raw = await (0, run_1.runOsaScript)(`tell application "Microsoft Outlook"
     set out to ""
-    repeat with k from 1 to (count of wanted)
+    repeat with theId in ${(0, run_1.asIdList)(candidates.map(c => c.id))}
         set theMsg to missing value
         try
-            set theMsg to message id (item k of wanted)
+            set theMsg to message id theId
         end try
         if theMsg is not missing value then
-${(0, scripts_1.senderSnippet)('theMsg', '            ')}
+${(0, scripts_1.senderSnippet)('            ')}
             set attNames to {}
             try
                 set attNames to name of every attachment of theMsg
             end try
-            set bodyText to ""
-            try
-                set bodyText to (plain text content of theMsg) as string
-            end try
-            set out to out & ${(0, run_1.asRow)([
-        '(id of theMsg as string)',
-        'sndName',
-        'sndAddr',
-        'my sanitizeList(attNames)',
-        'bodyText',
-    ])}
+${body}
+            set out to out & ${(0, run_1.asRow)(['(id of theMsg as string)', 'sndName', 'sndAddr', 'my sanitizePositionalList(attNames)', 'bodyText'])}
         end if
     end repeat
     return out
-end tell`;
-    const details = new Map();
-    for (const record of (0, run_1.splitRecords)(await (0, run_1.runOsaScript)(detailScript, 300000))) {
+end tell`, 'scan');
+    const details = new Map((0, run_1.splitRecords)(raw).map(record => {
         const parts = (0, run_1.splitFields)(record);
-        details.set((0, run_1.field)(parts, 0), {
+        const detail = {
             senderName: (0, run_1.field)(parts, 1),
             senderEmail: (0, run_1.field)(parts, 2),
-            attachmentNames: (0, run_1.splitList)((0, run_1.field)(parts, 3)),
+            attachmentNames: (0, run_1.splitPositionalList)((0, run_1.field)(parts, 3)),
             body: (0, run_1.field)(parts, 4),
-        });
-    }
+        };
+        return [(0, run_1.field)(parts, 0), detail];
+    }));
     const matches = [];
     for (const candidate of candidates) {
         const detail = details.get(candidate.id);
         if (!detail)
             continue;
-        // requireAttachment can only be answered once the attachment names are in
-        // hand, so it filters here rather than during the index pass.
-        if (filter.requireAttachment && detail.attachmentNames.length === 0)
+        // Attachment names only arrive with the details, so this test waits for them.
+        if (request.requireAttachment && detail.attachmentNames.length === 0)
             continue;
         matches.push({
             entryId: candidate.id,
-            storeId: '', // macOS AppleScript has no StoreID equivalent
+            storeId: '',
             subject: candidate.subject,
             senderName: detail.senderName,
             senderEmail: detail.senderEmail,
@@ -359,50 +317,74 @@ end tell`;
     return matches;
 }
 /**
- * Read the email currently selected (or open) in Outlook — full body,
- * attachments listed by name but not saved.
+ * The email currently selected — or open — in Outlook. `current messages`
+ * covers both cases the Windows reader handles separately.
  *
- * `current messages` covers both cases the Windows reader handles separately
- * (an explorer selection and an open item), so there is no second lookup here.
+ * Where it sits comes back as a second record, so the detail row keeps its body
+ * last. A mailbox with no account object answers `account of` with missing
+ * value; its root folder's id is then looked up in the profile database.
  */
 async function readSelectedEmail() {
-    const script = `tell application "Microsoft Outlook"
+    const records = (0, run_1.splitRecords)(await (0, run_1.runOsaScript)(`tell application "Microsoft Outlook"
     set sel to {}
     try
         set sel to current messages
     end try
-    if (count of sel) is 0 then error "No email is selected in Outlook. Open Outlook, select (or open) an email, then try again."
+    if (count of sel) is 0 then error ${(0, run_1.asString)(`${(0, errors_1.failureTag)('NOT_FOUND', 'email')}No email is selected in Outlook. Select or open an email, then try again.`)}
     set theMsg to item 1 of sel
 ${(0, scripts_1.messageDetailSnippet)(true)}
-    return ${(0, run_1.asRow)((0, scripts_1.messageDetailFields)(true))}
-end tell`;
-    const records = (0, run_1.splitRecords)(await (0, run_1.runOsaScript)(script, 30000));
-    if (records.length === 0) {
-        throw new errors_1.NotFoundError('email', 'Failed to read the selected Outlook email.');
-    }
+    set acctAddr to ""
+    try
+        set rawAddr to email address of (account of theMsg)
+        if rawAddr is not missing value then set acctAddr to rawAddr as string
+    end try
+    set chainNames to {}
+    set rootId to ""
+    set theFolder to missing value
+    try
+        set theFolder to folder of theMsg
+    end try
+    if theFolder is not missing value then
+${(0, scripts_1.folderChainSnippet)('        ')}
+        try
+            set rootId to (id of cur) as string
+        end try
+    end if
+    return ${(0, run_1.asRow)((0, scripts_1.messageDetailFields)(true))} & ${(0, run_1.asRow)(['acctAddr', 'my sanitizeList(chainNames)', 'rootId'])}
+end tell`, 'quick'));
+    if (records.length === 0)
+        throw new errors_1.NotFoundError('email', 'Outlook reported no selected email.');
     const parts = (0, run_1.splitFields)(records[0]);
+    const where = (0, run_1.splitFields)(records[1] ?? '');
+    const chain = (0, run_1.splitList)((0, run_1.field)(where, 1)).reverse();
+    const account = (0, run_1.field)(where, 0) || (chain.length ? await accountByRootFolder((0, run_1.field)(where, 2)) : '');
     return {
         entryId: (0, run_1.field)(parts, scripts_1.MessageDetail.id),
-        storeId: '', // macOS AppleScript has no StoreID equivalent
+        storeId: '',
         subject: (0, run_1.field)(parts, scripts_1.MessageDetail.subject).trim(),
         senderName: (0, run_1.field)(parts, scripts_1.MessageDetail.senderName),
         senderEmail: (0, run_1.field)(parts, scripts_1.MessageDetail.senderEmail),
         receivedTime: (0, run_1.field)(parts, scripts_1.MessageDetail.receivedTime),
         body: (0, run_1.field)(parts, scripts_1.MessageDetail.body),
-        attachmentNames: (0, run_1.splitList)((0, run_1.field)(parts, scripts_1.MessageDetail.attachmentNames)),
+        attachmentNames: (0, run_1.splitPositionalList)((0, run_1.field)(parts, scripts_1.MessageDetail.attachmentNames)),
+        folderPath: account && chain.length ? (0, scripts_1.macFolderPath)(account, chain[0], chain.slice(1)) : '',
     };
 }
-/** Open an email in Outlook by its message id, and bring Outlook forward.
- *  `_storeId` is accepted for parity with Windows and ignored — macOS
- *  AppleScript has no StoreID (see `readEmailBody`). */
-async function openOutlookEmail(entryId, _storeId) {
-    const id = (0, scripts_1.macMessageId)(entryId);
-    const script = `
+/** The address of the account whose root folder has this id, per the profile database; '' if none. */
+async function accountByRootFolder(rootId) {
+    if (!/^\d+$/.test(rootId))
+        return '';
+    const id = Number(rootId);
+    return (await (0, profile_1.readProfileAccounts)()).find(a => a.folderIds['root folder'] === id)?.emailAccount ?? '';
+}
+/** Open an email in Outlook and bring Outlook forward. */
+async function openOutlookEmail(email) {
+    const id = (0, scripts_1.macMessageId)(email.entryId);
+    await (0, run_1.runOsaScript)(`
 tell application "Microsoft Outlook"
 ${(0, scripts_1.messageLookupSnippet)(id)}
     open theMsg
     activate
-end tell`;
-    await (0, run_1.runOsaScript)(script, 30000);
+end tell`, 'quick');
 }
 //# sourceMappingURL=read.js.map