@agenticmail/api 0.7.19 → 0.7.20

package/dist/index.js

@@ -751,20 +751,75 @@ function createFeatureRoutes(db, _accountManager, config, gatewayManager) {
       next(err);
     }
   });
+  const MAX_DRAFT_ATTACHMENTS_BYTES = 25 * 1024 * 1024;
+  function normaliseDraftAttachments(raw) {
+    if (!Array.isArray(raw) || raw.length === 0) return null;
+    let totalBytes = 0;
+    const cleaned = raw.map((a) => {
+      const content = typeof a?.content === "string" ? a.content : "";
+      totalBytes += Math.ceil(content.length * 0.75);
+      return {
+        filename: typeof a?.filename === "string" ? a.filename : "attachment",
+        contentType: typeof a?.contentType === "string" ? a.contentType : "application/octet-stream",
+        content,
+        encoding: "base64",
+        size: typeof a?.size === "number" ? a.size : Math.ceil(content.length * 0.75)
+      };
+    });
+    if (totalBytes > MAX_DRAFT_ATTACHMENTS_BYTES) {
+      throw Object.assign(new Error("attachments exceed 25 MB total"), { status: 413 });
+    }
+    return JSON.stringify(cleaned);
+  }
   router.get("/drafts", requireAgent, async (req, res, next) => {
     try {
       const rows = db.prepare("SELECT * FROM drafts WHERE agent_id = ? ORDER BY updated_at DESC").all(req.agent.id);
-      res.json({ drafts: rows });
+      const stripped = rows.map((r) => {
+        let metaOnly;
+        if (r.attachments) {
+          try {
+            metaOnly = JSON.parse(r.attachments).map((a) => ({
+              filename: a.filename,
+              contentType: a.contentType,
+              size: a.size
+            }));
+          } catch {
+            metaOnly = void 0;
+          }
+        }
+        return { ...r, attachments: metaOnly };
+      });
+      res.json({ drafts: stripped });
+    } catch (err) {
+      next(err);
+    }
+  });
+  router.get("/drafts/:id", requireAgent, async (req, res, next) => {
+    try {
+      const row = db.prepare("SELECT * FROM drafts WHERE id = ? AND agent_id = ?").get(req.params.id, req.agent.id);
+      if (!row) {
+        res.status(404).json({ error: "Draft not found" });
+        return;
+      }
+      if (row.attachments) {
+        try {
+          row.attachments = JSON.parse(row.attachments);
+        } catch {
+          row.attachments = [];
+        }
+      }
+      res.json(row);
     } catch (err) {
       next(err);
     }
   });
   router.post("/drafts", requireAgent, async (req, res, next) => {
     try {
-      const { to, subject, text, html, cc, bcc, inReplyTo, references } = req.body || {};
+      const { to, subject, text, html, cc, bcc, inReplyTo, references, attachments } = req.body || {};
+      const attachmentsJson = normaliseDraftAttachments(attachments);
       const id = uuidv4();
-      db.prepare(`INSERT INTO drafts (id, agent_id, to_addr, subject, text_body, html_body, cc, bcc, in_reply_to, refs)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(
+      db.prepare(`INSERT INTO drafts (id, agent_id, to_addr, subject, text_body, html_body, cc, bcc, in_reply_to, refs, attachments)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(
         id,
         req.agent.id,
         to || null,
@@ -774,19 +829,30 @@ function createFeatureRoutes(db, _accountManager, config, gatewayManager) {
         cc || null,
         bcc || null,
         inReplyTo || null,
-        references ? JSON.stringify(references) : null
+        references ? JSON.stringify(references) : null,
+        attachmentsJson
       );
       res.json({ ok: true, id });
     } catch (err) {
+      const status = err.status;
+      if (status) {
+        res.status(status).json({ error: err.message });
+        return;
+      }
       next(err);
     }
   });
   router.put("/drafts/:id", requireAgent, async (req, res, next) => {
     try {
-      const { to, subject, text, html, cc, bcc, inReplyTo, references } = req.body || {};
-      const result = db.prepare(`UPDATE drafts SET to_addr=?, subject=?, text_body=?, html_body=?,
-        cc=?, bcc=?, in_reply_to=?, refs=?, updated_at=datetime('now')
-        WHERE id=? AND agent_id=?`).run(
+      const { to, subject, text, html, cc, bcc, inReplyTo, references, attachments } = req.body || {};
+      const includeAttachments = Object.prototype.hasOwnProperty.call(req.body || {}, "attachments");
+      const attachmentsJson = includeAttachments ? normaliseDraftAttachments(attachments) : void 0;
+      const sql = includeAttachments ? `UPDATE drafts SET to_addr=?, subject=?, text_body=?, html_body=?,
+            cc=?, bcc=?, in_reply_to=?, refs=?, attachments=?, updated_at=datetime('now')
+            WHERE id=? AND agent_id=?` : `UPDATE drafts SET to_addr=?, subject=?, text_body=?, html_body=?,
+            cc=?, bcc=?, in_reply_to=?, refs=?, updated_at=datetime('now')
+            WHERE id=? AND agent_id=?`;
+      const params = [
         to || null,
         subject || null,
         text || null,
@@ -794,16 +860,22 @@ function createFeatureRoutes(db, _accountManager, config, gatewayManager) {
         cc || null,
         bcc || null,
         inReplyTo || null,
-        references ? JSON.stringify(references) : null,
-        req.params.id,
-        req.agent.id
-      );
+        references ? JSON.stringify(references) : null
+      ];
+      if (includeAttachments) params.push(attachmentsJson);
+      params.push(req.params.id, req.agent.id);
+      const result = db.prepare(sql).run(...params);
       if (result.changes === 0) {
         res.status(404).json({ error: "Draft not found" });
         return;
       }
       res.json({ ok: true });
     } catch (err) {
+      const status = err.status;
+      if (status) {
+        res.status(status).json({ error: err.message });
+        return;
+      }
       next(err);
     }
   });
@@ -833,6 +905,19 @@ function createFeatureRoutes(db, _accountManager, config, gatewayManager) {
       const agent = req.agent;
       const wakeList = normalizeWakeList(req.body?.wake);
       const customHeaders = wakeHeaders(wakeList);
+      let persistedAttachments;
+      if (draft.attachments) {
+        try {
+          const parsed = JSON.parse(draft.attachments);
+          persistedAttachments = parsed.map((a) => ({
+            filename: a.filename,
+            contentType: a.contentType,
+            content: a.content,
+            encoding: "base64"
+          }));
+        } catch {
+        }
+      }
       const mailOpts = {
         to: draft.to_addr,
         subject: draft.subject || "(no subject)",
@@ -842,6 +927,7 @@ function createFeatureRoutes(db, _accountManager, config, gatewayManager) {
         bcc: draft.bcc || void 0,
         inReplyTo: draft.in_reply_to || void 0,
         references: draft.refs ? JSON.parse(draft.refs) : void 0,
+        ...persistedAttachments && persistedAttachments.length > 0 ? { attachments: persistedAttachments } : {},
         ...Object.keys(customHeaders).length > 0 ? { headers: customHeaders } : {}
       };
       if (gatewayManager) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agenticmail/api",
-  "version": "0.7.19",
+  "version": "0.7.20",
   "description": "REST API server for AgenticMail — email and SMS endpoints for AI agents",
   "type": "module",
   "main": "dist/index.js",

package/public/js/app.js

@@ -55,9 +55,16 @@ function showAuthErr(msg) {
 }
 function signOut() {
   localStorage.removeItem('agenticmail.masterKey');
+  localStorage.removeItem('agenticmail.selectedAgentId');
   location.reload();
 }
 
+// localStorage key for the inbox the user was last viewing.
+// Persisted on every successful agent switch and consulted on
+// bootstrap so a refresh / reopen lands on the same account
+// instead of bouncing back to the bridge.
+const STORAGE_LAST_AGENT = 'agenticmail.selectedAgentId';
+
 document.getElementById('auth-submit').addEventListener('click', signIn);
 document.getElementById('auth-key').addEventListener('keydown', e => {
   if (e.key === 'Enter') signIn();
@@ -77,7 +84,15 @@ async function bootstrap() {
       return a.name.localeCompare(b.name);
     });
     state.agents = all;
-    const initial = state.agents.find(isBridgeAgent) ?? state.agents[0];
+    // Prefer the inbox the user was last viewing (persisted in
+    // localStorage on every selectAgent call). Falls back to the
+    // bridge if the stored id is gone (agent was deleted) or the
+    // user never switched. Fixes the "refresh always bounces me
+    // back to the host account" bug.
+    const lastId = localStorage.getItem(STORAGE_LAST_AGENT);
+    const initial = (lastId && state.agents.find(a => a.id === lastId))
+      ?? state.agents.find(isBridgeAgent)
+      ?? state.agents[0];
     if (initial) await selectAgent(initial);
     renderProfile();
     populateComposeFrom();
@@ -96,6 +111,11 @@ async function selectAgent(agent) {
   state.selectedAgent = agent;
   state.selectedUid = null;
   state.currentMessage = null;
+  // Persist the selection so a page refresh lands back on this
+  // inbox rather than bouncing to the bridge. Stored under a
+  // separate key from the master key so signing out clears it
+  // cleanly without affecting auth.
+  try { localStorage.setItem(STORAGE_LAST_AGENT, agent.id); } catch { /* private mode etc. */ }
   // Reset the per-agent folder cache so a fresh discovery runs
   // against the new agent's IMAP. Otherwise switching to an
   // account that uses different folder names (e.g. Gmail relay

package/public/js/compose.js

@@ -102,8 +102,10 @@ export async function openDraft(draftId) {
   wireAutosave();
   wireAttachmentPicker();
   try {
-    const data = await apiGet('/drafts', { agentKey: state.selectedAgent.apiKey });
-    const draft = (data?.drafts ?? []).find(d => d.id === draftId);
+    // Use the single-draft endpoint, which returns attachment
+    // content in full (the list endpoint only sends metadata to
+    // keep the sidebar payload small).
+    const draft = await apiGet(`/drafts/${encodeURIComponent(draftId)}`, { agentKey: state.selectedAgent.apiKey });
     if (!draft) throw new Error('Draft not found');
     document.getElementById('compose-to').value = draft.to_addr ?? '';
     document.getElementById('compose-cc').value = draft.cc ?? '';
@@ -111,6 +113,19 @@ export async function openDraft(draftId) {
     document.getElementById('compose-body').value = draft.text_body ?? '';
     document.getElementById('compose-title').textContent =
       `Draft: ${draft.subject || '(no subject)'}`;
+    // Rehydrate attachment chips with the persisted blobs. Map
+    // the server-side `size` field back into the in-memory
+    // `sizeBytes` alias the rest of the compose code uses for
+    // the UI-side 20 MB cap.
+    pendingAttachments = Array.isArray(draft.attachments)
+      ? draft.attachments.map(a => ({
+          filename: a.filename,
+          contentType: a.contentType,
+          content: a.content,
+          encoding: 'base64',
+          sizeBytes: typeof a.size === 'number' ? a.size : 0,
+        }))
+      : [];
     renderAttachmentChips();
     setComposeStatus('Loaded from Drafts');
     setTimeout(() => document.getElementById('compose-body').focus(), 50);
@@ -174,12 +189,27 @@ function readComposeFields() {
   const subject = document.getElementById('compose-subject').value.trim();
   const text = document.getElementById('compose-body').value;
   const cc = document.getElementById('compose-cc').value.trim();
-  if (!to && !subject && !text.trim() && !cc) return null;
+  if (!to && !subject && !text.trim() && !cc && pendingAttachments.length === 0) return null;
+  // The API expects `{ filename, contentType, content (base64),
+  // size }` per attachment. Drop the local-only sizeBytes alias
+  // and the redundant encoding field — the server defaults to
+  // base64 anyway.
+  const attachments = pendingAttachments.map(a => ({
+    filename: a.filename,
+    contentType: a.contentType,
+    content: a.content,
+    size: a.sizeBytes,
+  }));
   return {
     to: to || null,
     subject: subject || null,
     text: text || null,
     cc: cc || null,
+    // Always send `attachments` (even empty) so the server clears
+    // the stored blob when the user removes every chip. The PUT
+    // route uses `hasOwnProperty('attachments')` to distinguish
+    // "leave alone" from "set to empty".
+    attachments,
   };
 }
 
@@ -278,6 +308,11 @@ function wireAttachmentPicker() {
       }
     }
     renderAttachmentChips();
+    // Persist the new attachments to the draft so a "close and
+    // reopen" round-trip keeps them. Without this, attachments
+    // only ever lived in memory until the user typed in another
+    // field and triggered autosave organically.
+    scheduleAutosave();
   });
 }
 
@@ -310,6 +345,9 @@ function renderAttachmentChips() {
     el.addEventListener('click', () => {
       pendingAttachments.splice(Number(el.dataset.attRemove), 1);
       renderAttachmentChips();
+      // Same reason as the picker: removing a chip needs to
+      // persist or the draft round-trip will resurrect the file.
+      scheduleAutosave();
     });
   });
 }