shipmail-mcp 0.5.4 → 0.5.8

package/dist/index.js

@@ -12,6 +12,7 @@ var MCP_MEMBER_PERMISSION_GROUP_NAMES = [
   "mail_read",
   "drafts",
   "mail_organize",
+  "mailbox_rules",
   "send_mail",
   "calendar_read",
   "calendar_write"
@@ -80,6 +81,13 @@ var MCP_PERMISSION_GROUPS = [
     scopes: ["mailbox_forwarding:read", "mailbox_forwarding:write"],
     persistent: true
   },
+  {
+    name: "mailbox_rules",
+    label: "Inbox rules",
+    description: "Read and manage persistent server-side sorting, move, read, and star rules.",
+    scopes: ["mailbox_rules:read", "mailbox_rules:write"],
+    persistent: true
+  },
   {
     name: "webhooks",
     label: "Webhooks",
@@ -173,6 +181,8 @@ var CAPABILITY_ROWS = [
   ["shipmail_update_mailbox", "updateMailbox", "mailboxes:write"],
   ["shipmail_delete_mailbox", "deleteMailbox", "mailboxes:write"],
   ["shipmail_list_mailbox_folders", "listMailboxFolders", "mailboxes:read"],
+  ["shipmail_get_mailbox_rules", "getMailboxRules", "mailbox_rules:read"],
+  ["shipmail_set_mailbox_rules", "updateMailboxRules", "mailbox_rules:write"],
   ["shipmail_create_mailbox_folder", "createMailboxFolder", "mailboxes:write"],
   ["shipmail_update_mailbox_folder", "updateMailboxFolder", "mailboxes:write"],
   ["shipmail_delete_mailbox_folder", "deleteMailboxFolder", "mailboxes:write"],
@@ -334,7 +344,8 @@ var DESTRUCTIVE_TOOLS = /* @__PURE__ */ new Set([
   "shipmail_create_mailbox_app_password",
   "shipmail_create_mailbox_export",
   "shipmail_rotate_webhook_secret",
-  "shipmail_consume_partner_mailbox_credential_grant"
+  "shipmail_consume_partner_mailbox_credential_grant",
+  "shipmail_set_mailbox_rules"
 ]);
 var EXTERNAL_WRITE_TOOLS = /* @__PURE__ */ new Set([
   "shipmail_send_message",
@@ -382,6 +393,7 @@ function permissionGroupFor(toolName, requiredScope) {
   if (requiredScope.startsWith("domains:")) return "domain_admin";
   if (requiredScope.startsWith("mailbox_credentials:")) return "credentials";
   if (requiredScope.startsWith("mailbox_forwarding:")) return "forwarding";
+  if (requiredScope.startsWith("mailbox_rules:")) return "mailbox_rules";
   if (requiredScope === "mailboxes:export") return "mailbox_export";
   if (requiredScope === "drafts:write") return "drafts";
   if (requiredScope === "messages:send") return "send_mail";
@@ -417,7 +429,7 @@ function durationFor(toolName) {
   if (toolName.includes("app_password") || toolName.includes("credential_grant") || toolName === "shipmail_rotate_webhook_secret") {
     return "credential";
   }
-  if (toolName.includes("forwarding") || toolName.includes("webhook") || toolName.includes("booking_page")) {
+  if (toolName.includes("forwarding") || toolName.includes("mailbox_rules") || toolName.includes("webhook") || toolName.includes("booking_page")) {
     return "persistent";
   }
   if (toolName === "shipmail_send_message" || toolName.includes("schedule_") || toolName.includes("scheduled_message")) {
@@ -566,14 +578,154 @@ function readConfig(argv = process.argv.slice(2)) {
 }
 
 // src/server.ts
-import { McpServer as McpServer4 } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { McpServer as McpServer5 } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { ShipMailClient } from "shipmail";
 
-// src/prompts.ts
+// src/cross-organization-tools.ts
+import { performance } from "perf_hooks";
 import "@modelcontextprotocol/sdk/server/mcp.js";
-import { WEBHOOK_EVENT_TYPES as WEBHOOK_EVENT_TYPES2 } from "shipmail";
+import { ShipMailError as ShipMailError2 } from "shipmail";
 import { z as z2 } from "zod/v4";
 
+// src/result.ts
+import { ShipMailError, ValidationError } from "shipmail";
+
+// src/sanitize.ts
+var MAX_STRING_LENGTH = 16384;
+var TRUNCATION_MARKER = "\n\u2026[truncated]";
+var DANGEROUS_CHARS_REGEX = (
+  // eslint-disable-next-line no-control-regex
+  /[\x00-\x08\x0B\x0C\x0E-\x1F\x7F؜‎‏‪-‮⁦-⁩]/gu
+);
+function sanitizeString(value, maxLength = MAX_STRING_LENGTH) {
+  const stripped = value.replace(DANGEROUS_CHARS_REGEX, "");
+  if (stripped.length <= maxLength) return stripped;
+  const keep = Math.max(0, maxLength - TRUNCATION_MARKER.length);
+  return stripped.slice(0, keep) + TRUNCATION_MARKER;
+}
+function isPlainObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function sanitizeValue(value, maxStringLength = MAX_STRING_LENGTH) {
+  if (typeof value === "string") {
+    return sanitizeString(value, maxStringLength);
+  }
+  if (Array.isArray(value)) {
+    return value.map((item) => sanitizeValue(item, maxStringLength));
+  }
+  if (isPlainObject(value)) {
+    const out = {};
+    for (const [key, item] of Object.entries(value)) {
+      out[key] = sanitizeValue(item, maxStringLength);
+    }
+    return out;
+  }
+  return value;
+}
+function sanitizeRecord(value, maxStringLength = MAX_STRING_LENGTH) {
+  const out = {};
+  for (const [key, item] of Object.entries(value)) {
+    out[key] = sanitizeValue(item, maxStringLength);
+  }
+  return out;
+}
+
+// src/result.ts
+var MAX_ERROR_MESSAGE_LENGTH = 500;
+var SAFE_ERROR_TYPES = /* @__PURE__ */ new Set([
+  "validation_error",
+  "not_found",
+  "conflict",
+  "rate_limit_error",
+  "authentication_error",
+  "authorization_error",
+  "quota_exceeded"
+]);
+var GENERIC_INTERNAL_MESSAGE = "Internal MCP error. The original message is logged on the MCP server stderr.";
+var MCP_RATE_LIMIT_MARKER = "[mcp.rate_limit]";
+var MCP_SCHEMA_VIOLATION_MARKER = "[mcp.schema_violation]";
+var SAFE_MARKERS = [MCP_RATE_LIMIT_MARKER, MCP_SCHEMA_VIOLATION_MARKER];
+function jsonResult(structuredContent) {
+  const sanitized = sanitizeRecord(structuredContent);
+  return {
+    content: [
+      {
+        type: "text",
+        text: JSON.stringify(sanitized, null, 2)
+      }
+    ],
+    structuredContent: sanitized
+  };
+}
+function formatShipMailError(error) {
+  const parts = [];
+  const isSafeMessage = error.type !== void 0 && SAFE_ERROR_TYPES.has(error.type);
+  if (isSafeMessage) {
+    parts.push(sanitizeString(error.message, MAX_ERROR_MESSAGE_LENGTH));
+  } else {
+    parts.push("ShipMail request failed. Contact ShipMail support with the request_id below.");
+  }
+  if (error.type) parts.push(`type=${error.type}`);
+  if (error.status !== void 0) parts.push(`status=${error.status}`);
+  if (error.requestId) parts.push(`request_id=${error.requestId}`);
+  if (isSafeMessage && error instanceof ValidationError && error.details?.length) {
+    const fields = error.details.map((detail) => sanitizeString(detail.field, 100)).filter((field) => field.length > 0).slice(0, 25).join(", ");
+    if (fields.length > 0) parts.push(`fields=${fields}`);
+  }
+  return parts.join(" | ");
+}
+function safeMarkerStrip(message) {
+  for (const marker of SAFE_MARKERS) {
+    if (message.startsWith(marker)) {
+      return message.slice(marker.length).trim();
+    }
+  }
+  return null;
+}
+function errorResult(error) {
+  let text;
+  if (error instanceof ShipMailError) {
+    text = formatShipMailError(error);
+  } else if (error instanceof Error && safeMarkerStrip(error.message) !== null) {
+    text = sanitizeString(safeMarkerStrip(error.message) ?? "", MAX_ERROR_MESSAGE_LENGTH);
+  } else {
+    if (error instanceof Error) {
+      process.stderr.write(
+        `${JSON.stringify({
+          tool: "mcp_internal_error",
+          name: error.name,
+          message: sanitizeString(error.message, MAX_ERROR_MESSAGE_LENGTH)
+        })}
+`
+      );
+    } else {
+      process.stderr.write(
+        `${JSON.stringify({
+          tool: "mcp_internal_error",
+          message: sanitizeString(String(error), MAX_ERROR_MESSAGE_LENGTH)
+        })}
+`
+      );
+    }
+    text = GENERIC_INTERNAL_MESSAGE;
+  }
+  return {
+    content: [{ type: "text", text }],
+    isError: true
+  };
+}
+function asTextResource(uri, value) {
+  return {
+    contents: [
+      {
+        uri,
+        mimeType: "application/json",
+        text: JSON.stringify(sanitizeValue(value), null, 2)
+      }
+    ]
+  };
+}
+
 // src/schemas.ts
 import {
   CONFERENCING_PROVIDER_IDS,
@@ -727,6 +879,8 @@ var SYSTEM_FOLDER_NAMES = [
   "junk",
   "trash"
 ];
+var MAILBOX_RULE_MATCH_MODES = ["all", "any"];
+var MAILBOX_RULE_SYSTEM_TARGET_ROLES = ["inbox", "archive", "junk", "trash"];
 var JMAP_KEYWORDS = ["$flagged", "$seen", "$draft", "$answered", "$forwarded"];
 var NEWSLETTER_STATUSES = [
   "draft",
@@ -748,6 +902,7 @@ var NEWSLETTER_DOMAIN_STATUSES = [
 ];
 var NEWSLETTER_DOMAIN_RECORD_STATUSES = ["pending", "verified", "failed"];
 var NEWSLETTER_ARCHIVE_VISIBILITIES = ["private", "public"];
+var NEWSLETTER_STYLING_MODES = ["styled", "plain"];
 var NEWSLETTER_PREFLIGHT_STATUSES = ["not_run", "passed", "warning", "failed"];
 var NEWSLETTER_PREFLIGHT_ITEM_STATUSES = ["pass", "warn", "fail"];
 var NEWSLETTER_TEST_SEND_STATUSES = ["pending", "sent", "failed"];
@@ -948,6 +1103,70 @@ var mailboxFoldersSchema = z.object({
   address: z.string(),
   data: z.array(mailboxFolderSchema)
 });
+var mailboxRuleConditionSchema = z.lazy(
+  () => z.union([
+    z.object({
+      type: z.enum([
+        "from_is",
+        "from_contains",
+        "recipient_is",
+        "plus_tag_is",
+        "subject_contains"
+      ]),
+      value: noControlString(256, "condition value").min(1)
+    }),
+    z.object({
+      type: z.enum(["has_attachment", "list_unsubscribe_exists"])
+    }),
+    z.object({
+      type: z.literal("group"),
+      match_mode: z.enum(MAILBOX_RULE_MATCH_MODES),
+      conditions: z.array(mailboxRuleConditionSchema).min(1).max(10)
+    })
+  ])
+);
+var mailboxRuleActionSchema = z.union([
+  z.object({
+    type: z.literal("move"),
+    target: z.union([
+      z.object({
+        kind: z.literal("system"),
+        role: z.enum(MAILBOX_RULE_SYSTEM_TARGET_ROLES)
+      }),
+      z.object({
+        kind: z.literal("custom"),
+        folder_id: noControlString(256, "folder_id").min(1)
+      })
+    ])
+  }),
+  z.object({ type: z.enum(["mark_read", "star"]) }),
+  z.object({ type: z.literal("send_webhook") }).strict()
+]);
+var mailboxRuleSchema = z.object({
+  id: z.uuid("Rule ID must be a UUID."),
+  name: noControlString(120, "name").trim().min(1),
+  enabled: z.boolean(),
+  position: z.number().int().min(0),
+  match_mode: z.enum(MAILBOX_RULE_MATCH_MODES),
+  stop: z.boolean(),
+  conditions: z.array(mailboxRuleConditionSchema).min(1).max(10),
+  actions: z.array(mailboxRuleActionSchema).min(1).max(4)
+});
+var mailboxRulesSchema = z.object({
+  object: z.literal("mailbox_rules"),
+  mailbox_id: z.string(),
+  address: z.string(),
+  rules: z.array(mailboxRuleSchema),
+  folders: z.array(
+    z.object({
+      id: z.string(),
+      name: z.string(),
+      parent_id: z.string().nullable(),
+      role: z.string().nullable(),
+      kind: z.enum(["custom", "system"])
+    })
+  )
+});
 var mailboxIdentitySchema = z.object({
   object: z.literal("mailbox_identity"),
   id: z.string(),
@@ -1230,6 +1449,10 @@ var messageSchema = z.object({
   source: z.enum(MESSAGE_SOURCES),
   mode: z.enum(["live", "test"]),
   status: z.enum(MESSAGE_STATUSES),
+  rule_disposition: z.object({
+    matched_rule_ids: z.array(z.string()).describe("Inbox rule IDs that matched this inbound message, in evaluation order."),
+    stop_rule_id: z.string().nullable().describe("Inbox rule ID that stopped further processing, if any.")
+  }).nullable().describe("Inbox rule evaluation recorded for this tracked message at delivery."),
   scheduled_at: z.string().nullable(),
   created_at: z.string(),
   updated_at: z.string()
@@ -1369,7 +1592,12 @@ var acknowledgmentSchema = z.object({
   ok: z.literal(true),
   id: z.string()
 });
-var statusOutputSchema = z.object({ status: statusSchema });
+var statusOutputSchema = z.object({
+  status: statusSchema,
+  // Present only when the connection covers more than one organization. Use an id here as
+  // organization_id on other tools.
+  organizations: z.array(z.object({ id: z.string(), name: z.string() })).optional()
+});
 var domainOutputSchema = z.object({ domain: domainSchema });
 var domainDnsRecordsOutputSchema = z.object({ dns_records: domainDnsRecordSetSchema });
 var mailboxOutputSchema = z.object({ mailbox: mailboxSchema });
@@ -1396,6 +1624,7 @@ var partnerMailboxCredentialGrantsOutputSchema = z.object({
 });
 var mailboxFolderOutputSchema = z.object({ folder: mailboxFolderSchema });
 var mailboxFoldersOutputSchema = z.object({ folders: mailboxFoldersSchema });
+var mailboxRulesOutputSchema = z.object({ rules: mailboxRulesSchema });
 var mailboxIdentitiesOutputSchema = z.object({ identities: mailboxIdentitiesSchema });
 var inboxMessagesOutputSchema = z.object({ inbox_messages: inboxMessagesSchema });
 var inboxMessageSummariesOutputSchema = z.object({
@@ -1649,6 +1878,11 @@ var deleteMailboxFolderInputSchema = z.object({
   id: idSchema,
   folder_id: folderIdSchema
 });
+var updateMailboxRulesInputSchema = z.object({
+  id: idSchema,
+  rules: z.array(mailboxRuleSchema).max(50),
+  idempotency_key: idempotencyKeySchema
+});
 var resetPasswordInputSchema = z.object({
   id: idSchema,
   password: z.string().min(8).max(128).refine((value) => /[a-z]/.test(value), "Password must include a lowercase letter.").refine((value) => /[A-Z]/.test(value), "Password must include an uppercase letter.").refine((value) => /[0-9]/.test(value), "Password must include a number."),
@@ -2163,6 +2397,9 @@ var newsletterSchema = z.object({
   body_text: z.string().nullable(),
   status: z.enum(NEWSLETTER_STATUSES),
   archive_visibility: z.enum(NEWSLETTER_ARCHIVE_VISIBILITIES),
+  styling_mode: z.enum(NEWSLETTER_STYLING_MODES).describe(
+    "styled applies Shipmail's email theme. plain sends your HTML without injected styles, width, or centering, so the reader's email client styles it."
+  ),
   preflight_status: z.enum(NEWSLETTER_PREFLIGHT_STATUSES),
   preflight_results: z.record(z.string(), z.unknown()),
   send_window_hours: z.number().int(),
@@ -2400,7 +2637,10 @@ var newsletterDraftFieldsInputSchema = {
   body_text: z.string().max(25e4).nullish(),
   blocks: z.array(newsletterBlockInputSchema).min(1).max(200).optional(),
   send_window_hours: z.number().int().min(1).max(24).optional(),
-  archive_visibility: z.enum(NEWSLETTER_ARCHIVE_VISIBILITIES).optional()
+  archive_visibility: z.enum(NEWSLETTER_ARCHIVE_VISIBILITIES).optional(),
+  styling_mode: z.enum(NEWSLETTER_STYLING_MODES).optional().describe(
+    "styled applies Shipmail's email theme. plain sends your HTML without injected styles, width, or centering, so the reader's email client styles it."
+  )
 };
 var createNewsletterInputSchema = z.object({
   ...newsletterDraftFieldsInputSchema,
@@ -2451,6 +2691,9 @@ var createNewsletterFromChangelogInputSchema = z.object({
   }).optional(),
   send_window_hours: z.number().int().min(1).max(24).optional(),
   archive_visibility: z.enum(NEWSLETTER_ARCHIVE_VISIBILITIES).optional(),
+  styling_mode: z.enum(NEWSLETTER_STYLING_MODES).optional().describe(
+    "styled applies Shipmail's email theme. plain sends your HTML without injected styles, width, or centering, so the reader's email client styles it."
+  ),
   idempotency_key: idempotencyKeySchema
 });
 var updateNewsletterInputSchema = z.object({
@@ -2466,9 +2709,10 @@ var updateNewsletterInputSchema = z.object({
   blocks: newsletterDraftFieldsInputSchema.blocks,
   send_window_hours: newsletterDraftFieldsInputSchema.send_window_hours,
   archive_visibility: newsletterDraftFieldsInputSchema.archive_visibility,
+  styling_mode: newsletterDraftFieldsInputSchema.styling_mode,
   idempotency_key: idempotencyKeySchema
 }).refine(
-  (value) => value.audience_id !== void 0 || value.newsletter_domain_id !== void 0 || value.name !== void 0 || value.subject !== void 0 || value.preview_text !== void 0 || value.from_name !== void 0 || value.body_html !== void 0 || value.body_text !== void 0 || value.blocks !== void 0 || value.send_window_hours !== void 0 || value.archive_visibility !== void 0,
+  (value) => value.audience_id !== void 0 || value.newsletter_domain_id !== void 0 || value.name !== void 0 || value.subject !== void 0 || value.preview_text !== void 0 || value.from_name !== void 0 || value.body_html !== void 0 || value.body_text !== void 0 || value.blocks !== void 0 || value.send_window_hours !== void 0 || value.archive_visibility !== void 0 || value.styling_mode !== void 0,
   {
     message: "Provide at least one newsletter field to update."
   }
@@ -2824,20 +3068,313 @@ var consumePartnerMailboxCredentialGrantInputSchema = z.object({
   allowed_cidrs: z.array(appPasswordCidrInputSchema).max(20).optional()
 });
 
+// src/cross-organization-tools.ts
+var MAX_CONCURRENT_ORGANIZATIONS = 4;
+var SAFE_ERROR_TYPES2 = /* @__PURE__ */ new Set([
+  "validation_error",
+  "authentication_error",
+  "authorization_error",
+  "quota_exceeded",
+  "not_found",
+  "rate_limit_error",
+  "conflict"
+]);
+var cursorSchema = z2.string().regex(/^[A-Za-z0-9_\-=.+/]{1,512}$/, "Cursor must be 1-512 characters of [A-Za-z0-9_\\-=.+/].");
+var crossOrganizationListInputSchema = z2.object({
+  limit: z2.number().int().min(1).max(100).default(25).describe("Maximum results to return from each organization."),
+  cursor_by_organization: z2.record(z2.string().min(1).max(128), cursorSchema).optional().describe(
+    "Independent pagination cursors keyed by organization ID. Copy each successful section's next_cursor into the matching key on the next call."
+  )
+});
+var organizationSchema = z2.object({
+  id: z2.string(),
+  name: z2.string()
+});
+var organizationErrorSchema = z2.object({
+  type: z2.string(),
+  message: z2.string(),
+  status: z2.number().int().nullable(),
+  request_id: z2.string().nullable(),
+  retryable: z2.boolean()
+});
+function crossOrganizationListOutputSchema(itemSchema) {
+  return z2.object({
+    organizations: z2.array(
+      z2.discriminatedUnion("status", [
+        z2.object({
+          organization: organizationSchema,
+          status: z2.literal("ok"),
+          data: z2.array(itemSchema),
+          pagination: paginationSchema
+        }),
+        z2.object({
+          organization: organizationSchema,
+          status: z2.literal("error"),
+          error: organizationErrorSchema
+        })
+      ])
+    )
+  });
+}
+var CROSS_ORGANIZATION_LIST_BEHAVIORS = [
+  {
+    toolName: "shipmail_list_domains_across_organizations",
+    baseToolName: "shipmail_list_domains",
+    title: "List Domains Across Organizations",
+    description: "List domains in every organization on this connection. Returns one independently paginated success or failure section per organization.",
+    itemSchema: domainSchema,
+    list: (client, params) => client.domains.list(params)
+  },
+  {
+    toolName: "shipmail_list_mailboxes_across_organizations",
+    baseToolName: "shipmail_list_mailboxes",
+    title: "List Mailboxes Across Organizations",
+    description: "List mailboxes in every organization on this connection. Returns one independently paginated success or failure section per organization.",
+    itemSchema: mailboxSchema,
+    list: (client, params) => client.mailboxes.list(params)
+  },
+  {
+    toolName: "shipmail_list_webhooks_across_organizations",
+    baseToolName: "shipmail_list_webhooks",
+    title: "List Webhooks Across Organizations",
+    description: "List webhooks in every organization on this connection. Returns one independently paginated success or failure section per organization.",
+    itemSchema: webhookSchema,
+    list: (client, params) => client.webhooks.list(params)
+  },
+  {
+    toolName: "shipmail_list_suppressions_across_organizations",
+    baseToolName: "shipmail_list_suppressions",
+    title: "List Suppressions Across Organizations",
+    description: "List suppressions in every organization on this connection. Returns one independently paginated success or failure section per organization.",
+    itemSchema: suppressionSchema,
+    list: (client, params) => client.suppressions.list(params)
+  },
+  {
+    toolName: "shipmail_list_newsletters_across_organizations",
+    baseToolName: "shipmail_list_newsletters",
+    title: "List Newsletters Across Organizations",
+    description: "List newsletters in every organization on this connection. Returns one independently paginated success or failure section per organization.",
+    itemSchema: newsletterSchema,
+    list: (client, params) => client.newsletters.list(params)
+  },
+  {
+    toolName: "shipmail_list_newsletter_domains_across_organizations",
+    baseToolName: "shipmail_list_newsletter_domains",
+    title: "List Newsletter Domains Across Organizations",
+    description: "List newsletter sending domains in every organization on this connection. Returns one independently paginated success or failure section per organization.",
+    itemSchema: newsletterDomainSchema,
+    list: (client, params) => client.newsletters.domains.list(params)
+  },
+  {
+    toolName: "shipmail_list_newsletter_assets_across_organizations",
+    baseToolName: "shipmail_list_newsletter_assets",
+    title: "List Newsletter Assets Across Organizations",
+    description: "List newsletter assets in every organization on this connection. Returns one independently paginated success or failure section per organization.",
+    itemSchema: newsletterAssetSchema,
+    list: (client, params) => client.newsletters.assets.list(params)
+  },
+  {
+    toolName: "shipmail_list_audiences_across_organizations",
+    baseToolName: "shipmail_list_audiences",
+    title: "List Audiences Across Organizations",
+    description: "List audiences in every organization on this connection. Returns one independently paginated success or failure section per organization.",
+    itemSchema: audienceSchema,
+    list: (client, params) => client.audiences.list(params)
+  },
+  {
+    toolName: "shipmail_list_booking_pages_across_organizations",
+    baseToolName: "shipmail_list_booking_pages",
+    title: "List Booking Pages Across Organizations",
+    description: "List booking pages in every organization on this connection. Returns one independently paginated success or failure section per organization.",
+    itemSchema: bookingPageSchema,
+    list: (client, params) => client.bookingPages.list(params)
+  }
+];
+var CROSS_ORGANIZATION_TOOL_NAMES = new Set(
+  CROSS_ORGANIZATION_LIST_BEHAVIORS.map((behavior) => behavior.toolName)
+);
+function permissionError(behavior) {
+  return {
+    type: "authorization_error",
+    message: `${behavior.baseToolName} is not permitted for this organization.`,
+    status: 403,
+    request_id: null,
+    retryable: false
+  };
+}
+function requestError(error) {
+  if (error instanceof ShipMailError2) {
+    const isSafeMessage = error.type !== void 0 && SAFE_ERROR_TYPES2.has(error.type);
+    return {
+      type: error.type ?? "api_error",
+      message: isSafeMessage ? sanitizeString(error.message, 500) : "ShipMail could not list this organization. Contact support with the request_id.",
+      status: error.status ?? null,
+      request_id: error.requestId ?? null,
+      retryable: error.retryable
+    };
+  }
+  return {
+    type: "internal_error",
+    message: "The organization could not be listed because of an unexpected error.",
+    status: null,
+    request_id: null,
+    retryable: false
+  };
+}
+function upstreamSchemaError(toolName, organizationId, issues) {
+  process.stderr.write(
+    `${JSON.stringify({
+      tool: toolName,
+      organization_id: organizationId,
+      output_schema_violation: issues
+    })}
+`
+  );
+}
+async function listOneOrganization(behavior, grant, args) {
+  const organization = { id: grant.id, name: grant.name };
+  if (!grant.allowedTools.has(behavior.baseToolName)) {
+    return {
+      organization,
+      status: "error",
+      error: permissionError(behavior)
+    };
+  }
+  try {
+    const cursor = args.cursor_by_organization?.[grant.id];
+    const raw = await behavior.list(grant.client, {
+      limit: args.limit,
+      ...cursor ? { cursor } : {}
+    });
+    const pageSchema = z2.object({
+      data: z2.array(behavior.itemSchema),
+      pagination: paginationSchema
+    });
+    const page = pageSchema.safeParse(raw);
+    if (!page.success) {
+      const issues = page.error.issues.slice(0, 5).map(
+        (issue) => `${issue.path.length === 0 ? "(root)" : issue.path.join(".")}: ${issue.message}`
+      ).join("; ");
+      upstreamSchemaError(behavior.toolName, grant.id, issues);
+      return {
+        organization,
+        status: "error",
+        error: {
+          type: "internal_error",
+          message: "ShipMail returned an unexpected response shape for this organization.",
+          status: 500,
+          request_id: null,
+          retryable: false
+        }
+      };
+    }
+    return {
+      organization,
+      status: "ok",
+      data: page.data.data,
+      pagination: page.data.pagination
+    };
+  } catch (error) {
+    return {
+      organization,
+      status: "error",
+      error: requestError(error)
+    };
+  }
+}
+async function listEveryOrganization(behavior, grants, args) {
+  const organizations = [];
+  for (let offset = 0; offset < grants.length; offset += MAX_CONCURRENT_ORGANIZATIONS) {
+    const batch = grants.slice(offset, offset + MAX_CONCURRENT_ORGANIZATIONS);
+    const sections = await Promise.all(
+      batch.map((grant) => listOneOrganization(behavior, grant, args))
+    );
+    organizations.push(...sections);
+  }
+  return { organizations };
+}
+function registerCrossOrganizationTools(server, grants) {
+  if (grants.length < 2) return;
+  for (const behavior of CROSS_ORGANIZATION_LIST_BEHAVIORS) {
+    if (!grants.some((grant) => grant.allowedTools.has(behavior.baseToolName))) continue;
+    const baseCapability = getMcpCapability(behavior.baseToolName);
+    if (!baseCapability || baseCapability.effect !== "read") {
+      throw new Error(
+        `Cross-organization MCP tool ${behavior.toolName} must map to an audited read capability.`
+      );
+    }
+    const outputSchema = crossOrganizationListOutputSchema(behavior.itemSchema);
+    server.registerTool(
+      behavior.toolName,
+      {
+        title: behavior.title,
+        description: behavior.description,
+        inputSchema: crossOrganizationListInputSchema,
+        outputSchema,
+        annotations: {
+          ...baseCapability.annotations,
+          readOnlyHint: true,
+          destructiveHint: false
+        }
+      },
+      async (args) => {
+        const startedAt = performance.now();
+        const raw = await listEveryOrganization(behavior, grants, args);
+        const parsed = outputSchema.safeParse(raw);
+        if (!parsed.success) {
+          process.stderr.write(
+            `${JSON.stringify({
+              tool: behavior.toolName,
+              output_schema_violation: parsed.error.message
+            })}
+`
+          );
+          return {
+            isError: true,
+            content: [
+              {
+                type: "text",
+                text: "ShipMail could not validate the cross-organization list result."
+              }
+            ]
+          };
+        }
+        const failedOrganizations = parsed.data.organizations.filter(
+          (section) => section.status === "error"
+        ).length;
+        process.stderr.write(
+          `${JSON.stringify({
+            tool: behavior.toolName,
+            duration_ms: Math.round(performance.now() - startedAt),
+            organizations: grants.length,
+            failed_organizations: failedOrganizations,
+            status: failedOrganizations === 0 ? "ok" : failedOrganizations === grants.length ? "failed" : "partial"
+          })}
+`
+        );
+        return jsonResult(parsed.data);
+      }
+    );
+  }
+}
+
 // src/prompts.ts
+import "@modelcontextprotocol/sdk/server/mcp.js";
+import { WEBHOOK_EVENT_TYPES as WEBHOOK_EVENT_TYPES2 } from "shipmail";
+import { z as z3 } from "zod/v4";
 var MAILBOX_LOCAL_REGEX = /^[a-zA-Z0-9]([a-zA-Z0-9._-]{0,62}[a-zA-Z0-9])?$/;
 var MAILBOX_ADDRESS_REGEX = /^[a-zA-Z0-9]([a-zA-Z0-9._-]{0,62}[a-zA-Z0-9])?@[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+$/;
 var TONE_REGEX = /^[A-Za-z][A-Za-z\s-]{0,49}$/;
 var LIMIT_REGEX = /^[1-9][0-9]?$|^100$/;
-var mailboxAddressArg = z2.string().max(254).regex(MAILBOX_ADDRESS_REGEX, "mailbox_address must be a valid email address.").optional();
-var mailboxLocalArg = z2.string().max(64).regex(MAILBOX_LOCAL_REGEX, "Mailbox local-part contains invalid characters.").optional();
+var mailboxAddressArg = z3.string().max(254).regex(MAILBOX_ADDRESS_REGEX, "mailbox_address must be a valid email address.").optional();
+var mailboxLocalArg = z3.string().max(64).regex(MAILBOX_LOCAL_REGEX, "Mailbox local-part contains invalid characters.").optional();
 var domainNameArg = domainNameSchema.optional();
-var toneArg = z2.string().regex(TONE_REGEX, "tone must be 1-50 letters/spaces/hyphens.").optional();
-var limitArg = z2.string().regex(LIMIT_REGEX, "limit must be an integer 1-100.").optional();
-var urlArg = z2.url().max(2048).refine((value) => isPublicHttpsUrl(value), {
+var toneArg = z3.string().regex(TONE_REGEX, "tone must be 1-50 letters/spaces/hyphens.").optional();
+var limitArg = z3.string().regex(LIMIT_REGEX, "limit must be an integer 1-100.").optional();
+var urlArg = z3.url().max(2048).refine((value) => isPublicHttpsUrl(value), {
   message: "url must use https on a public host."
 }).optional();
-var eventsArg = z2.string().max(500).refine(
+var eventsArg = z3.string().max(500).refine(
   (value) => {
     const parts = value.split(",").map((p) => p.trim()).filter((p) => p.length > 0);
     if (parts.length === 0) return false;
@@ -3190,145 +3727,6 @@ function toInboxMessageSummaries(messages) {
   };
 }
 
-// src/result.ts
-import { ShipMailError, ValidationError } from "shipmail";
-
-// src/sanitize.ts
-var MAX_STRING_LENGTH = 16384;
-var TRUNCATION_MARKER = "\n\u2026[truncated]";
-var DANGEROUS_CHARS_REGEX = (
-  // eslint-disable-next-line no-control-regex
-  /[\x00-\x08\x0B\x0C\x0E-\x1F\x7F؜‎‏‪-‮⁦-⁩]/gu
-);
-function sanitizeString(value, maxLength = MAX_STRING_LENGTH) {
-  const stripped = value.replace(DANGEROUS_CHARS_REGEX, "");
-  if (stripped.length <= maxLength) return stripped;
-  const keep = Math.max(0, maxLength - TRUNCATION_MARKER.length);
-  return stripped.slice(0, keep) + TRUNCATION_MARKER;
-}
-function isPlainObject(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function sanitizeValue(value, maxStringLength = MAX_STRING_LENGTH) {
-  if (typeof value === "string") {
-    return sanitizeString(value, maxStringLength);
-  }
-  if (Array.isArray(value)) {
-    return value.map((item) => sanitizeValue(item, maxStringLength));
-  }
-  if (isPlainObject(value)) {
-    const out = {};
-    for (const [key, item] of Object.entries(value)) {
-      out[key] = sanitizeValue(item, maxStringLength);
-    }
-    return out;
-  }
-  return value;
-}
-function sanitizeRecord(value, maxStringLength = MAX_STRING_LENGTH) {
-  const out = {};
-  for (const [key, item] of Object.entries(value)) {
-    out[key] = sanitizeValue(item, maxStringLength);
-  }
-  return out;
-}
-
-// src/result.ts
-var MAX_ERROR_MESSAGE_LENGTH = 500;
-var SAFE_ERROR_TYPES = /* @__PURE__ */ new Set([
-  "validation_error",
-  "not_found",
-  "conflict",
-  "rate_limit_error",
-  "authentication_error",
-  "authorization_error",
-  "quota_exceeded"
-]);
-var GENERIC_INTERNAL_MESSAGE = "Internal MCP error. The original message is logged on the MCP server stderr.";
-var MCP_RATE_LIMIT_MARKER = "[mcp.rate_limit]";
-var MCP_SCHEMA_VIOLATION_MARKER = "[mcp.schema_violation]";
-var SAFE_MARKERS = [MCP_RATE_LIMIT_MARKER, MCP_SCHEMA_VIOLATION_MARKER];
-function jsonResult(structuredContent) {
-  const sanitized = sanitizeRecord(structuredContent);
-  return {
-    content: [
-      {
-        type: "text",
-        text: JSON.stringify(sanitized, null, 2)
-      }
-    ],
-    structuredContent: sanitized
-  };
-}
-function formatShipMailError(error) {
-  const parts = [];
-  const isSafeMessage = error.type !== void 0 && SAFE_ERROR_TYPES.has(error.type);
-  if (isSafeMessage) {
-    parts.push(sanitizeString(error.message, MAX_ERROR_MESSAGE_LENGTH));
-  } else {
-    parts.push("ShipMail request failed. Contact ShipMail support with the request_id below.");
-  }
-  if (error.type) parts.push(`type=${error.type}`);
-  if (error.status !== void 0) parts.push(`status=${error.status}`);
-  if (error.requestId) parts.push(`request_id=${error.requestId}`);
-  if (isSafeMessage && error instanceof ValidationError && error.details?.length) {
-    const fields = error.details.map((detail) => sanitizeString(detail.field, 100)).filter((field) => field.length > 0).slice(0, 25).join(", ");
-    if (fields.length > 0) parts.push(`fields=${fields}`);
-  }
-  return parts.join(" | ");
-}
-function safeMarkerStrip(message) {
-  for (const marker of SAFE_MARKERS) {
-    if (message.startsWith(marker)) {
-      return message.slice(marker.length).trim();
-    }
-  }
-  return null;
-}
-function errorResult(error) {
-  let text;
-  if (error instanceof ShipMailError) {
-    text = formatShipMailError(error);
-  } else if (error instanceof Error && safeMarkerStrip(error.message) !== null) {
-    text = sanitizeString(safeMarkerStrip(error.message) ?? "", MAX_ERROR_MESSAGE_LENGTH);
-  } else {
-    if (error instanceof Error) {
-      process.stderr.write(
-        `${JSON.stringify({
-          tool: "mcp_internal_error",
-          name: error.name,
-          message: sanitizeString(error.message, MAX_ERROR_MESSAGE_LENGTH)
-        })}
-`
-      );
-    } else {
-      process.stderr.write(
-        `${JSON.stringify({
-          tool: "mcp_internal_error",
-          message: sanitizeString(String(error), MAX_ERROR_MESSAGE_LENGTH)
-        })}
-`
-      );
-    }
-    text = GENERIC_INTERNAL_MESSAGE;
-  }
-  return {
-    content: [{ type: "text", text }],
-    isError: true
-  };
-}
-function asTextResource(uri, value) {
-  return {
-    contents: [
-      {
-        uri,
-        mimeType: "application/json",
-        text: JSON.stringify(sanitizeValue(value), null, 2)
-      }
-    ]
-  };
-}
-
 // src/resources.ts
 var JSON_MIME = "application/json";
 function resourceConfig(title, description) {
@@ -3448,6 +3846,15 @@ function registerResources(server, client, componentConnectDomain2 = "https://sh
       return asTextResource(uri.toString(), await client.mailboxes.listIdentities(id));
     }
   );
+  server.registerResource(
+    "shipmail_mailbox_rules",
+    new ResourceTemplate("shipmail://mailboxes/{id}/rules", { list: void 0 }),
+    resourceConfig("ShipMail Mailbox Rules", "Server-side inbox rules and target folders."),
+    async (uri, variables) => {
+      const id = readId(variables);
+      return asTextResource(uri.toString(), await client.mailboxes.getRules(id));
+    }
+  );
   server.registerResource(
     "shipmail_mailbox_inbox_messages",
     new ResourceTemplate("shipmail://mailboxes/{id}/inbox/messages", { list: void 0 }),
@@ -3510,11 +3917,12 @@ function registerResources(server, client, componentConnectDomain2 = "https://sh
 
 // src/tools.ts
 import { randomUUID } from "crypto";
-import { performance } from "perf_hooks";
+import { performance as performance2 } from "perf_hooks";
 import "@modelcontextprotocol/sdk/server/mcp.js";
 import {
-  ShipMailError as ShipMailError2
+  ShipMailError as ShipMailError3
 } from "shipmail";
+import { z as z4 } from "zod/v4";
 var SESSION_LIMITS = {
   shipmail_inject_sandbox_inbound: 20,
   shipmail_compose_message_with_file: 10,
@@ -3556,6 +3964,7 @@ var SESSION_LIMITS = {
   shipmail_reset_mailbox_password: 10,
   shipmail_create_mailbox_forwarding: 10,
   shipmail_delete_mailbox_forwarding: 10,
+  shipmail_set_mailbox_rules: 20,
   shipmail_set_auto_reply: 20,
   shipmail_set_spam_filter: 20,
   shipmail_update_inbox_message: 50,
@@ -3626,7 +4035,7 @@ function logToolCall(name, durationMs, error) {
     tool: name,
     duration_ms: Math.round(durationMs)
   };
-  if (error instanceof ShipMailError2) {
+  if (error instanceof ShipMailError3) {
     entry["error_type"] = error.type ?? "unknown";
     if (DEBUG_ENABLED) {
       if (error.requestId) entry["request_id"] = error.requestId;
@@ -3640,7 +4049,25 @@ function logToolCall(name, durationMs, error) {
   process.stderr.write(`${JSON.stringify(entry)}
 `);
 }
-function registerTools(rawServer, client, allowedTools) {
+function organizationField(organizationIds) {
+  return z4.string().optional().describe(
+    `Organization to act in. This connection covers ${organizationIds.length} organizations: ${organizationIds.join(", ")}. Omit only when the target is unambiguous.`
+  );
+}
+function withOrganizationParam(inputSchema, organizationIds) {
+  if (organizationIds.length < 2) return inputSchema;
+  if (inputSchema === void 0 || typeof inputSchema !== "object" || inputSchema === null) {
+    return inputSchema;
+  }
+  if ("_def" in inputSchema || "~standard" in inputSchema) {
+    const schema = inputSchema;
+    if (typeof schema.extend !== "function") return inputSchema;
+    return schema.extend({ organization_id: organizationField(organizationIds) });
+  }
+  return { ...inputSchema, organization_id: organizationField(organizationIds) };
+}
+function registerTools(rawServer, client, allowedTools, grantedOrganizations = []) {
+  const organizationIds = grantedOrganizations.map((entry) => entry.id);
   const knownTools = [];
   const enabledTools = [];
   const callCounts = /* @__PURE__ */ new Map();
@@ -3655,6 +4082,7 @@ function registerTools(rawServer, client, allowedTools) {
         name,
         {
           ...config,
+          ...config.inputSchema === void 0 ? {} : { inputSchema: withOrganizationParam(config.inputSchema, organizationIds) },
           annotations: {
             ...config.annotations,
             ...capability.annotations
@@ -3688,7 +4116,7 @@ function registerTools(rawServer, client, allowedTools) {
     callCounts.set(name, used + 1);
   }
   async function runTool(name, outputSchema, body) {
-    const start = performance.now();
+    const start = performance2.now();
     try {
       checkRateLimit(name);
       const raw = await body();
@@ -3699,7 +4127,7 @@ function registerTools(rawServer, client, allowedTools) {
         ).join("; ");
         throw new OutputSchemaViolation(name, issues);
       }
-      logToolCall(name, performance.now() - start);
+      logToolCall(name, performance2.now() - start);
       return jsonResult(parsed.data);
     } catch (error) {
       if (error instanceof OutputSchemaViolation) {
@@ -3708,12 +4136,12 @@ function registerTools(rawServer, client, allowedTools) {
 `
         );
       }
-      logToolCall(name, performance.now() - start, error instanceof Error ? error : void 0);
+      logToolCall(name, performance2.now() - start, error instanceof Error ? error : void 0);
       return errorResult(error);
     }
   }
   async function runToolWithMeta(name, outputSchema, body) {
-    const start = performance.now();
+    const start = performance2.now();
     try {
       checkRateLimit(name);
       const raw = await body();
@@ -3724,7 +4152,7 @@ function registerTools(rawServer, client, allowedTools) {
         ).join("; ");
         throw new OutputSchemaViolation(name, issues);
       }
-      logToolCall(name, performance.now() - start);
+      logToolCall(name, performance2.now() - start);
       return { ...jsonResult(parsed.data), _meta: { ...raw.meta } };
     } catch (error) {
       if (error instanceof OutputSchemaViolation) {
@@ -3733,7 +4161,7 @@ function registerTools(rawServer, client, allowedTools) {
 `
         );
       }
-      logToolCall(name, performance.now() - start, error instanceof Error ? error : void 0);
+      logToolCall(name, performance2.now() - start, error instanceof Error ? error : void 0);
       return errorResult(error);
     }
   }
@@ -3747,7 +4175,16 @@ function registerTools(rawServer, client, allowedTools) {
         annotations: { readOnlyHint: true, openWorldHint: false }
       },
       async () => runTool("shipmail_status", statusOutputSchema, async () => ({
-        status: await client.status.get()
+        status: await client.status.get(),
+        // Reported here rather than from a tool of its own: status is always available on every
+        // profile, and it is what a caller checks before starting work. Without it the router's
+        // "pass organization_id" error names ids the caller cannot resolve to anything.
+        ...grantedOrganizations.length > 1 ? {
+          organizations: grantedOrganizations.map((entry) => ({
+            id: entry.id,
+            name: entry.name
+          }))
+        } : {}
       }))
     );
   });
@@ -4262,7 +4699,7 @@ function registerTools(rawServer, client, allowedTools) {
       "shipmail_list_mailbox_folders",
       {
         title: "List Mailbox Folders",
-        description: "List system and custom folders for a mailbox, including unread counts and folder IDs for Assistant automations.",
+        description: "List system and custom folders for a mailbox, including unread counts and folder IDs for inbox rules and Assistant automations.",
         inputSchema: getByIdInputSchema,
         outputSchema: mailboxFoldersOutputSchema,
         annotations: { readOnlyHint: true, openWorldHint: false }
@@ -4272,6 +4709,45 @@ function registerTools(rawServer, client, allowedTools) {
       }))
     );
   });
+  registerIfAllowed("shipmail_get_mailbox_rules", () => {
+    server.registerTool(
+      "shipmail_get_mailbox_rules",
+      {
+        title: "Get Mailbox Rules",
+        description: "List deterministic server-side inbox rules and the available destination folders for a mailbox.",
+        inputSchema: getByIdInputSchema,
+        outputSchema: mailboxRulesOutputSchema,
+        annotations: { readOnlyHint: true, openWorldHint: false }
+      },
+      async ({ id }) => runTool("shipmail_get_mailbox_rules", mailboxRulesOutputSchema, async () => ({
+        rules: await client.mailboxes.getRules(id)
+      }))
+    );
+  });
+  registerIfAllowed("shipmail_set_mailbox_rules", () => {
+    server.registerTool(
+      "shipmail_set_mailbox_rules",
+      {
+        title: "Set Mailbox Rules",
+        description: "Replace every deterministic server-side inbox rule for a mailbox. Call shipmail_get_mailbox_rules first and preserve any rules that should remain.",
+        inputSchema: updateMailboxRulesInputSchema,
+        outputSchema: mailboxRulesOutputSchema,
+        annotations: {
+          readOnlyHint: false,
+          destructiveHint: true,
+          idempotentHint: true,
+          openWorldHint: false
+        }
+      },
+      async (args) => runTool("shipmail_set_mailbox_rules", mailboxRulesOutputSchema, async () => ({
+        rules: await client.mailboxes.updateRules(
+          args.id,
+          { rules: args.rules },
+          mutationOptions(args)
+        )
+      }))
+    );
+  });
   registerIfAllowed("shipmail_create_mailbox_folder", () => {
     server.registerTool(
       "shipmail_create_mailbox_folder",
@@ -4301,7 +4777,7 @@ function registerTools(rawServer, client, allowedTools) {
       "shipmail_update_mailbox_folder",
       {
         title: "Update Mailbox Folder",
-        description: "Rename a custom mailbox folder. System folders cannot be renamed; Assistant automations keep the stable folder ID.",
+        description: "Rename a custom mailbox folder. System folders cannot be renamed. Inbox rules and Assistant automations keep the stable folder ID.",
         inputSchema: updateMailboxFolderInputSchema,
         outputSchema: mailboxFolderOutputSchema,
         annotations: {
@@ -4326,7 +4802,7 @@ function registerTools(rawServer, client, allowedTools) {
       "shipmail_delete_mailbox_folder",
       {
         title: "Delete Mailbox Folder",
-        description: "Delete a custom mailbox folder after moving its messages to Trash. Folders referenced by Assistant automations must be removed from those automations first.",
+        description: "Delete a custom mailbox folder after moving its messages to Trash. Remove references from inbox rules and Assistant automations first.",
         inputSchema: deleteMailboxFolderInputSchema,
         outputSchema: acknowledgmentOutputSchema,
         annotations: {
@@ -5528,7 +6004,7 @@ function registerTools(rawServer, client, allowedTools) {
       "shipmail_create_newsletter",
       {
         title: "Create Newsletter",
-        description: "Create a newsletter draft for an audience and sending domain. Prefer blocks for body content; Shipmail renders them to email-safe HTML and text. Provide at least one of blocks, body_html, or body_text. Drafts must pass preflight before scheduling.",
+        description: "Create a newsletter draft for an audience and sending domain. Prefer blocks for body content; Shipmail renders them to email-safe HTML and text. Provide at least one of blocks, body_html, or body_text. Drafts must pass preflight before scheduling. styled applies Shipmail's email theme. plain sends your HTML without injected styles, width, or centering, so the reader's email client styles it.",
         inputSchema: createNewsletterInputSchema,
         outputSchema: newsletterOutputSchema,
         annotations: {
@@ -5551,7 +6027,7 @@ function registerTools(rawServer, client, allowedTools) {
       "shipmail_create_newsletter_from_changelog",
       {
         title: "Create Newsletter From Changelog",
-        description: "Create a newsletter draft from changelog entries, attached media, tone, and an optional final CTA. ShipMail renders the entries into email-safe blocks.",
+        description: "Create a newsletter draft from changelog entries, attached media, tone, and an optional final CTA. ShipMail renders the entries into email-safe blocks. styled applies Shipmail's email theme. plain sends your HTML without injected styles, width, or centering, so the reader's email client styles it.",
         inputSchema: createNewsletterFromChangelogInputSchema,
         outputSchema: newsletterOutputSchema,
         annotations: {
@@ -5574,7 +6050,7 @@ function registerTools(rawServer, client, allowedTools) {
       "shipmail_update_newsletter",
       {
         title: "Update Newsletter",
-        description: "Update an editable newsletter draft or future scheduled newsletter. Prefer blocks for body content. When blocks already exist, body_text alone updates the plain-text override. Sending and sent newsletters cannot be edited. A concurrent save returns conflict (409); read the latest newsletter before retrying.",
+        description: "Update an editable newsletter draft or future scheduled newsletter. Prefer blocks for body content. When blocks already exist, body_text alone updates the plain-text override. Sending and sent newsletters cannot be edited. A concurrent save returns conflict (409); read the latest newsletter before retrying. styled applies Shipmail's email theme. plain sends your HTML without injected styles, width, or centering, so the reader's email client styles it.",
         inputSchema: updateNewsletterInputSchema,
         outputSchema: newsletterOutputSchema,
         annotations: {
@@ -5600,7 +6076,8 @@ function registerTools(rawServer, client, allowedTools) {
               ...rest.body_text !== void 0 ? { body_text: rest.body_text } : {},
               ...rest.blocks !== void 0 ? { blocks: rest.blocks } : {},
               ...rest.send_window_hours !== void 0 ? { send_window_hours: rest.send_window_hours } : {},
-              ...rest.archive_visibility !== void 0 ? { archive_visibility: rest.archive_visibility } : {}
+              ...rest.archive_visibility !== void 0 ? { archive_visibility: rest.archive_visibility } : {},
+              ...rest.styling_mode !== void 0 ? { styling_mode: rest.styling_mode } : {}
             },
             mutationOptions(args)
           )
@@ -6438,7 +6915,7 @@ function registerTools(rawServer, client, allowedTools) {
 }
 
 // src/version.ts
-var VERSION = "0.5.4";
+var VERSION = "0.5.8";
 
 // src/server.ts
 var INSTRUCTIONS = `ShipMail MCP exposes the business email and calendar tools authorized by the connection's current ShipMail permissions.
@@ -6463,7 +6940,7 @@ function buildDefaultHeaders() {
 function componentConnectDomain(baseUrl) {
   return new URL(baseUrl ?? "https://shipmail.to/api/v1").origin;
 }
-function createShipMailMcpServer(config, allowedTools) {
+function createShipMailMcpServer(config, allowedTools, organizationGrants = []) {
   const defaultHeaders = buildDefaultHeaders();
   const client = new ShipMailClient({
     apiKey: config.apiKey,
@@ -6471,7 +6948,7 @@ function createShipMailMcpServer(config, allowedTools) {
     ...config.organizationId ? { organizationId: config.organizationId } : {},
     defaultHeaders
   });
-  const server = new McpServer4(
+  const server = new McpServer5(
     {
       name: "shipmail",
       version: VERSION
@@ -6480,7 +6957,26 @@ function createShipMailMcpServer(config, allowedTools) {
       instructions: INSTRUCTIONS
     }
   );
-  registerTools(server, client, allowedTools);
+  const grantedOrganizations = organizationGrants.map(({ id, name }) => ({ id, name }));
+  registerTools(server, client, allowedTools, grantedOrganizations);
+  const crossOrganizationGrants = organizationGrants.map(
+    (grant) => ({
+      id: grant.id,
+      name: grant.name,
+      allowedTools: grant.allowedTools,
+      // Cross-organization tools deliberately make exactly one bounded REST request per grant.
+      // Retries would silently amplify one MCP call further, and a short timeout lets the tool
+      // report a failed section instead of losing every organization's result to the route limit.
+      client: new ShipMailClient({
+        apiKey: grant.apiKey,
+        ...config.baseUrl ? { baseUrl: config.baseUrl } : {},
+        maxRetries: 0,
+        timeout: 15e3,
+        defaultHeaders
+      })
+    })
+  );
+  registerCrossOrganizationTools(server, crossOrganizationGrants);
   registerResources(server, client, componentConnectDomain(config.baseUrl));
   registerPrompts(server);
   return server;