@bobfrankston/mailx 1.0.223 → 1.0.225

package/README.md

@@ -137,18 +137,28 @@ Gmail OAuth requires a one-time Google Cloud setup:
 - **Ctrl+R** -- Reply
 - **Ctrl+Shift+R** -- Reply All
 - **Ctrl+F** -- Forward
-- From dropdown lets you pick which account to send from
+- From dropdown lets you pick which account to send from; reply auto-detects which identity to reply from based on which of your addresses the mail was sent to
 - Contact autocomplete searches Google Contacts as you type in To/Cc/Bcc
-- Drafts auto-save every 5 seconds to your Drafts folder
+- **Cc / Bcc** are hidden by default — click the toggle buttons next to To to show them
+- **Attach** opens a file picker; attachments show as chips with remove buttons
+- Drafts auto-save 1.5s after you stop typing, plus a 5s safety-net interval, plus on window close
+- Compose window close asks Save / Discard / Cancel if there's content
+- Address validation (`local@domain.tld`) runs on To/Cc/Bcc/From before sending — invalid addresses are refused
+- **Editor shortcuts**: Ctrl+K insert link, Ctrl+Shift+K remove link, Ctrl+Shift+X strikethrough, Ctrl+Shift+7/8 ordered/bullet list, Ctrl+]/[ indent/outdent, Ctrl+Shift+C color, Ctrl+\ clear formatting. Native spell-check via WebView2 (right-click to add to dictionary).
+- **Link editor modal**: Ctrl+K opens a two-field dialog (text + URL) with Remove-link button; hovering any link in the editor shows a floating URL preview
+- **Paste URL** auto-links: paste a bare URL over a selection and it wraps it, or paste into empty space to insert as a link
 
 ### Managing Messages
 
 - **Delete** or **Ctrl+D** -- Delete selected messages (moves to Trash)
-- **Ctrl+Z** -- Undo last delete
+- **Ctrl+Z** -- Undo the last **delete or move** (whichever came last, 60s window)
 - **Ctrl+A** -- Select all messages in the list
 - **Drag and drop** -- Move messages to a folder by dragging them
 - Click the **star** column to flag/unflag a message
-- **Unsubscribe** button appears when the message has a List-Unsubscribe header
+- **Unsubscribe** button appears when the message has a List-Unsubscribe header (one-click)
+- **Right-click on a From/To/Cc address** -- Copy name, Copy address, Copy both, Add to contacts, or Reply/Reply All/Forward
+- **Preview pane zoom** -- Ctrl+wheel, Ctrl+= / Ctrl+- / Ctrl+0, or right-click menu (Zoom in/out/reset, Copy, Select all). Persisted across messages.
+- **Cross-folder search results** show the folder name for each hit
 
 ### Searching
 
@@ -191,11 +201,35 @@ Under **Settings** in the toolbar:
 | Ctrl+Shift+R | Reply All |
 | Ctrl+F | Forward |
 | Delete / Ctrl+D | Delete |
-| Ctrl+Z | Undo delete |
+| Ctrl+Z | Undo last delete or move |
 | Ctrl+A | Select all |
 | F5 | Sync all folders |
 | Escape | Clear search / close menus |
 
+**In the compose editor:**
+
+| Key | Action |
+|-----|--------|
+| Ctrl+K | Insert / edit link (opens dialog with text + URL fields) |
+| Ctrl+Shift+K | Remove link |
+| Ctrl+B / Ctrl+I / Ctrl+U | Bold / Italic / Underline |
+| Ctrl+Shift+X | Strikethrough |
+| Ctrl+Shift+7 / 8 | Ordered / Bullet list |
+| Ctrl+] / Ctrl+[ | Indent / Outdent |
+| Ctrl+Shift+C | Set text color |
+| Ctrl+\ | Clear formatting |
+| Ctrl+Enter | Send |
+| Escape | Close (prompts Save / Discard / Cancel) |
+
+**In the preview pane:**
+
+| Key | Action |
+|-----|--------|
+| Ctrl+wheel | Zoom in/out |
+| Ctrl+= / Ctrl+- | Zoom in / out |
+| Ctrl+0 | Reset zoom |
+| Delete | Delete message (also works with focus in preview) |
+
 ## Command Line
 
 ```

package/client/compose/compose.css

@@ -324,6 +324,29 @@ body {
 }
 .compose-att-chip button:hover { color: oklch(0.65 0.2 25); }
 
+/* Cc/Bcc toggle buttons in the To row */
+.compose-recipient-toggle {
+    display: inline-flex;
+    gap: 4px;
+    margin-left: var(--gap-xs);
+}
+.compose-toggle-btn {
+    background: transparent;
+    border: 1px solid var(--color-border);
+    border-radius: var(--radius-sm);
+    color: var(--color-text-muted);
+    padding: 1px 8px;
+    font-size: var(--font-size-sm);
+    cursor: pointer;
+    font-family: inherit;
+}
+.compose-toggle-btn:hover { background: var(--color-bg-hover); color: var(--color-text); }
+.compose-toggle-btn.active {
+    background: var(--color-accent);
+    color: #fff;
+    border-color: transparent;
+}
+
 /* Link editor modal (Ctrl+K / toolbar link button) */
 .mailx-modal-backdrop {
     position: fixed;

package/client/compose/compose.html

@@ -20,12 +20,16 @@
         <div class="compose-field">
             <label for="compose-to">To</label>
             <input type="text" id="compose-to" autocomplete="off">
+            <span class="compose-recipient-toggle">
+                <button type="button" class="compose-toggle-btn" id="btn-toggle-cc" title="Show/hide Cc">Cc</button>
+                <button type="button" class="compose-toggle-btn" id="btn-toggle-bcc" title="Show/hide Bcc">Bcc</button>
+            </span>
         </div>
-        <div class="compose-field">
+        <div class="compose-field" id="compose-cc-row" hidden>
             <label for="compose-cc">Cc</label>
             <input type="text" id="compose-cc" autocomplete="off">
         </div>
-        <div class="compose-field">
+        <div class="compose-field" id="compose-bcc-row" hidden>
             <label for="compose-bcc">Bcc</label>
             <input type="text" id="compose-bcc" autocomplete="off">
         </div>

package/client/compose/compose.js

@@ -275,6 +275,15 @@ function applyInit(init) {
     toInput.value = formatAddrs(init.to);
     ccInput.value = formatAddrs(init.cc);
     subjectInput.value = init.subject;
+    // Auto-expand Cc row if the init already has Cc content (reply-all, draft-with-cc)
+    if (ccInput.value.trim()) {
+        const ccRowEl = document.getElementById("compose-cc-row");
+        const ccBtn = document.getElementById("btn-toggle-cc");
+        if (ccRowEl)
+            ccRowEl.hidden = false;
+        if (ccBtn)
+            ccBtn.classList.add("active");
+    }
     if (init.bodyHtml) {
         editor.setHtml(init.bodyHtml);
         editor.setCursor(0);
@@ -497,6 +506,29 @@ async function handleCloseRequest() {
 document.getElementById("btn-discard")?.addEventListener("click", () => {
     handleCloseRequest();
 });
+// ── Cc / Bcc toggle ──
+const ccRow = document.getElementById("compose-cc-row");
+const bccRow = document.getElementById("compose-bcc-row");
+const toggleCcBtn = document.getElementById("btn-toggle-cc");
+const toggleBccBtn = document.getElementById("btn-toggle-bcc");
+function setCcVisible(visible) {
+    ccRow.hidden = !visible;
+    toggleCcBtn.classList.toggle("active", visible);
+    if (visible)
+        ccInput.focus();
+    else
+        ccInput.value = "";
+}
+function setBccVisible(visible) {
+    bccRow.hidden = !visible;
+    toggleBccBtn.classList.toggle("active", visible);
+    if (visible)
+        bccInput.focus();
+    else
+        bccInput.value = "";
+}
+toggleCcBtn?.addEventListener("click", () => setCcVisible(ccRow.hidden));
+toggleBccBtn?.addEventListener("click", () => setBccVisible(bccRow.hidden));
 // ── Attachments ──
 const fileInput = document.getElementById("compose-file");
 const attEl = document.getElementById("compose-attachments");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.223",
+  "version": "1.0.225",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -20,11 +20,11 @@
     "postinstall": "node bin/postinstall.js"
   },
   "dependencies": {
-    "@bobfrankston/iflow-direct": "^0.1.9",
+    "@bobfrankston/iflow-direct": "^0.1.10",
     "@bobfrankston/iflow-node": "^0.1.2",
     "@bobfrankston/miscinfo": "^1.0.8",
     "@bobfrankston/oauthsupport": "^1.0.22",
-    "@bobfrankston/msger": "^0.1.285",
+    "@bobfrankston/msger": "^0.1.287",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",
@@ -74,11 +74,11 @@
   },
   ".transformedSnapshot": {
     "dependencies": {
-      "@bobfrankston/iflow-direct": "^0.1.9",
+      "@bobfrankston/iflow-direct": "^0.1.10",
       "@bobfrankston/iflow-node": "^0.1.2",
       "@bobfrankston/miscinfo": "^1.0.8",
       "@bobfrankston/oauthsupport": "^1.0.22",
-      "@bobfrankston/msger": "^0.1.285",
+      "@bobfrankston/msger": "^0.1.287",
       "@capacitor/android": "^8.3.0",
       "@capacitor/cli": "^8.3.0",
       "@capacitor/core": "^8.3.0",

package/packages/mailx-imap/index.js

@@ -371,24 +371,35 @@ export class ImapManager extends EventEmitter {
             }
             const tokenDir = path.join(getConfigDir(), "tokens", account.imap.user.replace(/[@.]/g, "_"));
             tokenProvider = async () => {
-                const result = await authenticateOAuth(credPath, {
+                // Wrap authenticateOAuth with a 30s wall-clock timeout. Without this,
+                // a hung OAuth server could block the entire sync thread indefinitely.
+                const TOKEN_FETCH_TIMEOUT_MS = 30000;
+                const authPromise = authenticateOAuth(credPath, {
                     scope: "https://mail.google.com/ https://www.googleapis.com/auth/contacts.readonly https://www.googleapis.com/auth/calendar",
                     tokenDirectory: tokenDir,
                     credentialsKey: "installed",
                     loginHint: account.imap.user,
                 });
+                const timeoutPromise = new Promise((_, reject) => setTimeout(() => reject(new Error(`OAuth token fetch timeout (${TOKEN_FETCH_TIMEOUT_MS / 1000}s)`)), TOKEN_FETCH_TIMEOUT_MS));
+                const result = await Promise.race([authPromise, timeoutPromise]);
                 return result?.access_token || "";
             };
         }
+        // Non-Gmail accounts (typically Dovecot / generic IMAP) get a smaller
+        // fetch chunk size (10 vs 25) and longer inactivity timeout (300s) so
+        // multi-body FETCH batches don't trip the connection-dead detector on
+        // slow servers. Gmail stays at the defaults since it's fast and has
+        // its own rate limits to respect.
+        const isGmail = account.imap.host?.includes("gmail") || account.email.endsWith("@gmail.com");
         const config = createAutoImapConfig({
             server: account.imap.host,
             port: account.imap.port,
             username: account.imap.user,
             password: account.imap.password,
             tokenProvider,
-            // Slow Dovecot servers (e.g. iecc.com) can stall >60s during multi-body FETCH.
-            // Raise the inactivity timeout so the connection isn't dropped mid-stream.
-            inactivityTimeout: 180000,
+            inactivityTimeout: isGmail ? 60000 : 300000,
+            fetchChunkSize: isGmail ? 25 : 10,
+            fetchChunkSizeMax: isGmail ? 500 : 100,
         });
         this.configs.set(account.id, config);
         // Register account in DB