@agenticmail/api 0.9.0 → 0.9.1

package/dist/index.js

@@ -527,6 +527,19 @@ function createAccountRoutes(accountManager2, db, config) {
       next(err);
     }
   });
+  router.patch("/accounts/:id/wake-on-cc", requireMaster, async (req, res, next) => {
+    try {
+      const wakeOnCc = req.body?.wakeOnCc === false ? 0 : 1;
+      const result = db.prepare("UPDATE agents SET wake_on_cc = ? WHERE id = ?").run(wakeOnCc, req.params.id);
+      if (result.changes === 0) {
+        res.status(404).json({ error: "Agent not found" });
+        return;
+      }
+      res.json({ ok: true, wakeOnCc: wakeOnCc === 1 });
+    } catch (err) {
+      next(err);
+    }
+  });
   router.delete("/accounts/:id", requireMaster, async (req, res, next) => {
     try {
       const allAgents = await accountManager2.list();
@@ -1815,10 +1828,10 @@ function deriveDefaultWakeList(toField) {
   const arr = Array.isArray(toField) ? toField : String(toField).split(",");
   const localNames = [];
   for (const raw of arr) {
-    const addr = String(raw).trim().toLowerCase();
-    if (!addr.endsWith("@localhost")) continue;
-    const m = addr.match(/<([^>]+)>/);
-    const bare = m ? m[1].trim() : addr;
+    const trimmed = String(raw).trim().toLowerCase();
+    const m = trimmed.match(/<([^>]+)>/);
+    const bare = (m ? m[1] : trimmed).trim();
+    if (!bare.endsWith("@localhost")) continue;
     const name = bare.replace(/@localhost$/i, "");
     if (name) localNames.push(name);
   }
@@ -1839,15 +1852,25 @@ async function notifyLocalRecipientsOfNewMail(accountManager2, toField, ccField,
   push(ccField);
   push(bccField);
   const addrRe = /<([^>]+)>|([^\s,;<>]+@[^\s,;<>]+)/g;
-  const addresses = /* @__PURE__ */ new Set();
-  for (const entry of collected) {
-    let match;
-    addrRe.lastIndex = 0;
-    while ((match = addrRe.exec(entry)) !== null) {
-      const a = (match[1] || match[2] || "").trim().toLowerCase();
-      if (a) addresses.add(a);
-    }
+  function extractAddrs(v) {
+    if (!v) return [];
+    const items = Array.isArray(v) ? v : [v];
+    const out = /* @__PURE__ */ new Set();
+    for (const entry of items) {
+      let match;
+      addrRe.lastIndex = 0;
+      while ((match = addrRe.exec(entry)) !== null) {
+        const a = (match[1] || match[2] || "").trim().toLowerCase();
+        if (a) out.add(a);
+      }
+    }
+    return Array.from(out);
   }
+  const toAddrs = extractAddrs(toField);
+  const ccAddrs = extractAddrs(ccField);
+  const bccAddrs = extractAddrs(bccField);
+  const addresses = /* @__PURE__ */ new Set([...toAddrs, ...ccAddrs, ...bccAddrs]);
+  const toLocalNames = new Set(toAddrs.filter((a) => a.endsWith("@localhost")).map((a) => a.replace(/@localhost$/i, "")));
   const notified = /* @__PURE__ */ new Set();
   for (const addr of addresses) {
     const at = addr.indexOf("@");
@@ -1879,6 +1902,7 @@ async function notifyLocalRecipientsOfNewMail(accountManager2, toField, ccField,
         lookup = "failed";
       }
     }
+    const wasOnTo = toLocalNames.has(recipient.name.toLowerCase());
     pushEventToAgent(recipient.id, {
       type: "new",
       uid,
@@ -1894,7 +1918,11 @@ async function notifyLocalRecipientsOfNewMail(accountManager2, toField, ccField,
       // dispatcher reads this and spawns a Claude worker only for
       // recipients whose name is on the list (or for everyone if the
       // field is absent, preserving the v0.8.x default).
-      ...wakeList !== void 0 ? { wakeAllowlist: wakeList } : {}
+      ...wakeList !== void 0 ? { wakeAllowlist: wakeList } : {},
+      // Per-recipient "was I on To?" flag for wake_on_cc honoring.
+      // The dispatcher uses this combined with account.wakeOnCc to
+      // decide whether to skip a CC-only delivery.
+      wasOnTo
     });
   }
 }
@@ -4902,7 +4930,7 @@ function createStorageRoutes(rawDb, accountManager2, config, dialect = "sqlite")
       const meta = await verifyAccess(agent, tableName, res);
       if (!meta) return;
       let imported = 0;
-      let skipped = 0;
+      let skipped2 = 0;
       for (const row of rows) {
         const keys = Object.keys(row);
         const vals = Object.values(row).map((v) => typeof v === "object" && v !== null ? JSON.stringify(v) : v);
@@ -4928,7 +4956,7 @@ function createStorageRoutes(rawDb, accountManager2, config, dialect = "sqlite")
           imported++;
         } catch (e) {
           if (onConflict === "skip") {
-            skipped++;
+            skipped2++;
             continue;
           }
           throw e;
@@ -4936,7 +4964,7 @@ function createStorageRoutes(rawDb, accountManager2, config, dialect = "sqlite")
       }
       const countResult = await db.get(`SELECT COUNT(*) as cnt FROM ${tableName}`);
       await db.run("UPDATE agenticmail_storage_meta SET row_count = ?, updated_at = " + nowExpr(dialect) + " WHERE table_name = ?", [countResult?.cnt || 0, tableName]);
-      res.json({ ok: true, imported, skipped, totalRows: countResult?.cnt || 0 });
+      res.json({ ok: true, imported, skipped: skipped2, totalRows: countResult?.cnt || 0 });
     } catch (err) {
       res.status(500).json({ error: err.message });
     }
@@ -5090,6 +5118,10 @@ function prune(nowMs) {
     recent.delete(first);
   }
 }
+var skipped = [];
+var SKIPPED_CAP = 100;
+var SKIPPED_TTL_MS = 5 * 60 * 1e3;
+var processState = null;
 function createDispatcherActivityRoutes() {
   const router = Router13();
   router.post("/dispatcher/worker-started", requireMaster, (req, res) => {
@@ -5137,7 +5169,8 @@ function createDispatcherActivityRoutes() {
       endedAtMs: nowMs,
       ok: body.ok === false ? false : true,
       resultPreview: typeof body.resultPreview === "string" ? body.resultPreview.slice(0, 240) : void 0,
-      turnCount: typeof body.turnCount === "number" ? body.turnCount : existing?.turnCount
+      turnCount: typeof body.turnCount === "number" ? body.turnCount : existing?.turnCount,
+      usage: typeof body.usage === "string" ? body.usage : existing?.usage
     };
     active.delete(body.workerId);
     recent.set(body.workerId, info);
@@ -5170,8 +5203,26 @@ function createDispatcherActivityRoutes() {
   router.get("/dispatcher/activity", requireMaster, (_req, res) => {
     const nowMs = Date.now();
     prune(nowMs);
+    while (skipped.length > 0 && nowMs - skipped[0].atMs > SKIPPED_TTL_MS) skipped.shift();
+    while (skipped.length > SKIPPED_CAP) skipped.shift();
+    const processHealth = (() => {
+      if (!processState) return { state: "missing" };
+      const age = nowMs - processState.atMs;
+      const isAlive = age <= 9e4;
+      return {
+        state: isAlive ? "alive" : "unhealthy",
+        startedAtMs: processState.startedAtMs,
+        uptimeMs: nowMs - processState.startedAtMs,
+        lastHeartbeatAgeMs: age,
+        channels: processState.channels,
+        coalesceQueueSize: processState.coalesceQueueSize,
+        running: processState.running,
+        maxConcurrent: processState.maxConcurrent
+      };
+    })();
     res.json({
       now: nowMs,
+      dispatcher: processHealth,
       active: Array.from(active.values()).map((w) => ({
         ...w,
         durationMs: nowMs - w.startedAtMs,
@@ -5181,9 +5232,52 @@ function createDispatcherActivityRoutes() {
       recent: Array.from(recent.values()).map((w) => ({
         ...w,
         durationMs: (w.endedAtMs ?? nowMs) - w.startedAtMs
-      }))
+      })),
+      // Recent skipped wakes — every filter decision the dispatcher
+      // made that DROPPED a wake. Surfaced so the host can see "the
+      // mail landed, the dispatcher saw it, here's why it skipped"
+      // instead of staring at silence.
+      skipped: skipped.map((s) => ({ ...s, ageMs: nowMs - s.atMs }))
     });
   });
+  router.post("/dispatcher/process-heartbeat", requireMaster, (req, res) => {
+    const body = req.body ?? {};
+    if (typeof body.startedAtMs !== "number") {
+      res.status(400).json({ error: "startedAtMs is required" });
+      return;
+    }
+    processState = {
+      startedAtMs: body.startedAtMs,
+      channels: typeof body.channels === "number" ? body.channels : 0,
+      coalesceQueueSize: typeof body.coalesceQueueSize === "number" ? body.coalesceQueueSize : 0,
+      running: typeof body.running === "number" ? body.running : 0,
+      maxConcurrent: typeof body.maxConcurrent === "number" ? body.maxConcurrent : 0,
+      atMs: Date.now()
+    };
+    res.json({ ok: true });
+  });
+  router.post("/dispatcher/worker-skipped", requireMaster, (req, res) => {
+    const body = req.body ?? {};
+    if (typeof body.agentName !== "string" || typeof body.reason !== "string") {
+      res.status(400).json({ error: "agentName and reason are required" });
+      return;
+    }
+    skipped.push({
+      agentId: typeof body.agentId === "string" ? body.agentId : void 0,
+      agentName: body.agentName,
+      uid: typeof body.uid === "number" ? body.uid : void 0,
+      subject: typeof body.subject === "string" ? body.subject : void 0,
+      from: typeof body.from === "string" ? body.from : void 0,
+      reason: body.reason,
+      detail: typeof body.detail === "string" ? body.detail : void 0,
+      atMs: Date.now()
+    });
+    while (skipped.length > SKIPPED_CAP) skipped.shift();
+    res.json({ ok: true });
+  });
+  router.post("/dispatcher/worker-queued", requireMaster, (req, res) => {
+    res.json({ ok: true, recorded: req.body ?? null });
+  });
   router.get("/dispatcher/worker-log/:workerId", requireMaster, (req, res) => {
     const rawId = String(req.params.workerId ?? "");
     if (!rawId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agenticmail/api",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "REST API server for AgenticMail — email and SMS endpoints for AI agents",
   "type": "module",
   "main": "dist/index.js",
@@ -28,7 +28,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@agenticmail/core": "^0.9.0",
+    "@agenticmail/core": "^0.9.1",
     "cors": "^2.8.5",
     "dotenv": "^16.4.7",
     "express": "^4.21.0",
@@ -36,7 +36,7 @@
     "uuid": "^11.1.0"
   },
   "optionalDependencies": {
-    "@agenticmail/claudecode": "^0.2.0"
+    "@agenticmail/claudecode": "^0.2.1"
   },
   "devDependencies": {
     "@types/cors": "^2.8.17",

package/public/js/message-view.js

@@ -50,11 +50,22 @@ function renderMessage(msg) {
   if (!view) return;
   const fromAddr = msg.from?.[0]?.address ?? '?';
   const fromName = msg.from?.[0]?.name || fromAddr;
-  const toStr = (msg.to ?? []).map(a => a.name ? `${a.name} <${a.address}>` : a.address).join(', ') || '?';
-  const ccStr = (msg.cc ?? []).map(a => a.address).join(', ');
   const senderPseudo = { name: fromName };  // for avatar generation
   const bodyText = msg.text ?? stripHtml(msg.html ?? '');
 
+  // Build separate To / Cc / Bcc lines so the user can actually
+  // tell who was on the action list vs CC'd for awareness. The
+  // previous renderer concatenated everything onto one "to" line.
+  const formatAddr = (a) => a?.name && a.name !== a.address
+    ? `${a.name} <${a.address}>`
+    : (a?.address ?? '');
+  const renderAddrRow = (label, list, cls) => {
+    if (!Array.isArray(list) || list.length === 0) return '';
+    const rendered = list.map(formatAddr).filter(Boolean).map(escapeHtml).join(', ');
+    if (!rendered) return '';
+    return `<div class="message-recipient-row ${cls}"><span class="message-recipient-label">${label}</span><span class="message-recipient-list">${rendered}</span></div>`;
+  };
+
   const attachmentsHtml = (msg.attachments ?? []).length > 0
     ? `<div class="message-attachments">${msg.attachments.map((a, i) =>
         `<button class="message-attachment" data-att-index="${i}" data-att-filename="${escapeHtml(a.filename ?? 'attachment')}" title="Click to download">
@@ -75,7 +86,9 @@ function renderMessage(msg) {
             <span class="name">${escapeHtml(fromName)}</span>
             <span class="addr">&lt;${escapeHtml(fromAddr)}&gt;</span>
           </div>
-          <div class="message-to">to ${escapeHtml(toStr)}${ccStr ? `, cc ${escapeHtml(ccStr)}` : ''}</div>
+          ${renderAddrRow('To', msg.to, 'message-to')}
+          ${renderAddrRow('Cc', msg.cc, 'message-cc')}
+          ${renderAddrRow('Bcc', msg.bcc, 'message-bcc')}
         </div>
         <div class="message-date">${escapeHtml(formatDateFull(msg.date))}</div>
       </div>

package/public/styles.css

@@ -583,7 +583,28 @@ mark.search-hl {
 }
 .message-from .name { font-weight: 500; }
 .message-from .addr { color: var(--muted); margin-left: 4px; }
-.message-to { font-size: 12px; color: var(--muted); margin-top: 4px; }
+/* Recipient rows — one per field (To / Cc / Bcc). Renders only
+   when the field is non-empty. The label is a fixed-width tag
+   so the addresses align cleanly across the three rows. */
+.message-recipient-row {
+  display: flex; gap: 6px;
+  font-size: 12px; color: var(--muted);
+  margin-top: 4px;
+  line-height: 1.5;
+}
+.message-recipient-label {
+  flex: 0 0 28px;
+  font-weight: 600;
+  color: var(--ink-soft);
+  text-transform: none;
+}
+.message-recipient-list {
+  flex: 1 1 auto;
+  min-width: 0;
+  word-break: break-word;
+}
+.message-cc .message-recipient-label,
+.message-bcc .message-recipient-label { color: var(--muted); }
 .message-date {
   font-size: 12px; color: var(--muted);
   white-space: nowrap;