Email for professionals and teams
Atomic scheduled-send cancel and MCP scheduled tools (from #111) (#128)
Hieu Nguyen (Jack)3bbd1970f90e
diff --git a/src/app/api/messages/[messageId]/cancel-schedule/route.ts b/src/app/api/messages/[messageId]/cancel-schedule/route.tsindex d9262d1..7e7ac5a 100644--- a/src/app/api/messages/[messageId]/cancel-schedule/route.ts+++ b/src/app/api/messages/[messageId]/cancel-schedule/route.ts@@ -1,10 +1,11 @@-import { and, eq, isNotNull } from "drizzle-orm";+import { eq } from "drizzle-orm";import { NextResponse } from "next/server";import { getDb } from "@/db";-import { messages, outboundJobs } from "@/db/schema";+import { messages } from "@/db/schema";import { getCurrentUser } from "@/lib/auth/cookies";import { getEnv } from "@/lib/cloudflare";import { getMailboxAccessLevel } from "@/lib/mailboxes/access";+import { cancelScheduledSend, getScheduledTime } from "@/lib/email/scheduled";/*** Cancels a scheduled send and returns the message to Drafts. Deleting the job is@@ -33,20 +34,11 @@ export async function POST(return NextResponse.json({ error: "You cannot cancel sends from this mailbox" }, { status: 403 });}- const [job] = await db- .select({ id: outboundJobs.id })- .from(outboundJobs)- .where(and(- eq(outboundJobs.messageId, message.id),- eq(outboundJobs.status, "queued"),- isNotNull(outboundJobs.scheduledAt),- ))- .limit(1);- if (message.direction !== "outbound" || message.status !== "queued" || !job) {+ if (message.direction !== "outbound" || message.status !== "queued" || !(await getScheduledTime(db, message.id))) {return NextResponse.json({ error: "This message is not scheduled" }, { status: 409 });}-- await db.delete(outboundJobs).where(eq(outboundJobs.id, job.id));- await db.update(messages).set({ status: "draft" }).where(eq(messages.id, message.id));+ if (!(await cancelScheduledSend(db, message.id))) {+ return NextResponse.json({ error: "This message is already being sent" }, { status: 409 });+ }return NextResponse.json({ ok: true });}diff --git a/src/db/schema/index.ts b/src/db/schema/index.tsindex e2f784a..5a8572d 100644--- a/src/db/schema/index.ts+++ b/src/db/schema/index.ts@@ -378,7 +378,7 @@ export const outboundJobs = sqliteTable("outbound_jobs", {.notNull().references(() => users.id, { onDelete: "cascade" }),messageId: text("message_id").references(() => messages.id, { onDelete: "set null" }),- status: text("status", { enum: ["queued", "sent", "failed"] }).notNull().default("queued"),+ status: text("status", { enum: ["queued", "sending", "sent", "failed"] }).notNull().default("queued"),payload: text("payload").notNull(),error: text("error"),scheduledAt: integer("scheduled_at", { mode: "timestamp" }),diff --git a/src/lib/agent/tools.ts b/src/lib/agent/tools.tsindex f785608..4fe3b26 100644--- a/src/lib/agent/tools.ts+++ b/src/lib/agent/tools.ts@@ -1,5 +1,6 @@import { and, desc, eq, isNull, lt, or } from "drizzle-orm";import { z } from "zod";+import { scheduledMessageCondition } from "@/lib/email/scheduled";import { getDb } from "@/db";import { agentDraftMetadata, domains, mailboxes, messages } from "@/db/schema";import { buildSnippet } from "@/lib/email/parse";@@ -24,10 +25,10 @@ const body = z.string().trim().min(1).max(40_000).describe("The recipient-facingconst limit = z.number().int().min(1).max(50).default(20);export const emailToolSchemas = {- list_emails: z.object({ folder: z.enum(["inbox", "sent", "draft", "archived", "trash", "spam"]).default("inbox"), limit, cursor: id.optional() }),+ list_emails: z.object({ folder: z.enum(["inbox", "sent", "scheduled", "draft", "archived", "trash", "spam"]).default("inbox"), limit, cursor: id.optional() }),get_email: z.object({ emailId: id }),get_thread: z.object({ emailId: id }),- search_emails: z.object({ query: z.string().trim().min(1).max(300), folder: z.enum(["inbox", "sent", "draft", "archived", "trash", "spam"]).optional(), limit }),+ search_emails: z.object({ query: z.string().trim().min(1).max(300), folder: z.enum(["inbox", "sent", "scheduled", "draft", "archived", "trash", "spam"]).optional(), limit }),draft_email: z.object({ to: z.string().email(), subject: z.string().trim().min(1).max(500), body }),draft_reply: z.object({ emailId: id, body, replyAll: z.boolean().default(false) }),edit_draft: z.object({@@ -125,6 +126,7 @@ export async function runEmailTool(context: AgentToolContext, name: EmailToolNamconst conditions = [eq(messages.mailboxId, context.mailboxId)];if (folder === "draft") conditions.push(eq(messages.status, "draft"), eq(messages.userId, context.user.id));else if (folder === "sent") conditions.push(eq(messages.status, "sent"));+ else if (folder === "scheduled") conditions.push(scheduledMessageCondition(db));else if (folder === "inbox") conditions.push(eq(messages.status, "received"), isNull(messages.folderId));else if (folder === "archived" || folder === "trash" || folder === "spam") conditions.push(eq(messages.status, folder));else conditions.push(or(eq(messages.userId, context.user.id), eq(messages.direction, "inbound"))!);diff --git a/src/lib/email/scheduled.ts b/src/lib/email/scheduled.tsindex b93dc97..3a098a6 100644--- a/src/lib/email/scheduled.ts+++ b/src/lib/email/scheduled.ts@@ -16,3 +16,26 @@ export function scheduledMessageCondition(db: ReturnType<typeof getDb>): SQL {),)!;}++/** When a queued outbound message is scheduled to go out; null when it is not scheduled. */+export async function getScheduledTime(db: ReturnType<typeof getDb>, messageId: string): Promise<Date | null> {+ const [job] = await db+ .select({ scheduledAt: outboundJobs.scheduledAt })+ .from(outboundJobs)+ .where(and(eq(outboundJobs.messageId, messageId), eq(outboundJobs.status, "queued"), isNotNull(outboundJobs.scheduledAt)))+ .limit(1);+ return job?.scheduledAt ?? null;+}++/** Cancels a scheduled send and returns the message to Drafts. Deletes only a job that is+ * still waiting: the queue consumer claims it (queued -> sending) before delivering, so a+ * send already under way is left alone. Returns false when there was nothing to cancel. */+export async function cancelScheduledSend(db: ReturnType<typeof getDb>, messageId: string): Promise<boolean> {+ const deleted = await db+ .delete(outboundJobs)+ .where(and(eq(outboundJobs.messageId, messageId), eq(outboundJobs.status, "queued"), isNotNull(outboundJobs.scheduledAt)))+ .returning({ id: outboundJobs.id });+ if (!deleted.length) return false;+ await db.update(messages).set({ status: "draft" }).where(and(eq(messages.id, messageId), eq(messages.status, "queued")));+ return true;+}diff --git a/src/lib/email/send.ts b/src/lib/email/send.tsindex f6cbd97..dbc528f 100644--- a/src/lib/email/send.ts+++ b/src/lib/email/send.ts@@ -1,4 +1,4 @@-import { eq } from "drizzle-orm";+import { and, eq } from "drizzle-orm";import { getDb } from "@/db";import { messages, outboundJobs } from "@/db/schema";import { newId } from "@/lib/ids";@@ -326,6 +326,14 @@ export async function processOutboundQueue(await enqueueScheduledDelivery(env, delivery, scheduledAt);return;}+ // Claim the job before delivering. Cancelling deletes only a job that is still+ // "queued", so exactly one of cancel and delivery wins.+ const claimed = await db+ .update(outboundJobs)+ .set({ status: "sending", updatedAt: new Date() })+ .where(and(eq(outboundJobs.id, payload.jobId), eq(outboundJobs.status, "queued")))+ .returning({ id: outboundJobs.id });+ if (!claimed.length) return;delivery.attachments = await loadMessageAttachmentContents(env, payload.messageId);await deliverEmail(env, delivery);}diff --git a/src/lib/mcp/server.ts b/src/lib/mcp/server.tsindex 017c5bf..aca2be3 100644--- a/src/lib/mcp/server.ts+++ b/src/lib/mcp/server.ts@@ -7,6 +7,7 @@ import { listAccessibleMailboxes } from "@/lib/mailboxes/access";import { runEmailTool, EMAIL_TOOL_NAMES, emailToolDescriptions, emailToolSchemas } from "@/lib/agent/tools";import { editAgentDraft } from "@/lib/agent/edit-draft";import { requestAgentSend, getAgentSendRequest } from "@/lib/agent/approvals/utils";+import { cancelScheduledSend, getScheduledTime } from "@/lib/email/scheduled";import type { EmailToolName } from "@/lib/agent/types";import type { McpPrincipal } from "./types";import { registerAdminMcpTools } from "./admin-tools";@@ -61,6 +62,22 @@ export function createMailflareMcpHandler(env: CloudflareEnv, principal: McpPrin}catch (error) { return output({ error: error instanceof Error ? error.message : "Request failed" }, true); }});+ server.registerTool("get_scheduled_send", { description: "Get when a scheduled email (from the scheduled folder) will be sent.", inputSchema: z.object({ mailboxId: z.string(), messageId: z.string() }) }, async ({ mailboxId, messageId }) => {+ if (!principal.scopes.includes("mcp:read") || !principal.mailboxIds.includes(mailboxId)) return output({ error: "Permission denied" }, true);+ const db = getDb(env);+ const [row] = await db.select({ mailboxId: messages.mailboxId, status: messages.status }).from(messages).where(eq(messages.id, messageId)).limit(1);+ const scheduledAt = row?.mailboxId === mailboxId && row.status === "queued" ? await getScheduledTime(db, messageId) : null;+ return scheduledAt ? output({ messageId, scheduledAt: scheduledAt.toISOString() }) : output({ error: "Scheduled email not found" }, true);+ });+ server.registerTool("cancel_scheduled_send", { description: "Cancel a scheduled email before it is sent. It returns to Drafts and is not sent.", inputSchema: z.object({ mailboxId: z.string(), messageId: z.string() }) }, async ({ mailboxId, messageId }) => {+ if (!principal.scopes.includes("mcp:draft") || !principal.mailboxIds.includes(mailboxId)) return output({ error: "Permission denied" }, true);+ const db = getDb(env);+ const [row] = await db.select({ mailboxId: messages.mailboxId, status: messages.status }).from(messages).where(eq(messages.id, messageId)).limit(1);+ if (row?.mailboxId !== mailboxId || row.status !== "queued") return output({ error: "Scheduled email not found" }, true);+ return await cancelScheduledSend(db, messageId)+ ? output({ messageId, status: "cancelled", draftId: messageId })+ : output({ error: "This email is already being sent" }, true);+ });server.registerTool("get_send_request", { description: "Read the status of this key's send review request", inputSchema: z.object({ approvalId: z.string() }) }, async ({ approvalId }) => {if (!principal.scopes.includes("mcp:request-send")) return output({ error: "Permission denied" }, true);const [row] = await getDb(env).select({ keyId: agentSendApprovals.requestKeyId }).from(agentSendApprovals).where(eq(agentSendApprovals.id, approvalId)).limit(1);