@agenticmail/api 0.5.59 → 0.5.61

package/dist/index.js

@@ -264,17 +264,17 @@ function createAccountRoutes(accountManager, db, config) {
   const router = Router2();
   const deletionService = new AgentDeletionService(db, accountManager, config);
   router.post("/accounts", requireMaster, async (req, res, next) => {
+    if (!req.body || typeof req.body !== "object") {
+      res.status(400).json({ error: "Request body must be JSON" });
+      return;
+    }
+    const { name: accountName, domain, password, metadata, role, persistent } = req.body;
     try {
-      if (!req.body || typeof req.body !== "object") {
-        res.status(400).json({ error: "Request body must be JSON" });
-        return;
-      }
-      const { name: name2, domain, password, metadata, role, persistent } = req.body;
-      if (!name2 || typeof name2 !== "string") {
+      if (!accountName || typeof accountName !== "string") {
         res.status(400).json({ error: "name is required and must be a string" });
         return;
       }
-      if (name2.length > 64) {
+      if (accountName.length > 64) {
         res.status(400).json({ error: "name must be 64 characters or fewer" });
         return;
       }
@@ -293,7 +293,7 @@ function createAccountRoutes(accountManager, db, config) {
       const cleanMeta = metadata ? Object.fromEntries(
         Object.entries(metadata).filter(([k]) => !k.startsWith("_"))
       ) : void 0;
-      const agent = await accountManager.create({ name: name2, domain, password: password || void 0, metadata: cleanMeta, role });
+      const agent = await accountManager.create({ name: accountName, domain, password: password || void 0, metadata: cleanMeta, role });
       try {
         db.prepare("UPDATE agents SET last_activity_at = datetime('now') WHERE id = ?").run(agent.id);
       } catch {
@@ -310,7 +310,7 @@ function createAccountRoutes(accountManager, db, config) {
     } catch (err) {
       const msg = err.message ?? "";
       if (msg.includes("UNIQUE") || msg.includes("unique") || msg.includes("already exists") || msg.includes("duplicate") || msg.includes("fieldAlreadyExists") || msg.toLowerCase().includes("alreadyexists")) {
-        res.status(409).json({ error: "Account already exists", name });
+        res.status(409).json({ error: "Account already exists", name: accountName });
         return;
       }
       next(err);
@@ -644,13 +644,13 @@ function createFeatureRoutes(db, _accountManager, config, gatewayManager) {
   });
   router.post("/contacts", requireAgent, async (req, res, next) => {
     try {
-      const { name: name2, email, notes } = req.body || {};
+      const { name, email, notes } = req.body || {};
       if (!email) {
         res.status(400).json({ error: "email is required" });
         return;
       }
       const id = uuidv4();
-      db.prepare("INSERT OR REPLACE INTO contacts (id, agent_id, name, email, notes) VALUES (?, ?, ?, ?, ?)").run(id, req.agent.id, name2 || null, email, notes || null);
+      db.prepare("INSERT OR REPLACE INTO contacts (id, agent_id, name, email, notes) VALUES (?, ?, ?, ?, ?)").run(id, req.agent.id, name || null, email, notes || null);
       res.json({ ok: true, id, email });
     } catch (err) {
       next(err);
@@ -795,8 +795,8 @@ function createFeatureRoutes(db, _accountManager, config, gatewayManager) {
   });
   router.post("/signatures", requireAgent, async (req, res, next) => {
     try {
-      const { name: name2, text, html, isDefault } = req.body || {};
-      if (!name2) {
+      const { name, text, html, isDefault } = req.body || {};
+      if (!name) {
         res.status(400).json({ error: "name is required" });
         return;
       }
@@ -804,7 +804,7 @@ function createFeatureRoutes(db, _accountManager, config, gatewayManager) {
       if (isDefault) {
         db.prepare("UPDATE signatures SET is_default = 0 WHERE agent_id = ?").run(req.agent.id);
       }
-      db.prepare("INSERT OR REPLACE INTO signatures (id, agent_id, name, text_content, html_content, is_default) VALUES (?, ?, ?, ?, ?, ?)").run(id, req.agent.id, name2, text || null, html || null, isDefault ? 1 : 0);
+      db.prepare("INSERT OR REPLACE INTO signatures (id, agent_id, name, text_content, html_content, is_default) VALUES (?, ?, ?, ?, ?, ?)").run(id, req.agent.id, name, text || null, html || null, isDefault ? 1 : 0);
       res.json({ ok: true, id });
     } catch (err) {
       next(err);
@@ -832,13 +832,13 @@ function createFeatureRoutes(db, _accountManager, config, gatewayManager) {
   });
   router.post("/templates", requireAgent, async (req, res, next) => {
     try {
-      const { name: name2, subject, text, html } = req.body || {};
-      if (!name2) {
+      const { name, subject, text, html } = req.body || {};
+      if (!name) {
         res.status(400).json({ error: "name is required" });
         return;
       }
       const id = uuidv4();
-      db.prepare("INSERT OR REPLACE INTO templates (id, agent_id, name, subject, text_body, html_body) VALUES (?, ?, ?, ?, ?, ?)").run(id, req.agent.id, name2, subject || null, text || null, html || null);
+      db.prepare("INSERT OR REPLACE INTO templates (id, agent_id, name, subject, text_body, html_body) VALUES (?, ?, ?, ?, ?, ?)").run(id, req.agent.id, name, subject || null, text || null, html || null);
       res.json({ ok: true, id });
     } catch (err) {
       next(err);
@@ -912,14 +912,14 @@ function createFeatureRoutes(db, _accountManager, config, gatewayManager) {
   });
   router.post("/tags", requireAgent, async (req, res, next) => {
     try {
-      const { name: name2, color } = req.body || {};
-      if (!name2) {
+      const { name, color } = req.body || {};
+      if (!name) {
         res.status(400).json({ error: "name is required" });
         return;
       }
       const id = uuidv4();
-      db.prepare("INSERT OR IGNORE INTO tags (id, agent_id, name, color) VALUES (?, ?, ?, ?)").run(id, req.agent.id, name2.trim(), color || "#888888");
-      res.json({ ok: true, id, name: name2.trim(), color: color || "#888888" });
+      db.prepare("INSERT OR IGNORE INTO tags (id, agent_id, name, color) VALUES (?, ?, ?, ?)").run(id, req.agent.id, name.trim(), color || "#888888");
+      res.json({ ok: true, id, name: name.trim(), color: color || "#888888" });
     } catch (err) {
       next(err);
     }
@@ -1049,16 +1049,16 @@ function createFeatureRoutes(db, _accountManager, config, gatewayManager) {
   });
   router.post("/rules", requireAgent, async (req, res, next) => {
     try {
-      const { name: name2, conditions, actions, priority, enabled } = req.body || {};
-      if (!name2) {
+      const { name, conditions, actions, priority, enabled } = req.body || {};
+      if (!name) {
         res.status(400).json({ error: "name is required" });
         return;
       }
       const id = uuidv4();
       db.prepare(
         "INSERT INTO email_rules (id, agent_id, name, priority, enabled, conditions, actions) VALUES (?, ?, ?, ?, ?, ?, ?)"
-      ).run(id, req.agent.id, name2, priority ?? 0, enabled !== false ? 1 : 0, JSON.stringify(conditions || {}), JSON.stringify(actions || {}));
-      res.status(201).json({ id, name: name2, conditions: conditions || {}, actions: actions || {}, priority: priority ?? 0, enabled: enabled !== false });
+      ).run(id, req.agent.id, name, priority ?? 0, enabled !== false ? 1 : 0, JSON.stringify(conditions || {}), JSON.stringify(actions || {}));
+      res.status(201).json({ id, name, conditions: conditions || {}, actions: actions || {}, priority: priority ?? 0, enabled: enabled !== false });
     } catch (err) {
       next(err);
     }
@@ -1539,7 +1539,31 @@ async function closeCaches() {
   }
   receiverCache.clear();
 }
-async function notifyLocalRecipientsOfNewMail(accountManager, toField, ccField, bccField, fromAgent, subject, messageId) {
+async function findUidByMessageId(receiver, messageId, maxAttempts = 5) {
+  const client = receiver.getImapClient();
+  for (let i = 0; i < maxAttempts; i++) {
+    try {
+      const lock = await client.getMailboxLock("INBOX");
+      try {
+        const results = await client.search(
+          { header: ["Message-ID", messageId] },
+          { uid: true }
+        );
+        if (Array.isArray(results) && results.length > 0) {
+          return results[results.length - 1];
+        }
+      } finally {
+        lock.release();
+      }
+    } catch {
+    }
+    if (i < maxAttempts - 1) {
+      await new Promise((r) => setTimeout(r, 200 * (i + 1)));
+    }
+  }
+  return 0;
+}
+async function notifyLocalRecipientsOfNewMail(accountManager, toField, ccField, bccField, fromAgent, subject, messageId, config) {
   const collected = [];
   const push = (v) => {
     if (!v) return;
@@ -1574,12 +1598,29 @@ async function notifyLocalRecipientsOfNewMail(accountManager, toField, ccField,
     }
     if (!recipient || notified.has(recipient.id)) continue;
     notified.add(recipient.id);
+    let uid = 0;
+    let lookup = "no-message-id";
+    if (messageId) {
+      try {
+        const recipientPassword = getAgentPassword(recipient);
+        const receiver = await getReceiver(
+          recipient.stalwartPrincipal,
+          recipientPassword,
+          config
+        );
+        uid = await findUidByMessageId(receiver, messageId);
+        lookup = uid > 0 ? "resolved" : "failed";
+      } catch {
+        lookup = "failed";
+      }
+    }
     pushEventToAgent(recipient.id, {
       type: "new",
-      // uid is unknown without an IMAP fetch; use 0 as a sentinel —
-      // this matches the watcher's autoFetch=false path. SSE consumers
-      // that want full message detail can call /mail/inbox.
-      uid: 0,
+      uid,
+      // Tell consumers whether the UID is real or a sentinel — preserves
+      // backwards compat (uid is still always a number) while giving
+      // clients a reliable signal to fall back to /mail/inbox.
+      uidLookup: lookup,
       internal: true,
       from: { name: fromAgent.name, address: fromAgent.email },
       subject,
@@ -1726,7 +1767,8 @@ function createMailRoutes(accountManager, config, db, gatewayManager) {
         bcc,
         agent,
         subject,
-        result.messageId
+        result.messageId,
+        config
       ).catch((err) => {
         console.warn(`[mail] Internal SSE notify failed: ${err.message}`);
       });
@@ -1988,19 +2030,19 @@ function createMailRoutes(accountManager, config, db, gatewayManager) {
   router.post("/mail/folders", requireAgent, async (req, res, next) => {
     try {
       const agent = req.agent;
-      const { name: name2 } = req.body || {};
-      if (!name2 || typeof name2 !== "string" || !name2.trim()) {
+      const { name } = req.body || {};
+      if (!name || typeof name !== "string" || !name.trim()) {
         res.status(400).json({ error: "name is required" });
         return;
       }
-      if (name2.length > 200 || /[\\*%]/.test(name2)) {
+      if (name.length > 200 || /[\\*%]/.test(name)) {
         res.status(400).json({ error: "Invalid folder name" });
         return;
       }
       const password = getAgentPassword(agent);
       const receiver = await getReceiver(agent.stalwartPrincipal, password, config);
-      await receiver.createFolder(name2);
-      res.json({ ok: true, folder: name2 });
+      await receiver.createFolder(name);
+      res.json({ ok: true, folder: name });
     } catch (err) {
       next(err);
     }
@@ -2336,7 +2378,8 @@ function createMailRoutes(accountManager, config, db, gatewayManager) {
           mailOpts.bcc,
           agent,
           mailOpts.subject,
-          result.messageId
+          result.messageId,
+          config
         ).catch((err) => {
           console.warn(`[mail] Internal SSE notify (approve) failed: ${err.message}`);
         });
@@ -3478,7 +3521,7 @@ function buildColumnDDL(col, dialect) {
     if (typeof col.default === "string") {
       const trimmed = col.default.trim();
       const isSqlExpr = /\(.*\)/.test(trimmed) || /^CURRENT_(?:TIMESTAMP|DATE|TIME)$/i.test(trimmed);
-      val = isSqlExpr ? trimmed : `'${col.default.replace(/'/g, "''")}'`;
+      val = isSqlExpr ? `(${trimmed})` : `'${col.default.replace(/'/g, "''")}'`;
     } else {
       val = col.default;
     }
@@ -3491,15 +3534,15 @@ function buildColumnDDL(col, dialect) {
   }
   return ddl;
 }
-function safeTableName(agentId, name2, shared) {
-  const clean = name2.replace(/[^a-zA-Z0-9_]/g, "").substring(0, 64);
+function safeTableName(agentId, name, shared) {
+  const clean = name.replace(/[^a-zA-Z0-9_]/g, "").substring(0, 64);
   if (!clean) throw new Error("Invalid table name");
   const prefix = shared ? "shared" : `agt_${agentId.replace(/[^a-zA-Z0-9]/g, "").substring(0, 16)}`;
   return `${prefix}_${clean}`;
 }
-function resolveTable(agentId, name2) {
-  if (name2.startsWith("agt_") || name2.startsWith("shared_")) return name2;
-  return safeTableName(agentId, name2, false);
+function resolveTable(agentId, name) {
+  if (name.startsWith("agt_") || name.startsWith("shared_")) return name;
+  return safeTableName(agentId, name, false);
 }
 function isSafeTable(tableName) {
   return tableName.startsWith("agt_") || tableName.startsWith("shared_");
@@ -3657,8 +3700,8 @@ function createStorageRoutes(rawDb, accountManager, config, dialect = "sqlite")
     if (!agent) return;
     await ensureMetaTable();
     try {
-      const { name: name2, columns, indexes, shared, description, timestamps } = req.body;
-      if (!name2 || !columns?.length) return res.status(400).json({ error: "name and columns are required" });
+      const { name, columns, indexes, shared, description, timestamps } = req.body;
+      if (!name || !columns?.length) return res.status(400).json({ error: "name and columns are required" });
       const hasPK = columns.some((c) => c.primaryKey);
       const allCols = [...hasPK ? [] : [{ name: "id", type: "text", primaryKey: true }], ...columns];
       if (timestamps !== false) {
@@ -3669,9 +3712,9 @@ function createStorageRoutes(rawDb, accountManager, config, dialect = "sqlite")
           allCols.push({ name: "updated_at", type: "timestamp", default: nowExpr(dialect) });
         }
       }
-      const tableName = safeTableName(agent.id, name2, !!shared);
+      const tableName = safeTableName(agent.id, name, !!shared);
       const existing = await db.get("SELECT table_name FROM agenticmail_storage_meta WHERE table_name = ?", [tableName]);
-      if (existing) return res.status(409).json({ error: `Table "${name2}" already exists`, table: tableName });
+      if (existing) return res.status(409).json({ error: `Table "${name}" already exists`, table: tableName });
       const colDefs = allCols.map((c) => buildColumnDDL(c, dialect)).join(",\n  ");
       await db.run(`CREATE TABLE IF NOT EXISTS ${tableName} (
   ${colDefs}
@@ -3692,7 +3735,7 @@ function createStorageRoutes(rawDb, accountManager, config, dialect = "sqlite")
       }
       await db.run(
         "INSERT INTO agenticmail_storage_meta (table_name, agent_id, display_name, description, shared, columns, indexes) VALUES (?, ?, ?, ?, ?, ?, ?)",
-        [tableName, agent.id, name2, description || "", shared ? 1 : 0, JSON.stringify(allCols), JSON.stringify(idxMeta)]
+        [tableName, agent.id, name, description || "", shared ? 1 : 0, JSON.stringify(allCols), JSON.stringify(idxMeta)]
       );
       res.json({ ok: true, table: tableName, columns: allCols, indexes: idxMeta });
     } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agenticmail/api",
-  "version": "0.5.59",
+  "version": "0.5.61",
   "description": "REST API server for AgenticMail — email and SMS endpoints for AI agents",
   "type": "module",
   "main": "dist/index.js",
@@ -27,7 +27,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@agenticmail/core": "^0.5.59",
+    "@agenticmail/core": "^0.5.61",
     "cors": "^2.8.5",
     "dotenv": "^16.4.7",
     "express": "^4.21.0",