@dawnlit/outlook-bridge 1.1.1 → 2.1.0

package/dist/windows/cleanup.js

@@ -7,160 +7,146 @@ const run_1 = require("./run");
 const scripts_1 = require("./scripts");
 const json_1 = require("../shared/json");
 const mail_1 = require("../mail");
-/** Folders whose contents are received or already-sent mail, not working state. */
-const PROTECTED_FOLDER_IDS = [6, 5];
-/** Walks an item's parent chain, so Inbox/Sent protection covers their subfolders too. */
-const FOLDER_CHAIN_PS = `
-function Get-FolderChainIds($folder) {
-    $ids = @()
-    $cur = $folder
-    $guard = 0
-    while ($cur -ne $null -and $guard -lt 25) {
-        $cid = $null
-        try { $cid = $cur.EntryID } catch { $cid = $null }
-        if (-not $cid) { break }
-        $ids += $cid
-        $parent = $null
-        try { $parent = $cur.Parent } catch { $parent = $null }
-        if ($parent -eq $null) { break }
-        $cur = $parent
-        $guard++
-    }
-    return $ids
-}
-`;
+/** Folders whose contents are received or sent mail rather than working state. */
+const PROTECTED_FOLDER_IDS = [mail_1.FolderId.Inbox, mail_1.FolderId.SentMail];
 /**
- * Delete mail by EntryID from anywhere in the account. Delete() moves each item to
- * Deleted Items, so this is recoverable — purgeDeletedItems is what destroys.
+ * Delete mail by entry id from anywhere in the account. Delete() moves each item
+ * to Deleted Items, so this is recoverable — purgeDeletedItems is what destroys.
  *
- * ⚠️ This is the one tool here that can reach received mail, and EntryIDs are a
- * genuinely unsafe key for it: GetItemFromID silently returns a DIFFERENT message
- * when handed a stale or wrong id, which is common precisely when many replies share
- * one subject (see saveEmailAttachmentDetailed). Three things hold the line:
- *
- *  - **Inbox and Sent Items are refused by default, INCLUDING their subfolders** —
- *    a filed subfolder is still received mail. `allowProtected` lifts that, and is
- *    the caller explicitly taking responsibility.
- *  - **`dryRun` resolves and reports without deleting**, so the exact subjects and
- *    folders can be shown to the user before anything happens. Use it first.
- *  - **Every outcome echoes the subject and folderPath** of the item actually
- *    resolved, so a wrong id is visible after the fact rather than silent.
+ * This is the one operation that can reach received mail, and an entry id is an
+ * unsafe key for it: a stale or wrong id can resolve to a DIFFERENT message.
+ * Four things hold the line:
+ *  - An id that resolves outside this account's store is refused. The bare
+ *    lookup falls back to the default store, and the Inbox/Sent check below
+ *    only knows this account's folders, so another mailbox's received mail
+ *    would otherwise pass it.
+ *  - Inbox and Sent Items are refused, INCLUDING their subfolders (a filed
+ *    folder is still received mail), unless `allowProtected`.
+ *  - `dryRun` resolves and reports without deleting, so the exact subjects and
+ *    folders can be checked before anything happens.
+ *  - Every outcome echoes the subject and folder of the item actually resolved.
  */
-async function deleteOutlookEmails(emailAccount, entryIds, options = {}) {
-    (0, run_1.requireWindows)();
-    const { allowProtected = false, dryRun = false } = options;
-    if (entryIds.length === 0) {
-        return { dryRun, deleted: 0, refused: 0, failed: 0, items: [] };
-    }
-    const script = `${(0, scripts_1.accountScript)(emailAccount)}
+async function deleteOutlookEmails(request) {
+    const output = await (0, run_1.runPowerShellJson)(`${(0, scripts_1.accountScript)(request.account)}
 ${scripts_1.DELIVERY_STORE_PS}
-${FOLDER_CHAIN_PS}
+$allowProtected = ${(0, run_1.psBool)(request.allowProtected)}
+$dryRun = ${(0, run_1.psBool)(request.dryRun)}
+$protectedReason = ${(0, run_1.psString)(mail_1.PROTECTED_MAIL_REASON)}
 $protectedIds = @{}
-foreach ($fid in @(${PROTECTED_FOLDER_IDS.join(',')})) {
-    try { $protectedIds[$store.GetDefaultFolder($fid).EntryID] = $true } catch {}
+foreach ($role in @(${PROTECTED_FOLDER_IDS.map(run_1.psInt).join(', ')})) {
+    try { $protectedIds[[string]$store.GetDefaultFolder($role).EntryID] = $true } catch {}
+}
+function Test-UnderProtectedFolder($folder) {
+    $current = $folder
+    for ($guard = 0; $current -ne $null -and $guard -lt 25; $guard++) {
+        $folderId = $null
+        try { $folderId = [string]$current.EntryID } catch {}
+        if (-not $folderId) { return $false }
+        if ($protectedIds.ContainsKey($folderId)) { return $true }
+        $parent = $null
+        try { $parent = $current.Parent } catch {}
+        $current = $parent
+    }
+    return $false
+}
+function Test-InAccountStore($folder) {
+    $folderStoreId = $null
+    try { $folderStoreId = [string]$folder.StoreID } catch {}
+    if (-not $folderStoreId) { return $false }
+    if ($folderStoreId -ieq $storeId) { return $true }
+    # One store can be named by two id strings; MAPI decides whether they match.
+    try { return [bool]$ns.CompareEntryIDs($folderStoreId, $storeId) } catch { return $false }
 }
-
 $items = @()
-$deleted = 0
-$refused = 0
-$failed = 0
-foreach ($id in @(${(0, run_1.psList)(entryIds)})) {
+foreach ($id in ${(0, run_1.psArray)(request.entryIds)}) {
     $subject = ''
     $folderPath = ''
     try {
         $it = $null
         try { $it = $ns.GetItemFromID($id, $store.StoreID) } catch { $it = $null }
         if ($it -eq $null) { try { $it = $ns.GetItemFromID($id) } catch { $it = $null } }
-        if ($it -eq $null) { throw "no item with that EntryID in this account" }
-        try { $subject = $it.Subject } catch {}
+        if ($it -eq $null) { throw "no item with that entry id in this account" }
+        try { $subject = [string]$it.Subject } catch {}
         $parent = $null
         try { $parent = $it.Parent } catch {}
         if ($parent -eq $null) { throw "item has no parent folder - refusing to delete" }
-        try { $folderPath = $parent.FolderPath } catch {}
-
-        $chain = Get-FolderChainIds $parent
-        $isProtected = $false
-        foreach ($cid in $chain) { if ($protectedIds.ContainsKey($cid)) { $isProtected = $true; break } }
-
-        if ($isProtected -and -not ${(0, run_1.psBool)(allowProtected)}) {
-            $refused++
-            $items += [pscustomobject]@{ entryId = $id; subject = $subject; folderPath = $folderPath; status = 'refused'; reason = '${(0, run_1.psEscape)(mail_1.PROTECTED_MAIL_REASON)}' }
-        } elseif (${(0, run_1.psBool)(dryRun)}) {
-            $items += [pscustomobject]@{ entryId = $id; subject = $subject; folderPath = $folderPath; status = 'would-delete'; reason = '' }
+        try { $folderPath = [string]$parent.FolderPath } catch {}
+        if (-not (Test-InAccountStore $parent)) { throw "item is in another mailbox, not this account - refusing to delete" }
+        if ((Test-UnderProtectedFolder $parent) -and -not $allowProtected) {
+            $items += [PSCustomObject]@{ entryId = $id; subject = $subject; folderPath = $folderPath; status = 'refused'; reason = $protectedReason }
+        } elseif ($dryRun) {
+            $items += [PSCustomObject]@{ entryId = $id; subject = $subject; folderPath = $folderPath; status = 'would-delete'; reason = '' }
         } else {
             $it.Delete()
-            $deleted++
-            $items += [pscustomobject]@{ entryId = $id; subject = $subject; folderPath = $folderPath; status = 'deleted'; reason = '' }
+            $items += [PSCustomObject]@{ entryId = $id; subject = $subject; folderPath = $folderPath; status = 'deleted'; reason = '' }
         }
     } catch {
-        $failed++
-        $items += [pscustomobject]@{ entryId = $id; subject = $subject; folderPath = $folderPath; status = 'failed'; reason = $_.Exception.Message }
+        $items += [PSCustomObject]@{ entryId = $id; subject = $subject; folderPath = $folderPath; status = 'failed'; reason = $_.Exception.Message }
     }
 }
-ConvertTo-Json @{ dryRun = ${(0, run_1.psBool)(dryRun)}; deleted = $deleted; refused = $refused; failed = $failed; items = @($items) } -Depth 4
-`;
-    const parsed = (0, json_1.parseObject)(await (0, run_1.runPowerShell)(script, 300000));
-    return {
-        dryRun,
-        deleted: (0, json_1.num)(parsed.deleted),
-        refused: (0, json_1.num)(parsed.refused),
-        failed: (0, json_1.num)(parsed.failed),
-        items: (0, json_1.toArray)(parsed.items).map(i => {
-            const e = (0, json_1.record)(i);
-            return {
-                entryId: (0, json_1.str)(e.entryId),
-                subject: (0, json_1.str)(e.subject),
-                folderPath: (0, json_1.str)(e.folderPath),
-                status: ((0, json_1.str)(e.status) || 'failed'),
-                reason: (0, json_1.str)(e.reason),
-            };
-        }),
-    };
+ConvertTo-Json -Depth 3 -InputObject @($items)
+`, 'scan');
+    const items = (0, json_1.toArray)(output).map(row => {
+        const e = (0, json_1.record)(row);
+        return {
+            entryId: (0, json_1.str)(e.entryId),
+            subject: (0, json_1.str)(e.subject),
+            folderPath: (0, json_1.str)(e.folderPath),
+            status: (0, mail_1.deleteStatus)((0, json_1.str)(e.status)),
+            reason: (0, json_1.str)(e.reason),
+        };
+    });
+    return (0, mail_1.deleteMailResult)(request.dryRun, items);
 }
 /**
- * Permanently remove items from the account's Deleted Items folder. This is the ONE
- * genuinely irreversible operation here — nothing recovers from it — which is why it
- * is folder-scoped rather than keyed on an EntryID: it can only ever destroy what the
- * user already threw away.
+ * Permanently remove items from the account's Deleted Items. The ONE irreversible
+ * operation here, which is why it is folder-scoped rather than keyed on ids: it
+ * can only ever destroy what was already thrown away.
  *
- * `olderThanDays` keeps recent items (0 = purge everything). Iterates backwards, as
- * deleting mutates the collection and a forward walk would skip every other item.
+ * Walks backwards, since deleting shifts the collection and a forward walk would
+ * skip every other item.
  */
-async function purgeDeletedItems(emailAccount, olderThanDays = 0, dryRun = false) {
-    (0, run_1.requireWindows)();
-    const script = `${(0, scripts_1.accountScript)(emailAccount)}
+async function purgeDeletedItems(request) {
+    const output = await (0, run_1.runPowerShellJson)(`${(0, scripts_1.accountScript)(request.account)}
 ${scripts_1.DELIVERY_STORE_PS}
-$folder = $store.GetDefaultFolder(3)
-$cutoff = (Get-Date).AddDays(-${olderThanDays})
+$folder = $store.GetDefaultFolder(${(0, run_1.psInt)(mail_1.FolderId.DeletedItems)})
+$olderThanDays = ${(0, run_1.psInt)(request.olderThanDays)}
+$dryRun = ${(0, run_1.psBool)(request.dryRun)}
+${(0, scripts_1.cutoffScript)(request.olderThanDays)}
 $matched = 0
 $purged = 0
 $kept = 0
 $failed = 0
-# Bound once: every $folder.Items is a COM property get that materialises a
-# fresh collection object, and this loop runs once per message in Deleted Items.
+# Bound once: each $folder.Items is a COM call that builds a fresh collection.
 $folderItems = $folder.Items
 for ($i = $folderItems.Count; $i -ge 1; $i--) {
     $it = $null
     try { $it = $folderItems.Item($i) } catch { continue }
     $stamp = $null
-    foreach ($p in @('ReceivedTime','LastModificationTime','CreationTime')) {
-        try { $stamp = $it.$p; if ($stamp -ne $null) { break } } catch {}
+    foreach ($property in @('ReceivedTime', 'LastModificationTime', 'CreationTime')) {
+        try { $stamp = $it.$property; if ($stamp -ne $null) { break } } catch {}
     }
-    if (${olderThanDays} -gt 0 -and $stamp -ne $null -and $stamp -gt $cutoff) { $kept++; continue }
+    if ($olderThanDays -gt 0 -and $stamp -ne $null -and $stamp -gt $cutoff) { $kept++; continue }
     $matched++
-    if (${(0, run_1.psBool)(dryRun)}) { continue }
+    if ($dryRun) { continue }
     try { $it.Delete(); $purged++ } catch { $failed++ }
 }
-ConvertTo-Json @{ folderPath = $folder.FolderPath; matched = $matched; purged = $purged; kept = $kept; failed = $failed } -Depth 3
-`;
-    const parsed = (0, json_1.parseObject)(await (0, run_1.runPowerShell)(script, 600000));
+ConvertTo-Json -Compress -InputObject ([PSCustomObject]@{
+    folderPath = [string]$folder.FolderPath
+    matched    = $matched
+    purged     = $purged
+    kept       = $kept
+    failed     = $failed
+})
+`, 'purge');
+    const e = (0, json_1.record)(output);
     return {
-        folderPath: (0, json_1.str)(parsed.folderPath),
-        dryRun,
-        matched: (0, json_1.num)(parsed.matched),
-        purged: (0, json_1.num)(parsed.purged),
-        kept: (0, json_1.num)(parsed.kept),
-        failed: (0, json_1.num)(parsed.failed),
+        folderPath: (0, json_1.str)(e.folderPath),
+        dryRun: request.dryRun,
+        matched: (0, json_1.num)(e.matched),
+        purged: (0, json_1.num)(e.purged),
+        kept: (0, json_1.num)(e.kept),
+        failed: (0, json_1.num)(e.failed),
     };
 }
 //# sourceMappingURL=cleanup.js.map

package/dist/windows/cleanup.js.map

@@ -1 +1 @@
-{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../src/windows/cleanup.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../src/windows/cleanup.ts"],"names":[],"mappings":";;AA4BA,kDAuEC;AAUD,8CA0CC;AAvJD,wDAAwD;AACxD,+BAA4E;AAC5E,uCAA2E;AAC3E,yCAA2D;AAC3D,kCAA0F;AAI1F,kFAAkF;AAClF,MAAM,oBAAoB,GAAG,CAAC,eAAQ,CAAC,KAAK,EAAE,eAAQ,CAAC,QAAQ,CAAC,CAAC;AAEjE;;;;;;;;;;;;;;;;GAgBG;AACI,KAAK,UAAU,mBAAmB,CAAC,OAA4B;IAClE,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAiB,EAAC,GAAG,IAAA,uBAAa,EAAC,OAAO,CAAC,OAAO,CAAC;EAC1E,2BAAiB;oBACC,IAAA,YAAM,EAAC,OAAO,CAAC,cAAc,CAAC;YACtC,IAAA,YAAM,EAAC,OAAO,CAAC,MAAM,CAAC;qBACb,IAAA,cAAQ,EAAC,4BAAqB,CAAC;;sBAE9B,oBAAoB,CAAC,GAAG,CAAC,WAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;kBAyB9C,IAAA,aAAO,EAAC,OAAO,CAAC,QAAQ,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2B1C,EAAE,MAAM,CAAC,CAAC;IACP,MAAM,KAAK,GAAwB,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QACzD,MAAM,CAAC,GAAG,IAAA,aAAM,EAAC,GAAG,CAAC,CAAC;QACtB,OAAO;YACH,OAAO,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,OAAO,CAAC;YACvB,OAAO,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,OAAO,CAAC;YACvB,UAAU,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,UAAU,CAAC;YAC7B,MAAM,EAAE,IAAA,mBAAY,EAAC,IAAA,UAAG,EAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YACnC,MAAM,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,MAAM,CAAC;SACxB,CAAC;IACN,CAAC,CAAC,CAAC;IACH,OAAO,IAAA,uBAAgB,EAAC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACnD,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,iBAAiB,CAAC,OAAqB;IACzD,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAiB,EAAC,GAAG,IAAA,uBAAa,EAAC,OAAO,CAAC,OAAO,CAAC;EAC1E,2BAAiB;oCACiB,IAAA,WAAK,EAAC,eAAQ,CAAC,YAAY,CAAC;mBAC7C,IAAA,WAAK,EAAC,OAAO,CAAC,aAAa,CAAC;YACnC,IAAA,YAAM,EAAC,OAAO,CAAC,MAAM,CAAC;EAChC,IAAA,sBAAY,EAAC,OAAO,CAAC,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;CA0BpC,EAAE,OAAO,CAAC,CAAC;IACR,MAAM,CAAC,GAAG,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC;IACzB,OAAO;QACH,UAAU,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,UAAU,CAAC;QAC7B,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,OAAO,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,OAAO,CAAC;QACvB,MAAM,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,MAAM,CAAC;QACrB,IAAI,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,IAAI,CAAC;QACjB,MAAM,EAAE,IAAA,UAAG,EAAC,CAAC,CAAC,MAAM,CAAC;KACxB,CAAC;AACN,CAAC","sourcesContent":["// Deleting mail, and emptying what was already deleted.\nimport { psArray, psBool, psInt, psString, runPowerShellJson } from './run';\nimport { accountScript, cutoffScript, DELIVERY_STORE_PS } from './scripts';\nimport { num, record, str, toArray } from '../shared/json';\nimport { deleteMailResult, deleteStatus, FolderId, PROTECTED_MAIL_REASON } from '../mail';\nimport type { DeleteEmailsRequest, PurgeRequest } from '../backend';\nimport type { DeleteMailOutcome, DeleteMailResult, PurgeDeletedItemsResult } from '../types';\n\n/** Folders whose contents are received or sent mail rather than working state. */\nconst PROTECTED_FOLDER_IDS = [FolderId.Inbox, FolderId.SentMail];\n\n/**\n * Delete mail by entry id from anywhere in the account. Delete() moves each item\n * to Deleted Items, so this is recoverable — purgeDeletedItems is what destroys.\n *\n * This is the one operation that can reach received mail, and an entry id is an\n * unsafe key for it: a stale or wrong id can resolve to a DIFFERENT message.\n * Four things hold the line:\n *  - An id that resolves outside this account's store is refused. The bare\n *    lookup falls back to the default store, and the Inbox/Sent check below\n *    only knows this account's folders, so another mailbox's received mail\n *    would otherwise pass it.\n *  - Inbox and Sent Items are refused, INCLUDING their subfolders (a filed\n *    folder is still received mail), unless `allowProtected`.\n *  - `dryRun` resolves and reports without deleting, so the exact subjects and\n *    folders can be checked before anything happens.\n *  - Every outcome echoes the subject and folder of the item actually resolved.\n */\nexport async function deleteOutlookEmails(request: DeleteEmailsRequest): Promise<DeleteMailResult> {\n    const output = await runPowerShellJson(`${accountScript(request.account)}\n${DELIVERY_STORE_PS}\n$allowProtected = ${psBool(request.allowProtected)}\n$dryRun = ${psBool(request.dryRun)}\n$protectedReason = ${psString(PROTECTED_MAIL_REASON)}\n$protectedIds = @{}\nforeach ($role in @(${PROTECTED_FOLDER_IDS.map(psInt).join(', ')})) {\n    try { $protectedIds[[string]$store.GetDefaultFolder($role).EntryID] = $true } catch {}\n}\nfunction Test-UnderProtectedFolder($folder) {\n    $current = $folder\n    for ($guard = 0; $current -ne $null -and $guard -lt 25; $guard++) {\n        $folderId = $null\n        try { $folderId = [string]$current.EntryID } catch {}\n        if (-not $folderId) { return $false }\n        if ($protectedIds.ContainsKey($folderId)) { return $true }\n        $parent = $null\n        try { $parent = $current.Parent } catch {}\n        $current = $parent\n    }\n    return $false\n}\nfunction Test-InAccountStore($folder) {\n    $folderStoreId = $null\n    try { $folderStoreId = [string]$folder.StoreID } catch {}\n    if (-not $folderStoreId) { return $false }\n    if ($folderStoreId -ieq $storeId) { return $true }\n    # One store can be named by two id strings; MAPI decides whether they match.\n    try { return [bool]$ns.CompareEntryIDs($folderStoreId, $storeId) } catch { return $false }\n}\n$items = @()\nforeach ($id in ${psArray(request.entryIds)}) {\n    $subject = ''\n    $folderPath = ''\n    try {\n        $it = $null\n        try { $it = $ns.GetItemFromID($id, $store.StoreID) } catch { $it = $null }\n        if ($it -eq $null) { try { $it = $ns.GetItemFromID($id) } catch { $it = $null } }\n        if ($it -eq $null) { throw \"no item with that entry id in this account\" }\n        try { $subject = [string]$it.Subject } catch {}\n        $parent = $null\n        try { $parent = $it.Parent } catch {}\n        if ($parent -eq $null) { throw \"item has no parent folder - refusing to delete\" }\n        try { $folderPath = [string]$parent.FolderPath } catch {}\n        if (-not (Test-InAccountStore $parent)) { throw \"item is in another mailbox, not this account - refusing to delete\" }\n        if ((Test-UnderProtectedFolder $parent) -and -not $allowProtected) {\n            $items += [PSCustomObject]@{ entryId = $id; subject = $subject; folderPath = $folderPath; status = 'refused'; reason = $protectedReason }\n        } elseif ($dryRun) {\n            $items += [PSCustomObject]@{ entryId = $id; subject = $subject; folderPath = $folderPath; status = 'would-delete'; reason = '' }\n        } else {\n            $it.Delete()\n            $items += [PSCustomObject]@{ entryId = $id; subject = $subject; folderPath = $folderPath; status = 'deleted'; reason = '' }\n        }\n    } catch {\n        $items += [PSCustomObject]@{ entryId = $id; subject = $subject; folderPath = $folderPath; status = 'failed'; reason = $_.Exception.Message }\n    }\n}\nConvertTo-Json -Depth 3 -InputObject @($items)\n`, 'scan');\n    const items: DeleteMailOutcome[] = toArray(output).map(row => {\n        const e = record(row);\n        return {\n            entryId: str(e.entryId),\n            subject: str(e.subject),\n            folderPath: str(e.folderPath),\n            status: deleteStatus(str(e.status)),\n            reason: str(e.reason),\n        };\n    });\n    return deleteMailResult(request.dryRun, items);\n}\n\n/**\n * Permanently remove items from the account's Deleted Items. The ONE irreversible\n * operation here, which is why it is folder-scoped rather than keyed on ids: it\n * can only ever destroy what was already thrown away.\n *\n * Walks backwards, since deleting shifts the collection and a forward walk would\n * skip every other item.\n */\nexport async function purgeDeletedItems(request: PurgeRequest): Promise<PurgeDeletedItemsResult> {\n    const output = await runPowerShellJson(`${accountScript(request.account)}\n${DELIVERY_STORE_PS}\n$folder = $store.GetDefaultFolder(${psInt(FolderId.DeletedItems)})\n$olderThanDays = ${psInt(request.olderThanDays)}\n$dryRun = ${psBool(request.dryRun)}\n${cutoffScript(request.olderThanDays)}\n$matched = 0\n$purged = 0\n$kept = 0\n$failed = 0\n# Bound once: each $folder.Items is a COM call that builds a fresh collection.\n$folderItems = $folder.Items\nfor ($i = $folderItems.Count; $i -ge 1; $i--) {\n    $it = $null\n    try { $it = $folderItems.Item($i) } catch { continue }\n    $stamp = $null\n    foreach ($property in @('ReceivedTime', 'LastModificationTime', 'CreationTime')) {\n        try { $stamp = $it.$property; if ($stamp -ne $null) { break } } catch {}\n    }\n    if ($olderThanDays -gt 0 -and $stamp -ne $null -and $stamp -gt $cutoff) { $kept++; continue }\n    $matched++\n    if ($dryRun) { continue }\n    try { $it.Delete(); $purged++ } catch { $failed++ }\n}\nConvertTo-Json -Compress -InputObject ([PSCustomObject]@{\n    folderPath = [string]$folder.FolderPath\n    matched    = $matched\n    purged     = $purged\n    kept       = $kept\n    failed     = $failed\n})\n`, 'purge');\n    const e = record(output);\n    return {\n        folderPath: str(e.folderPath),\n        dryRun: request.dryRun,\n        matched: num(e.matched),\n        purged: num(e.purged),\n        kept: num(e.kept),\n        failed: num(e.failed),\n    };\n}\n"]}

package/dist/windows/drafts.d.ts

@@ -1,40 +1,21 @@
-import type { DeleteDraftsResult, ListDraftsResult, SendAllDraftsResult, SendDraftsResult } from '../types';
+import type { AccountRequest, EntryIdsRequest, ListDraftsRequest } from '../backend';
+import type { DeleteDraftsResult, ListDraftsResult, SendDraftsResult } from '../types';
+/** The account's drafts, newest first. Bodies are previewed, never returned whole. */
+export declare function listOutlookDrafts(request: ListDraftsRequest): Promise<ListDraftsResult>;
+/** Send the named drafts. */
+export declare function sendDrafts(request: EntryIdsRequest): Promise<SendDraftsResult>;
 /**
- * Send the mail drafts that belong to `emailAccount`, wherever Outlook filed them.
- * Which drafts those are is DRAFTS_SCAN_PS's rule, not this function's.
+ * Send every draft belonging to the account.
  *
- * Item references are snapshotted before any Send() call: sending moves an item out
- * of Drafts, and mutating the collection mid-enumeration would skip every other one.
+ * The matching items are snapshotted before the first send: sending moves an
+ * item out of Drafts, and sending during a live enumeration would skip every
+ * other one.
  */
-export declare function sendAllDrafts(emailAccount: string): Promise<SendAllDraftsResult>;
+export declare function sendAllDrafts(request: AccountRequest): Promise<SendDraftsResult>;
 /**
- * List the mail drafts belonging to `emailAccount`, newest first. Which drafts
- * those are is DRAFTS_SCAN_PS's rule.
- *
- * Deliberately returns no StoreID: deleteOutlookDrafts re-resolves each EntryID
- * against the same folders, so repeating a ~700-char store id on every row would be
- * pure payload. 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.
- */
-export declare function listOutlookDrafts(emailAccount: string, limit?: number, previewChars?: number): Promise<ListDraftsResult>;
-/**
- * Delete mail drafts by EntryID. Outlook's Delete() moves the item to Deleted Items
- * rather than destroying it, so a mistaken call stays recoverable from there.
- *
- * Every id must resolve to a mail item sitting in one of THIS account's Drafts
- * folders 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.
- */
-export declare function deleteOutlookDrafts(emailAccount: string, entryIds: string[]): Promise<DeleteDraftsResult>;
-/**
- * Send a chosen subset of `emailAccount`'s drafts by EntryID — 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 mail
- * item sitting in one of THIS account's Drafts folders before anything is sent.
- * An id pointing at ordinary inbox mail, or at another account's draft, is
- * refused and reported rather than sent.
+ * Delete the named drafts. Outlook's Delete() moves an item to Deleted Items,
+ * so a mistake stays recoverable. Without the proof that each is this
+ * account's draft, this would be a general "delete any email by id" call,
+ * which is not what it is for.
  */
-export declare function sendDrafts(emailAccount: string, entryIds: string[]): Promise<SendDraftsResult>;
+export declare function deleteOutlookDrafts(request: EntryIdsRequest): Promise<DeleteDraftsResult>;