@agenticmail/api 0.7.17 → 0.7.18

package/dist/index.js

@@ -2167,9 +2167,23 @@ function createMailRoutes(accountManager2, config, db, gatewayManager) {
         res.status(400).json({ error: "Invalid UID" });
         return;
       }
+      const permanent = req.query.permanent === "true" || req.query.permanent === "1";
+      const sourceFolder = req.query.folder || "INBOX";
       const password = getAgentPassword(agent);
       const receiver = await getReceiver(agent.stalwartPrincipal, password, config);
-      await receiver.deleteMessage(uid);
+      if (permanent) {
+        await receiver.expungeMessage(uid, sourceFolder);
+        res.status(204).send();
+        return;
+      }
+      const folders = await receiver.listFolders();
+      const trashRe = /^trash\b|deleted items|deleted messages|\[gmail\]\/trash|\[gmail\]\/bin/i;
+      const trashFolder = folders.find((f) => trashRe.test(f.name) || trashRe.test(f.path))?.path ?? folders.find((f) => f.specialUse === "\\Trash")?.path;
+      if (!trashFolder || trashFolder === sourceFolder) {
+        await receiver.expungeMessage(uid, sourceFolder);
+      } else {
+        await receiver.moveToTrash(uid, sourceFolder, trashFolder);
+      }
       res.status(204).send();
     } catch (err) {
       next(err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agenticmail/api",
-  "version": "0.7.17",
+  "version": "0.7.18",
   "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

@@ -247,15 +247,25 @@ async function markSpam() {
 async function deleteMessage() {
   if (!state.currentMessage || !state.selectedAgent) return;
   const subject = state.currentMessage.subject ?? '(no subject)';
+  // From Trash, delete is permanent (no further fallback). From
+  // every other folder it's a move-to-trash, recoverable.
+  const isTrash = state.selectedFolder === 'trash';
   const ok = await confirmModal({
-    title: 'Delete this message?',
-    body: `"${subject}" will be moved to Trash. This can't be undone from the web UI.`,
-    confirm: 'Delete',
+    title: isTrash ? 'Delete this message forever?' : 'Delete this message?',
+    body: isTrash
+      ? `"${subject}" will be permanently removed. This can't be undone.`
+      : `"${subject}" will be moved to Trash. You can recover it from there.`,
+    confirm: isTrash ? 'Delete forever' : 'Move to Trash',
     danger: true,
   });
   if (!ok) return;
   try {
-    await apiDelete(`/mail/messages/${state.selectedUid}`, { agentKey: state.selectedAgent.apiKey });
+    // Pass the real IMAP folder name + permanent flag. The API
+    // uses the folder for the IMAP source mailbox and decides
+    // move-to-trash vs expunge based on `permanent`.
+    const imap = state.folderNames?.[state.selectedFolder] ?? 'INBOX';
+    const qs = `?folder=${encodeURIComponent(imap)}${isTrash ? '&permanent=true' : ''}`;
+    await apiDelete(`/mail/messages/${state.selectedUid}${qs}`, { agentKey: state.selectedAgent.apiKey });
     toast('Deleted.');
     location.hash = `#/folder/${state.selectedFolder ?? 'inbox'}`;
     await loadList(state.selectedAgent, state.selectedFolder);