@bobfrankston/rmfmail 1.2.251 → 1.2.253

package/packages/mailx-service/index.js

@@ -97,6 +97,7 @@ import * as gsync from "./google-sync.js";
 import { SyncQueue } from "./sync-queue.js";
 import { Reconciler } from "./reconciler.js";
 import { spawnDbWorker } from "./db-worker-client.js";
+import { priceCall, recordAiUsage, summarizeAiUsage } from "./ai-usage.js";
 export { spawnSyncWorker } from "./sync-worker-client.js";
 import { loadSettings, saveSettings, loadAccounts, loadAccountsAsync, saveAccounts, initCloudConfig, loadAllowlist, saveAllowlist, loadAutocomplete, saveAutocomplete, loadKeys, getStorePath, getStorageInfo, getConfigDir, loadUserDict, saveUserDict, loadReminderState, saveReminderState, cloudReadBinary, providerForDomain } from "@bobfrankston/mailx-settings";
 import { buildMimeMessage } from "@bobfrankston/mailx-types";
@@ -1082,6 +1083,13 @@ export class MailxService {
             : ((body.trim().split("\n")[0] || resp.statusText).slice(0, 200));
         return { ok, status: displayStatus, statusText };
     }
+    /** AI spend since `sinceMs` (default: start of this month). Reads the
+     *  per-call log written by aiTransform. `unpricedCalls` are excluded from
+     *  `costUsd` — a model with no published price contributes tokens, not a
+     *  made-up dollar figure. */
+    getAiUsage(sinceMs) {
+        return summarizeAiUsage(sinceMs);
+    }
     /** Fetch a remote image so the WebView can put it on the clipboard.
      *
      *  The client cannot do this itself: an image hosted by a sender is
@@ -3740,6 +3748,25 @@ export class MailxService {
      *  openInWord / openLocalPath). Cross-platform: start / open / xdg-open. */
     async openAttachment(accountId, uid, attachmentId, folderId, filename) {
         const att = await this.getAttachment(accountId, uid, attachmentId, folderId);
+        return await this.stageAndOpenFile(filename || att.filename, att.contentType, att.content);
+    }
+    /** Open a file the user is composing WITH — an attachment sitting in the
+     *  compose window that has never been in a message. The bytes come from
+     *  the client (it already holds them for the send), so there is nothing
+     *  to fetch; everything after that is identical to opening a received
+     *  attachment, which is why both go through stageAndOpenFile. */
+    async openPendingAttachment(filename, mimeType, dataBase64) {
+        const content = Buffer.from(dataBase64 || "", "base64");
+        if (content.length === 0)
+            throw new Error(`"${filename}" has no content to open`);
+        return await this.stageAndOpenFile(filename, mimeType, content);
+    }
+    /** Stage bytes to the attachment temp dir and hand them to the OS opener.
+     *  Shared by received attachments and compose attachments — the collision
+     *  handling and Mark-of-the-Web tagging below are subtle enough that a
+     *  second copy of them would drift. */
+    async stageAndOpenFile(filename, contentType, content) {
+        const att = { filename, contentType, content };
         const dir = getAttachmentStagingDir();
         fs.mkdirSync(dir, { recursive: true });
         // Prefer the filename the UI is showing — it comes from the sync-time
@@ -3750,7 +3777,7 @@ export class MailxService {
         // silently no-ops — the invite.ics that "did nothing" (2026-06-08).
         // basename() strips any path components so a crafted name can't escape
         // the temp dir; also drop newlines.
-        let safeName = (path.basename(filename || att.filename || "attachment").replace(/[\r\n]/g, "_")) || "attachment";
+        let safeName = (path.basename(att.filename || "attachment").replace(/[\r\n]/g, "_")) || "attachment";
         // Guarantee an extension so the OS has something to associate. Derive
         // it from the MIME type when the name lacks one.
         if (!path.extname(safeName)) {
@@ -3879,7 +3906,7 @@ export class MailxService {
         }
     }
     // ── Drafts ──
-    async saveDraft(accountId, subject, bodyHtml, bodyText, to, cc, previousDraftUid, draftId, bcc, from) {
+    async saveDraft(accountId, subject, bodyHtml, bodyText, to, cc, previousDraftUid, draftId, bcc, from, attachments) {
         // Local-first: commit the draft to the local filesystem synchronously
         // and return immediately. The IMAP APPEND (and the previous-draft
         // delete) run in the background. Previously this method awaited IMAP
@@ -3908,11 +3935,17 @@ export class MailxService {
         // the account default — a reply to an alias must keep that alias
         // (Bob 2026-07-30); and Bcc belongs IN a draft, it is the SEND path
         // that strips it, so reopening a draft still shows the Bcc list.
+        // Attachments belong IN the draft. Without them the saved draft is
+        // body-only: close compose and the file is gone, and the list shows
+        // the body-only size (Bob 2026-08-11: "65KB attachment, why is the
+        // email size showing as 6K?" — the size was right, the draft was
+        // wrong). The send path always passed them; only this one didn't.
         const raw = buildMimeMessage({
             from: from?.trim() || `${account.name} <${account.email}>`,
             to, cc, bcc,
             subject: subject || "(no subject)",
             bodyHtml, bodyText,
+            attachments,
             domain: account.email.split("@")[1] || "mailx.local",
             extraHeaders: [`X-Mailx-Draft-ID: ${id}`],
             omitMessageId: true,
@@ -4701,6 +4734,8 @@ Resolve relative dates ("tomorrow", "next Friday") against today's date. If no y
         // provider-call site so the three branches stay close together.
         let rawText = "";
         let reason = "";
+        // Token usage for cost accounting, filled in by whichever branch runs.
+        let usage = null;
         try {
             if (cfg.provider === "ollama") {
                 const res = await fetch(`${cfg.ollamaUrl}/api/generate`, {
@@ -4717,6 +4752,9 @@ Resolve relative dates ("tomorrow", "next Friday") against today's date. If no y
                     return { text: "", reason: `ollama ${res.status}` };
                 const data = await res.json();
                 rawText = (data.response || "").trim();
+                // Local model — free, but still counted so "$0.00" is measured
+                // rather than merely absent.
+                usage = { input: data.prompt_eval_count || 0, output: data.eval_count || 0, model: cfg.ollamaModel };
             }
             else {
                 // Cloud providers: read API keys from accounts.jsonc,
@@ -4744,6 +4782,11 @@ Resolve relative dates ("tomorrow", "next Friday") against today's date. If no y
                         return { text: "", reason: `claude ${res.status}` };
                     const data = await res.json();
                     rawText = (data.content?.[0]?.text || "").trim();
+                    usage = {
+                        input: data.usage?.input_tokens || 0,
+                        output: data.usage?.output_tokens || 0,
+                        model: data.model || cfg.cloudModel,
+                    };
                 }
                 else if (cfg.provider === "openai") {
                     const apiKey = aiKeys.openai || cfg.cloudApiKey;
@@ -4768,6 +4811,11 @@ Resolve relative dates ("tomorrow", "next Friday") against today's date. If no y
                         return { text: "", reason: `openai ${res.status}` };
                     const data = await res.json();
                     rawText = (data.choices?.[0]?.message?.content || "").trim();
+                    usage = {
+                        input: data.usage?.prompt_tokens || 0,
+                        output: data.usage?.completion_tokens || 0,
+                        model: data.model || cfg.cloudModel,
+                    };
                 }
                 else {
                     return { text: "", reason: "no provider matched" };
@@ -4775,8 +4823,47 @@ Resolve relative dates ("tomorrow", "next Friday") against today's date. If no y
             }
         }
         catch (e) {
-            console.error(`  [aiTransform] ${cfg.provider} ${req.action} error: ${e.message}`);
-            return { text: "", reason: e.message };
+            // Node's fetch throws a bare `TypeError: fetch failed` and buries
+            // the actual cause (ECONNREFUSED, ENOTFOUND, cert error) in
+            // `e.cause`. Reporting only the message told Bob nothing — the
+            // real answer was "Ollama isn't running" (2026-08-11). Unwrap it,
+            // and name the endpoint we couldn't reach.
+            const cause = e?.cause?.code || e?.cause?.message || "";
+            const where = cfg.provider === "ollama" ? cfg.ollamaUrl
+                : cfg.provider === "claude" ? "api.anthropic.com"
+                    : cfg.provider === "openai" ? "api.openai.com" : cfg.provider;
+            const detail = cause ? `${e.message} (${cause})` : e.message;
+            const reasonText = /fetch failed/i.test(e?.message || "")
+                ? `can't reach ${cfg.provider} at ${where} — ${cause || "connection failed"}`
+                : detail;
+            console.error(`  [aiTransform] ${cfg.provider} ${req.action} error: ${detail} [${where}]`);
+            return { text: "", reason: reasonText };
+        }
+        // Cost accounting. Bob asked to monitor AI spend (2026-08-11); nothing
+        // tracked it before. Recorded per call to ~/.rmfmail/logs/ai-usage.jsonl,
+        // with the month-to-date total on the log line so spend is visible
+        // without opening anything. A local model records $0, not "no data";
+        // a model with no published price records tokens and a null cost
+        // rather than a guessed figure.
+        if (usage) {
+            const costUsd = priceCall(cfg.provider, usage.model, usage.input, usage.output);
+            recordAiUsage({
+                ts: Date.now(),
+                provider: cfg.provider,
+                model: usage.model,
+                action: req.action,
+                inputTokens: usage.input,
+                outputTokens: usage.output,
+                costUsd,
+            });
+            const mtd = summarizeAiUsage();
+            const costText = costUsd == null
+                ? "cost unknown (no published price for this model)"
+                : `$${costUsd.toFixed(4)}`;
+            const mtdText = mtd.unpricedCalls > 0
+                ? `$${mtd.costUsd.toFixed(2)} + ${mtd.unpricedCalls} unpriced call(s)`
+                : `$${mtd.costUsd.toFixed(2)}`;
+            console.log(`  [ai-usage] ${cfg.provider}/${usage.model} ${req.action}: ${usage.input} in + ${usage.output} out = ${costText}; month-to-date ${mtdText} over ${mtd.calls} call(s)`);
         }
         if (req.action !== "extractEvent")
             return { text: rawText, reason };