@remit/mcp-server 0.8.0 → 0.10.0

package/dist/deps.d.ts

@@ -1,5 +1,5 @@
 import type { RemitClient } from "@remit/backend/client";
-import type { IAccountRepository, IAddressRepository, IFilterRepository, IMailboxRepository, IMessageRepository, IOrganizeJobRequestRepository, IThreadMessageRepository, OrganizeJobEvent, QueueProducer } from "@remit/data-ports";
+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 { StorageService } from "@remit/storage-service";
 export declare const FOLDER_SETTLE_TIMEOUT_MS = 20000;
@@ -15,12 +15,14 @@ export interface FilterToolDeps {
     logger: OrganizeJobLogger;
 }
 export interface McpDeps {
-    account: Pick<IAccountRepository, "get" | "listAllByAccountConfig">;
+    account: Pick<IAccountRepository, "get" | "listAllByAccountConfig" | "listMailSourcesByAccountConfig">;
     mailbox: Pick<IMailboxRepository, "get" | "listAllByAccount" | "findByPath" | "resolveAccountId">;
     address: Pick<IAddressRepository, "countCategoryOverridesSince">;
+    label: Pick<ILabelRepository, "create" | "findByNormalizedName" | "listByAccountConfig">;
+    labelMailbox: Pick<ILabelMailboxRepository, "get" | "put" | "listByAccount" | "listByLabel">;
     message: Pick<IMessageRepository, "get" | "describe" | "countClassifiedSince">;
     threadMessage: Pick<IThreadMessageRepository, "listByMailbox" | "listByThread" | "searchByDate">;
-    filter: Pick<IFilterRepository, "listPageByAccountConfig" | "refreshExpiry" | "create" | "get" | "update">;
+    filter: Pick<IFilterRepository, "listByAccountConfig" | "refreshExpiry" | "create" | "get" | "update">;
     organizeJobRequest: Pick<IOrganizeJobRequestRepository, "create" | "get">;
     storage: Pick<StorageService, "retrieveBodyPart">;
     bodySync: BodyPartMaterializer;

package/dist/deps.js

@@ -4,6 +4,8 @@ export const mcpDepsOf = (client, { logger, settle }) => ({
     account: client.account,
     mailbox: client.mailbox,
     address: client.address,
+    label: client.label,
+    labelMailbox: client.labelMailbox,
     message: client.message,
     threadMessage: client.threadMessage,
     filter: client.filter,

package/dist/filter-tools.js

@@ -1,8 +1,8 @@
-import { FILTER_NO_ACTION, } from "@remit/data-ports";
+import { FILTER_NO_ACTION, FilterRuleV1Schema, filterClausesFromRule, MAX_FILTER_RULE_DEPTH, MAX_FILTER_RULE_LEAVES, } from "@remit/data-ports";
 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, listFilters, ownedAccount, queueOrganizeJob, refuse, updateFilter, } from "@remit/mailbox-service";
+import { accept, createFilter, listAccountFilters, ownedAccount, queueOrganizeJob, refuse, updateFilter, } from "@remit/mailbox-service";
 import { z } from "zod";
 import { asJson, refused, toolError } from "./tool-result.js";
 const FILTER_WRITE = {
@@ -18,8 +18,10 @@ const toFilter = (item) => ({
     expiresAt: item.expiresAt,
     state: item.state,
     disabledReason: item.disabledReason,
-    matchOperator: item.matchOperator,
-    literalClauses: item.literalClauses,
+    ...filterClausesFromRule(item.rule),
+    rule: item.rule,
+    priority: item.priority,
+    stop: item.stop,
     actionLabelId: item.actionLabelId,
     actionMailboxId: item.actionMailboxId,
     ruleChangedAt: item.ruleChangedAt,
@@ -59,7 +61,15 @@ const literalClauses = z
         .describe("Message attribute the clause matches"),
     value: z.string().min(1).max(256).describe("Literal text to match"),
 }))
-    .min(1);
+    .min(1)
+    .describe("Literal clauses combined by matchOperator. Send these or rule.");
+const rule = FilterRuleV1Schema.describe(`A Sieve-like test tree. Send this or literalClauses, never both. At most ${MAX_FILTER_RULE_LEAVES} header, address, hasWords or classification tests and ${MAX_FILTER_RULE_DEPTH} levels, counting the top test. Example: {"version":1,"test":{"test":"allof","tests":[{"test":"address","match":"Is","part":"RegistrableDomain","key":"github.com"},{"test":"not","operand":{"test":"header","match":"Contains","header":"Subject","key":"security"}}]}}`);
+const priority = z
+    .int()
+    .describe("Evaluation order: lower runs first; ties go to the most recently changed filter. The first matching filter with a folder decides the move, and labels add up");
+const stop = z
+    .boolean()
+    .describe("When true, a message this filter matches is not evaluated against any later filter");
 const scope = z
     .enum(FilterScope)
     .describe("Standing runs until changed; Temporary stops at expiresAt");
@@ -85,36 +95,27 @@ export const registerFilterTools = (server, deps, userId) => {
         logger: deps.filters.logger,
     };
     server.registerTool("list_filters", {
-        description: "List the user's mail filters: what each matches, where it moves or labels mail, and whether it is on. A page at a time.",
-        inputSchema: {
-            accountId,
-            continuationToken: z
-                .string()
-                .optional()
-                .describe("Opaque cursor from a previous response"),
-        },
+        description: "List the mail filters that act on one account: what each matches (rule, plus literalClauses when the rule is a flat list), its priority and stop, where it moves or labels mail, and whether it is on. A filter that moves mail into a folder is listed under the account that holds the folder; a filter that only labels mail, or moves it into a label's folder, is listed under every account.",
+        inputSchema: { accountId },
         annotations: { readOnlyHint: true, openWorldHint: false },
     }, async (args) => {
-        const page = await listFilters(deps, accountConfigId, {
-            accountId: args.accountId,
-            continuationToken: args.continuationToken,
-        }).catch(notFound);
-        if (!page.ok)
-            return refused(page.refusal);
-        return asJson({
-            items: page.value.items.map(toFilter),
-            continuationToken: page.value.continuationToken,
-        });
+        const listed = await listAccountFilters(deps, accountConfigId, args.accountId).catch(notFound);
+        if (!listed.ok)
+            return refused(listed.refusal);
+        return asJson({ items: listed.value.map(toFilter) });
     });
     server.registerTool("create_filter", {
-        description: "Create a filter that sorts new mail, and queue a job that applies it to existing mail. Returns the filter and the organizeJobId of that job. A target folder must be confirmed by the mail server first.",
+        description: "Create a filter that sorts new mail, and queue a job that applies it to existing mail. Match with literalClauses for a flat list, or with rule for not, nesting and exact matches. Returns the filter and the organizeJobId of that job. A target folder must be confirmed by the mail server first.",
         inputSchema: {
             accountId,
             name: z.string().min(1).max(256).describe("Name for the filter"),
             scope: scope.default(FilterScope.Standing),
             expiresAt: expiresAt.optional(),
             matchOperator: matchOperator.default(FilterMatchOperator.And),
-            literalClauses,
+            literalClauses: literalClauses.optional(),
+            rule: rule.optional(),
+            priority: priority.default(0),
+            stop: stop.default(false),
             actionMailboxId: actionMailboxId.default(FILTER_NO_ACTION),
             actionLabelId: actionLabelId.default(FILTER_NO_ACTION),
         },
@@ -129,7 +130,7 @@ export const registerFilterTools = (server, deps, userId) => {
         });
     });
     server.registerTool("update_filter", {
-        description: "Change a filter: its name, clauses, target folder or label, scope, expiry, or turn it on or off. Only the fields given change. Set applyToExisting to also queue a job that applies the filter to existing mail; its organizeJobId is returned.",
+        description: "Change a filter: its name, clauses or rule, priority, stop, target folder or label, scope, expiry, or turn it on or off. Only the fields given change. A filter whose rule has no clause form (literalClauses is empty in list_filters) changes only through rule. Set applyToExisting to also queue a job that applies the filter to existing mail; its organizeJobId is returned.",
         inputSchema: {
             accountId,
             filterId: z.string().min(1).describe("Filter from list_filters"),
@@ -138,6 +139,9 @@ export const registerFilterTools = (server, deps, userId) => {
             expiresAt: expiresAt.optional(),
             matchOperator: matchOperator.optional(),
             literalClauses: literalClauses.optional(),
+            rule: rule.optional(),
+            priority: priority.optional(),
+            stop: stop.optional(),
             actionMailboxId: actionMailboxId.optional(),
             actionLabelId: actionLabelId.optional(),
             state: z

package/dist/label-tools.d.ts

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

package/dist/label-tools.js

@@ -0,0 +1,52 @@
+import { LabelColor } from "@remit/domain-enums";
+import { createLabelWithFolders, listLabelsWithFolders, } from "@remit/mailbox-service";
+import { z } from "zod";
+import { asJson, refused } from "./tool-result.js";
+const READ_ONLY = { readOnlyHint: true, openWorldHint: false };
+const LABEL_WRITE = {
+    readOnlyHint: false,
+    destructiveHint: false,
+    idempotentHint: true,
+    openWorldHint: false,
+};
+const toLabel = ({ label, folders }) => ({
+    labelId: label.labelId,
+    name: label.name,
+    color: label.color,
+    folders,
+});
+export const registerLabelReadTools = (server, deps, accountConfigId) => {
+    server.registerTool("list_labels", {
+        description: "List the user's labels. Each label lists its folder in every mail account, with state Present, Pending (the mail server has not confirmed it yet) or Missing, and the mailboxId of a folder that is there.",
+        inputSchema: {},
+        annotations: READ_ONLY,
+    }, async () => {
+        const labels = await listLabelsWithFolders(deps, accountConfigId);
+        return asJson({ labels: labels.map(toLabel) });
+    });
+};
+export const registerLabelWriteTools = (server, deps, accountConfigId) => {
+    server.registerTool("create_label", {
+        description: "Create a label and its folder in every mail account, under the account's remit folder. A label with the same name is reused, and calling again creates only the folders that are missing. Returns each folder's state; a Pending folder settles once the mail server confirms it, which list_labels shows.",
+        inputSchema: {
+            name: z.string().trim().min(1).max(140).describe("Label name"),
+            color: z
+                .enum(LabelColor)
+                .optional()
+                .describe("Display color, Default when left out"),
+        },
+        annotations: LABEL_WRITE,
+    }, async ({ name, color }) => {
+        const created = await createLabelWithFolders({
+            account: deps.account,
+            mailbox: deps.mailbox,
+            label: deps.label,
+            labelMailbox: deps.labelMailbox,
+            mailboxQueue: deps.folders.mailboxQueue,
+            log: deps.logger,
+        }, accountConfigId, { name, color });
+        if (!created.ok)
+            return refused(created.refusal);
+        return asJson(toLabel(created.value));
+    });
+};

package/dist/server.js

@@ -4,6 +4,7 @@ import { deriveAccountConfigId } from "@remit/data-ports/id";
 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 { registerReadTools } from "./read-tools.js";
 const unusedJsonSchemaValidator = {
     getValidator: () => {
@@ -14,9 +15,11 @@ const buildServer = (principal, deps) => {
     const server = new McpServer({ name: "remit-reader", version: "1.0.0" }, { jsonSchemaValidator: unusedJsonSchemaValidator });
     if (principal.scopes.includes(MCP_READ_SCOPE)) {
         registerReadTools(server, deps, deriveAccountConfigId(principal.userId));
+        registerLabelReadTools(server, deps, deriveAccountConfigId(principal.userId));
     }
     if (principal.scopes.includes(MCP_RULES_SCOPE)) {
         registerFolderTools(server, deps, deriveAccountConfigId(principal.userId));
+        registerLabelWriteTools(server, deps, deriveAccountConfigId(principal.userId));
         registerFilterTools(server, deps, principal.userId);
     }
     return server;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remit/mcp-server",
-	"version": "0.8.0",
+	"version": "0.10.0",
 	"description": "The remit MCP server: mail tools over streamable HTTP and the OAuth authorization server that guards them.",
 	"type": "module",
 	"exports": {
@@ -21,16 +21,16 @@
 		"mcp-login": "node --import tsx src/cli/mcp-login.ts"
 	},
 	"dependencies": {
-		"@remit/logger": "*",
+		"@remit/logger": "0.2.0",
 		"@better-auth/oauth-provider": "^1.7.12",
 		"@hono/node-server": "^2.1.3",
 		"@modelcontextprotocol/sdk": "1.32.1",
-		"@remit/auth-service": "*",
-		"@remit/data-ports": "*",
-		"@remit/domain-enums": "*",
-		"@remit/drizzle-service": "*",
-		"@remit/mailbox-service": "*",
-		"@remit/storage-service": "*",
+		"@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/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": "*",
+		"@remit/backend": "5.4.0",
 		"@types/react": "^19",
 		"@types/react-dom": "^19"
 	},
 	"devDependencies": {
-		"@remit/imap-worker": "*",
+		"@remit/imap-worker": "3.2.0",
 		"@tailwindcss/vite": "^4",
 		"tailwindcss": "^4",
 		"tsx": "*",