@agenticmail/api 0.9.18 → 0.9.20

package/dist/index.js

@@ -2468,9 +2468,10 @@ function createMailRoutes(accountManager, config, db, gatewayManager) {
         res.status(400).json({ error: "Invalid UID" });
         return;
       }
+      const folder = req.body?.folder || "INBOX";
       const password = getAgentPassword(agent);
       const receiver = await getReceiver(agent.stalwartPrincipal, password, config);
-      await receiver.markUnseen(uid);
+      await receiver.markUnseen(uid, folder);
       invalidateParsedMessage(agent.id, uid);
       res.json({ ok: true });
     } catch (err) {
@@ -2673,6 +2674,17 @@ function createMailRoutes(accountManager, config, db, gatewayManager) {
       next(err);
     }
   });
+  async function resolveSpamFolder(receiver) {
+    const folders = await receiver.listFolders();
+    const junkRe = /^junk\b|^junk mail\b|^spam\b/i;
+    const found = folders.find((f) => f.specialUse === "\\Junk")?.path ?? folders.find((f) => junkRe.test(f.name) || junkRe.test(f.path))?.path;
+    if (found) return found;
+    try {
+      await receiver.createFolder("Junk Mail");
+    } catch {
+    }
+    return "Junk Mail";
+  }
   router.get("/mail/spam", requireAgent, async (req, res, next) => {
     try {
       const agent = req.agent;
@@ -2680,15 +2692,16 @@ function createMailRoutes(accountManager, config, db, gatewayManager) {
       const offset = Math.max(parseInt(req.query.offset) || 0, 0);
       const password = getAgentPassword(agent);
       const receiver = await getReceiver(agent.stalwartPrincipal, password, config);
+      const spamFolder = await resolveSpamFolder(receiver);
       let mailboxInfo;
       try {
-        mailboxInfo = await receiver.getMailboxInfo("Spam");
+        mailboxInfo = await receiver.getMailboxInfo(spamFolder);
       } catch {
-        res.json({ messages: [], count: 0, total: 0, folder: "Spam" });
+        res.json({ messages: [], count: 0, total: 0, folder: spamFolder });
         return;
       }
-      const envelopes = await receiver.listEnvelopes("Spam", { limit, offset });
-      res.json({ messages: envelopes, count: envelopes.length, total: mailboxInfo.exists, folder: "Spam" });
+      const envelopes = await receiver.listEnvelopes(spamFolder, { limit, offset });
+      res.json({ messages: envelopes, count: envelopes.length, total: mailboxInfo.exists, folder: spamFolder });
     } catch (err) {
       next(err);
     }
@@ -2793,12 +2806,13 @@ function createMailRoutes(accountManager, config, db, gatewayManager) {
       const folder = req.body?.folder || "INBOX";
       const password = getAgentPassword(agent);
       const receiver = await getReceiver(agent.stalwartPrincipal, password, config);
-      try {
-        await receiver.createFolder("Spam");
-      } catch {
+      const spamFolder = await resolveSpamFolder(receiver);
+      if (spamFolder === folder) {
+        res.status(400).json({ error: "Message already in spam" });
+        return;
       }
-      await receiver.moveMessage(uid, folder, "Spam");
-      res.json({ ok: true, movedToSpam: true });
+      await receiver.moveMessage(uid, folder, spamFolder);
+      res.json({ ok: true, movedToSpam: true, spam: spamFolder });
     } catch (err) {
       next(err);
     }
@@ -2813,8 +2827,9 @@ function createMailRoutes(accountManager, config, db, gatewayManager) {
       }
       const password = getAgentPassword(agent);
       const receiver = await getReceiver(agent.stalwartPrincipal, password, config);
-      await receiver.moveMessage(uid, "Spam", "INBOX");
-      res.json({ ok: true, movedToInbox: true });
+      const spamFolder = await resolveSpamFolder(receiver);
+      await receiver.moveMessage(uid, spamFolder, "INBOX");
+      res.json({ ok: true, movedToInbox: true, spam: spamFolder });
     } catch (err) {
       next(err);
     }

package/package.json

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

package/public/js/message-view.js

@@ -36,7 +36,20 @@ export async function openMessage(uid) {
   document.getElementById('msg-delete').addEventListener('click', () => deleteMessage());
 
   try {
-    const msg = await apiGet(`/mail/messages/${uid}`, { agentKey: state.selectedAgent.apiKey });
+    // Pass the current folder so the API fetches from the right
+    // mailbox — Spam / Archive / Trash UIDs don't exist in INBOX,
+    // and the API defaults `folder` to INBOX when omitted. Without
+    // this, opening a message from any non-Inbox folder 404'd
+    // with `MESSAGE_NOT_FOUND` because UID N existed in (say) Junk
+    // Mail but the API looked in INBOX.
+    //
+    // We resolve the IMAP folder name via state.folderNames (the
+    // map populated by /mail/folders auto-discovery) so renames
+    // like Stalwart's "Junk Mail" vs "Spam" are handled in one
+    // place. "inbox" maps to "INBOX" by convention.
+    const imap = state.folderNames?.[state.selectedFolder] ?? 'INBOX';
+    const qs = imap && imap !== 'INBOX' ? `?folder=${encodeURIComponent(imap)}` : '';
+    const msg = await apiGet(`/mail/messages/${uid}${qs}`, { agentKey: state.selectedAgent.apiKey });
     state.currentMessage = msg;
     renderMessage(msg);
   } catch (err) {
@@ -220,7 +233,8 @@ function renderThreadQuote(dateRaw, sender, quotedBody) {
 async function markUnread() {
   if (!state.currentMessage || !state.selectedAgent) return;
   try {
-    await apiPost(`/mail/messages/${state.selectedUid}/unseen`, {}, { agentKey: state.selectedAgent.apiKey });
+    const imap = state.folderNames?.[state.selectedFolder] ?? 'INBOX';
+    await apiPost(`/mail/messages/${state.selectedUid}/unseen`, { folder: imap }, { agentKey: state.selectedAgent.apiKey });
     toast('Marked unread.');
     location.hash = `#/folder/${state.selectedFolder ?? 'inbox'}`;
     await loadList(state.selectedAgent, state.selectedFolder);
@@ -262,7 +276,8 @@ async function markSpam() {
   });
   if (!ok) return;
   try {
-    await apiPost(`/mail/messages/${state.selectedUid}/spam`, {}, { agentKey: state.selectedAgent.apiKey });
+    const imap = state.folderNames?.[state.selectedFolder] ?? 'INBOX';
+    await apiPost(`/mail/messages/${state.selectedUid}/spam`, { folder: imap }, { agentKey: state.selectedAgent.apiKey });
     toast('Reported as spam.');
     location.hash = `#/folder/${state.selectedFolder ?? 'inbox'}`;
     await loadList(state.selectedAgent, state.selectedFolder);