[patrickfreyer]

Opened by Claude (AI assistant) on Patrick's behalf.

Fixes #106

What

reply_to_email's AppleScript put the "Restore clipboard" block after return outputText, and its on error branch returned early too, so the restore never ran. Every reply (send, draft or open) left the reply body on the user's clipboard.

• reply_to_email: the error path now sets outputText instead of returning. The tell block falls through to the restore, which is followed by a single return outputText.
• forward_email (with message): the success path already restored the clipboard. The error path now restores it too, inside try because oldClip is undefined if the failure happens before the paste.
• _send_html_email restores before its return already. It has no AppleScript on error, so a mid-script failure still skips the restore. That isn't touched here.

Tests

ClipboardRestoreTests in tests/test_compose_tools.py, mock-level like the existing ones:

• for each of send, draft and open, the reply script has no return before the restore, and only return outputText after it;
• forward's error block restores before returning;
• forward without a message has no clipboard code at all.

Full suite: 123 passed (venv, mcp<2 pinned until #104 lands). Nothing was run against the real Mail.app.

🤖 Generated with Claude Code