@bobfrankston/rmfmail 1.0.524 → 1.0.526

package/packages/mailx-service/index.js

@@ -2712,6 +2712,10 @@ export class MailxService {
             translate: cfg.translateEnabled,
             proofread: cfg.proofreadEnabled,
             summarize: cfg.proofreadEnabled, // bundled with proofread for now
+            // extractEvent is gated on the same flag so the user has one
+            // toggle for "AI features that send your text to the cloud".
+            // Local-Ollama users get it for free without changing the flag.
+            extractEvent: cfg.proofreadEnabled,
         };
         if (!featureGate[req.action])
             return { text: "", reason: `AI ${req.action} disabled in settings` };
@@ -2719,6 +2723,7 @@ export class MailxService {
         if (!text.trim())
             return { text: "", reason: "no input" };
         const target = req.targetLang || "en";
+        const nowISO = req.nowISO || new Date().toISOString();
         let systemPrompt;
         let userPrompt;
         switch (req.action) {
@@ -2734,7 +2739,27 @@ export class MailxService {
                 systemPrompt = `You are a summarizer. Render the user's text as a short paragraph (2-4 sentences). Output ONLY the summary.`;
                 userPrompt = text;
                 break;
+            case "extractEvent":
+                // Strict JSON-only response — anything else makes the client
+                // throw on JSON.parse. Today's date is supplied so the model
+                // can resolve "tomorrow"/"next Tuesday" consistently with the
+                // user's wall clock (the service may not share it).
+                systemPrompt = `You parse natural-language event descriptions into structured calendar events. Today is ${nowISO.slice(0, 10)} (current time ${nowISO}). Output ONLY a JSON object with these fields, no prose, no markdown fences:
+  - title (string, required) — short event name
+  - startISO (string) — ISO 8601 local time, e.g. "2026-05-06T12:00:00". Omit if no time mentioned.
+  - endISO (string) — ISO 8601 local time. If duration is unstated, default to 1 hour after start.
+  - allDay (boolean) — true when no time-of-day was given.
+  - location (string) — venue / address. Omit if absent.
+  - notes (string) — extra detail not captured in title. Omit if absent.
+Resolve relative dates ("tomorrow", "next Friday") against today's date. If no year is given, use the next future occurrence. If only a date is given (no time), set allDay=true and omit endISO.`;
+                userPrompt = text;
+                break;
         }
+        // Get the raw text from the active provider, then post-process for
+        // structured-output actions (extractEvent → JSON.parse). Single
+        // provider-call site so the three branches stay close together.
+        let rawText = "";
+        let reason = "";
         try {
             if (cfg.provider === "ollama") {
                 const res = await fetch(`${cfg.ollamaUrl}/api/generate`, {
@@ -2750,64 +2775,96 @@ export class MailxService {
                 if (!res.ok)
                     return { text: "", reason: `ollama ${res.status}` };
                 const data = await res.json();
-                return { text: (data.response || "").trim() };
-            }
-            // Same migration as autocomplete: read keys from accounts.jsonc,
-            // fall back to legacy preferences.cloudApiKey.
-            const aiKeys = loadKeys();
-            if (cfg.provider === "claude") {
-                const apiKey = aiKeys.anthropic || cfg.cloudApiKey;
-                if (!apiKey)
-                    return { text: "", reason: "no Anthropic API key in accounts.jsonc keys" };
-                const res = await fetch("https://api.anthropic.com/v1/messages", {
-                    method: "POST",
-                    headers: {
-                        "Content-Type": "application/json",
-                        "x-api-key": apiKey,
-                        "anthropic-version": "2023-06-01",
-                    },
-                    body: JSON.stringify({
-                        model: cfg.cloudModel,
-                        max_tokens: 2048,
-                        system: systemPrompt,
-                        messages: [{ role: "user", content: userPrompt }],
-                    }),
-                });
-                if (!res.ok)
-                    return { text: "", reason: `claude ${res.status}` };
-                const data = await res.json();
-                return { text: (data.content?.[0]?.text || "").trim() };
+                rawText = (data.response || "").trim();
             }
-            if (cfg.provider === "openai") {
-                const apiKey = aiKeys.openai || cfg.cloudApiKey;
-                if (!apiKey)
-                    return { text: "", reason: "no OpenAI API key in accounts.jsonc keys" };
-                const res = await fetch("https://api.openai.com/v1/chat/completions", {
-                    method: "POST",
-                    headers: {
-                        "Content-Type": "application/json",
-                        "Authorization": `Bearer ${apiKey}`,
-                    },
-                    body: JSON.stringify({
-                        model: cfg.cloudModel,
-                        max_tokens: 2048,
-                        messages: [
-                            { role: "system", content: systemPrompt },
-                            { role: "user", content: userPrompt },
-                        ],
-                    }),
-                });
-                if (!res.ok)
-                    return { text: "", reason: `openai ${res.status}` };
-                const data = await res.json();
-                return { text: (data.choices?.[0]?.message?.content || "").trim() };
+            else {
+                // Cloud providers: read API keys from accounts.jsonc,
+                // fall back to the legacy preferences.cloudApiKey field.
+                const aiKeys = loadKeys();
+                if (cfg.provider === "claude") {
+                    const apiKey = aiKeys.anthropic || cfg.cloudApiKey;
+                    if (!apiKey)
+                        return { text: "", reason: "no Anthropic API key in accounts.jsonc keys" };
+                    const res = await fetch("https://api.anthropic.com/v1/messages", {
+                        method: "POST",
+                        headers: {
+                            "Content-Type": "application/json",
+                            "x-api-key": apiKey,
+                            "anthropic-version": "2023-06-01",
+                        },
+                        body: JSON.stringify({
+                            model: cfg.cloudModel,
+                            max_tokens: 2048,
+                            system: systemPrompt,
+                            messages: [{ role: "user", content: userPrompt }],
+                        }),
+                    });
+                    if (!res.ok)
+                        return { text: "", reason: `claude ${res.status}` };
+                    const data = await res.json();
+                    rawText = (data.content?.[0]?.text || "").trim();
+                }
+                else if (cfg.provider === "openai") {
+                    const apiKey = aiKeys.openai || cfg.cloudApiKey;
+                    if (!apiKey)
+                        return { text: "", reason: "no OpenAI API key in accounts.jsonc keys" };
+                    const res = await fetch("https://api.openai.com/v1/chat/completions", {
+                        method: "POST",
+                        headers: {
+                            "Content-Type": "application/json",
+                            "Authorization": `Bearer ${apiKey}`,
+                        },
+                        body: JSON.stringify({
+                            model: cfg.cloudModel,
+                            max_tokens: 2048,
+                            messages: [
+                                { role: "system", content: systemPrompt },
+                                { role: "user", content: userPrompt },
+                            ],
+                        }),
+                    });
+                    if (!res.ok)
+                        return { text: "", reason: `openai ${res.status}` };
+                    const data = await res.json();
+                    rawText = (data.choices?.[0]?.message?.content || "").trim();
+                }
+                else {
+                    return { text: "", reason: "no provider matched" };
+                }
             }
         }
         catch (e) {
             console.error(`  [aiTransform] ${cfg.provider} ${req.action} error: ${e.message}`);
             return { text: "", reason: e.message };
         }
-        return { text: "", reason: "no provider matched" };
+        if (req.action !== "extractEvent")
+            return { text: rawText, reason };
+        // extractEvent post-processing: pull a JSON object out of rawText.
+        // Models sometimes wrap output in ```json fences or add a leading
+        // sentence even when told not to. Locate the first { ... } block
+        // and parse that. Empty event with reason "no JSON" lets the UI
+        // fall back to "use the raw description as the event title".
+        const match = rawText.match(/\{[\s\S]*\}/);
+        if (!match)
+            return { text: rawText, reason: "AI did not return JSON" };
+        try {
+            const parsed = JSON.parse(match[0]);
+            if (typeof parsed?.title !== "string" || !parsed.title.trim()) {
+                return { text: rawText, reason: "AI JSON missing title" };
+            }
+            const ev = {
+                title: parsed.title.trim(),
+                startISO: typeof parsed.startISO === "string" ? parsed.startISO : undefined,
+                endISO: typeof parsed.endISO === "string" ? parsed.endISO : undefined,
+                allDay: typeof parsed.allDay === "boolean" ? parsed.allDay : undefined,
+                location: typeof parsed.location === "string" ? parsed.location : undefined,
+                notes: typeof parsed.notes === "string" ? parsed.notes : undefined,
+            };
+            return { text: JSON.stringify(ev), event: ev };
+        }
+        catch (e) {
+            return { text: rawText, reason: `AI JSON parse failed: ${e.message}` };
+        }
     }
 }
 /** Trim suggestion: remove leading/trailing whitespace, cap at sentence boundary */