@dawnlit/outlook-bridge 1.1.1 → 2.1.0

package/dist/mac/send.js

@@ -5,90 +5,106 @@ exports.replyOutlookEmail = replyOutlookEmail;
 // Composing outgoing mail on macOS: a new email, and a reply to an existing one.
 const run_1 = require("./run");
 const scripts_1 = require("./scripts");
-const replyBody_1 = require("../shared/replyBody");
-const signatures_1 = require("./signatures");
-const templates_1 = require("./templates");
-/** Split a To/CC string the way the Windows contract accepts it. */
-function splitAddresses(s) {
-    return s.split(/[,;]+/).map(x => x.trim()).filter(Boolean);
-}
+const args_1 = require("../shared/args");
 /**
- * What to do with a composed item.
+ * What to do with a composed message. A filed draft leaves its id in
+ * `filedDraftId` ("" for the other dispositions, or when it can't be told).
+ *
+ * A new outgoing message lands in Temporary Items, not Drafts — `open` only
+ * shows it — so a windowless draft is moved into Drafts explicitly. `move`
+ * reports success even where it silently does nothing, so the folder is
+ * confirmed to hold a message it didn't before rather than report a draft that
+ * doesn't exist.
  *
- * A new outgoing message lands in Temporary Items, not Drafts — `open` is what
- * surfaces it, so a windowless draft has to be moved into the Drafts folder
- * explicitly. (`save` is no help: it demands a file destination, not a folder.)
- * `move` reports success even where it silently does nothing, so the folder is
- * confirmed to have grown rather than risk reporting a draft that doesn't exist.
+ * Moving rewrites a message's id, so the draft's id is the one Drafts gained.
+ * Another draft can land in the same moment — an autosave of a compose window,
+ * a sync — and then the subject tells them apart; a tie is left unnamed rather
+ * than guessed, since a caller that keeps the id may later send by it.
  */
-function composeAction(variable, sendImmediately, openDraftWindow) {
-    if (sendImmediately)
-        return { prelude: '', action: `    send ${variable}` };
-    if (openDraftWindow !== false)
-        return { prelude: '', action: `    open ${variable}` };
-    return {
-        prelude: `    set draftsFolder to drafts of targetAcct
-    set draftsBefore to count of messages of draftsFolder`,
-        action: `    move ${variable} to draftsFolder
-    if (count of messages of draftsFolder) is not greater than draftsBefore then error "Outlook did not file the draft in the Drafts folder."`,
-    };
+function dispose(variable, disposition) {
+    switch (disposition) {
+        case 'send':
+            return { prelude: '    set filedDraftId to ""', action: `    send ${variable}` };
+        case 'display':
+            return { prelude: '    set filedDraftId to ""', action: `    open ${variable}` };
+        case 'save':
+            return {
+                prelude: `    set filedDraftId to ""
+    set draftsFolder to drafts of targetAcct
+    set draftIdsBefore to id of every message of draftsFolder`,
+                action: `    set filedSubject to ""
+    try
+        set filedSubject to (subject of ${variable}) as string
+    end try
+    move ${variable} to draftsFolder
+    -- Bound before the loop, so it walks a local list rather than asking
+    -- Outlook for each item in turn.
+    set draftIdsAfter to id of every message of draftsFolder
+    set newIds to {}
+    repeat with anId in draftIdsAfter
+        if draftIdsBefore does not contain (contents of anId) then set end of newIds to (contents of anId)
+    end repeat
+    if (count of newIds) is 0 then error "Outlook did not file the draft in the Drafts folder."
+    if (count of newIds) is 1 then
+        set filedDraftId to (item 1 of newIds) as string
+    else
+        set sameSubject to {}
+        repeat with anId in newIds
+            try
+                if ((subject of message id (contents of anId)) as string) is filedSubject then set end of sameSubject to (contents of anId)
+            end try
+        end repeat
+        if (count of sameSubject) is 1 then set filedDraftId to (item 1 of sameSubject) as string
+    end if`,
+            };
+    }
 }
-/**
- * Create an Outlook email as a draft window (or send it) via AppleScript.
- * Mirrors the Windows COM contract from windows/send.ts.
- */
-async function sendOutlookEmail(params) {
-    // Same safety property as Windows: never silently send from the wrong mailbox.
-    // The account lookup raises when the address doesn't resolve, so there's no
-    // pre-flight getOutlookAccounts() round-trip — it cost an extra osascript
-    // launch on every email in a batch.
-    const recipientLines = [
-        ...splitAddresses(params.to).map(addr => `    make new to recipient at newMsg with properties {email address:{address:"${(0, run_1.asEscape)(addr)}"}}`),
-        ...splitAddresses(params.cc || '').map(addr => `    make new cc recipient at newMsg with properties {email address:{address:"${(0, run_1.asEscape)(addr)}"}}`),
-    ].join('\n');
-    const attachLine = params.attachmentPath
-        ? `    make new attachment at newMsg with properties {file:POSIX file "${(0, run_1.asEscape)(params.attachmentPath)}"}`
-        : '';
-    const { prelude, action } = composeAction('newMsg', params.sendImmediately, params.openDraftWindow);
-    const script = `
+/** One `make new … recipient` line per entry, keeping a display name when given. */
+function recipientLines(kind, entries) {
+    return entries.map(entry => {
+        const { name, address } = (0, args_1.parseRecipient)(entry);
+        const emailAddress = name
+            ? `{name:${(0, run_1.asString)(name)}, address:${(0, run_1.asString)(address)}}`
+            : `{address:${(0, run_1.asString)(address)}}`;
+        return `    make new ${kind} recipient at newMsg with properties {email address:${emailAddress}}`;
+    });
+}
+/** Send, display or file a new email; a filed draft reports its id. */
+async function sendOutlookEmail(request) {
+    const acct = await (0, scripts_1.resolveMacAccount)(request.account);
+    const { prelude, action } = dispose('newMsg', request.disposition);
+    const lines = [
+        ...recipientLines('to', request.to),
+        ...recipientLines('cc', request.cc),
+        ...recipientLines('bcc', request.bcc),
+        ...request.attachments.map(file => `    make new attachment at newMsg with properties {file:POSIX file ${(0, run_1.asString)(file)}}`),
+    ];
+    const raw = await (0, run_1.runOsaScript)(`
 tell application "Microsoft Outlook"
-${(0, scripts_1.accountLookupSnippet)(params.emailAccount)}
+${(0, scripts_1.accountLookupSnippet)(acct, true)}
 ${prelude}
-    set newMsg to make new outgoing message with properties {subject:"${(0, run_1.asEscape)(params.subject)}", content:"${(0, run_1.asEscape)(params.htmlBody)}"}
-${recipientLines}
+    set newMsg to make new outgoing message with properties {subject:${(0, run_1.asString)(request.subject)}, content:${(0, run_1.asString)(request.htmlBody)}}
+${lines.join('\n')}
     set account of newMsg to targetAcct
-${attachLine}
 ${action}
-end tell`;
-    await (0, run_1.runOsaScript)(script, 120000);
+    return filedDraftId
+end tell`, 'standard');
+    return { draftEntryId: raw.trim() };
 }
 /**
- * Reply to an email, inserting the caller's HTML above the quoted original.
+ * Reply to an email with the composed HTML above the quoted original.
  *
- * `entryId` is Outlook for Mac's small integer message id (see readInboxEmails),
- * not a Windows MAPI EntryID; `storeId` is accepted for signature parity and
- * ignored, since macOS has no StoreID and `message id N` resolves against the
- * application rather than one folder.
- *
- * `reply to` builds the quoted body Outlook itself would have — the same thing
- * COM's Reply() returns — so the insertion point is the one place the two
- * platforms have to agree, and both look for WordSection1 then `<body>`.
- *
- * The `to` line is the reply's resolved recipient addresses rather than the
- * display-name string Windows reports: Outlook for Mac exposes recipients as
- * records, and an address is the more useful half to verify against.
+ * `reply to` builds the same quoted body COM's Reply() returns, so the insertion
+ * point is the one thing the platforms must agree on (see WORD_SECTION_ANCHOR).
+ * `to` comes back as the reply's resolved addresses: Outlook for Mac exposes
+ * recipients as records, and the address is the half worth checking.
  */
-async function replyOutlookEmail(params) {
-    const id = (0, scripts_1.macMessageId)(params.entryId);
-    const insertHtml = await (0, replyBody_1.composeReplyHtml)(params, {
-        readTemplateEmails: templates_1.readTemplateEmails,
-        readOutlookSignatureHtml: signatures_1.readOutlookSignatureHtml,
-        listOutlookSignatures: signatures_1.listOutlookSignatures,
-    });
-    const { prelude, action } = composeAction('theReply', params.sendImmediately, params.openDraftWindow);
-    const replyAll = params.replyAll ? 'reply to all true' : 'without reply to all';
-    const script = `tell application "Microsoft Outlook"
-${(0, scripts_1.accountLookupSnippet)(params.emailAccount)}
+async function replyOutlookEmail(request) {
+    const id = (0, scripts_1.macMessageId)(request.email.entryId);
+    const acct = await (0, scripts_1.resolveMacAccount)(request.account);
+    const { prelude, action } = dispose('theReply', request.disposition);
+    const raw = await (0, run_1.runOsaScript)(`tell application "Microsoft Outlook"
+${(0, scripts_1.accountLookupSnippet)(acct, true)}
 ${(0, scripts_1.messageLookupSnippet)(id)}
     set repliedTo to ""
     try
@@ -98,16 +114,14 @@ ${(0, scripts_1.messageLookupSnippet)(id)}
         set repliedTo to (address of origSender) as string
     end try
 ${prelude}
-    set theReply to reply to theMsg opening window false ${replyAll}
-    -- Neither of these is wrapped in a try, and both would read more defensively
-    -- if they were. A swallowed account assignment sends from whichever mailbox
-    -- Outlook considers default, and a swallowed insertion files a reply with the
-    -- caller's text missing — the two failures this package exists to prevent,
-    -- both of them invisible to the caller if tolerated here.
+    set theReply to reply to theMsg opening window false ${request.replyAll ? 'reply to all true' : 'without reply to all'}
+    -- Neither of these is wrapped in a try. A swallowed account assignment sends
+    -- from the default mailbox, and a swallowed insertion files a reply missing
+    -- its text — both invisible to the caller if tolerated here.
     set account of theReply to targetAcct
-    set content of theReply to my insertAboveQuoted(content of theReply, "${(0, run_1.asEscape)(insertHtml)}")
-    -- Read the outgoing fields BEFORE acting: sending moves the item, after which
-    -- the reference is no longer readable.
+    set content of theReply to my insertAboveQuoted(content of theReply, ${(0, run_1.asString)(request.html)})
+    -- Read the outgoing fields BEFORE acting: sending moves the item, and the
+    -- reference can't be read afterwards.
     set toList to {}
     try
         repeat with r in (every to recipient of theReply)
@@ -123,13 +137,9 @@ ${prelude}
         set subj to (subject of theReply) as string
     end try
 ${action}
-    return my sanitize(toLine) & (character id 31) & my sanitize(subj) & (character id 31) & my sanitize(repliedTo)
-end tell`;
-    const parts = (0, run_1.splitFields)(await (0, run_1.runOsaScript)(script, 120000));
-    return {
-        to: (0, run_1.field)(parts, 0),
-        subject: (0, run_1.field)(parts, 1),
-        repliedToSender: (0, run_1.field)(parts, 2),
-    };
+    return ${(0, run_1.asRow)(['toLine', 'subj', 'repliedTo'])}
+end tell`, 'standard');
+    const parts = (0, run_1.summaryFields)(raw);
+    return { to: (0, run_1.field)(parts, 0), subject: (0, run_1.field)(parts, 1), repliedToSender: (0, run_1.field)(parts, 2) };
 }
 //# sourceMappingURL=send.js.map

package/dist/mac/send.js.map

@@ -1 +1 @@
-{"version":3,"file":"send.js","sourceRoot":"","sources":["../../src/mac/send.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"send.js","sourceRoot":"","sources":["../../src/mac/send.ts"],"names":[],"mappings":"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","sourcesContent":["// Composing outgoing mail on macOS: a new email, and a reply to an existing one.\nimport { asRow, asString, field, runOsaScript, summaryFields } from './run';\nimport { accountLookupSnippet, macMessageId, messageLookupSnippet, resolveMacAccount } from './scripts';\nimport { parseRecipient } from '../shared/args';\nimport type { Disposition, ReplyRequest, SendRequest } from '../backend';\nimport type { ReplyEmailResult, SendEmailResult } from '../types';\n\n/**\n * What to do with a composed message. A filed draft leaves its id in\n * `filedDraftId` (\"\" for the other dispositions, or when it can't be told).\n *\n * A new outgoing message lands in Temporary Items, not Drafts — `open` only\n * shows it — so a windowless draft is moved into Drafts explicitly. `move`\n * reports success even where it silently does nothing, so the folder is\n * confirmed to hold a message it didn't before rather than report a draft that\n * doesn't exist.\n *\n * Moving rewrites a message's id, so the draft's id is the one Drafts gained.\n * Another draft can land in the same moment — an autosave of a compose window,\n * a sync — and then the subject tells them apart; a tie is left unnamed rather\n * than guessed, since a caller that keeps the id may later send by it.\n */\nfunction dispose(variable: string, disposition: Disposition): { prelude: string; action: string } {\n    switch (disposition) {\n        case 'send':\n            return { prelude: '    set filedDraftId to \"\"', action: `    send ${variable}` };\n        case 'display':\n            return { prelude: '    set filedDraftId to \"\"', action: `    open ${variable}` };\n        case 'save':\n            return {\n                prelude: `    set filedDraftId to \"\"\n    set draftsFolder to drafts of targetAcct\n    set draftIdsBefore to id of every message of draftsFolder`,\n                action: `    set filedSubject to \"\"\n    try\n        set filedSubject to (subject of ${variable}) as string\n    end try\n    move ${variable} to draftsFolder\n    -- Bound before the loop, so it walks a local list rather than asking\n    -- Outlook for each item in turn.\n    set draftIdsAfter to id of every message of draftsFolder\n    set newIds to {}\n    repeat with anId in draftIdsAfter\n        if draftIdsBefore does not contain (contents of anId) then set end of newIds to (contents of anId)\n    end repeat\n    if (count of newIds) is 0 then error \"Outlook did not file the draft in the Drafts folder.\"\n    if (count of newIds) is 1 then\n        set filedDraftId to (item 1 of newIds) as string\n    else\n        set sameSubject to {}\n        repeat with anId in newIds\n            try\n                if ((subject of message id (contents of anId)) as string) is filedSubject then set end of sameSubject to (contents of anId)\n            end try\n        end repeat\n        if (count of sameSubject) is 1 then set filedDraftId to (item 1 of sameSubject) as string\n    end if`,\n            };\n    }\n}\n\n/** One `make new … recipient` line per entry, keeping a display name when given. */\nfunction recipientLines(kind: 'to' | 'cc' | 'bcc', entries: readonly string[]): string[] {\n    return entries.map(entry => {\n        const { name, address } = parseRecipient(entry);\n        const emailAddress = name\n            ? `{name:${asString(name)}, address:${asString(address)}}`\n            : `{address:${asString(address)}}`;\n        return `    make new ${kind} recipient at newMsg with properties {email address:${emailAddress}}`;\n    });\n}\n\n/** Send, display or file a new email; a filed draft reports its id. */\nexport async function sendOutlookEmail(request: SendRequest): Promise<SendEmailResult> {\n    const acct = await resolveMacAccount(request.account);\n    const { prelude, action } = dispose('newMsg', request.disposition);\n    const lines = [\n        ...recipientLines('to', request.to),\n        ...recipientLines('cc', request.cc),\n        ...recipientLines('bcc', request.bcc),\n        ...request.attachments.map(file => `    make new attachment at newMsg with properties {file:POSIX file ${asString(file)}}`),\n    ];\n    const raw = await runOsaScript(`\ntell application \"Microsoft Outlook\"\n${accountLookupSnippet(acct, true)}\n${prelude}\n    set newMsg to make new outgoing message with properties {subject:${asString(request.subject)}, content:${asString(request.htmlBody)}}\n${lines.join('\\n')}\n    set account of newMsg to targetAcct\n${action}\n    return filedDraftId\nend tell`, 'standard');\n    return { draftEntryId: raw.trim() };\n}\n\n/**\n * Reply to an email with the composed HTML above the quoted original.\n *\n * `reply to` builds the same quoted body COM's Reply() returns, so the insertion\n * point is the one thing the platforms must agree on (see WORD_SECTION_ANCHOR).\n * `to` comes back as the reply's resolved addresses: Outlook for Mac exposes\n * recipients as records, and the address is the half worth checking.\n */\nexport async function replyOutlookEmail(request: ReplyRequest): Promise<ReplyEmailResult> {\n    const id = macMessageId(request.email.entryId);\n    const acct = await resolveMacAccount(request.account);\n    const { prelude, action } = dispose('theReply', request.disposition);\n    const raw = await runOsaScript(`tell application \"Microsoft Outlook\"\n${accountLookupSnippet(acct, true)}\n${messageLookupSnippet(id)}\n    set repliedTo to \"\"\n    try\n        -- Bind the record before reading its field: a nested\n        -- 'address of (sender of theMsg)' does not coerce.\n        set origSender to sender of theMsg\n        set repliedTo to (address of origSender) as string\n    end try\n${prelude}\n    set theReply to reply to theMsg opening window false ${request.replyAll ? 'reply to all true' : 'without reply to all'}\n    -- Neither of these is wrapped in a try. A swallowed account assignment sends\n    -- from the default mailbox, and a swallowed insertion files a reply missing\n    -- its text — both invisible to the caller if tolerated here.\n    set account of theReply to targetAcct\n    set content of theReply to my insertAboveQuoted(content of theReply, ${asString(request.html)})\n    -- Read the outgoing fields BEFORE acting: sending moves the item, and the\n    -- reference can't be read afterwards.\n    set toList to {}\n    try\n        repeat with r in (every to recipient of theReply)\n            try\n                set ea to email address of r\n                set end of toList to (address of ea) as string\n            end try\n        end repeat\n    end try\n    set toLine to my joinList(toList, \", \")\n    set subj to \"\"\n    try\n        set subj to (subject of theReply) as string\n    end try\n${action}\n    return ${asRow(['toLine', 'subj', 'repliedTo'])}\nend tell`, 'standard');\n    const parts = summaryFields(raw);\n    return { to: field(parts, 0), subject: field(parts, 1), repliedToSender: field(parts, 2) };\n}\n"]}

package/dist/mac/signatures.d.ts

@@ -1,4 +1,4 @@
-/** Names of the user's Outlook signatures. */
+/** The signature names, sorted. */
 export declare function listOutlookSignatures(): Promise<string[]>;
-/** Read a named signature's HTML. Returns '' if the signature can't be found. */
+/** A signature's HTML; '' when there is no signature by that name. */
 export declare function readOutlookSignatureHtml(name: string): Promise<string>;

package/dist/mac/signatures.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listOutlookSignatures = listOutlookSignatures;
 exports.readOutlookSignatureHtml = readOutlookSignatureHtml;
-// Unlike Windows (files on disk), Outlook for Mac serves signature content
-// directly through AppleScript, images included (inline data or remote refs).
+// Outlook for Mac serves signatures through AppleScript, images included
+// (inline data or remote references), where Windows keeps them as files.
 const run_1 = require("./run");
-/** Names of the user's Outlook signatures. */
+/** The signature names, sorted. */
 async function listOutlookSignatures() {
-    const script = `
+    const raw = await (0, run_1.runOsaScript)(`
 set sigNames to {}
 tell application "Microsoft Outlook"
     try
@@ -17,20 +17,18 @@ tell application "Microsoft Outlook"
     end try
 end tell
 set AppleScript's text item delimiters to linefeed
-return sigNames as string`;
-    const raw = await (0, run_1.runOsaScript)(script, 15000);
+return sigNames as string`, 'quick');
     return raw.split('\n').map(s => s.trim()).filter(Boolean).sort((a, b) => a.localeCompare(b));
 }
-/** Read a named signature's HTML. Returns '' if the signature can't be found. */
+/** A signature's HTML; '' when there is no signature by that name. */
 async function readOutlookSignatureHtml(name) {
-    const script = `
+    return (0, run_1.runOsaScript)(`
 tell application "Microsoft Outlook"
     try
-        return content of (first signature whose name is "${(0, run_1.asEscape)(name)}")
+        return content of (first signature whose name is ${(0, run_1.asString)(name)})
     on error
         return ""
     end try
-end tell`;
-    return (0, run_1.runOsaScript)(script, 15000);
+end tell`, 'quick');
 }
 //# sourceMappingURL=signatures.js.map

package/dist/mac/signatures.js.map

@@ -1 +1 @@
-{"version":3,"file":"signatures.js","sourceRoot":"","sources":["../../src/mac/signatures.ts"],"names":[],"mappings":";;AAKA,sDAcC;AAGD,4DAUC;AAhCD,2EAA2E;AAC3E,8EAA8E;AAC9E,+BAA+C;AAE/C,8CAA8C;AACvC,KAAK,UAAU,qBAAqB;IACvC,MAAM,MAAM,GAAG;;;;;;;;;;0BAUO,CAAC;IACvB,MAAM,GAAG,GAAG,MAAM,IAAA,kBAAY,EAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC9C,OAAO,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;AACjG,CAAC;AAED,iFAAiF;AAC1E,KAAK,UAAU,wBAAwB,CAAC,IAAY;IACvD,MAAM,MAAM,GAAG;;;4DAGyC,IAAA,cAAQ,EAAC,IAAI,CAAC;;;;SAIjE,CAAC;IACN,OAAO,IAAA,kBAAY,EAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACvC,CAAC"}
+{"version":3,"file":"signatures.js","sourceRoot":"","sources":["../../src/mac/signatures.ts"],"names":[],"mappings":";;AAKA,sDAaC;AAGD,4DASC;AA9BD,yEAAyE;AACzE,yEAAyE;AACzE,+BAA+C;AAE/C,mCAAmC;AAC5B,KAAK,UAAU,qBAAqB;IACvC,MAAM,GAAG,GAAG,MAAM,IAAA,kBAAY,EAAC;;;;;;;;;;0BAUT,EAAE,OAAO,CAAC,CAAC;IACjC,OAAO,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;AACjG,CAAC;AAED,sEAAsE;AAC/D,KAAK,UAAU,wBAAwB,CAAC,IAAY;IACvD,OAAO,IAAA,kBAAY,EAAC;;;2DAGmC,IAAA,cAAQ,EAAC,IAAI,CAAC;;;;SAIhE,EAAE,OAAO,CAAC,CAAC;AACpB,CAAC","sourcesContent":["// Outlook for Mac serves signatures through AppleScript, images included\n// (inline data or remote references), where Windows keeps them as files.\nimport { asString, runOsaScript } from './run';\n\n/** The signature names, sorted. */\nexport async function listOutlookSignatures(): Promise<string[]> {\n    const raw = await runOsaScript(`\nset sigNames to {}\ntell application \"Microsoft Outlook\"\n    try\n        repeat with s in signatures\n            set end of sigNames to (name of s as string)\n        end repeat\n    end try\nend tell\nset AppleScript's text item delimiters to linefeed\nreturn sigNames as string`, 'quick');\n    return raw.split('\\n').map(s => s.trim()).filter(Boolean).sort((a, b) => a.localeCompare(b));\n}\n\n/** A signature's HTML; '' when there is no signature by that name. */\nexport async function readOutlookSignatureHtml(name: string): Promise<string> {\n    return runOsaScript(`\ntell application \"Microsoft Outlook\"\n    try\n        return content of (first signature whose name is ${asString(name)})\n    on error\n        return \"\"\n    end try\nend tell`, 'quick');\n}\n"]}

package/dist/mac/templates.d.ts

@@ -1,34 +1,22 @@
+import type { EditTemplateRequest, ReadTemplatesRequest, SaveTemplateRequest } from '../backend';
 import type { SaveTemplateResult, TemplateFolderResult } from '../types';
 /**
- * Read the template emails saved in a mailbox folder (default "Templates"),
- * returning each item's full HTML body. When the folder doesn't exist, returns
- * folderFound:false plus the mailbox's folder names instead of throwing, so the
- * caller can ask the user whether to create it rather than fail.
+ * The template emails in a mailbox folder, newest first; a missing folder is
+ * reported as folderFound:false with the mailbox's top-level folder names.
  *
- * Bodies are read in a second pass, for the chosen templates only. That is not
- * a micro-optimisation: a folder of Word-sized templates is megabytes, and
- * pulling all of them through stdout on a call that wanted one is what overruns
- * the buffer — the same reason the Windows reader filters before reading.
+ * Bodies are read in a second pass, for the chosen templates only: a folder of
+ * Word-sized templates is megabytes, and pulling all of them through stdout on
+ * a call that wanted one is what overruns the output limit.
  */
-export declare function readTemplateEmails(emailAccount: string, folderName?: string, limit?: number, includeBody?: boolean, subject?: string): Promise<TemplateFolderResult>;
+export declare function readTemplateEmails(request: ReadTemplatesRequest): Promise<TemplateFolderResult>;
 /**
- * Save a new template email into a mailbox folder (default "Templates"),
- * creating the folder at the mailbox root if it doesn't exist. The item is a
- * plain unsent mail (subject + HTML body) that can be edited in Outlook.
- * Never overwrites an existing item — it always adds a new one, so check with
- * readTemplateEmails first and only call after the user has agreed to create it.
+ * Save a new template email into a folder, creating the folder at the mailbox
+ * root when absent. Always adds a new item — never overwrites one.
  */
-export declare function saveTemplateEmail(emailAccount: string, subject: string, htmlBody: string, folderName?: string): Promise<SaveTemplateResult>;
+export declare function saveTemplateEmail(request: SaveTemplateRequest): Promise<SaveTemplateResult>;
 /**
- * Open an Outlook compose window pre-filled with `currentHtml`, wait for the
- * user to close it, and return the HTML they saved.
- *
- * Deliberately unbounded: the run lasts as long as the person is editing. Give
- * it an AbortSignal (`bridge.withOptions({ signal })`) if the caller needs a way
- * to give up on them.
- *
- * The macOS half of the round trip differs from Windows in one visible way: an
- * edited draft is filed by answering Outlook's own "save this message?" prompt
- * on close, so the subject tells the user to save rather than to press a key.
+ * Open a compose window pre-filled with the HTML, wait for it to close, and
+ * return the saved draft's HTML. On macOS the edit is kept by answering
+ * Outlook's own "save this message?" prompt on close.
  */
-export declare function editEmailTemplate(label: string, currentHtml: string): Promise<string>;
+export declare function editEmailTemplate(request: EditTemplateRequest): Promise<string>;