@bobfrankston/rmfmail 1.1.128 → 1.1.130

package/.commitmsg

@@ -0,0 +1,16 @@
+feat: -send <file> CLI + general-outbox auto-routing; draft UI fixes
+
+- rmfmail -send <file> [-account <id>]: enqueue a .ltr/.eml from disk for
+  sending. With -account, drops into outbox/<id>/; without, drops into the
+  general ~/.rmfmail/outbox/ and the daemon's outbox sweep auto-routes by
+  parsing the file's From: header (exact match → known-provider domain →
+  first non-known-provider "override" account). Bcc preserved as-is;
+  existing SMTP/IMAP-Outbox paths handle the strip.
+- Draft UI: clicking a Drafts row no longer auto-pops compose — the
+  existing "Edit Draft" button (and double-click) are the only entry
+  points. On Send, the draft row drops from the list immediately (was a
+  2 s debounce). New "Sent HH:MM" / "Send failed: …" status confirmation.
+- CLI: -send / -account added to knownFlags. Top-of-file Usage comment and
+  unknown-flag error string rewritten to be complete and consistent —
+  single-dash is canonical, double-dash still accepted as a synonym.
+  README "Command Line" section refreshed in lockstep.

package/README.md

@@ -246,22 +246,79 @@ All AI features are opt-in. Provider + API key live in the autocomplete settings
 
 ## Command Line
 
+Flag style: single-dash is canonical (`-kill`, `-setup`, ...). The parser
+also accepts double-dash (`--kill`, `--setup`) as a synonym, so older
+scripts that used `--server` / `--email` keep working.
+
 ```
 rmfmail                        Start the app (native window via IPC)
-rmfmail --email <addr>          First-time setup with this email (skips prompt)
-rmfmail --verbose               Show log output in terminal (default: log file only)
-rmfmail --import <file>         Import accounts.jsonc into Google Drive
-rmfmail --server                Start HTTP server for dev/remote (http://localhost:9333)
-
-rmfmail -kill                   Kill running rmfmail processes + clean up WAL files
-rmfmail -repair                 Re-sync message metadata (fix garbled subjects)
-rmfmail -rebuild                Wipe local cache and re-download everything from IMAP
-rmfmail -setup                  Interactive first-time setup (CLI)
-rmfmail -test                   Test IMAP/SMTP connectivity for all accounts
-rmfmail -reauth                 Clear cached OAuth tokens; next start re-consents
-rmfmail -v                      Show version
+rmfmail -email <addr>          First-time setup with this email (skips prompt)
+rmfmail -verbose               Show log output in terminal (default: log file only)
+rmfmail -import <file>         Import accounts.jsonc into Google Drive
+rmfmail -server                Start HTTP server for dev/remote (http://localhost:9333)
+
+rmfmail -kill                  Kill running rmfmail processes + clean up WAL files
+rmfmail -repair                Re-sync message metadata (fix garbled subjects)
+rmfmail -rebuild               Wipe local cache and re-download everything from IMAP
+rmfmail -setup                 Interactive first-time setup (CLI)
+rmfmail -test                  Test IMAP/SMTP connectivity for all accounts
+rmfmail -reauth                Clear cached OAuth tokens; next start re-consents
+rmfmail -v                     Show version
+
+rmfmail -send <file>           Enqueue a .ltr/.eml for sending. Daemon parses
+                               the file's From: header to auto-route to a
+                               configured account; falls back to the first
+                               "override" account (non-known-provider domain).
+rmfmail -send <file> -account <id>
+                               Same, but force the account.
+
+rmfmail -register-mailto       Register rmfmail as a Windows mailto: handler
+rmfmail -unregister-mailto     Remove the mailto: handler registration
 ```
 
+### -send
+
+Drop a raw `.ltr` or `.eml` file into the outbox without going through
+compose. Two paths under the hood:
+
+- `rmfmail -send <file>` copies into `~/.rmfmail/outbox/<basename>` (general
+  outbox). The running daemon's outbox sweep parses `From:` and routes the
+  file into `outbox/<accountId>/` based on:
+  1. exact match against an account's email,
+  2. known-provider domain match (gmail.com → first Gmail account; outlook.com /
+     hotmail.com / live.com → first Outlook account),
+  3. first account on a non-known-provider domain (the "override" account).
+
+- `rmfmail -send <file> -account <id>` skips routing and copies directly
+  into `~/.rmfmail/outbox/<id>/`.
+
+Bcc handling: the file's `Bcc:` header is preserved on disk. The SMTP path
+(Gmail accounts) strips it from the wire bytes and adds the Bcc addresses
+to the SMTP envelope; the IMAP-Outbox path (Dovecot/etc.) uploads the file
+intact and lets the server-side outbox-drain sieve do the strip.
+
+The CLI exits immediately. If the daemon isn't running, the file queues
+until next launch. To send right now, also run `rmfmail` (or have a daemon
+already running) — the outbox sweep ticks every 10 s.
+
+### Mailto handler (Windows)
+
+`rmfmail -register-mailto` writes the HKCU registry keys so rmfmail
+appears in the Windows "Select an app to open this 'mailto' link" picker
+(and in Settings → Apps → Default apps). The picker entry launches
+`%LOCALAPPDATA%\rmfmail\bin\rmfmailto.exe` which shells out to the rmfmail
+daemon with the parsed mailto URL.
+
+To make rmfmail the *active default* for mailto (rather than just a
+candidate), open Settings → Apps → Default apps, search for rmfmail, and
+click "Set default" for the mailto link type. Windows 11 enforces a hash
+on the UserChoice key so this final step can't be automated without
+MSIX packaging or a hash-aware helper.
+
+`rmfmail -unregister-mailto` removes the registration. Run this before
+`-register-mailto` if the picker is showing a stale "Node.js JavaScript
+Runtime" entry from an older install.
+
 ### -repair vs -rebuild
 
 **-repair** clears message metadata (subjects, flags, sender names) from the database but preserves your downloaded `.eml` message files. Folder sync state resets so rmfmail re-fetches all envelopes on next run. Use this when subjects show garbled characters.

package/bin/mailx.js

@@ -2,21 +2,49 @@
 /**
  * rmfmail -- email client
  *
- * Usage:
- *   rmfmail                   Start service + open in msger (IPC, no TCP)
- *   rmfmail --server           Start Express HTTP server (dev/remote)
- *   rmfmail --no-browser       Start server only (headless)
- *   rmfmail --verbose          Show console output (default: log file only)
- *   rmfmail --email <addr>     First-time setup with email (skips prompt)
- *   rmfmail --import <file>    Import accounts.jsonc into GDrive and merge
- *   rmfmail -v / --version     Show version and exit
- *   rmfmail -kill              Kill running rmfmail processes
- *   rmfmail -setup             Interactive first-time setup (CLI)
- *   rmfmail -test              Test IMAP/SMTP connectivity
- *   rmfmail -rebuild           Wipe local cache, re-sync from IMAP
- *   rmfmail -repair            Re-sync metadata (fix corrupt subjects) keeping .eml files
- *   rmfmail -reauth            Clear cached OAuth tokens; next start re-consents
- *                             (use when new Google scopes have been added)
+ * Flag style: single-dash is canonical (-kill, -setup, ...). The parser also
+ * accepts double-dash (--kill, --setup) as a synonym for every flag — old
+ * scripts that used --server / --email / etc. keep working.
+ *
+ * Launch:
+ *   rmfmail                 Start daemon + open WebView (IPC, no TCP)
+ *   rmfmail -server          Start Express HTTP server (dev/remote)
+ *   rmfmail -no-browser      Server mode without auto-opening a browser
+ *   rmfmail -another         Don't replace any existing rmfmail daemon
+ *   rmfmail -verbose         Echo logs to terminal (default: log file only)
+ *   rmfmail -debug-server    Launch debug introspection server
+ *
+ * Commands (exit immediately):
+ *   rmfmail -kill            Kill running rmfmail daemon + WebView
+ *   rmfmail -v / -version    Show version and exit
+ *   rmfmail -setup           Interactive first-time account setup (CLI)
+ *   rmfmail -add             Add another account (CLI)
+ *   rmfmail -test            Test IMAP/SMTP connectivity for all accounts
+ *   rmfmail -rebuild         Wipe local cache, re-sync everything from IMAP
+ *   rmfmail -repair          Re-sync metadata (fix corrupt subjects), keeps .eml files
+ *   rmfmail -reauth          Clear cached OAuth tokens; next start re-consents
+ *                            (use when new Google scopes have been added)
+ *   rmfmail -log             Print log file path and exit
+ *   rmfmail -email <addr>    First-time setup with this email (skips prompt)
+ *   rmfmail -import <file>   Import accounts.jsonc into GDrive and merge
+ *   rmfmail -send <file>     Enqueue a .ltr/.eml for sending — daemon auto-routes
+ *                            by parsing the file's `From:` header against
+ *                            configured accounts. Falls back to the first
+ *                            "override" account (non-known-provider domain).
+ *   rmfmail -send <file> -account <id>
+ *                            Same, but force the account (skips auto-routing).
+ *
+ * Mailto handler (Windows):
+ *   rmfmail -register-mailto    Register as the OS-level mailto: handler so
+ *                               rmfmail appears in the "Open this 'mailto'
+ *                               link" picker (Settings → Default apps to set
+ *                               it as the active default).
+ *   rmfmail -unregister-mailto  Remove the mailto: handler registration.
+ *   rmfmail -mailto <url>       (internal) Decode a mailto URL and open compose.
+ *
+ * Internal:
+ *   rmfmail -daemon          (internal) marker for the detached daemon respawn.
+ *   rmfmail -allow-elevated  Bypass the admin/root refusal (debug only).
  */
 import fs from "node:fs";
 import path from "node:path";
@@ -109,6 +137,45 @@ const isDaemon = hasFlag("daemon"); // internal: re-spawned detached process
         }
     }
 }
+// -send <file> [-account <id>]: enqueue a .ltr/.eml from disk for sending.
+// Just drops the file into `~/.rmfmail/outbox/` (or `~/.rmfmail/outbox/<id>/`
+// when -account is given) and exits. The running daemon's outbox sweep picks
+// it up within 10 s; if the daemon isn't running, the file queues until next
+// launch. Routing (auto-account from `From:` header) is handled by
+// ImapManager.routeGeneralOutbox() inside the daemon — keeps the CLI thin.
+{
+    const sendIdx = args.findIndex(a => a === "-send" || a === "--send");
+    if (sendIdx !== -1) {
+        const file = args[sendIdx + 1];
+        if (!file) {
+            console.error("Usage: rmfmail -send <file> [-account <accountId>]");
+            process.exit(1);
+        }
+        if (!fs.existsSync(file)) {
+            console.error(`rmfmail -send: file not found: ${file}`);
+            process.exit(1);
+        }
+        const acctIdx = args.findIndex(a => a === "-account" || a === "--account");
+        const accountId = acctIdx !== -1 ? args[acctIdx + 1] : "";
+        const { getConfigDir } = await import("@bobfrankston/mailx-settings");
+        const outboxRoot = path.join(getConfigDir(), "outbox");
+        const targetDir = accountId ? path.join(outboxRoot, accountId) : outboxRoot;
+        fs.mkdirSync(targetDir, { recursive: true });
+        const now = new Date();
+        const pad2 = (n) => String(n).padStart(2, "0");
+        const ts = `${now.getFullYear()}${pad2(now.getMonth() + 1)}${pad2(now.getDate())}_${pad2(now.getHours())}${pad2(now.getMinutes())}${pad2(now.getSeconds())}-${String(Math.floor(Math.random() * 10000)).padStart(4, "0")}.ltr`;
+        const target = path.join(targetDir, ts);
+        fs.copyFileSync(file, target);
+        if (accountId) {
+            console.log(`Queued ${path.basename(file)} → outbox/${accountId}/${ts}`);
+        }
+        else {
+            console.log(`Queued ${path.basename(file)} → outbox/${ts} (daemon will auto-route by From: header)`);
+        }
+        console.log("Outbox sweep picks it up within 10 s (start rmfmail if it isn't running).");
+        process.exit(0);
+    }
+}
 if (hasFlag("register-mailto") || hasFlag("unregister-mailto")) {
     const unregister = hasFlag("unregister-mailto");
     if (process.platform !== "win32") {
@@ -426,13 +493,41 @@ const rebuildMode = hasFlag("rebuild");
 const repairMode = hasFlag("repair");
 const importMode = hasFlag("import");
 // Validate arguments
-const knownFlags = ["verbose", "kill", "v", "version", "setup", "add", "test", "rebuild", "repair", "log", "import", "email", "mail", "daemon", "reauth", "mailto", "register-mailto", "unregister-mailto", "allow-elevated", "another", "server", "debug-server"];
+const knownFlags = ["verbose", "kill", "v", "version", "setup", "add", "test", "rebuild", "repair", "log", "import", "email", "mail", "daemon", "reauth", "mailto", "register-mailto", "unregister-mailto", "allow-elevated", "another", "server", "no-browser", "debug-server", "send", "account"];
 for (const arg of args) {
     // Strip a leading -/-- and any `=value` suffix before checking.
     const flag = arg.replace(/^--?/, "").split("=")[0];
     if (arg.startsWith("-") && !knownFlags.includes(flag)) {
         console.error(`Unknown option: ${arg}`);
-        console.error("Usage: rmfmail [-verbose] [-kill] [-rebuild] [-v|-version] [-setup]");
+        console.error("Usage: rmfmail [options]   (-- prefix also accepted for every flag)\n" +
+            "  Launch:\n" +
+            "    (no args)              Start daemon + open WebView (IPC, no TCP)\n" +
+            "    -server                Start Express HTTP server (dev/remote)\n" +
+            "    -no-browser            Server mode without auto-opening a browser\n" +
+            "    -another               Don't replace any existing rmfmail daemon\n" +
+            "    -verbose               Echo logs to terminal (default: log file only)\n" +
+            "    -debug-server          Launch debug introspection server\n" +
+            "  Commands (exit immediately):\n" +
+            "    -kill                  Kill running rmfmail daemon + WebView\n" +
+            "    -v / -version          Print version and exit\n" +
+            "    -setup                 Interactive first-time account setup (CLI)\n" +
+            "    -add                   Add another account (CLI)\n" +
+            "    -test                  Test IMAP/SMTP connectivity for all accounts\n" +
+            "    -rebuild               Wipe local cache, re-sync everything\n" +
+            "    -repair                Re-sync metadata (keeps .eml files)\n" +
+            "    -reauth                Clear cached OAuth tokens; re-consent on next start\n" +
+            "    -log                   Print log file path and exit\n" +
+            "    -email <addr>          First-time setup with this email (skips prompt)\n" +
+            "    -import <file>         Import accounts.jsonc into GDrive and merge\n" +
+            "    -send <file>           Enqueue a .ltr/.eml for sending (auto-route by From:)\n" +
+            "    -send <file> -account <id>  Enqueue under a specific account\n" +
+            "  Mailto handler (Windows):\n" +
+            "    -register-mailto       Register as the OS-level mailto: handler\n" +
+            "    -unregister-mailto     Remove the mailto: handler registration\n" +
+            "    -mailto <url>          (internal) Decode a mailto URL and open compose\n" +
+            "  Internal:\n" +
+            "    -daemon                (internal) marker for the detached daemon respawn\n" +
+            "    -allow-elevated        Bypass the admin/root refusal (debug only)");
         process.exit(1);
     }
 }