@rubytech/create-maxy-code 0.1.368 → 0.1.370

package/dist/__tests__/cron-heartbeat-registration.test.js

@@ -0,0 +1,100 @@
+// Acceptance gate for the restored scheduling-watcher heartbeat cron.
+//
+// The installer registers exactly ONE install-level cron line that ticks
+// check-due-events.js once a minute. These invariants protect the two
+// regressions that the original block caused (and that its narrowed
+// replacement must not reintroduce), plus the marker contract the admin
+// `system-status` check reads back.
+//
+//   (a) The block carries a single heartbeat entry — no email-fetch /
+//       email-auto-respond line. Those dispatchers act without an operator
+//       booking and stay unscheduled by the installer.
+//   (b) The entry never `mkdir`s an account log dir. The legacy line ran
+//       `mkdir -p data/accounts/<id>/logs` every 60s, tripping
+//       setup-account/seed-neo4j's stub-account-dirs guard on reinstall.
+//       Logs land under <persistDir>/logs, outside the seed-guard zone.
+//   (c) NEO4J_URI is pinned to bolt://localhost:<brand port>. Cron inherits
+//       no shell env, so an unpinned URI would default to 7687 and leak
+//       across co-resident brand installs.
+//   (d) The BEGIN/END markers equal `# BEGIN <PRODUCT_UPPER> CRONS` — the
+//       exact strings admin `system-status` greps to report registration.
+//   (e) Re-running the merge is idempotent: a re-install replaces the block,
+//       never stacks a second copy.
+import test from "node:test";
+import assert from "node:assert/strict";
+import { cronBlockMarkers, buildHeartbeatCronBlock, stripCronBlock, mergeHeartbeatBlock, } from "../cron-registration.js";
+const OPTS = {
+    productName: "maxy-code",
+    platformRoot: "/home/me/maxy-code/platform",
+    neo4jPort: 17687,
+    nodeBin: "/usr/bin/node",
+    logDir: "/home/me/.maxy-code/logs",
+};
+test("markers are # BEGIN/END <PRODUCT_UPPER> CRONS (admin system-status contract)", () => {
+    const { begin, end } = cronBlockMarkers("maxy-code");
+    assert.equal(begin, "# BEGIN MAXY-CODE CRONS");
+    assert.equal(end, "# END MAXY-CODE CRONS");
+});
+test("block has exactly one heartbeat entry, no email lines", () => {
+    const block = buildHeartbeatCronBlock(OPTS);
+    const entries = block.split("\n").filter((l) => l.trim() && !l.trim().startsWith("#"));
+    assert.equal(entries.length, 1, "expected exactly one cron entry");
+    assert.match(entries[0], / # heartbeat$/, "entry must be tagged # heartbeat");
+    assert.doesNotMatch(block, /email-fetch/, "email-fetch must not be scheduled");
+    assert.doesNotMatch(block, /email-auto-respond/, "email-auto-respond must not be scheduled");
+});
+test("heartbeat entry never mkdirs an account log dir (Task 039 guard)", () => {
+    const block = buildHeartbeatCronBlock(OPTS);
+    assert.doesNotMatch(block, /mkdir/, "no mkdir in the cron line");
+    assert.doesNotMatch(block, /data\/accounts/, "must not touch the seed-guard account dir");
+    assert.match(block, />> \/home\/me\/\.maxy-code\/logs\/check-due-events\.log 2>&1/, "log must redirect to <persistDir>/logs");
+});
+test("NEO4J_URI is pinned to the brand bolt port, never defaulting 7687 (Task 571 guard)", () => {
+    const block = buildHeartbeatCronBlock(OPTS);
+    assert.match(block, /NEO4J_URI=bolt:\/\/localhost:17687 /, "NEO4J_URI must pin the brand port");
+    assert.doesNotMatch(block, /7687(?!.)/, "must not reference the default 7687 port");
+});
+test("entry runs check-due-events.js with PLATFORM_ROOT and no ACCOUNT_ID", () => {
+    const block = buildHeartbeatCronBlock(OPTS);
+    assert.match(block, /PLATFORM_ROOT=\/home\/me\/maxy-code\/platform /);
+    assert.match(block, /\/plugins\/scheduling\/mcp\/dist\/scripts\/check-due-events\.js/);
+    assert.doesNotMatch(block, /ACCOUNT_ID=/, "watcher scans all accounts itself; no per-account scoping");
+});
+test("entry fires every minute", () => {
+    const block = buildHeartbeatCronBlock(OPTS);
+    const entry = block.split("\n").find((l) => l.includes("check-due-events"));
+    assert.match(entry, /^\* \* \* \* \* /, "must be a once-a-minute schedule");
+});
+test("stripCronBlock removes a present block and counts its entries", () => {
+    const tab = `MAILTO=""\n${buildHeartbeatCronBlock(OPTS)}\n`;
+    const { cleaned, removedEntries, matched } = stripCronBlock(tab, "maxy-code");
+    assert.equal(matched, true);
+    assert.equal(removedEntries, 1);
+    assert.equal(cleaned, 'MAILTO=""');
+});
+test("stripCronBlock is a no-op signal when no block is present", () => {
+    const tab = `0 3 * * * /usr/bin/backup.sh\n`;
+    const { cleaned, removedEntries, matched } = stripCronBlock(tab, "maxy-code");
+    assert.equal(matched, false);
+    assert.equal(removedEntries, 0);
+    assert.equal(cleaned, "0 3 * * * /usr/bin/backup.sh");
+});
+test("stripCronBlock escapes the brand name (hyphen/dot safe)", () => {
+    const block = buildHeartbeatCronBlock({ ...OPTS, productName: "real.agent-code" });
+    const { matched, removedEntries } = stripCronBlock(block, "real.agent-code");
+    assert.equal(matched, true);
+    assert.equal(removedEntries, 1);
+});
+test("mergeHeartbeatBlock appends to an empty crontab", () => {
+    const block = buildHeartbeatCronBlock(OPTS);
+    const merged = mergeHeartbeatBlock("", block, "maxy-code");
+    assert.equal(merged, `${block}\n`);
+});
+test("mergeHeartbeatBlock replaces an existing block — idempotent re-install", () => {
+    const block = buildHeartbeatCronBlock(OPTS);
+    const once = mergeHeartbeatBlock(`0 3 * * * /usr/bin/backup.sh\n`, block, "maxy-code");
+    const twice = mergeHeartbeatBlock(once, block, "maxy-code");
+    assert.equal(once, twice, "re-applying the merge must not stack a second block");
+    const blockCount = (twice.match(/# BEGIN MAXY-CODE CRONS/g) || []).length;
+    assert.equal(blockCount, 1, "exactly one brand block after re-install");
+});

package/dist/cron-registration.js

@@ -0,0 +1,72 @@
+// Scheduling-watcher heartbeat cron — pure string builders.
+//
+// The installer registers ONE install-level cron line that ticks
+// `scheduling/mcp/dist/scripts/check-due-events.js` once a minute. The watcher
+// scans every account itself (listLocalAccountIds → data/accounts/*/account.json)
+// and only dispatches operator-created bookings whose time has come, so a
+// per-minute tick creates no activity of its own.
+//
+// Narrowed from the block removed in Task 039 (commit 08e64c1f7), which also
+// reintroduces neither regression that removal fixed:
+//   - No `mkdir` of an account log dir. Logs go to <persistDir>/logs, outside
+//     the seed-guard zone, so reinstall after `rm -rf ~/<brand>` never trips
+//     the stub-account-dirs guard.
+//   - NEO4J_URI pinned to the brand bolt port. Cron inherits no shell env, so
+//     an unpinned URI would default to 7687 and leak across co-resident brands
+//     (Task 571).
+//
+// The email dispatchers (email-fetch, email-auto-respond) act without an
+// operator booking and stay unscheduled by the installer — they are NOT part
+// of this block.
+//
+// I/O (read/write the user crontab) lives in the installer/uninstaller; this
+// module is pure so the line shape and merge semantics are unit-testable.
+/**
+ * BEGIN/END marker pair, byte-identical to the strings admin `system-status`
+ * greps (`# BEGIN ${productName.toUpperCase()} CRONS`).
+ */
+export function cronBlockMarkers(productName) {
+    const upper = productName.toUpperCase();
+    return { begin: `# BEGIN ${upper} CRONS`, end: `# END ${upper} CRONS` };
+}
+/** The three-line cron block: BEGIN marker, the single heartbeat entry, END marker. */
+export function buildHeartbeatCronBlock(opts) {
+    const { begin, end } = cronBlockMarkers(opts.productName);
+    const script = `${opts.platformRoot}/plugins/scheduling/mcp/dist/scripts/check-due-events.js`;
+    const log = `${opts.logDir}/check-due-events.log`;
+    const entry = `* * * * * PLATFORM_ROOT=${opts.platformRoot} ` +
+        `NEO4J_URI=bolt://localhost:${opts.neo4jPort} ` +
+        `${opts.nodeBin} ${script} >> ${log} 2>&1 # heartbeat`;
+    return [begin, entry, end].join("\n");
+}
+/** Escape a brand name for safe embedding in a RegExp (hyphens, dots). */
+function escapeRegExp(s) {
+    return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+/**
+ * Strip every brand cron block from a crontab string.
+ * `matched` is true when at least one block was present; `removedEntries`
+ * counts the non-comment, non-blank lines inside the removed block(s).
+ */
+export function stripCronBlock(crontab, productName) {
+    const { begin, end } = cronBlockMarkers(productName);
+    const pattern = new RegExp(`${escapeRegExp(begin)}[\\s\\S]*?${escapeRegExp(end)}\\n?`, "g");
+    const blocks = crontab.match(pattern) ?? [];
+    let removedEntries = 0;
+    for (const block of blocks) {
+        removedEntries += block
+            .split("\n")
+            .filter((line) => line.trim() && !line.trim().startsWith("#")).length;
+    }
+    const cleaned = crontab.replace(pattern, "").replace(/\n{3,}/g, "\n\n").trimEnd();
+    return { cleaned, removedEntries, matched: blocks.length > 0 };
+}
+/**
+ * Produce the next crontab: strip any existing brand block, then append the
+ * fresh block. Re-running with the same block is idempotent — a re-install
+ * replaces the block, never stacks a second copy.
+ */
+export function mergeHeartbeatBlock(existing, block, productName) {
+    const { cleaned } = stripCronBlock(existing, productName);
+    return cleaned ? `${cleaned}\n${block}\n` : `${block}\n`;
+}

package/dist/index.js

@@ -6,6 +6,7 @@ import { seedBypassPermissionsSettings, assertBypassPermissionsSeed } from "./pe
 import { resolve, join, dirname } from "node:path";
 import { randomBytes } from "node:crypto";
 import { resolveInstallPortFromFs, buildMaxyUnitFile, buildClaudeSessionManagerUnitFile, buildClaudePtysSliceUnitFile, buildCloudflaredSliceUnitFile } from "./port-resolution.js";
+import { buildHeartbeatCronBlock, mergeHeartbeatBlock } from "./cron-registration.js";
 import { validateTierFlag, validateEntitlementBase64, applyTierToAccountConfig, entitlementPath } from "./tier-flag.js";
 import { parseOsRelease, isUbuntuLike as isUbuntuLikePure, parseAptCacheCandidate, decideAptResolution, } from "./apt-resolve.js";
 import { findPeerBrandOnDefaultNeo4jPort } from "./peer-brand-detect.js";
@@ -2981,9 +2982,10 @@ function registerSpecialistAgents() {
 // written by setup-account.sh during setupAccount(). One reader, one shape, one
 // source of truth.
 //
-// retired the installer's cron registration — `resolveInstallAccountId`
-// kept its second consumer (installService) and is referenced again at print
-// time for the post-install banner.
+// `resolveInstallAccountId` has two consumers: `installService` (stamps the
+// unit env) and the post-install banner. The restored heartbeat cron
+// (`installCrons` below) is NOT a third consumer — the scheduling watcher
+// scans every account itself, so the cron line carries no ACCOUNT_ID.
 // ---------------------------------------------------------------------------
 function resolveInstallAccountId() {
     // Managed-service model: prefer the single `role:"house"` account; fall back
@@ -3015,6 +3017,47 @@ function resolveInstallAccountId() {
     catch { /* directory unreadable */ }
     return "";
 }
+// ---------------------------------------------------------------------------
+// Cron registration — scheduling-watcher heartbeat
+//
+// Registers ONE install-level cron line that ticks check-due-events.js every
+// minute (see cron-registration.ts for the line shape and the two regression
+// guards). Idempotent across re-installs via the BEGIN/END markers. Linux-only
+// — darwin runs under launchd and registers no cron. The email dispatchers are
+// deliberately NOT registered here.
+//
+// The log dir <persistDir>/logs is created earlier in installServiceLinux
+// (alongside the .env write); the cron line never mkdir's it.
+// ---------------------------------------------------------------------------
+function installCrons() {
+    if (!isLinux())
+        return;
+    const nodeBin = spawnSync("which", ["node"], { encoding: "utf-8" }).stdout.trim() || "/usr/bin/node";
+    const platformRoot = join(INSTALL_DIR, "platform");
+    const logDir = join(resolve(process.env.HOME ?? "/root", BRAND.configDir), "logs");
+    const block = buildHeartbeatCronBlock({
+        productName: BRAND.productName,
+        platformRoot,
+        neo4jPort: NEO4J_PORT,
+        nodeBin,
+        logDir,
+    });
+    const existing = spawnSync("crontab", ["-l"], { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] });
+    const currentCrontab = existing.status === 0 ? existing.stdout : "";
+    const newCrontab = mergeHeartbeatBlock(currentCrontab, block, BRAND.productName);
+    const write = spawnSync("crontab", ["-"], {
+        input: newCrontab,
+        encoding: "utf-8",
+        stdio: ["pipe", "pipe", "pipe"],
+    });
+    if (write.status === 0) {
+        console.log("  Cron jobs: registered (heartbeat)");
+    }
+    else {
+        console.error(`  Cron jobs: failed to register — ${(write.stderr || "").trim()}`);
+        logFile(`  crontab write failed: ${write.stderr}`);
+    }
+}
 // retired the ttyd/tmux/xterm admin terminal stack. Upgrades run
 // via the action runner — `systemd-run --user` transient units spawned by
 // POST /api/admin/actions/upgrade — whose lifetime is independent of
@@ -3846,6 +3889,10 @@ WantedBy=multi-user.target
     if (!webServerUp) {
         console.log(`  Server may still be starting. Check http://${DEVICE_HOSTNAME}.local:${PORT} in a moment.`);
     }
+    // Register the scheduling-watcher heartbeat cron — depends on the web server
+    // being up (the dispatched MCP tools talk to the running platform), independent
+    // of CDP. <persistDir>/logs was created above.
+    installCrons();
     // Validate CDP: the programmatic Playwright MCP server connects to Chromium
     // via --cdp-endpoint http://127.0.0.1:9222. In virtual (VNC) mode, Chromium is
     // started by vnc.sh (ExecStartPre) before the web server — a failed probe here

package/dist/uninstall.js

@@ -4,6 +4,7 @@ import { resolve, join, dirname } from "node:path";
 import { homedir } from "node:os";
 import { createInterface } from "node:readline";
 import { removeBrandStanza, hasAnyBrandStanza } from "./samba-provision.js";
+import { stripCronBlock } from "./cron-registration.js";
 import { resolveDedicatedNeo4jTeardown } from "./neo4j-teardown.js";
 import { KNOWN_BRAND_HOSTNAMES } from "./known-brands.js";
 const HOME = homedir();
@@ -94,6 +95,35 @@ function commandExists(cmd) {
     }
 }
 // ---------------------------------------------------------------------------
+// Cron block removal
+//
+// Strips the `# BEGIN <PRODUCT> CRONS` … `# END` block (the installer's
+// scheduling-watcher heartbeat) from the user crontab. Idempotent: a no-op
+// when the block is absent, leaving a clean crontab byte-identical. When the
+// block was the only content, the crontab is dropped entirely with `crontab -r`
+// so no empty tab is left behind. Linux-only — darwin registers no cron.
+// ---------------------------------------------------------------------------
+function removeCronBlock() {
+    if (!isLinux())
+        return;
+    if (!commandExists("crontab"))
+        return;
+    const existing = spawnSync("crontab", ["-l"], { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] });
+    const currentCrontab = existing.status === 0 ? existing.stdout : "";
+    const { cleaned, removedEntries, matched } = stripCronBlock(currentCrontab, BRAND.productName);
+    if (!matched) {
+        console.log("  Cron block: none present");
+        return;
+    }
+    if (cleaned.trim() === "") {
+        spawnSync("crontab", ["-r"], { stdio: ["pipe", "pipe", "pipe"] });
+    }
+    else {
+        spawnSync("crontab", ["-"], { input: `${cleaned}\n`, encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] });
+    }
+    console.log(`  Cron block: removed ${removedEntries} entries`);
+}
+// ---------------------------------------------------------------------------
 // Detection
 // ---------------------------------------------------------------------------
 export function isMaxyInstalled() {
@@ -949,6 +979,7 @@ export async function runUninstall(options) {
     const failures = [];
     const steps = [
         { name: "Stop services", fn: stopServices },
+        { name: "Remove cron block", fn: removeCronBlock },
         { name: "Delete Cloudflare tunnel", fn: deleteCloudflareTunnel },
         ...(options.exportPath
             ? [{ name: "Export data", fn: () => exportData(options.exportPath) }]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rubytech/create-maxy-code",
-  "version": "0.1.368",
+  "version": "0.1.370",
   "description": "Install Maxy — AI for Productive People",
   "bin": {
     "create-maxy-code": "./dist/index.js"

package/payload/platform/plugins/email/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "email",
-  "description": "Email — dedicated email account. Retrieval: email-graph-query for stored email-thread history as :ConversationArchive {source:'email'} with :Section chunks (recall, search, 'threads about X', 'what did Y send?'); email-read / email-search for live IMAP inbox previews (with best-effort per-archive section hints from the graph); email-fetch-body for the COMPLETE decoded body of one message (by uid or message_id) when a preview is not enough. Ingestion (operator-initiated, human-in-the-loop): email-fetch lists new messages, email-ingest writes the operator-approved subset via the conversation-archive pipeline. Sending: email-send (new), email-reply (threaded — resolves the original via IMAP Message-ID search), email-draft (compose to the mailbox Drafts folder, unsent, for operator review; pass messageId for a threaded draft-reply), email-draft-edit (revise a stored draft, located by its Drafts UID or, when Gmail has renumbered it, its draft Message-ID), email-draft-send (dispatch a stored draft by Drafts UID, then remove it). Config: email-provider-info (pre-password host + app-password lookup from an address alone), email-setup, email-status, email-otp-extract.",
+  "description": "Email — one or more dedicated email mailboxes per account, each addressable by a `mailbox` selector. Retrieval: email-graph-query for stored email-thread history as :ConversationArchive {source:'email'} with :Section chunks (recall, search, 'threads about X', 'what did Y send?'); email-read / email-search for live IMAP inbox previews (with best-effort per-archive section hints from the graph); email-fetch-body for the COMPLETE decoded body of one message (by uid or message_id) when a preview is not enough. Ingestion (operator-initiated, human-in-the-loop): email-fetch lists new messages, email-ingest writes the operator-approved subset via the conversation-archive pipeline. Sending: email-send (new), email-reply (threaded — resolves the original via IMAP Message-ID search), email-draft (compose to the mailbox Drafts folder, unsent, for operator review; pass messageId for a threaded draft-reply), email-draft-edit (revise a stored draft, located by its Drafts UID or, when Gmail has renumbered it, its draft Message-ID), email-draft-send (dispatch a stored draft by Drafts UID, then remove it). Deleting: email-delete (move named UIDs from email-read/email-search to the mailbox Trash — recoverable, never an expunge). Config: email-provider-info (pre-password host + app-password lookup from an address alone), email-setup, email-status, email-otp-extract.",
   "version": "0.1.0",
   "author": {
     "name": "Rubytech LLC"

package/payload/platform/plugins/email/PLUGIN.md

@@ -1,6 +1,6 @@
 ---
 name: email
-description: "Email — dedicated email account. Retrieval: email-graph-query for stored email-thread history as :ConversationArchive {source:'email'} with :Section chunks (recall, search, 'threads about X', 'what did Y send?'); email-read / email-search for live IMAP inbox previews (with best-effort per-archive section hints from the graph); email-fetch-body for the COMPLETE decoded body of one message (by uid or message_id) when a preview is not enough. Ingestion (operator-initiated, human-in-the-loop): email-fetch lists new messages, email-ingest writes the operator-approved subset via the conversation-archive pipeline. Sending: email-send (new), email-reply (threaded — resolves the original via IMAP Message-ID search), email-draft (compose to the mailbox Drafts folder, unsent, for operator review; pass messageId for a threaded draft-reply), email-draft-edit (revise a stored draft, located by its Drafts UID or, when Gmail has renumbered it, its draft Message-ID), email-draft-send (dispatch a stored draft by Drafts UID, then remove it). Config: email-provider-info (pre-password host + app-password lookup from an address alone), email-setup, email-status, email-otp-extract."
+description: "Email — one or more dedicated email mailboxes per account, each addressable by a `mailbox` selector. Retrieval: email-graph-query for stored email-thread history as :ConversationArchive {source:'email'} with :Section chunks (recall, search, 'threads about X', 'what did Y send?'); email-read / email-search for live IMAP inbox previews (with best-effort per-archive section hints from the graph); email-fetch-body for the COMPLETE decoded body of one message (by uid or message_id) when a preview is not enough. Ingestion (operator-initiated, human-in-the-loop): email-fetch lists new messages, email-ingest writes the operator-approved subset via the conversation-archive pipeline. Sending: email-send (new), email-reply (threaded — resolves the original via IMAP Message-ID search), email-draft (compose to the mailbox Drafts folder, unsent, for operator review; pass messageId for a threaded draft-reply), email-draft-edit (revise a stored draft, located by its Drafts UID or, when Gmail has renumbered it, its draft Message-ID), email-draft-send (dispatch a stored draft by Drafts UID, then remove it). Deleting: email-delete (move named UIDs from email-read/email-search to the mailbox Trash — recoverable, never an expunge). Config: email-provider-info (pre-password host + app-password lookup from an address alone), email-setup, email-status, email-otp-extract."
 tools:
   - name: email-provider-info
     publicAllowlist: false
@@ -32,6 +32,9 @@ tools:
   - name: email-search
     publicAllowlist: false
     adminAllowlist: false
+  - name: email-delete
+    publicAllowlist: false
+    adminAllowlist: false
   - name: email-graph-query
     publicAllowlist: false
     adminAllowlist: false
@@ -72,12 +75,15 @@ Manages the agent's own dedicated email account — IMAP for reading, SMTP for s
 
 **Login vs alias — the default recipient set.** A config carries two addresses. `email` is the IMAP login: the address you authenticate as, and an address this mailbox owns. `agentAddress` is an *additional* alias to surface (often a per-agent address on a shared catch-all mailbox). When they differ, `email-read`, `email-search`, `email-otp-extract`, and `email-fetch` default to surfacing mail whose **To or Cc** carries **either** address — not the alias alone — because replies commonly arrive at the login address, and a reply or multi-party thread routinely Cc's the alias rather than To'ing it (a proposal sent from `info@` is answered to `info@`, not the `maxy@` alias; a thread copies `maxy@` on Cc). When no distinct alias is configured, no recipient filter is applied. Pass an explicit `to=` to narrow to a single address. Whenever the default filter hides messages from the fetched window, `email-read`/`email-search` append a `Recipient filter: kept N, hid M (to ∈ {…}); pass to="…" to change.` line — including when every message was hidden — so "I can't see it" is never indistinguishable from "it isn't there". `email-fetch` has no tool-output filter line; its kept-vs-hidden split is recorded in the stderr `diag("fetchSinceUid", "filter applied", …)` log instead.
 
+**Multiple mailboxes.** An account holds any number of mailboxes at once. Each is its own `:EmailAccount` node keyed by `(accountId, email)`, and `email-setup` adds one without touching the others (no destructive re-point to act on a second inbox). Every operational tool takes an optional `mailbox` argument naming which configured mailbox to act on. Resolution order: the named mailbox if given; the single configured mailbox when only one exists (so single-mailbox installs pass nothing); otherwise the call is refused with a line listing the stored mailbox identities, so the agent picks one rather than guessing an address. The poll high-water mark and the pending fetch/ingest batch are per-mailbox. `email-status` lists every attached mailbox.
+
 ## Capabilities
 
 - **Provider lookup:** `email-provider-info` — given just an email address, returns the inferred IMAP/SMTP hosts and the provider's app-password / trusted-application / IMAP-enable requirement, deterministically from the provider map. Call this BEFORE soliciting a password so the requirement is relayed first; most providers reject the normal login password. Returns "unknown" (operator supplies hosts) or "unsupported" (provider blocks IMAP/SMTP, e.g. Tuta).
 - **Setup:** `email-setup` — collect credentials in plain chat and connect IMAP/SMTP. Hosts are auto-inferred for known providers; supports alias addresses (`agentAddress`).
 - **Read inbox:** `email-read` — metadata only (UID, sender, subject, date), plus a best-effort `Archive`/`Archive-Section` hint when the IMAP message's `receivedAt` falls inside a stored `:ConversationArchive {source:'email'}` section, plus an `Attachments (N): filename (mime, size); …` footer when the message carries enclosures. Supports pagination (`before_uid`), folders (`inbox`/`sent`), filtering by sender/date/subject. Metadata is derived from IMAP `bodyStructure` — no bytes downloaded.
 - **Search inbox:** `email-search` — live IMAP search by sender, subject, body keyword, date range. Same per-archive hint and attachment footer as `email-read`.
+- **Delete (move to Trash):** `email-delete` — move the messages named by `uids` (from a prior `email-read`/`email-search`, scoped to a source `folder` of `inbox` or `sent`) into the mailbox's Trash folder. **Recoverable, never an expunge** — the message leaves the inbox and permanent removal is left to the operator's own mail client or the provider's Trash auto-purge; this tool never permanently deletes. Trash is resolved per provider: the `\Trash` special-use folder if advertised, else the first existing of `Trash`, `[Gmail]/Trash`, `Deleted Items`, `Deleted Messages`. `Junk` is never treated as Trash. A mailbox with no resolvable Trash yields a typed error and moves nothing — there is no silent expunge fallback. A `uid` that is already gone is counted not-moved without failing the rest; the result reports `Moved N of M message(s) to <Trash>`. It deletes only the UIDs you name, never by search criteria.
 - **Read one whole message:** `email-fetch-body` — the COMPLETE decoded body of a single message addressed by `uid` (with optional `folder`) or `message_id` (resolved across inbox and sent). No 500-char preview cap. Downloads the full RFC822 source and decodes it with `mailparser`, so every MIME shape — flat text, single-part HTML, `multipart/alternative`, and nested `multipart/related`/`multipart/mixed` (Outlook's inline-image house style) — yields a body; the preview tools above intentionally stay preview-only. Use this when the operator wants to read or act on a message's actual content.
 - **Send:** `email-send` — new outbound email. Pass `cc`/`bcc` (each an array of email addresses) to copy or blind-copy recipients — CC appears in the message header, BCC recipients receive the message without appearing in any header. Pass `attachments` (absolute file paths under the account directory, ≤25 MB each) to attach files as SMTP attachments; an invalid path fails the send with no email dispatched. The success message names the CC recipients and reports the BCC count without naming them.
 - **Reply:** `email-reply` — threaded reply to an existing email by `messageId`. Resolves the original envelope via IMAP `SEARCH HEADER Message-ID` (INBOX then `\Sent`), so threading works for any message still present on the server even if the graph never ingested it. Supports `replyAll`, `cc`/`bcc`, and `attachments` (same path rules as `email-send`). Explicit `cc`/`bcc` are added in addition to whatever `replyAll` places in `To`, passed through as given (no overlap de-duplication against `To`).
@@ -87,7 +93,7 @@ Manages the agent's own dedicated email account — IMAP for reading, SMTP for s
 - **Ingestion — fetch:** `email-fetch` — list new IMAP messages since the stored high-water mark. Metadata + body preview only — including attachment names, mimetypes, and sizes so the operator sees what's attached before approving. No bytes downloaded, no graph writes. Stages the batch in-memory for `email-ingest`.
 - **Ingestion — apply:** `email-ingest` — apply the operator's per-message decisions to the staged batch. Each Message-ID must carry a disposition (`ingest` or `discard`). Approved messages land on `:ConversationArchive {source:'email'}` via the source-agnostic conversation-archive pipeline (one archive per thread, sessionised into `:Section` chunks). Attachment bytes are fetched, archived to `{accountDir}/archive/email/<uidValidity>-<uid>/<sha256>-<filename>` (0o600, 25 MB cap), and each attachment lands as a content-addressed `:DigitalDocument` keyed on `attachmentId = sha256(bytes)`; the `:HAS_ENCLOSURE` edge from the parent `:ConversationArchive` is wired by `memory-ingest` on its next pass via the `pendingArchiveEdges` queue. Advances the inbox high-water mark only after a successful write.
 - **Recall/history:** `email-graph-query` — search stored email archives in Neo4j by natural language, participant address, or date range. Each thread is one `:ConversationArchive {source:'email'}` with `:Section` chunks; operator participants attach via `:PARTICIPANT_IN` edges from `:Person`/`:AdminUser`. List mode surfaces a per-archive summary built from concatenated `:Section.summary` values; query mode runs vector search over the `section_embedding` index and dedups to the parent archive.
-- **Status:** `email-status` — connection health and configuration state.
+- **Status / list:** `email-status` — connection health and configuration state for every attached mailbox (one health block each, prefixed by `Mailbox: <email>` when more than one is configured). Pass `mailbox` to report just one. This is the list surface the agent reads to see which mailboxes exist before naming one in a selector.
 - **OTP:** `email-otp-extract` — poll for verification codes during service authentication.
 
 ## Ingestion model

package/payload/platform/plugins/email/mcp/dist/__tests__/email-delete.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=email-delete.test.d.ts.map

package/payload/platform/plugins/email/mcp/dist/__tests__/email-delete.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"email-delete.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/email-delete.test.ts"],"names":[],"mappings":""}

package/payload/platform/plugins/email/mcp/dist/__tests__/email-delete.test.js

@@ -0,0 +1,151 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+// Mock imapflow so moveToTrash's internal createClient() yields our spy client.
+// `calls` records the wire sequence (lock, search, messageMove) so the move
+// target, the not-moved accounting, and the resolve-before-lock contract can be
+// asserted directly. `folders` is the client.list() result; `existingUids` is
+// which UIDs the source folder actually holds (the rest are already gone).
+const state = {
+    folders: [],
+    existingUids: [],
+    calls: { locked: null, searched: null, moves: [], released: false },
+};
+const mockClient = {
+    connect: vi.fn(async () => { }),
+    list: vi.fn(async () => state.folders),
+    getMailboxLock: vi.fn(async (path) => {
+        state.calls.locked = path;
+        return { release: () => { state.calls.released = true; } };
+    }),
+    search: vi.fn(async (query) => {
+        state.calls.searched = query;
+        const requested = String(query.uid).split(",").map(Number);
+        return requested.filter((u) => state.existingUids.includes(u));
+    }),
+    messageMove: vi.fn(async (range, dest, opts) => {
+        state.calls.moves.push({ range, dest, opts });
+    }),
+    logout: vi.fn(async () => { }),
+    close: vi.fn(() => { }),
+};
+vi.mock("imapflow", () => ({
+    ImapFlow: function ImapFlow() {
+        return mockClient;
+    },
+}));
+// Mock credentials so the tool resolves an account without touching Neo4j. The
+// spy records that loadCredentials was called by accountId (the by-address read
+// happens inside loadCredentials → readPassword), and supplies the config/password
+// moveToTrash receives — the tool itself takes no password input. vi.hoisted keeps
+// the spy and its config available to the (hoisted) vi.mock factory without a TDZ.
+const { loadCredentials, credConfig } = vi.hoisted(() => {
+    const credConfig = {
+        email: "owner@x.com",
+        agentAddress: "owner@x.com",
+        imapHost: "imap.x.com",
+        imapPort: 993,
+        imapSecurity: "tls",
+        smtpHost: "smtp.x.com",
+        smtpPort: 587,
+        smtpSecurity: "starttls",
+    };
+    const loadCredentials = vi.fn(async (_accountId) => ({
+        credentials: { config: credConfig, password: "resolved-pw" },
+    }));
+    return { loadCredentials, credConfig };
+});
+vi.mock("../lib/credentials.js", () => ({ loadCredentials }));
+import { moveToTrash, resolveTrashFolder } from "../lib/imap.js";
+import { emailDelete, deleteLine } from "../tools/email-delete.js";
+const config = {
+    email: "a@x.com",
+    agentAddress: "a@x.com",
+    imapHost: "imap.x.com",
+    imapPort: 993,
+    imapSecurity: "tls",
+    smtpHost: "smtp.x.com",
+    smtpPort: 587,
+    smtpSecurity: "starttls",
+};
+function reset(folders, existingUids) {
+    state.folders = folders;
+    state.existingUids = existingUids;
+    state.calls = { locked: null, searched: null, moves: [], released: false };
+}
+beforeEach(() => {
+    reset([], []);
+});
+describe("resolveTrashFolder", () => {
+    it("prefers the \\Trash special-use folder over a name match", async () => {
+        const folders = [{ path: "INBOX" }, { path: "Trash" }, { path: "Bin", specialUse: "\\Trash" }];
+        await expect(resolveTrashFolder({ list: async () => folders })).resolves.toBe("Bin");
+    });
+    it("falls back to a known Deleted-folder name when no special-use exists", async () => {
+        const folders = [{ path: "INBOX" }, { path: "Deleted Items" }];
+        await expect(resolveTrashFolder({ list: async () => folders })).resolves.toBe("Deleted Items");
+    });
+    it("throws a typed no-trash-folder error and never treats Junk as Trash", async () => {
+        const folders = [{ path: "INBOX" }, { path: "Junk" }];
+        await expect(resolveTrashFolder({ list: async () => folders })).rejects.toMatchObject({ code: "no-trash-folder" });
+    });
+});
+describe("moveToTrash", () => {
+    it("moves every requested UID that exists, targets the resolved Trash, and reports moved=requested", async () => {
+        reset([{ path: "INBOX" }, { path: "Trash", specialUse: "\\Trash" }], [10, 11, 12]);
+        const res = await moveToTrash(config, "pw", { folder: "inbox", uids: [10, 11, 12] });
+        expect(res).toEqual({ moved: 3, requested: 3, trash: "Trash" });
+        expect(state.calls.locked).toBe("INBOX");
+        expect(state.calls.moves).toHaveLength(1);
+        expect(state.calls.moves[0].range).toEqual([10, 11, 12]);
+        expect(state.calls.moves[0].dest).toBe("Trash");
+        expect(state.calls.moves[0].opts.uid).toBe(true);
+        expect(state.calls.released).toBe(true);
+    });
+    it("counts a vanished UID as not-moved and still moves the rest", async () => {
+        reset([{ path: "INBOX" }, { path: "Trash", specialUse: "\\Trash" }], [10, 12]); // 11 is gone
+        const res = await moveToTrash(config, "pw", { folder: "inbox", uids: [10, 11, 12] });
+        expect(res).toEqual({ moved: 2, requested: 3, trash: "Trash" });
+        expect(state.calls.moves[0].range).toEqual([10, 12]);
+    });
+    it("with no Trash folder errors, moves nothing, and never locks the source", async () => {
+        reset([{ path: "INBOX" }, { path: "Junk" }], [10]);
+        await expect(moveToTrash(config, "pw", { folder: "inbox", uids: [10] })).rejects.toMatchObject({ code: "no-trash-folder" });
+        expect(state.calls.moves).toHaveLength(0);
+        expect(state.calls.locked).toBeNull();
+    });
+    it("makes no messageMove call when none of the requested UIDs still exist", async () => {
+        reset([{ path: "INBOX" }, { path: "Trash", specialUse: "\\Trash" }], []);
+        const res = await moveToTrash(config, "pw", { folder: "inbox", uids: [10, 11] });
+        expect(res).toEqual({ moved: 0, requested: 2, trash: "Trash" });
+        expect(state.calls.moves).toHaveLength(0);
+    });
+});
+describe("emailDelete tool", () => {
+    it("resolves the credential by accountId (no password input) and moves via the resolved Trash", async () => {
+        reset([{ path: "INBOX" }, { path: "Trash", specialUse: "\\Trash" }], [10, 11]);
+        loadCredentials.mockClear();
+        const text = await emailDelete({ accountId: "acct-1", uids: [10, 11], folder: "inbox" });
+        expect(loadCredentials).toHaveBeenCalledWith("acct-1", undefined);
+        // The owner address came from the resolved config, not from any tool input.
+        expect(text).toBe("Moved 2 of 2 message(s) to Trash.");
+        expect(state.calls.moves[0].dest).toBe("Trash");
+    });
+});
+describe("deleteLine", () => {
+    it("carries the mailbox, counts, trash, and ok — never a password", () => {
+        const ok = deleteLine("owner@x.com", "inbox", 3, 2, "Trash", true);
+        expect(ok).toContain("op=delete");
+        expect(ok).toContain("email=owner@x.com");
+        expect(ok).toContain("folder=inbox");
+        expect(ok).toContain("requested=3");
+        expect(ok).toContain("moved=2");
+        expect(ok).toContain("trash=Trash");
+        expect(ok).toContain("ok=true");
+        expect(ok).not.toContain("resolved-pw");
+    });
+    it("records the typed reason and ok=false when no Trash resolves", () => {
+        const fail = deleteLine("owner@x.com", "inbox", 1, 0, null, false, "no-trash-folder");
+        expect(fail).toContain("ok=false");
+        expect(fail).toContain("reason=no-trash-folder");
+    });
+});
+//# sourceMappingURL=email-delete.test.js.map

package/payload/platform/plugins/email/mcp/dist/__tests__/email-delete.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"email-delete.test.js","sourceRoot":"","sources":["../../src/__tests__/email-delete.test.ts"],"names":[],"mappings":"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"}

package/payload/platform/plugins/email/mcp/dist/__tests__/email-status.test.js

@@ -6,7 +6,7 @@ const smtp = vi.hoisted(() => ({ testConnection: vi.fn() }));
 vi.mock("../lib/imap.js", () => imap);
 vi.mock("../lib/smtp.js", () => smtp);
 const cred = vi.hoisted(() => ({
-    readConfig: vi.fn(),
+    listConfigs: vi.fn(),
     loadCredentials: vi.fn(),
     credentialStorePath: vi.fn(() => "/tmp/store.json"),
     recordSuccessfulConnect: vi.fn(),
@@ -22,7 +22,7 @@ const config = {
 };
 beforeEach(() => {
     vi.clearAllMocks();
-    cred.readConfig.mockResolvedValue(config);
+    cred.listConfigs.mockResolvedValue([config]);
     cred.loadCredentials.mockResolvedValue({ credentials: { config, password: "pw" } });
 });
 describe("email-status never-connected signal", () => {
@@ -48,11 +48,44 @@ describe("email-status never-connected signal", () => {
         smtp.testConnection.mockResolvedValue(null);
         imap.getInboxCount.mockResolvedValue(12);
         const out = await emailStatus({ accountId: "acct-1" });
-        expect(cred.recordSuccessfulConnect).toHaveBeenCalledWith("acct-1");
+        expect(cred.recordSuccessfulConnect).toHaveBeenCalledWith("acct-1", config.email);
         expect(out).toMatch(/Last successful connect: \d{4}-\d{2}-\d{2}T/);
         expect(out).not.toMatch(/never-connected/);
         // A live success never falls back to readLastSuccessfulConnect.
         expect(cred.readLastSuccessfulConnect).not.toHaveBeenCalled();
     });
 });
+describe("email-status multi-mailbox list surface", () => {
+    const configA = { ...config, email: "a@x.com", agentAddress: "a@x.com" };
+    const configB = { ...config, email: "b@x.com", agentAddress: "b@x.com" };
+    beforeEach(() => {
+        cred.listConfigs.mockResolvedValue([configA, configB]);
+        cred.loadCredentials.mockImplementation(async (_acct, email) => ({
+            credentials: { config: email === "a@x.com" ? configA : configB, password: "pw" },
+        }));
+        imap.testConnection.mockResolvedValue(null);
+        smtp.testConnection.mockResolvedValue(null);
+        imap.getInboxCount.mockResolvedValue(3);
+    });
+    it("lists every attached mailbox with a per-mailbox header and health block", async () => {
+        const out = await emailStatus({ accountId: "acct-1" });
+        expect(out).toMatch(/2 mailboxes attached/);
+        expect(out).toMatch(/Mailbox: a@x\.com/);
+        expect(out).toMatch(/Mailbox: b@x\.com/);
+        // Both blocks carry their own IMAP/SMTP health line.
+        expect((out.match(/IMAP: .* — OK/g) ?? []).length).toBe(2);
+    });
+    it("narrows to one mailbox when mailbox is named, probing only that one", async () => {
+        const out = await emailStatus({ accountId: "acct-1", mailbox: "b@x.com" });
+        expect(out).toMatch(/b@x\.com/);
+        expect(out).not.toMatch(/a@x\.com/);
+        expect(cred.recordSuccessfulConnect).toHaveBeenCalledWith("acct-1", "b@x.com");
+        expect(cred.recordSuccessfulConnect).not.toHaveBeenCalledWith("acct-1", "a@x.com");
+    });
+    it("refuses an unmatched selector, naming the stored identities", async () => {
+        const out = await emailStatus({ accountId: "acct-1", mailbox: "c@x.com" });
+        expect(out).toMatch(/No mailbox c@x\.com/);
+        expect(out).toMatch(/Stored mailbox identities: \[a@x\.com, b@x\.com\]/);
+    });
+});
 //# sourceMappingURL=email-status.test.js.map