@remit/mcp-server 0.10.0 → 0.11.0

package/dist/auth/scopes.js

@@ -4,7 +4,7 @@ export const OFFLINE_ACCESS_SCOPE = "offline_access";
 export const MCP_SCOPES = [MCP_READ_SCOPE, MCP_RULES_SCOPE];
 const SCOPE_DESCRIPTIONS = {
     [MCP_READ_SCOPE]: "Read your mail",
-    [MCP_RULES_SCOPE]: "Create and change folders and filters",
+    [MCP_RULES_SCOPE]: "Create and change folders and filters, and move mail",
     [OFFLINE_ACCESS_SCOPE]: "Stay connected until you disconnect it",
 };
 export const describeScopes = (scopes) => scopes.map((scope) => ({

package/dist/deps.d.ts

@@ -1,6 +1,6 @@
 import type { RemitClient } from "@remit/backend/client";
-import type { IAccountRepository, IAddressRepository, IFilterRepository, ILabelMailboxRepository, ILabelRepository, IMailboxRepository, IMessageRepository, IOrganizeJobRequestRepository, IThreadMessageRepository, OrganizeJobEvent, QueueProducer } from "@remit/data-ports";
-import type { BodyPartMaterializer, BodySyncCue, MailboxQueueService, MaterializeLogger, OrganizeJobLogger } from "@remit/mailbox-service";
+import type { IAccountRepository, IAddressRepository, IFilterRepository, ILabelMailboxRepository, ILabelRepository, IMailboxRepository, IMessageLabelRepository, IMessageRepository, IOrganizeJobRequestRepository, IThreadMessageRepository, OrganizeJobEvent, QueueProducer } from "@remit/data-ports";
+import type { BodyPartMaterializer, BodySyncCue, MailboxQueueService, MaterializeLogger, MessageMoveService, OrganizeJobLogger } from "@remit/mailbox-service";
 import type { StorageService } from "@remit/storage-service";
 export declare const FOLDER_SETTLE_TIMEOUT_MS = 20000;
 export declare const FOLDER_POLL_INTERVAL_MS = 500;
@@ -18,9 +18,11 @@ export interface McpDeps {
     account: Pick<IAccountRepository, "get" | "listAllByAccountConfig" | "listMailSourcesByAccountConfig">;
     mailbox: Pick<IMailboxRepository, "get" | "listAllByAccount" | "findByPath" | "resolveAccountId">;
     address: Pick<IAddressRepository, "countCategoryOverridesSince">;
-    label: Pick<ILabelRepository, "create" | "findByNormalizedName" | "listByAccountConfig">;
+    label: Pick<ILabelRepository, "create" | "findByNormalizedName" | "get" | "listByAccountConfig">;
     labelMailbox: Pick<ILabelMailboxRepository, "get" | "put" | "listByAccount" | "listByLabel">;
     message: Pick<IMessageRepository, "get" | "describe" | "countClassifiedSince">;
+    messageLabel: Pick<IMessageLabelRepository, "apply">;
+    messageMove: Pick<MessageMoveService, "moveMessages">;
     threadMessage: Pick<IThreadMessageRepository, "listByMailbox" | "listByThread" | "searchByDate">;
     filter: Pick<IFilterRepository, "listByAccountConfig" | "refreshExpiry" | "create" | "get" | "update">;
     organizeJobRequest: Pick<IOrganizeJobRequestRepository, "create" | "get">;

package/dist/deps.js

@@ -7,6 +7,8 @@ export const mcpDepsOf = (client, { logger, settle }) => ({
     label: client.label,
     labelMailbox: client.labelMailbox,
     message: client.message,
+    messageLabel: client.messageLabel,
+    messageMove: client.messageMove,
     threadMessage: client.threadMessage,
     filter: client.filter,
     organizeJobRequest: client.organizeJobRequest,

package/dist/filter-tools.js

@@ -2,9 +2,9 @@ import { FILTER_NO_ACTION, FilterRuleV1Schema, filterClausesFromRule, MAX_FILTER
 import { isNotFoundError } from "@remit/data-ports/errors";
 import { deriveAccountConfigId } from "@remit/data-ports/id";
 import { FilterClauseField, FilterMatchOperator, FilterScope, FilterState, } from "@remit/domain-enums";
-import { accept, createFilter, listAccountFilters, ownedAccount, queueOrganizeJob, refuse, updateFilter, } from "@remit/mailbox-service";
+import { accept, createFilter, listAccountFilters, ownedAccount, queueOrganizeJob, updateFilter, } from "@remit/mailbox-service";
 import { z } from "zod";
-import { asJson, refused, toolError } from "./tool-result.js";
+import { asJson, notFoundRefusal, refused, toolError } from "./tool-result.js";
 const FILTER_WRITE = {
     readOnlyHint: false,
     destructiveHint: false,
@@ -44,15 +44,7 @@ const absentJob = (error) => {
         throw error;
     return null;
 };
-const notFound = (error) => {
-    if (!isNotFoundError(error))
-        throw error;
-    const message = error instanceof Error ? error.message : "Not found";
-    return refuse({
-        kind: "NotFound",
-        message: `${message}. Check the filterId against list_filters.`,
-    });
-};
+const notFound = notFoundRefusal("Check the filterId against list_filters.");
 const accountId = z.string().min(1).describe("Account from list_mailboxes");
 const literalClauses = z
     .array(z.object({
@@ -173,12 +165,12 @@ export const registerFilterTools = (server, deps, userId) => {
         return asJson({ filter, organizeJobId: job.organizeJobId });
     });
     server.registerTool("get_organize_job", {
-        description: "Read an organize job that applies a filter to existing mail: its state (Pending, Running, Complete, Failed), how many messages it matched, applied and failed, and the error when it failed.",
+        description: "Read an organize job that applies a filter to existing mail or moves a folder's messages: its state (Pending, Running, Complete, Failed), how many messages it matched, applied and failed, and the error when it failed.",
         inputSchema: {
             organizeJobId: z
                 .string()
                 .min(1)
-                .describe("organizeJobId from create_filter or update_filter"),
+                .describe("organizeJobId from create_filter, update_filter, apply_filter or move_folder_messages"),
         },
         annotations: { readOnlyHint: true, openWorldHint: false },
     }, async ({ organizeJobId }) => {
@@ -186,7 +178,7 @@ export const registerFilterTools = (server, deps, userId) => {
             .get(organizeJobId)
             .catch(absentJob);
         if (!job || job.accountConfigId !== accountConfigId) {
-            return toolError(`Organize job not found: ${organizeJobId}. Use the organizeJobId create_filter or update_filter returned.`);
+            return toolError(`Organize job not found: ${organizeJobId}. Use the organizeJobId a create_filter, update_filter, apply_filter or move_folder_messages call returned.`);
         }
         return asJson(toOrganizeJob(job));
     });

package/dist/move-tools.d.ts

@@ -0,0 +1,3 @@
+import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { McpDeps } from "./deps.js";
+export declare const registerMoveTools: (server: McpServer, deps: McpDeps, userId: string) => void;

package/dist/move-tools.js

@@ -0,0 +1,150 @@
+import { ORGANIZE_MATCH_LIMIT, organizePredicateRejection, } from "@remit/backend/organize";
+import { FILTER_NO_ACTION, FilterRuleV1Schema, filterRuleFromClauses, filterRuleLimitRefusal, } from "@remit/data-ports";
+import { deriveAccountConfigId } from "@remit/data-ports/id";
+import { FilterMatchOperator } from "@remit/domain-enums";
+import { accept, folderInAccount, invalid, moveMessagesTo, ownedAccount, queueOrganizeJob, resolveMoveDestination, } from "@remit/mailbox-service";
+import { z } from "zod";
+import { asJson, notFoundRefusal, refused } from "./tool-result.js";
+const MAX_MOVE_MESSAGES = 500;
+const MOVE_WRITE = {
+    readOnlyHint: false,
+    destructiveHint: false,
+    idempotentHint: true,
+    openWorldHint: false,
+};
+const notFound = notFoundRefusal("");
+const EVERY_MESSAGE = filterRuleFromClauses({
+    matchOperator: FilterMatchOperator.And,
+    literalClauses: [],
+});
+const targetMailboxId = z
+    .string()
+    .min(1)
+    .optional()
+    .describe("Folder from list_mailboxes to move into. Send this or labelId.");
+const targetLabelId = z
+    .string()
+    .min(1)
+    .optional()
+    .describe("Label from list_labels: the messages move into its folder in their account and get the label. Send this or mailboxId.");
+const oneTarget = (args) => {
+    if (args.mailboxId && args.labelId) {
+        return invalid("Send mailboxId or labelId, not both.");
+    }
+    if (args.mailboxId)
+        return accept({ mailboxId: args.mailboxId });
+    if (args.labelId)
+        return accept({ labelId: args.labelId });
+    return invalid("Send a target: mailboxId for a folder, or labelId.");
+};
+const jobAction = (destination) => ({
+    actionMailboxId: destination.mailboxId,
+    actionLabelId: destination.kind === "Label" ? destination.labelId : FILTER_NO_ACTION,
+});
+export const registerMoveTools = (server, deps, userId) => {
+    const accountConfigId = deriveAccountConfigId(userId);
+    const organizeDeps = {
+        organizeJobRequest: deps.organizeJobRequest,
+        queue: deps.filters.organizeQueue,
+        logger: deps.filters.logger,
+    };
+    const ruleFor = async (args) => {
+        if (args.filterId && args.rule) {
+            return invalid("Send filterId or rule, not both.");
+        }
+        if (args.filterId) {
+            const filter = await deps.filter.get(accountConfigId, args.filterId);
+            return accept(filter.rule);
+        }
+        if (!args.rule)
+            return accept(EVERY_MESSAGE);
+        const tooBig = filterRuleLimitRefusal(args.rule);
+        return tooBig ? invalid(tooBig) : accept(args.rule);
+    };
+    server.registerTool("move_messages", {
+        description: "Move messages into a folder, or into a label's folder, the way the mail app moves them. A folder takes messages of its own account; a label files each account's messages into that account's label folder. Returns once the moves are queued; the mail server confirms them shortly after.",
+        inputSchema: {
+            messageIds: z
+                .array(z.string().min(1))
+                .min(1)
+                .max(MAX_MOVE_MESSAGES)
+                .describe("Messages from list_threads, search_threads or get_thread"),
+            mailboxId: targetMailboxId,
+            labelId: targetLabelId,
+        },
+        annotations: MOVE_WRITE,
+    }, async ({ messageIds, ...args }) => {
+        const target = oneTarget(args);
+        if (!target.ok)
+            return refused(target.refusal);
+        const ids = [...new Set(messageIds)];
+        const moved = await moveMessagesTo(deps, accountConfigId, ids, target.value).catch(notFound);
+        if (!moved.ok)
+            return refused(moved.refusal);
+        return asJson({
+            moved: ids.length,
+            destinations: moved.value.map(({ messageIds: _, ...group }) => group),
+        });
+    });
+    server.registerTool("move_folder_messages", {
+        description: `Move every message in one folder, or only those matching a filter's rule or a given rule, into another folder or a label's folder. Runs as an organize job: returns its organizeJobId, which get_organize_job reports on. One job moves at most ${ORGANIZE_MATCH_LIMIT} messages; call again while a finished job reports appliedCount above 0.`,
+        inputSchema: {
+            accountId: z.string().min(1).describe("Account from list_mailboxes"),
+            sourceMailboxId: z
+                .string()
+                .min(1)
+                .describe("Folder from list_mailboxes to move messages out of"),
+            mailboxId: targetMailboxId,
+            labelId: targetLabelId,
+            filterId: z
+                .string()
+                .min(1)
+                .optional()
+                .describe("Only move messages this filter's rule matches; the filter's own action is ignored"),
+            rule: FilterRuleV1Schema.optional().describe("Only move messages this rule matches, in the shape create_filter takes. Send this or filterId, or neither to move everything."),
+        },
+        annotations: { ...MOVE_WRITE, idempotentHint: false },
+    }, async ({ accountId, sourceMailboxId, mailboxId, labelId, ...match }) => {
+        const target = oneTarget({ mailboxId, labelId });
+        if (!target.ok)
+            return refused(target.refusal);
+        const owned = await deps.account
+            .get(accountId)
+            .then((account) => ownedAccount(account, accountConfigId, "act"))
+            .catch(notFound);
+        if (!owned.ok)
+            return refused(owned.refusal);
+        const source = await deps.mailbox
+            .get(accountId, sourceMailboxId)
+            .then((folder) => folderInAccount(folder, accountId, "act"))
+            .catch(notFound);
+        if (!source.ok)
+            return refused(source.refusal);
+        const destination = await resolveMoveDestination(deps, accountConfigId, accountId, target.value).catch(notFound);
+        if (!destination.ok)
+            return refused(destination.refusal);
+        const action = jobAction(destination.value);
+        if (action.actionMailboxId === sourceMailboxId) {
+            return refused(invalid("The target folder is the source folder.").refusal);
+        }
+        const rule = await ruleFor(match).catch(notFound);
+        if (!rule.ok)
+            return refused(rule.refusal);
+        const rejection = organizePredicateRejection({
+            rule: rule.value,
+            ...action,
+        });
+        if (rejection)
+            return refused(invalid(rejection.message).refusal);
+        const job = await queueOrganizeJob(organizeDeps, {
+            accountConfigId,
+            userId,
+            predicate: {
+                rule: rule.value,
+                sourceMailboxId,
+                ...action,
+            },
+        });
+        return asJson({ organizeJobId: job.organizeJobId, state: job.state });
+    });
+};

package/dist/server.js

@@ -5,6 +5,7 @@ import { MCP_READ_SCOPE, MCP_RULES_SCOPE } from "./auth/scopes.js";
 import { registerFilterTools } from "./filter-tools.js";
 import { registerFolderTools } from "./folder-tools.js";
 import { registerLabelReadTools, registerLabelWriteTools, } from "./label-tools.js";
+import { registerMoveTools } from "./move-tools.js";
 import { registerReadTools } from "./read-tools.js";
 const unusedJsonSchemaValidator = {
     getValidator: () => {
@@ -21,6 +22,7 @@ const buildServer = (principal, deps) => {
         registerFolderTools(server, deps, deriveAccountConfigId(principal.userId));
         registerLabelWriteTools(server, deps, deriveAccountConfigId(principal.userId));
         registerFilterTools(server, deps, principal.userId);
+        registerMoveTools(server, deps, principal.userId);
     }
     return server;
 };

package/dist/tool-result.d.ts

@@ -1,5 +1,6 @@
 import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
-import type { Refusal } from "@remit/mailbox-service";
+import { type Refusal, type Refused } from "@remit/mailbox-service";
 export declare const asJson: (value: unknown) => CallToolResult;
 export declare const toolError: (message: string) => CallToolResult;
 export declare const refused: (refusal: Refusal) => CallToolResult;
+export declare const notFoundRefusal: (fix: string) => (error: unknown) => Refused;

package/dist/tool-result.js

@@ -1,3 +1,5 @@
+import { isNotFoundError } from "@remit/data-ports/errors";
+import { refuse } from "@remit/mailbox-service";
 export const asJson = (value) => ({
     content: [{ type: "text", text: JSON.stringify(value) }],
 });
@@ -14,3 +16,12 @@ const REFUSAL_FIX = {
 };
 const sentence = (message) => /[.!?]$/.test(message) ? message : `${message}.`;
 export const refused = (refusal) => toolError(`${sentence(refusal.message)}${REFUSAL_FIX[refusal.kind]}`);
+export const notFoundRefusal = (fix) => (error) => {
+    if (!isNotFoundError(error))
+        throw error;
+    const message = error instanceof Error ? error.message : "Not found";
+    return refuse({
+        kind: "NotFound",
+        message: fix ? `${sentence(message)} ${fix}` : message,
+    });
+};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remit/mcp-server",
-	"version": "0.10.0",
+	"version": "0.11.0",
 	"description": "The remit MCP server: mail tools over streamable HTTP and the OAuth authorization server that guards them.",
 	"type": "module",
 	"exports": {
@@ -25,12 +25,12 @@
 		"@better-auth/oauth-provider": "^1.7.12",
 		"@hono/node-server": "^2.1.3",
 		"@modelcontextprotocol/sdk": "1.32.1",
-		"@remit/auth-service": "0.3.7",
-		"@remit/data-ports": "2.6.0",
-		"@remit/domain-enums": "0.0.50",
-		"@remit/drizzle-service": "3.4.0",
-		"@remit/mailbox-service": "2.18.0",
-		"@remit/storage-service": "0.0.36",
+		"@remit/auth-service": "0.3.9",
+		"@remit/data-ports": "2.7.0",
+		"@remit/domain-enums": "0.0.51",
+		"@remit/drizzle-service": "3.5.0",
+		"@remit/mailbox-service": "2.19.0",
+		"@remit/storage-service": "0.0.37",
 		"@remit/ui": "0.0.234",
 		"better-auth": "^1.7.12",
 		"drizzle-orm": "1.0.0-rc.5",
@@ -38,12 +38,12 @@
 		"react": "^19",
 		"react-dom": "^19",
 		"zod": "^4.6.7",
-		"@remit/backend": "5.4.0",
+		"@remit/backend": "5.5.0",
 		"@types/react": "^19",
 		"@types/react-dom": "^19"
 	},
 	"devDependencies": {
-		"@remit/imap-worker": "3.2.0",
+		"@remit/imap-worker": "3.2.2",
 		"@tailwindcss/vite": "^4",
 		"tailwindcss": "^4",
 		"tsx": "*",