@dawnlit/outlook-bridge 1.1.1 → 2.1.0

package/dist/mac/drafts.js

@@ -1,34 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listOutlookDrafts = listOutlookDrafts;
-exports.sendAllDrafts = sendAllDrafts;
-exports.deleteOutlookDrafts = deleteOutlookDrafts;
 exports.sendDrafts = sendDrafts;
-// Drafts: which ones belong to an account, and sending, listing or deleting them.
+exports.deleteOutlookDrafts = deleteOutlookDrafts;
+exports.sendAllDrafts = sendAllDrafts;
+// Drafts: which ones belong to an account, and listing, sending or deleting them.
+//
+// Where Windows scans two Drafts folders and proves each item's sending
+// account, macOS resolves the one Drafts folder belonging to the account —
+// through the account object, or by the folder's own id for a mailbox the
+// dictionary won't name (see profile.ts) — so a draft found there belongs to
+// the account by construction.
 //
-// Where Windows has to scan two Drafts folders and prove each item's
-// SendUsingAccount, macOS asks the account for its own Drafts folder directly —
-// `drafts of targetAcct` is already account-scoped, so a draft found there
-// belongs to this account by construction. That is the same rule the Windows
-// scan reaches by a longer route, not a weaker one.
+// What the folder can't vouch for is an item's own binding, which is why the
+// guards compare against the requested address as a literal rather than asking
+// `targetAcct`: there may be no account object to ask.
 const run_1 = require("./run");
 const scripts_1 = require("./scripts");
-/** The Drafts folder path this account's drafts are reported under. */
-function draftsPath(emailAccount) {
-    return (0, scripts_1.macFolderPath)(emailAccount, 'Drafts', []);
-}
-/**
- * List the mail drafts belonging to `emailAccount`, newest first.
- *
- * Bodies are previewed, never returned whole — a templated reply body runs to
- * tens of thousands of characters and a folder's worth would blow the cap.
- */
-async function listOutlookDrafts(emailAccount, limit = 100, previewChars = 300) {
-    const cap = Math.max(1, Math.floor(limit));
-    const preview = Math.max(1, Math.floor(previewChars));
-    const script = `tell application "Microsoft Outlook"
-${(0, scripts_1.accountLookupSnippet)(emailAccount)}
-    set draftsFolder to drafts of targetAcct
+/** The account's drafts, newest first. Bodies are previewed, never returned whole. */
+async function listOutlookDrafts(request) {
+    const acct = await (0, scripts_1.resolveMacAccount)(request.account);
+    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"
+${(0, scripts_1.accountLookupSnippet)(acct)}
+${(0, scripts_1.rootFolderSnippet)(acct, 'drafts', 'draftsFolder')}
     set out to ""
     repeat with theMsg in (messages of draftsFolder)
         set subj to ""
@@ -55,11 +56,7 @@ ${(0, scripts_1.accountLookupSnippet)(emailAccount)}
                 end try
             end repeat
         end try
-        set bodyText to ""
-        try
-            set bodyText to (plain text content of theMsg) as string
-        end try
-        if (length of bodyText) > ${preview} then set bodyText to text 1 thru ${preview} of bodyText
+${preview}
         set attCount to 0
         try
             set attCount to count of attachments of theMsg
@@ -68,21 +65,13 @@ ${(0, scripts_1.accountLookupSnippet)(emailAccount)}
         try
             set modAt to my isoDate(modification date of theMsg)
         end try
-        set out to out & ${(0, run_1.asRow)([
-        '(id of theMsg as string)',
-        'subj',
-        'my joinList(toNames, ", ")',
-        'my sanitizeList(toAddrs)',
-        'bodyText',
-        '(attCount as string)',
-        'modAt',
-    ])}
+${boundElsewhereSnippet(request.account, '        ')}
+        if not boundElsewhere then set out to out & ${(0, run_1.asRow)(['(id of theMsg as string)', 'subj', 'my joinList(toNames, ", ")', 'my sanitizeList(toAddrs)', 'bodyText', '(attCount as string)', 'modAt'])}
     end repeat
     return out
-end tell`;
-    // One string for every row, rather than rebuilt per draft.
-    const folderPath = draftsPath(emailAccount);
-    const drafts = (0, run_1.splitRecords)(await (0, run_1.runOsaScript)(script, 120000)).map(record => {
+end tell`, 'standard');
+    const folderPath = (0, scripts_1.macFolderPath)(request.account, 'Drafts', []);
+    const drafts = (0, run_1.splitRecords)(raw).map(record => {
         const parts = (0, run_1.splitFields)(record);
         return {
             entryId: (0, run_1.field)(parts, 0),
@@ -95,191 +84,129 @@ end tell`;
             folderPath,
         };
     });
-    // 'yyyy-MM-dd HH:mm' is lexicographically ordered, so a string compare sorts it.
     drafts.sort((a, b) => b.lastModified.localeCompare(a.lastModified));
     return {
-        account: emailAccount,
+        account: request.account,
         foldersScanned: [folderPath],
         count: drafts.length,
-        truncated: drafts.length > cap,
-        drafts: drafts.slice(0, cap),
+        truncated: drafts.length > request.limit,
+        drafts: drafts.slice(0, request.limit),
     };
 }
 /**
- * Send the mail drafts that belong to `emailAccount`.
- *
- * The ids are snapshotted before the first send: sending moves an item out of
- * Drafts, and mutating the collection mid-enumeration would skip every other one
- * — the same trap the Windows implementation avoids by snapshotting item refs.
+ * Set `boundElsewhere` to whether `theMsg`, a message in the account's Drafts
+ * folder, is set to send from some OTHER account. An unbound draft there is the
+ * account's own. Listing, sending all and the per-id guard all apply this one
+ * rule, as Windows' Test-DraftMatches is applied to all three.
  */
-async function sendAllDrafts(emailAccount) {
-    const script = `tell application "Microsoft Outlook"
-${(0, scripts_1.accountLookupSnippet)(emailAccount)}
-    set draftsFolder to drafts of targetAcct
-    set wanted to id of every message of draftsFolder
-    set sentCount to 0
-    set out to ""
-    repeat with theId in wanted
-        set subj to ""
-        try
-            set theMsg to missing value
-            try
-                set theMsg to message id theId
-            end try
-            if theMsg is missing value then error "draft is no longer in the Drafts folder"
-            try
-                set subj to (subject of theMsg) as string
-            end try
-            send theMsg
-            set sentCount to sentCount + 1
-        on error errText
-            set out to out & ${(0, run_1.asRow)(['subj', 'errText'])}
-        end try
-    end repeat
-    return ${(0, run_1.asRow)(['(sentCount as string)'])} & out
-end tell`;
-    const records = (0, run_1.splitRecords)(await (0, run_1.runOsaScript)(script, 300000));
-    return {
-        sent: (0, run_1.intField)((0, run_1.splitFields)(records[0] || ''), 0),
-        failed: records.slice(1).map(record => {
-            const parts = (0, run_1.splitFields)(record);
-            return { subject: (0, run_1.field)(parts, 0), error: (0, run_1.field)(parts, 1) };
-        }),
-    };
+function boundElsewhereSnippet(emailAccount, indent) {
+    return `${indent}set boundTo to ""
+${indent}try
+${indent}    set boundTo to (email address of (account of theMsg)) as string
+${indent}end try
+${indent}set boundElsewhere to (boundTo is not "" and boundTo is not ${(0, run_1.asString)(emailAccount)})`;
 }
 /**
- * Delete mail drafts by message id. `delete` files the item in Deleted Items
- * rather than destroying it, so a mistaken call stays recoverable from there —
- * matching the Windows contract.
- *
- * Every id must resolve to a message sitting in THIS account's Drafts folder
- * before anything is deleted; an id pointing at ordinary mail, or at another
- * account's draft, is refused and reported. Without that gate this would be a
- * general-purpose "delete any email by id" tool, which is not what it is for.
+ * The AppleScript that proves `theMsg` is one of this account's drafts before
+ * `verb` happens to it: it sits in the account's Drafts folder, and it is bound
+ * to this account or to none.
  */
-async function deleteOutlookDrafts(emailAccount, entryIds) {
-    if (entryIds.length === 0)
-        return { deleted: 0, failed: [] };
-    const { valid, invalid } = (0, scripts_1.partitionMessageIds)(entryIds);
+function ownDraftGuard(emailAccount, verb) {
+    return `            set inFolder to ""
+            try
+                set inFolder to (name of (folder of theMsg)) as string
+            end try
+            if inFolder is not draftsName or draftIds does not contain (id of theMsg) then error "item is not in this account's Drafts folder - refusing to ${verb}"
+${boundElsewhereSnippet(emailAccount, '            ')}
+            if boundElsewhere then error "draft is not bound to this account - refusing to ${verb}"`;
+}
+/** Run `verb` over named drafts of the account, each proved to be its own first. */
+async function actOnDrafts(request, verb) {
+    const { valid, invalid } = (0, scripts_1.partitionMessageIds)(request.entryIds);
     if (valid.length === 0)
-        return { deleted: 0, failed: invalid };
-    const script = `tell application "Microsoft Outlook"
-${(0, scripts_1.accountLookupSnippet)(emailAccount)}
-    set draftsFolder to drafts of targetAcct
+        return { done: 0, failed: invalid };
+    const acct = await (0, scripts_1.resolveMacAccount)(request.account);
+    const raw = await (0, run_1.runOsaScript)(`tell application "Microsoft Outlook"
+${(0, scripts_1.accountLookupSnippet)(acct)}
+${(0, scripts_1.rootFolderSnippet)(acct, 'drafts', 'draftsFolder')}
     set draftsName to (name of draftsFolder) as string
     set draftIds to id of every message of draftsFolder
-    set deletedCount to 0
+    set doneCount to 0
     set out to ""
-    repeat with theId in {${valid.join(', ')}}
+    repeat with theId in ${(0, run_1.asIdList)(valid)}
+        set subj to ""
         try
             set theMsg to missing value
             try
                 set theMsg to message id theId
             end try
             if theMsg is missing value then error "no such item in this account's Drafts folder"
-            -- Prove it is in THIS account's Drafts before deleting: the folder it
-            -- currently sits in, and the account it is bound to, must both match.
-            set inFolder to ""
             try
-                set inFolder to (name of (folder of theMsg)) as string
-            end try
-            if inFolder is not draftsName then error "item is not in this account's Drafts folder - refusing to delete"
-            if draftIds does not contain (id of theMsg) then error "item is not in this account's Drafts folder - refusing to delete"
-            set boundTo to ""
-            try
-                set boundTo to (email address of (account of theMsg)) as string
+                set subj to (subject of theMsg) as string
             end try
-            if boundTo is not "" and boundTo is not (email address of targetAcct) then
-                error "draft is not bound to this account - refusing to delete"
-            end if
-            delete theMsg
-            set deletedCount to deletedCount + 1
+${ownDraftGuard(request.account, verb)}
+            ${verb} theMsg
+            set doneCount to doneCount + 1
         on error errText
-            set out to out & ${(0, run_1.asRow)(['(theId as string)', 'errText'])}
+            set out to out & ${run_1.ITEM_FAILURE_ROW}
         end try
     end repeat
-    return ${(0, run_1.asRow)(['(deletedCount as string)'])} & out
-end tell`;
-    const records = (0, run_1.splitRecords)(await (0, run_1.runOsaScript)(script, 300000));
-    return {
-        deleted: (0, run_1.intField)((0, run_1.splitFields)(records[0] || ''), 0),
-        failed: [
-            ...invalid,
-            ...records.slice(1).map(record => {
-                const parts = (0, run_1.splitFields)(record);
-                return { entryId: (0, run_1.field)(parts, 0), error: (0, run_1.field)(parts, 1) };
-            }),
-        ],
-    };
+    return ${(0, run_1.asRow)(['(doneCount as string)'])} & out
+end tell`, 'scan');
+    const { summary, failed } = (0, run_1.splitBatch)(raw);
+    return { done: (0, run_1.intField)(summary, 0), failed: [...invalid, ...failed] };
+}
+/** Send the named drafts. */
+async function sendDrafts(request) {
+    const { done, failed } = await actOnDrafts(request, 'send');
+    return { sent: done, failed };
 }
 /**
- * Send a chosen subset of `emailAccount`'s drafts by message id — e.g. after
- * `listOutlookDrafts` and a user review pass — instead of `sendAllDrafts`'s
- * account-wide sweep.
- *
- * Same ownership gate as `deleteOutlookDrafts`: every id must resolve to a
- * message sitting in THIS account's Drafts folder before anything is sent. An
- * id pointing at ordinary mail, or at another account's draft, is refused and
- * reported rather than sent.
+ * Delete the named drafts. `delete` files an item in Deleted Items, so a
+ * mistaken call stays recoverable.
  */
-async function sendDrafts(emailAccount, entryIds) {
-    if (entryIds.length === 0)
-        return { sent: 0, failed: [] };
-    const { valid, invalid } = (0, scripts_1.partitionMessageIds)(entryIds);
-    if (valid.length === 0) {
-        return { sent: 0, failed: invalid.map(f => ({ entryId: f.entryId, subject: '', error: f.error })) };
-    }
-    const script = `tell application "Microsoft Outlook"
-${(0, scripts_1.accountLookupSnippet)(emailAccount)}
-    set draftsFolder to drafts of targetAcct
-    set draftsName to (name of draftsFolder) as string
-    set draftIds to id of every message of draftsFolder
+async function deleteOutlookDrafts(request) {
+    const { done, failed } = await actOnDrafts(request, 'delete');
+    return { deleted: done, failed };
+}
+/**
+ * Send every draft belonging to the account. The ids are snapshotted before the
+ * first send: sending moves an item out of Drafts, and mutating the collection
+ * mid-enumeration would skip every other one. A draft in the folder that is set
+ * to send from another account is not this account's, so it is skipped, as on
+ * Windows, rather than sent from that account.
+ */
+async function sendAllDrafts(request) {
+    const acct = await (0, scripts_1.resolveMacAccount)(request.account);
+    const raw = await (0, run_1.runOsaScript)(`tell application "Microsoft Outlook"
+${(0, scripts_1.accountLookupSnippet)(acct)}
+${(0, scripts_1.rootFolderSnippet)(acct, 'drafts', 'draftsFolder')}
+    set wanted to id of every message of draftsFolder
     set sentCount to 0
     set out to ""
-    repeat with theId in {${valid.join(', ')}}
+    repeat with theId in wanted
         set subj to ""
         try
             set theMsg to missing value
             try
                 set theMsg to message id theId
             end try
-            if theMsg is missing value then error "no such item in this account's Drafts folder"
-            try
-                set subj to (subject of theMsg) as string
-            end try
-            -- Prove it is in THIS account's Drafts before sending: the folder it
-            -- currently sits in, and the account it is bound to, must both match.
-            set inFolder to ""
-            try
-                set inFolder to (name of (folder of theMsg)) as string
-            end try
-            if inFolder is not draftsName then error "item is not in this account's Drafts folder - refusing to send"
-            if draftIds does not contain (id of theMsg) then error "item is not in this account's Drafts folder - refusing to send"
-            set boundTo to ""
-            try
-                set boundTo to (email address of (account of theMsg)) as string
-            end try
-            if boundTo is not "" and boundTo is not (email address of targetAcct) then
-                error "draft is not bound to this account - refusing to send"
+            if theMsg is missing value then error "draft is no longer in the Drafts folder"
+${boundElsewhereSnippet(request.account, '            ')}
+            if not boundElsewhere then
+                try
+                    set subj to (subject of theMsg) as string
+                end try
+                send theMsg
+                set sentCount to sentCount + 1
             end if
-            send theMsg
-            set sentCount to sentCount + 1
         on error errText
-            set out to out & ${(0, run_1.asRow)(['(theId as string)', 'subj', 'errText'])}
+            set out to out & ${run_1.ITEM_FAILURE_ROW}
         end try
     end repeat
     return ${(0, run_1.asRow)(['(sentCount as string)'])} & out
-end tell`;
-    const records = (0, run_1.splitRecords)(await (0, run_1.runOsaScript)(script, 300000));
-    return {
-        sent: (0, run_1.intField)((0, run_1.splitFields)(records[0] || ''), 0),
-        failed: [
-            ...invalid.map(f => ({ entryId: f.entryId, subject: '', error: f.error })),
-            ...records.slice(1).map(record => {
-                const parts = (0, run_1.splitFields)(record);
-                return { entryId: (0, run_1.field)(parts, 0), subject: (0, run_1.field)(parts, 1), error: (0, run_1.field)(parts, 2) };
-            }),
-        ],
-    };
+end tell`, 'scan');
+    const { summary, failed } = (0, run_1.splitBatch)(raw);
+    return { sent: (0, run_1.intField)(summary, 0), failed };
 }
 //# sourceMappingURL=drafts.js.map

package/dist/mac/drafts.js.map

@@ -1 +1 @@
-{"version":3,"file":"drafts.js","sourceRoot":"","sources":["../../src/mac/drafts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"drafts.js","sourceRoot":"","sources":["../../src/mac/drafts.ts"],"names":[],"mappings":"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","sourcesContent":["// Drafts: which ones belong to an account, and listing, sending or deleting them.\n//\n// Where Windows scans two Drafts folders and proves each item's sending\n// account, macOS resolves the one Drafts folder belonging to the account —\n// through the account object, or by the folder's own id for a mailbox the\n// dictionary won't name (see profile.ts) — so a draft found there belongs to\n// the account by construction.\n//\n// What the folder can't vouch for is an item's own binding, which is why the\n// guards compare against the requested address as a literal rather than asking\n// `targetAcct`: there may be no account object to ask.\nimport {\n    asIdList,\n    asInt,\n    asRow,\n    asString,\n    field,\n    intField,\n    ITEM_FAILURE_ROW,\n    runOsaScript,\n    splitBatch,\n    splitFields,\n    splitList,\n    splitRecords,\n} from './run';\nimport {\n    accountLookupSnippet,\n    macFolderPath,\n    partitionMessageIds,\n    resolveMacAccount,\n    rootFolderSnippet,\n} from './scripts';\nimport type { AccountRequest, EntryIdsRequest, ListDraftsRequest } from '../backend';\nimport type { DeleteDraftsResult, ItemFailure, ListDraftsResult, SendDraftsResult } from '../types';\n\n/** The account's drafts, newest first. Bodies are previewed, never returned whole. */\nexport async function listOutlookDrafts(request: ListDraftsRequest): Promise<ListDraftsResult> {\n    const acct = await resolveMacAccount(request.account);\n    const preview = request.previewChars > 0\n        ? `        set bodyText to \"\"\n        try\n            set bodyText to (plain text content of theMsg) as string\n        end try\n        if (length of bodyText) > ${asInt(request.previewChars)} then set bodyText to text 1 thru ${asInt(request.previewChars)} of bodyText`\n        : '        set bodyText to \"\"';\n    const raw = await runOsaScript(`tell application \"Microsoft Outlook\"\n${accountLookupSnippet(acct)}\n${rootFolderSnippet(acct, 'drafts', 'draftsFolder')}\n    set out to \"\"\n    repeat with theMsg in (messages of draftsFolder)\n        set subj to \"\"\n        try\n            set subj to (subject of theMsg) as string\n        end try\n        set toNames to {}\n        set toAddrs to {}\n        try\n            repeat with r in (every to recipient of theMsg)\n                try\n                    set ea to email address of r\n                    set oneAddr to \"\"\n                    set oneName to \"\"\n                    try\n                        set oneAddr to (address of ea) as string\n                    end try\n                    try\n                        set oneName to (name of ea) as string\n                    end try\n                    if oneName is \"\" then set oneName to oneAddr\n                    if oneName is not \"\" then set end of toNames to oneName\n                    if oneAddr is not \"\" then set end of toAddrs to oneAddr\n                end try\n            end repeat\n        end try\n${preview}\n        set attCount to 0\n        try\n            set attCount to count of attachments of theMsg\n        end try\n        set modAt to \"\"\n        try\n            set modAt to my isoDate(modification date of theMsg)\n        end try\n${boundElsewhereSnippet(request.account, '        ')}\n        if not boundElsewhere then set out to out & ${asRow(['(id of theMsg as string)', 'subj', 'my joinList(toNames, \", \")', 'my sanitizeList(toAddrs)', 'bodyText', '(attCount as string)', 'modAt'])}\n    end repeat\n    return out\nend tell`, 'standard');\n\n    const folderPath = macFolderPath(request.account, 'Drafts', []);\n    const drafts = splitRecords(raw).map(record => {\n        const parts = splitFields(record);\n        return {\n            entryId: field(parts, 0),\n            subject: field(parts, 1),\n            to: field(parts, 2),\n            toEmails: splitList(field(parts, 3)),\n            bodyPreview: field(parts, 4).replace(/\\s+/g, ' ').trim(),\n            hasAttachments: intField(parts, 5) > 0,\n            lastModified: field(parts, 6),\n            folderPath,\n        };\n    });\n    drafts.sort((a, b) => b.lastModified.localeCompare(a.lastModified));\n    return {\n        account: request.account,\n        foldersScanned: [folderPath],\n        count: drafts.length,\n        truncated: drafts.length > request.limit,\n        drafts: drafts.slice(0, request.limit),\n    };\n}\n\n/**\n * Set `boundElsewhere` to whether `theMsg`, a message in the account's Drafts\n * folder, is set to send from some OTHER account. An unbound draft there is the\n * account's own. Listing, sending all and the per-id guard all apply this one\n * rule, as Windows' Test-DraftMatches is applied to all three.\n */\nfunction boundElsewhereSnippet(emailAccount: string, indent: string): string {\n    return `${indent}set boundTo to \"\"\n${indent}try\n${indent}    set boundTo to (email address of (account of theMsg)) as string\n${indent}end try\n${indent}set boundElsewhere to (boundTo is not \"\" and boundTo is not ${asString(emailAccount)})`;\n}\n\n/**\n * The AppleScript that proves `theMsg` is one of this account's drafts before\n * `verb` happens to it: it sits in the account's Drafts folder, and it is bound\n * to this account or to none.\n */\nfunction ownDraftGuard(emailAccount: string, verb: 'send' | 'delete'): string {\n    return `            set inFolder to \"\"\n            try\n                set inFolder to (name of (folder of theMsg)) as string\n            end try\n            if inFolder is not draftsName or draftIds does not contain (id of theMsg) then error \"item is not in this account's Drafts folder - refusing to ${verb}\"\n${boundElsewhereSnippet(emailAccount, '            ')}\n            if boundElsewhere then error \"draft is not bound to this account - refusing to ${verb}\"`;\n}\n\n/** Run `verb` over named drafts of the account, each proved to be its own first. */\nasync function actOnDrafts(\n    request: EntryIdsRequest,\n    verb: 'send' | 'delete',\n): Promise<{ done: number; failed: ItemFailure[] }> {\n    const { valid, invalid } = partitionMessageIds(request.entryIds);\n    if (valid.length === 0) return { done: 0, failed: invalid };\n    const acct = await resolveMacAccount(request.account);\n    const raw = await runOsaScript(`tell application \"Microsoft Outlook\"\n${accountLookupSnippet(acct)}\n${rootFolderSnippet(acct, 'drafts', 'draftsFolder')}\n    set draftsName to (name of draftsFolder) as string\n    set draftIds to id of every message of draftsFolder\n    set doneCount to 0\n    set out to \"\"\n    repeat with theId in ${asIdList(valid)}\n        set subj to \"\"\n        try\n            set theMsg to missing value\n            try\n                set theMsg to message id theId\n            end try\n            if theMsg is missing value then error \"no such item in this account's Drafts folder\"\n            try\n                set subj to (subject of theMsg) as string\n            end try\n${ownDraftGuard(request.account, verb)}\n            ${verb} theMsg\n            set doneCount to doneCount + 1\n        on error errText\n            set out to out & ${ITEM_FAILURE_ROW}\n        end try\n    end repeat\n    return ${asRow(['(doneCount as string)'])} & out\nend tell`, 'scan');\n    const { summary, failed } = splitBatch(raw);\n    return { done: intField(summary, 0), failed: [...invalid, ...failed] };\n}\n\n/** Send the named drafts. */\nexport async function sendDrafts(request: EntryIdsRequest): Promise<SendDraftsResult> {\n    const { done, failed } = await actOnDrafts(request, 'send');\n    return { sent: done, failed };\n}\n\n/**\n * Delete the named drafts. `delete` files an item in Deleted Items, so a\n * mistaken call stays recoverable.\n */\nexport async function deleteOutlookDrafts(request: EntryIdsRequest): Promise<DeleteDraftsResult> {\n    const { done, failed } = await actOnDrafts(request, 'delete');\n    return { deleted: done, failed };\n}\n\n/**\n * Send every draft belonging to the account. The ids are snapshotted before the\n * first send: sending moves an item out of Drafts, and mutating the collection\n * mid-enumeration would skip every other one. A draft in the folder that is set\n * to send from another account is not this account's, so it is skipped, as on\n * Windows, rather than sent from that account.\n */\nexport async function sendAllDrafts(request: AccountRequest): Promise<SendDraftsResult> {\n    const acct = await resolveMacAccount(request.account);\n    const raw = await runOsaScript(`tell application \"Microsoft Outlook\"\n${accountLookupSnippet(acct)}\n${rootFolderSnippet(acct, 'drafts', 'draftsFolder')}\n    set wanted to id of every message of draftsFolder\n    set sentCount to 0\n    set out to \"\"\n    repeat with theId in wanted\n        set subj to \"\"\n        try\n            set theMsg to missing value\n            try\n                set theMsg to message id theId\n            end try\n            if theMsg is missing value then error \"draft is no longer in the Drafts folder\"\n${boundElsewhereSnippet(request.account, '            ')}\n            if not boundElsewhere then\n                try\n                    set subj to (subject of theMsg) as string\n                end try\n                send theMsg\n                set sentCount to sentCount + 1\n            end if\n        on error errText\n            set out to out & ${ITEM_FAILURE_ROW}\n        end try\n    end repeat\n    return ${asRow(['(sentCount as string)'])} & out\nend tell`, 'scan');\n    const { summary, failed } = splitBatch(raw);\n    return { sent: intField(summary, 0), failed };\n}\n"]}

package/dist/mac/folders.d.ts

@@ -1,28 +1,19 @@
+import type { ListFoldersRequest, MoveRequest } from '../backend';
 import type { InboxFolderInfo, MoveEmailsResult } from '../types';
 /**
- * List the folders under an account's Inbox with their item counts.
- *
- * The recursive walk joins path segments with the LIST separator rather than a
- * backslash: a literal backslash would have to survive a JS template literal and
- * then an AppleScript string literal, and the `folderPath` shape is assembled in
- * TypeScript anyway (see macFolderPath).
+ * The folders under an account's Inbox with their message counts. Path segments
+ * travel joined by the LIST separator and are assembled into a folder path in
+ * TypeScript, rather than pushed through two layers of backslash escaping.
  */
-export declare function listInboxFolders(emailAccount: string, maxDepth?: number): Promise<InboxFolderInfo[]>;
+export declare function listInboxFolders(request: ListFoldersRequest): Promise<InboxFolderInfo[]>;
 /**
- * Move emails (by message id) into any folder of the account — a filing folder
- * under the Inbox, or a well-known folder by name (see WELL_KNOWN_FOLDERS).
- *
- * **Moving to "Deleted Items" is how mail gets deleted reversibly**, which is why
- * this takes well-known roots at all: it means the destructive path and the filing
- * path are one tool, and the destructive one is undoable from the folder it lands in.
- *
- * `createIfMissing` builds the WHOLE missing chain, so a nested destination
- * ("Clients\\Acme\\2026") is one call rather than a manual mkdir first.
- * NOTE: moving changes a message's id — the passed ids are dead afterwards.
+ * File emails into a folder of the account. Moving rewrites each message's id.
  *
  * Outlook for Mac's `move` reports success even where it silently does nothing,
- * so the destination's message count is compared before and after. A run where
- * every move "succeeded" and yet the folder never grew fails loudly instead of
- * reporting mail that was never filed.
+ * so each move is confirmed by the destination growing, and one that didn't
+ * fails as its own item. A count compared once around the whole batch would let
+ * one real move cover for silent failures, and give no per-item results when it
+ * tripped. A message already in the destination counts as moved without being
+ * moved, as Windows' Move() to its own folder does.
  */
-export declare function moveOutlookEmails(emailAccount: string, entryIds: string[], folderName: string, createIfMissing?: boolean): Promise<MoveEmailsResult>;
+export declare function moveOutlookEmails(request: MoveRequest): Promise<MoveEmailsResult>;

package/dist/mac/folders.js

@@ -5,18 +5,14 @@ exports.moveOutlookEmails = moveOutlookEmails;
 // Listing the folders under an Inbox, and filing mail into one.
 const run_1 = require("./run");
 const scripts_1 = require("./scripts");
-const mail_1 = require("../mail");
 /**
- * List the folders under an account's Inbox with their item counts.
- *
- * The recursive walk joins path segments with the LIST separator rather than a
- * backslash: a literal backslash would have to survive a JS template literal and
- * then an AppleScript string literal, and the `folderPath` shape is assembled in
- * TypeScript anyway (see macFolderPath).
+ * The folders under an account's Inbox with their message counts. Path segments
+ * travel joined by the LIST separator and are assembled into a folder path in
+ * TypeScript, rather than pushed through two layers of backslash escaping.
  */
-async function listInboxFolders(emailAccount, maxDepth = 2) {
-    const depth = (0, mail_1.clamp)(maxDepth, 1, 4);
-    const script = `on walkFolders(theFolder, level, maxLevel, prefix)
+async function listInboxFolders(request) {
+    const acct = await (0, scripts_1.resolveMacAccount)(request.account);
+    const raw = await (0, run_1.runOsaScript)(`on walkFolders(theFolder, level, maxLevel, prefix)
     set out to ""
     tell application "Microsoft Outlook"
         set subs to mail folders of theFolder
@@ -42,86 +38,75 @@ async function listInboxFolders(emailAccount, maxDepth = 2) {
 end walkFolders
 
 tell application "Microsoft Outlook"
-${(0, scripts_1.accountLookupSnippet)(emailAccount)}
-    set inb to inbox of targetAcct
+${(0, scripts_1.accountLookupSnippet)(acct)}
+${(0, scripts_1.rootFolderSnippet)(acct, 'inbox', 'inb')}
 end tell
-return my walkFolders(inb, 1, ${depth}, "")`;
-    return (0, run_1.splitRecords)(await (0, run_1.runOsaScript)(script, 120000)).map(record => {
+return my walkFolders(inb, 1, ${(0, run_1.asInt)(request.maxDepth)}, "")`, 'standard');
+    return (0, run_1.splitRecords)(raw).map(record => {
         const parts = (0, run_1.splitFields)(record);
-        const segments = (0, run_1.splitList)((0, run_1.field)(parts, 1));
         return {
             name: (0, run_1.field)(parts, 0),
-            folderPath: (0, scripts_1.macFolderPath)(emailAccount, 'Inbox', segments),
+            folderPath: (0, scripts_1.macFolderPath)(request.account, 'Inbox', (0, run_1.splitList)((0, run_1.field)(parts, 1))),
             itemCount: (0, run_1.intField)(parts, 2),
             depth: (0, run_1.intField)(parts, 3, 1),
         };
     });
 }
 /**
- * Move emails (by message id) into any folder of the account — a filing folder
- * under the Inbox, or a well-known folder by name (see WELL_KNOWN_FOLDERS).
- *
- * **Moving to "Deleted Items" is how mail gets deleted reversibly**, which is why
- * this takes well-known roots at all: it means the destructive path and the filing
- * path are one tool, and the destructive one is undoable from the folder it lands in.
- *
- * `createIfMissing` builds the WHOLE missing chain, so a nested destination
- * ("Clients\\Acme\\2026") is one call rather than a manual mkdir first.
- * NOTE: moving changes a message's id — the passed ids are dead afterwards.
+ * File emails into a folder of the account. Moving rewrites each message's id.
  *
  * Outlook for Mac's `move` reports success even where it silently does nothing,
- * so the destination's message count is compared before and after. A run where
- * every move "succeeded" and yet the folder never grew fails loudly instead of
- * reporting mail that was never filed.
+ * so each move is confirmed by the destination growing, and one that didn't
+ * fails as its own item. A count compared once around the whole batch would let
+ * one real move cover for silent failures, and give no per-item results when it
+ * tripped. A message already in the destination counts as moved without being
+ * moved, as Windows' Move() to its own folder does.
  */
-async function moveOutlookEmails(emailAccount, entryIds, folderName, createIfMissing = false) {
-    if (entryIds.length === 0) {
-        return { folderPath: '', folderCreated: false, moved: 0, failed: [] };
-    }
-    const ref = (0, mail_1.mailFolderRef)(folderName);
-    const { valid, invalid } = (0, scripts_1.partitionMessageIds)(entryIds);
-    const folderPath = (0, scripts_1.macFolderPath)(emailAccount, ref.rootLabel, ref.segments);
-    if (valid.length === 0) {
+async function moveOutlookEmails(request) {
+    const folderPath = (0, scripts_1.macFolderPath)(request.account, request.folder.rootLabel, request.folder.segments);
+    const { valid, invalid } = (0, scripts_1.partitionMessageIds)(request.entryIds);
+    if (valid.length === 0)
         return { folderPath, folderCreated: false, moved: 0, failed: invalid };
-    }
-    const script = `tell application "Microsoft Outlook"
-${(0, scripts_1.accountLookupSnippet)(emailAccount)}
-${(0, scripts_1.mailScopeSnippet)(ref, folderName, createIfMissing)}
-    set countBefore to count of messages of scopeFolder
+    const acct = await (0, scripts_1.resolveMacAccount)(request.account);
+    const raw = await (0, run_1.runOsaScript)(`tell application "Microsoft Outlook"
+${(0, scripts_1.accountLookupSnippet)(acct)}
+${(0, scripts_1.mailScopeSnippet)(acct, request.folder, request.folderLabel, request.createIfMissing)}
+    set scopeId to id of scopeFolder
     set movedCount to 0
     set out to ""
-    repeat with theId in {${valid.join(', ')}}
+    repeat with theId in ${(0, run_1.asIdList)(valid)}
+        set subj to ""
         try
             set theMsg to missing value
             try
                 set theMsg to message id theId
             end try
             if theMsg is missing value then error "no message with that id in this Outlook"
-            move theMsg to scopeFolder
+            try
+                set subj to (subject of theMsg) as string
+            end try
+            set fromId to missing value
+            try
+                set fromId to id of (folder of theMsg)
+            end try
+            if fromId is not scopeId then
+                set countBefore to count of messages of scopeFolder
+                move theMsg to scopeFolder
+                if (count of messages of scopeFolder) is not greater than countBefore then error "Outlook reported the move but '" & (name of scopeFolder) & "' did not grow - not filed"
+            end if
             set movedCount to movedCount + 1
         on error errText
-            set out to out & ${(0, run_1.asRow)(['(theId as string)', 'errText'])}
+            set out to out & ${run_1.ITEM_FAILURE_ROW}
         end try
     end repeat
-    set countAfter to count of messages of scopeFolder
-    if movedCount > 0 and countAfter is not greater than countBefore then
-        error "Outlook reported " & (movedCount as string) & " move(s) but '" & (name of scopeFolder) & "' did not grow - nothing was filed."
-    end if
     return ${(0, run_1.asRow)(['(movedCount as string)', '(scopeCreated as string)'])} & out
-end tell`;
-    const records = (0, run_1.splitRecords)(await (0, run_1.runOsaScript)(script, 300000));
-    const summary = (0, run_1.splitFields)(records[0] || '');
+end tell`, 'scan');
+    const { summary, failed } = (0, run_1.splitBatch)(raw);
     return {
         folderPath,
         folderCreated: (0, run_1.boolField)(summary, 1),
         moved: (0, run_1.intField)(summary, 0),
-        failed: [
-            ...invalid,
-            ...records.slice(1).map(record => {
-                const parts = (0, run_1.splitFields)(record);
-                return { entryId: (0, run_1.field)(parts, 0), error: (0, run_1.field)(parts, 1) };
-            }),
-        ],
+        failed: [...invalid, ...failed],
     };
 }
 //# sourceMappingURL=folders.js.map