@bobfrankston/rmfmail 1.2.250 → 1.2.252

package/packages/mailx-service/index.ts

@@ -103,6 +103,7 @@ import { Store } from "@bobfrankston/mailx-store";
 import { SyncQueue } from "./sync-queue.js";
 import { Reconciler } from "./reconciler.js";
 import { spawnDbWorker, type SpawnedDbWorker } from "./db-worker-client.js";
+import { priceCall, recordAiUsage, summarizeAiUsage, type AiUsageSummary } from "./ai-usage.js";
 export { spawnSyncWorker, type SpawnedSyncWorker } from "./sync-worker-client.js";
 import { loadSettings, saveSettings, loadAccounts, loadAccountsAsync, saveAccounts, initCloudConfig, loadAllowlist, saveAllowlist, loadAutocomplete, saveAutocomplete, loadKeys, saveKeys, ensureKeysSectionExists, getStorePath, getStorageInfo, getConfigDir, loadUserDict, saveUserDict, loadReminderState, saveReminderState, cloudReadBinary, providerForDomain } from "@bobfrankston/mailx-settings";
 import type { AccountConfig, Folder, AutocompleteRequest, AutocompleteResponse, AutocompleteSettings, AiTransformRequest, AiTransformResponse, ExtractedEvent, MailxApi } from "@bobfrankston/mailx-types";
@@ -1095,6 +1096,14 @@ export class MailxService implements MailxApi {
         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?: number): AiUsageSummary {
+        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
@@ -4532,6 +4541,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: { input: number; output: number; model: string } | null = null;
         try {
             if (cfg.provider === "ollama") {
                 const res = await fetch(`${cfg.ollamaUrl}/api/generate`, {
@@ -4547,6 +4558,9 @@ Resolve relative dates ("tomorrow", "next Friday") against today's date. If no y
                 if (!res.ok) return { text: "", reason: `ollama ${res.status}` };
                 const data = await res.json() as any;
                 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,
                 // fall back to the legacy preferences.cloudApiKey field.
@@ -4571,6 +4585,11 @@ Resolve relative dates ("tomorrow", "next Friday") against today's date. If no y
                     if (!res.ok) return { text: "", reason: `claude ${res.status}` };
                     const data = await res.json() as any;
                     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;
                     if (!apiKey) return { text: "", reason: "no OpenAI API key in accounts.jsonc keys" };
@@ -4592,13 +4611,58 @@ Resolve relative dates ("tomorrow", "next Friday") against today's date. If no y
                     if (!res.ok) return { text: "", reason: `openai ${res.status}` };
                     const data = await res.json() as any;
                     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" };
                 }
             }
         } catch (e: any) {
-            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 };

package/packages/mailx-service/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-service",
-  "version": "0.1.24",
+  "version": "0.1.25",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",