shipmail-mcp 0.8.8 → 0.9.0

package/dist/index.js

@@ -19,8 +19,6 @@ Environment:
                         SHIPMAIL_API_KEY when set; reduces env-trace leak surface for hosts that
                         log environment variables.
   SHIPMAIL_BASE_URL     Optional API base URL. Must be https. Defaults to ${DEFAULT_BASE_URL}.
-  SHIPMAIL_ORGANIZATION_ID
-                        Optional delegated child organization ID for infrastructure tools.
   SHIPMAIL_ALLOW_INSECURE_BASE_URL=1
                         Permit non-https or non-shipmail.to base URL (development only).
 
@@ -89,8 +87,7 @@ function readConfig(argv = process.argv.slice(2)) {
   const baseUrl = rawBaseUrl !== void 0 && rawBaseUrl.length > 0 ? validateBaseUrl(rawBaseUrl, allowInsecure) : void 0;
   return {
     apiKey: readApiKey(),
-    baseUrl,
-    organizationId: env["SHIPMAIL_ORGANIZATION_ID"] || void 0
+    baseUrl
   };
 }
 
@@ -266,19 +263,6 @@ var MCP_PERMISSION_GROUPS = [
     description: "Read and remove suppressed recipient addresses.",
     scopes: ["suppressions:read", "suppressions:write"],
     persistent: false
-  },
-  {
-    name: "partner_admin",
-    label: "Partner administration",
-    description: "Manage delegated partner organizations, credential grants, and usage.",
-    scopes: [
-      "partner:organizations:read",
-      "partner:organizations:write",
-      "partner:organizations:access",
-      "partner:mailbox_credentials:issue",
-      "partner:usage:read"
-    ],
-    persistent: true
   }
 ];
 var CAPABILITY_ROWS = [
@@ -435,50 +419,7 @@ var CAPABILITY_ROWS = [
   ["shipmail_create_booking_page", "createBookingPage", "booking_pages:write"],
   ["shipmail_get_booking_page", "getBookingPage", "booking_pages:read"],
   ["shipmail_update_booking_page", "updateBookingPage", "booking_pages:write"],
-  ["shipmail_delete_booking_page", "deleteBookingPage", "booking_pages:write"],
-  ["shipmail_list_partner_organizations", "listPartnerOrganizations", "partner:organizations:read"],
-  [
-    "shipmail_create_partner_organization",
-    "createPartnerOrganization",
-    "partner:organizations:write"
-  ],
-  ["shipmail_get_partner_organization", "getPartnerOrganization", "partner:organizations:read"],
-  [
-    "shipmail_update_partner_organization",
-    "updatePartnerOrganization",
-    "partner:organizations:write"
-  ],
-  [
-    "shipmail_resend_partner_ownership_invitation",
-    "resendPartnerOwnershipInvitation",
-    "partner:organizations:write"
-  ],
-  [
-    "shipmail_suspend_partner_organization",
-    "suspendPartnerOrganization",
-    "partner:organizations:write"
-  ],
-  [
-    "shipmail_resume_partner_organization",
-    "resumePartnerOrganization",
-    "partner:organizations:write"
-  ],
-  [
-    "shipmail_offboard_partner_organization",
-    "offboardPartnerOrganization",
-    "partner:organizations:write"
-  ],
-  [
-    "shipmail_list_partner_mailbox_credential_grants",
-    "listPartnerMailboxCredentialGrants",
-    "partner:mailbox_credentials:issue"
-  ],
-  [
-    "shipmail_consume_partner_mailbox_credential_grant",
-    "consumePartnerMailboxCredentialGrant",
-    "partner:mailbox_credentials:issue"
-  ],
-  ["shipmail_get_partner_usage", "getPartnerUsage", "partner:usage:read"]
+  ["shipmail_delete_booking_page", "deleteBookingPage", "booking_pages:write"]
 ];
 var MEMBER_GROUPS = new Set(
   MCP_MEMBER_PERMISSION_GROUP_NAMES
@@ -487,14 +428,12 @@ var DESTRUCTIVE_PREFIXES = [
   "shipmail_delete_",
   "shipmail_remove_",
   "shipmail_revoke_",
-  "shipmail_offboard_",
   "shipmail_cancel_"
 ];
 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_rotate_audience_feed",
   "shipmail_revoke_audience_feed"
 ]);
@@ -541,7 +480,6 @@ var OPEN_WORLD_READ_SCOPES = /* @__PURE__ */ new Set([
 ]);
 function permissionGroupFor(toolName, requiredScope) {
   if (requiredScope === "public") return "account_status";
-  if (requiredScope.startsWith("partner:")) return "partner_admin";
   if (requiredScope.startsWith("domains:")) return "domain_admin";
   if (requiredScope.startsWith("mailbox_credentials:")) return "credentials";
   if (requiredScope.startsWith("mailbox_forwarding:")) return "forwarding";
@@ -582,7 +520,7 @@ function recipientControlFor(toolName) {
 }
 function durationFor(toolName) {
   if (toolName === "shipmail_run_automation") return "one_shot";
-  if (toolName.includes("app_password") || toolName.includes("credential_grant") || toolName === "shipmail_rotate_webhook_secret") {
+  if (toolName.includes("app_password") || toolName === "shipmail_rotate_webhook_secret") {
     return "credential";
   }
   if (toolName.includes("forwarding") || toolName.includes("mailbox_rule") || toolName.includes("webhook") || toolName.includes("booking_page") || toolName.includes("automation")) {
@@ -595,7 +533,7 @@ function durationFor(toolName) {
 }
 function idempotencyFor(toolName, effect) {
   if (effect === "read") return "none";
-  if (toolName === "shipmail_create_mailbox_app_password" || toolName === "shipmail_consume_partner_mailbox_credential_grant" || toolName === "shipmail_prepare_newsletter_asset_upload" || toolName === "shipmail_prepare_staged_attachment_upload") {
+  if (toolName === "shipmail_create_mailbox_app_password" || toolName === "shipmail_prepare_newsletter_asset_upload" || toolName === "shipmail_prepare_staged_attachment_upload") {
     return "forbidden";
   }
   if (DESTRUCTIVE_PREFIXES.some((prefix) => toolName.startsWith(prefix)) || toolName.startsWith("shipmail_suspend_") || toolName.startsWith("shipmail_resume_")) {
@@ -626,7 +564,7 @@ function defineCapability(row) {
     },
     auditAction: effect === "read" ? null : "api.mutation",
     transports: {
-      hostedOAuth: permissionGroup !== "partner_admin",
+      hostedOAuth: true,
       directApiKeyHttp: true,
       stdio: toolName !== "shipmail_compose_message_with_file" && toolName !== "shipmail_upload_newsletter_asset_with_file"
     }
@@ -740,7 +678,7 @@ 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
+  /[\x00-\x08\x0B\x0C\x0E-\x1F\x7F\u061C\u200B\u200E\u200F\u202A-\u202E\u2060\u2066-\u2069\uFEFF\u{E0000}-\u{E007F}]/gu
 );
 function sanitizeString(value, maxLength = MAX_STRING_LENGTH) {
   const stripped = value.replace(DANGEROUS_CHARS_REGEX, "");
@@ -751,26 +689,25 @@ function sanitizeString(value, maxLength = MAX_STRING_LENGTH) {
 function isPlainObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function sanitizeValue(value, maxStringLength = MAX_STRING_LENGTH) {
+function childField(field, key) {
+  return field !== void 0 && field.path[0] === key ? { path: field.path.slice(1), maxLength: field.maxLength } : void 0;
+}
+function sanitizeValue(value, longField) {
   if (typeof value === "string") {
-    return sanitizeString(value, maxStringLength);
+    return sanitizeString(value, longField?.path.length === 0 ? longField.maxLength : void 0);
   }
   if (Array.isArray(value)) {
-    return value.map((item) => sanitizeValue(item, maxStringLength));
+    return value.map((item) => sanitizeValue(item));
   }
   if (isPlainObject(value)) {
-    const out = {};
-    for (const [key, item] of Object.entries(value)) {
-      out[key] = sanitizeValue(item, maxStringLength);
-    }
-    return out;
+    return sanitizeRecord(value, longField);
   }
   return value;
 }
-function sanitizeRecord(value, maxStringLength = MAX_STRING_LENGTH) {
+function sanitizeRecord(value, longField) {
   const out = {};
   for (const [key, item] of Object.entries(value)) {
-    out[key] = sanitizeValue(item, maxStringLength);
+    out[key] = sanitizeValue(item, childField(longField, key));
   }
   return out;
 }
@@ -791,8 +728,8 @@ var GENERIC_INTERNAL_MESSAGE = "Internal MCP error. The original message is logg
 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);
+function jsonResult(structuredContent, longField) {
+  const sanitized = sanitizeRecord(structuredContent, longField);
   return {
     content: [
       {
@@ -998,6 +935,7 @@ function isPublicHttpsUrl(rawUrl) {
   if (host.startsWith("[") && host.endsWith("]")) {
     host = host.slice(1, -1);
   }
+  host = host.replace(/\.$/, "");
   if (host.length === 0) return false;
   for (const pattern of PRIVATE_HOST_NAME_PATTERNS) {
     if (pattern.test(host)) return false;
@@ -1183,7 +1121,7 @@ var mailboxSchema = z.object({
   address: z.string(),
   display_name: z.string().nullable(),
   suspended_at: z.string().nullable(),
-  suspension_reasons: z.array(z.enum(["billing", "manual", "security"])),
+  suspension_reasons: z.array(z.enum(["billing", "manual", "security", "abuse"])),
   auto_reply: autoReplySchema,
   created_at: z.string(),
   updated_at: z.string()
@@ -1244,7 +1182,7 @@ var mailboxAppPasswordSchema = z.object({
   mailbox_id: z.string(),
   name: z.string(),
   state: z.enum(["pending_create", "active", "pending_revoke", "revoked", "failed"]),
-  purpose: z.enum(["operator_client", "partner_embedded_webmail"]),
+  purpose: z.enum(["operator_client"]),
   expires_at: z.string().nullable(),
   allowed_cidrs: z.array(z.string()),
   last_used_at: z.string().nullable(),
@@ -1254,23 +1192,6 @@ var mailboxAppPasswordSchema = z.object({
 var createdMailboxAppPasswordSchema = mailboxAppPasswordSchema.extend({
   secret: z.string()
 });
-var partnerMailboxCredentialSchema = createdMailboxAppPasswordSchema.extend({
-  operator_notified: z.boolean()
-});
-var partnerMailboxCredentialGrantSchema = z.object({
-  object: z.literal("partner_mailbox_credential_grant"),
-  id: z.string(),
-  partner_organization_id: z.string(),
-  organization_id: z.string(),
-  organization_name: z.string(),
-  external_reference: z.string(),
-  operator_email: z.string(),
-  mailbox_id: z.string(),
-  mailbox_address: z.string(),
-  disclosure_version: z.string(),
-  expires_at: z.string(),
-  consented_at: z.string()
-});
 var mailboxFolderSchema = z.object({
   object: z.literal("mailbox_folder"),
   id: z.string(),
@@ -1447,7 +1368,8 @@ var inboxFullMessageSchema = inboxMessageSchema.omit({ object: true }).extend({
 var inboxAttachmentContentSchema = inboxAttachmentSchema.omit({ download_path: true }).extend({
   object: z.literal("inbox_attachment_content"),
   mailbox_id: z.string(),
-  message_id: z.string()
+  message_id: z.string(),
+  text: z.string().optional()
 });
 var inboxMessagesSchema = z.object({
   object: z.literal("inbox_messages"),
@@ -1740,6 +1662,8 @@ var scheduledMessageSchema = z.object({
   object: z.literal("scheduled_message"),
   id: z.string(),
   scheduled_message_id: z.string(),
+  // Optional so this package keeps working against a server that predates the field.
+  status: z.enum(["scheduled", "settling"]).optional(),
   kind: z.enum(["scheduled", "undo"]),
   mailbox_id: z.string(),
   mailbox_address: z.string(),
@@ -1838,6 +1762,8 @@ var webhookSchema = z.object({
   events: z.array(z.enum(WEBHOOK_EVENT_TYPES)),
   active: z.boolean(),
   description: z.string().nullable(),
+  mailbox_ids: z.array(z.string()).nullable(),
+  domain_ids: z.array(z.string()).nullable(),
   created_at: z.string(),
   updated_at: z.string()
 });
@@ -1905,14 +1831,6 @@ var mailboxAppPasswordsOutputSchema = z.object({
     data: z.array(mailboxAppPasswordSchema)
   })
 });
-var partnerMailboxCredentialOutputSchema = z.object({
-  credential: partnerMailboxCredentialSchema
-});
-var partnerMailboxCredentialGrantsOutputSchema = z.object({
-  grants: z.object({
-    data: z.array(partnerMailboxCredentialGrantSchema)
-  })
-});
 var mailboxFolderOutputSchema = z.object({ folder: mailboxFolderSchema });
 var mailboxFoldersOutputSchema = z.object({ folders: mailboxFoldersSchema });
 var mailboxRulesOutputSchema = z.object({ rules: mailboxRulesSchema });
@@ -2634,10 +2552,15 @@ var webhookEventSchema = z.enum(WEBHOOK_EVENT_TYPES);
 var webhookDeliveryStatusSchema = z.enum(WEBHOOK_DELIVERY_STATUSES);
 var listWebhooksInputSchema = paginationInputSchema;
 var listMembersInputSchema = paginationInputSchema;
+var webhookScopeIdsInputSchema = z.array(idSchema).max(100).nullable();
 var createWebhookInputSchema = z.object({
   url: publicHttpsUrlSchema,
   events: z.array(webhookEventSchema).min(1).max(WEBHOOK_EVENT_TYPES.length),
   description: noControlString(500, "description").optional(),
+  mailbox_ids: webhookScopeIdsInputSchema.optional().describe(
+    "Only deliver events for these mailbox IDs (plus mailboxes of domain_ids). Omit for every mailbox. Organization events are always delivered."
+  ),
+  domain_ids: webhookScopeIdsInputSchema.optional().describe("Only deliver events for these domain IDs and their mailboxes."),
   idempotency_key: idempotencyKeySchema
 });
 var updateWebhookInputSchema = z.object({
@@ -2646,9 +2569,11 @@ var updateWebhookInputSchema = z.object({
   events: z.array(webhookEventSchema).min(1).max(WEBHOOK_EVENT_TYPES.length).optional(),
   description: noControlString(500, "description").nullable().optional(),
   active: z.boolean().optional(),
+  mailbox_ids: webhookScopeIdsInputSchema.optional().describe("Replace the mailbox filter. Null or [] clears it."),
+  domain_ids: webhookScopeIdsInputSchema.optional().describe("Replace the domain filter. Null or [] clears it."),
   idempotency_key: idempotencyKeySchema
 }).refine(
-  (value) => value.url !== void 0 || value.events !== void 0 || value.description !== void 0 || value.active !== void 0,
+  (value) => value.url !== void 0 || value.events !== void 0 || value.description !== void 0 || value.active !== void 0 || value.mailbox_ids !== void 0 || value.domain_ids !== void 0,
   {
     message: "Provide at least one webhook field to update."
   }
@@ -3765,95 +3690,6 @@ var updateBookingPageInputSchema = z.object({
   active: z.boolean().optional(),
   idempotency_key: idempotencyKeySchema
 });
-var partnerOrganizationSchema = z.object({
-  object: z.literal("partner_organization"),
-  id: z.string(),
-  organization_id: z.string(),
-  name: z.string(),
-  external_reference: z.string(),
-  owner_email: z.string(),
-  owner_user_id: z.string().nullable(),
-  status: z.enum(["pending_owner", "active", "suspended", "offboarding", "disconnected"]),
-  data_classification: z.enum(["internal_test", "customer"]),
-  mailbox_limit: z.number().int(),
-  delegated_permissions: z.array(z.string()),
-  owner_accepted_at: z.string().nullable(),
-  activated_at: z.string().nullable(),
-  suspended_at: z.string().nullable(),
-  disconnected_at: z.string().nullable(),
-  created_at: z.string(),
-  updated_at: z.string()
-});
-var partnerOrganizationOutputSchema = z.object({
-  organization: partnerOrganizationSchema
-});
-var createdPartnerOrganizationSchema = partnerOrganizationSchema.extend({
-  ownership_invitation: z.object({
-    object: z.literal("partner_ownership_invitation"),
-    owner_email: z.string(),
-    email_sent: z.boolean(),
-    expires_at: z.string()
-  }).nullable()
-});
-var createdPartnerOrganizationOutputSchema = z.object({
-  organization: createdPartnerOrganizationSchema
-});
-var partnerOrganizationsOutputSchema = z.object({
-  data: z.array(partnerOrganizationSchema)
-});
-var partnerInvitationOutputSchema = z.object({
-  invitation: z.object({
-    object: z.literal("partner_ownership_invitation"),
-    owner_email: z.string(),
-    email_sent: z.boolean(),
-    expires_at: z.string()
-  })
-});
-var partnerUsageOutputSchema = z.object({
-  usage: z.object({
-    object: z.literal("partner_usage"),
-    period_start: z.string(),
-    period_end: z.string(),
-    closed_through: z.string().nullable(),
-    active_children: z.number().int(),
-    active_mailboxes: z.number().int(),
-    child_active_seconds: z.number().int(),
-    mailbox_active_seconds: z.number().int(),
-    child_subtotal: z.number().int(),
-    mailbox_subtotal: z.number().int(),
-    minimum_shortfall: z.number().int(),
-    projected_total: z.number().int(),
-    currency: z.string()
-  })
-});
-var createPartnerOrganizationInputSchema = z.object({
-  name: noControlString(120, "name").min(1),
-  external_reference: noControlString(200, "external reference").min(1),
-  owner_email: emailSchema,
-  mailbox_limit: z.number().int().min(1).max(50).default(3),
-  data_classification: z.enum(["internal_test", "customer"]).default("customer"),
-  idempotency_key: idempotencyKeySchema
-});
-var partnerOrganizationByIdInputSchema = z.object({
-  id: idSchema.describe("Partner organization relationship ID.")
-});
-var updatePartnerOrganizationInputSchema = partnerOrganizationByIdInputSchema.extend({
-  name: noControlString(120, "name").min(1).optional(),
-  mailbox_limit: z.number().int().min(1).max(50).optional(),
-  idempotency_key: idempotencyKeySchema
-}).refine((value) => value.name !== void 0 || value.mailbox_limit !== void 0, {
-  message: "Provide name or mailbox_limit."
-});
-var resendPartnerInvitationInputSchema = partnerOrganizationByIdInputSchema.extend({
-  owner_email: emailSchema.optional(),
-  idempotency_key: idempotencyKeySchema
-});
-var consumePartnerMailboxCredentialGrantInputSchema = z.object({
-  grant_id: idSchema.describe("Single-use mailbox credential grant ID."),
-  name: noControlString(100, "name").trim().min(1).optional(),
-  expires_at: z.iso.datetime().optional(),
-  allowed_cidrs: z.array(appPasswordCidrInputSchema).max(20).optional()
-});
 
 // src/cross-organization-tools.ts
 var MAX_CONCURRENT_ORGANIZATIONS = 4;
@@ -5266,14 +5102,7 @@ var SESSION_LIMITS = {
   shipmail_delete_booking_page: 10,
   shipmail_create_automation: 20,
   shipmail_update_automation: 20,
-  shipmail_run_automation: 20,
-  shipmail_create_partner_organization: 20,
-  shipmail_update_partner_organization: 50,
-  shipmail_resend_partner_ownership_invitation: 20,
-  shipmail_suspend_partner_organization: 20,
-  shipmail_resume_partner_organization: 20,
-  shipmail_offboard_partner_organization: 10,
-  shipmail_consume_partner_mailbox_credential_grant: 20
+  shipmail_run_automation: 20
 };
 var SESSION_TOTAL_LIMIT = 500;
 var DEBUG_ENABLED = process.env["SHIPMAIL_MCP_DEBUG"] === "1";
@@ -5299,11 +5128,25 @@ var OutputSchemaViolation = class extends Error {
   issues;
 };
 var MEDIA_TYPE_PATTERN = /^[a-z0-9][a-z0-9!#$&^_.+-]{0,126}\/[a-z0-9][a-z0-9!#$&^_.+-]{0,126}$/i;
+var CHARSET_PARAMETER_PATTERN = /(?:^|;)\s*charset\s*=\s*(?:"([a-z0-9][a-z0-9._-]{0,39})"|([a-z0-9][a-z0-9._-]{0,39}))(?:\s*;|$)/i;
 var MAX_MCP_ATTACHMENT_BYTES = 3 * 1024 * 1024;
+var MAX_MCP_ATTACHMENT_RESPONSE_BYTES = Math.ceil(MAX_MCP_ATTACHMENT_BYTES * 4 / 3) + 64 * 1024;
 function normalizeAttachmentContentType(contentType) {
   const mediaType = contentType.split(";", 1)[0]?.trim().toLowerCase();
   return mediaType && MEDIA_TYPE_PATTERN.test(mediaType) ? mediaType : "application/octet-stream";
 }
+function isTextAttachment(contentType) {
+  return normalizeAttachmentContentType(contentType).startsWith("text/");
+}
+function decodeTextAttachment(bytes, contentType) {
+  if (!isTextAttachment(contentType)) return null;
+  const charset = contentType.match(CHARSET_PARAMETER_PATTERN)?.slice(1).find(Boolean) ?? "utf-8";
+  try {
+    return new TextDecoder(charset, { fatal: true }).decode(bytes);
+  } catch {
+    return null;
+  }
+}
 function attachmentResourceUri(mailboxId, messageId, partId) {
   return `shipmail://mailboxes/${encodeURIComponent(mailboxId)}/inbox/messages/${encodeURIComponent(messageId)}/attachments/${encodeURIComponent(partId)}`;
 }
@@ -5397,7 +5240,7 @@ function registerTools(rawServer, client, allowedTools, grantedOrganizations = [
     }
     callCounts.set(name, used + 1);
   }
-  async function runTool(name, outputSchema, body) {
+  async function runTool(name, outputSchema, body, longField) {
     const start = performance2.now();
     try {
       checkRateLimit(name);
@@ -5410,7 +5253,7 @@ function registerTools(rawServer, client, allowedTools, grantedOrganizations = [
         throw new OutputSchemaViolation(name, issues);
       }
       logToolCall(name, performance2.now() - start);
-      return jsonResult(parsed.data);
+      return jsonResult(parsed.data, longField);
     } catch (error) {
       if (error instanceof OutputSchemaViolation) {
         process.stderr.write(
@@ -6328,13 +6171,14 @@ function registerTools(rawServer, client, allowedTools, grantedOrganizations = [
       "shipmail_read_mailbox_inbox_attachment",
       {
         title: "Read Mailbox Inbox Attachment",
-        description: "Fetch one attachment from an exact JMAP inbox message as an embedded MCP resource. The input uses the attachment part ID.",
+        description: "Fetch one attachment from an exact JMAP inbox message. Decodable text attachments are returned in attachment.text; other attachments are embedded resources. The input uses the attachment part ID.",
         inputSchema: readMailboxInboxAttachmentInputSchema,
         outputSchema: inboxAttachmentContentOutputSchema,
         annotations: { readOnlyHint: true, openWorldHint: true }
       },
       async ({ id, message_id, part_id }) => {
         let resource;
+        let text;
         const result = await runTool(
           "shipmail_read_mailbox_inbox_attachment",
           inboxAttachmentContentOutputSchema,
@@ -6358,15 +6202,18 @@ function registerTools(rawServer, client, allowedTools, grantedOrganizations = [
             if (bytes.byteLength > MAX_MCP_ATTACHMENT_BYTES) {
               throw new ValidationError3("Attachment exceeds the MCP read limit of 3 MB.");
             }
-            resource = {
-              type: "resource",
-              resource: {
-                uri: attachmentResourceUri(id, message.id, attachment.part_id),
-                mimeType: normalizeAttachmentContentType(attachment.content_type),
-                blob: Buffer.from(bytes).toString("base64")
-              },
-              annotations: { audience: ["assistant"], priority: 1 }
-            };
+            text = decodeTextAttachment(bytes, attachment.content_type) ?? void 0;
+            if (text === void 0) {
+              resource = {
+                type: "resource",
+                resource: {
+                  uri: attachmentResourceUri(id, message.id, attachment.part_id),
+                  mimeType: isTextAttachment(attachment.content_type) ? "application/octet-stream" : normalizeAttachmentContentType(attachment.content_type),
+                  blob: Buffer.from(bytes).toString("base64")
+                },
+                annotations: { audience: ["assistant"], priority: 1 }
+              };
+            }
             return {
               attachment: {
                 object: "inbox_attachment_content",
@@ -6376,13 +6223,23 @@ function registerTools(rawServer, client, allowedTools, grantedOrganizations = [
                 blob_id: attachment.blob_id,
                 name: attachment.name,
                 content_type: attachment.content_type,
-                size: bytes.byteLength
+                size: bytes.byteLength,
+                ...text !== void 0 ? { text } : {}
               }
             };
-          }
+          },
+          { path: ["attachment", "text"], maxLength: MAX_MCP_ATTACHMENT_BYTES }
         );
-        if (result.isError || resource === void 0) return result;
-        return { ...result, content: [...result.content, resource] };
+        if (result.isError) return result;
+        if (resource !== void 0) return { ...result, content: [...result.content, resource] };
+        if (text !== void 0 && Buffer.byteLength(JSON.stringify(result), "utf8") > MAX_MCP_ATTACHMENT_RESPONSE_BYTES) {
+          return errorResult(
+            new ValidationError3(
+              "Text attachment exceeds the MCP response budget after JSON encoding."
+            )
+          );
+        }
+        return result;
       }
     );
   });
@@ -6917,11 +6774,14 @@ function registerTools(rawServer, client, allowedTools, grantedOrganizations = [
           client_reference: args.client_reference,
           cursor: args.cursor,
           limit: args.limit
-        } : {
+        } : args.client_reference ? {
           client_reference: args.client_reference,
           cursor: args.cursor,
           limit: args.limit
-        };
+        } : void 0;
+        if (!params) {
+          throw new Error("Provide mailbox_id or client_reference.");
+        }
         return client.messages.list(params);
       })
     );
@@ -7305,7 +7165,7 @@ function registerTools(rawServer, client, allowedTools, grantedOrganizations = [
       "shipmail_update_webhook",
       {
         title: "Update Webhook",
-        description: "Update webhook URL, subscribed events, description, or active state. A URL change redirects future deliveries.",
+        description: "Update webhook URL, subscribed events, description, active state, or mailbox and domain filter. A URL change redirects future deliveries.",
         inputSchema: updateWebhookInputSchema,
         outputSchema: webhookOutputSchema,
         annotations: {
@@ -7321,6 +7181,8 @@ function registerTools(rawServer, client, allowedTools, grantedOrganizations = [
         if (args.events !== void 0) update.events = args.events;
         if (args.description !== void 0) update.description = args.description;
         if (args.active !== void 0) update.active = args.active;
+        if (args.mailbox_ids !== void 0) update.mailbox_ids = args.mailbox_ids;
+        if (args.domain_ids !== void 0) update.domain_ids = args.domain_ids;
         return {
           webhook: await client.webhooks.update(args.id, update, mutationOptions(args))
         };
@@ -8596,204 +8458,6 @@ function registerTools(rawServer, client, allowedTools, grantedOrganizations = [
       })
     );
   });
-  registerIfAllowed("shipmail_list_partner_organizations", () => {
-    server.registerTool(
-      "shipmail_list_partner_organizations",
-      {
-        title: "List Partner Organizations",
-        description: "List operator-owned organizations connected to the partner account.",
-        outputSchema: partnerOrganizationsOutputSchema,
-        annotations: { readOnlyHint: true, openWorldHint: false }
-      },
-      async () => runTool(
-        "shipmail_list_partner_organizations",
-        partnerOrganizationsOutputSchema,
-        () => client.partner.listOrganizations()
-      )
-    );
-  });
-  registerIfAllowed("shipmail_create_partner_organization", () => {
-    server.registerTool(
-      "shipmail_create_partner_organization",
-      {
-        title: "Create Partner Organization",
-        description: "Create an operator organization and email its ownership invitation. No domain or mailbox is created.",
-        inputSchema: createPartnerOrganizationInputSchema,
-        outputSchema: createdPartnerOrganizationOutputSchema,
-        annotations: {
-          readOnlyHint: false,
-          destructiveHint: false,
-          idempotentHint: true,
-          openWorldHint: false
-        }
-      },
-      async (args) => runTool(
-        "shipmail_create_partner_organization",
-        createdPartnerOrganizationOutputSchema,
-        async () => ({
-          organization: await client.partner.createOrganization(
-            stripIdempotencyKey(args),
-            mutationOptions(args)
-          )
-        })
-      )
-    );
-  });
-  registerIfAllowed("shipmail_get_partner_organization", () => {
-    server.registerTool(
-      "shipmail_get_partner_organization",
-      {
-        title: "Get Partner Organization",
-        description: "Get one partner child relationship and its ownership state.",
-        inputSchema: partnerOrganizationByIdInputSchema,
-        outputSchema: partnerOrganizationOutputSchema,
-        annotations: { readOnlyHint: true, openWorldHint: false }
-      },
-      async ({ id }) => runTool("shipmail_get_partner_organization", partnerOrganizationOutputSchema, async () => ({
-        organization: await client.partner.getOrganization(id)
-      }))
-    );
-  });
-  registerIfAllowed("shipmail_update_partner_organization", () => {
-    server.registerTool(
-      "shipmail_update_partner_organization",
-      {
-        title: "Update Partner Organization",
-        description: "Update an operator organization name or mailbox allocation.",
-        inputSchema: updatePartnerOrganizationInputSchema,
-        outputSchema: partnerOrganizationOutputSchema,
-        annotations: {
-          readOnlyHint: false,
-          destructiveHint: false,
-          idempotentHint: true,
-          openWorldHint: false
-        }
-      },
-      async (args) => runTool(
-        "shipmail_update_partner_organization",
-        partnerOrganizationOutputSchema,
-        async () => {
-          const { id, idempotency_key: _key, ...params } = args;
-          return {
-            organization: await client.partner.updateOrganization(
-              id,
-              params,
-              mutationOptions(args)
-            )
-          };
-        }
-      )
-    );
-  });
-  registerIfAllowed("shipmail_resend_partner_ownership_invitation", () => {
-    server.registerTool(
-      "shipmail_resend_partner_ownership_invitation",
-      {
-        title: "Resend Partner Ownership Invitation",
-        description: "Revoke the pending ownership link and email a new single-use link.",
-        inputSchema: resendPartnerInvitationInputSchema,
-        outputSchema: partnerInvitationOutputSchema,
-        annotations: {
-          readOnlyHint: false,
-          destructiveHint: false,
-          idempotentHint: true,
-          openWorldHint: true
-        }
-      },
-      async (args) => runTool(
-        "shipmail_resend_partner_ownership_invitation",
-        partnerInvitationOutputSchema,
-        async () => ({
-          invitation: await client.partner.resendOwnershipInvitation(
-            args.id,
-            { owner_email: args.owner_email },
-            mutationOptions(args)
-          )
-        })
-      )
-    );
-  });
-  for (const transition of ["suspend", "resume", "offboard"]) {
-    const toolName = `shipmail_${transition}_partner_organization`;
-    registerIfAllowed(toolName, () => {
-      server.registerTool(
-        toolName,
-        {
-          title: `${transition[0]?.toUpperCase() ?? ""}${transition.slice(1)} Partner Organization`,
-          description: transition === "suspend" ? "Suspend outbound sending for one operator organization. Inbound mail and storage continue." : transition === "resume" ? "Resume partner-managed outbound sending for one operator organization." : "Start non-destructive offboarding and immediately remove delegated access.",
-          inputSchema: partnerOrganizationByIdInputSchema,
-          outputSchema: partnerOrganizationOutputSchema,
-          annotations: {
-            readOnlyHint: false,
-            destructiveHint: transition !== "resume",
-            idempotentHint: true,
-            openWorldHint: false
-          }
-        },
-        async ({ id }) => runTool(toolName, partnerOrganizationOutputSchema, async () => ({
-          organization: transition === "suspend" ? await client.partner.suspendOrganization(id) : transition === "resume" ? await client.partner.resumeOrganization(id) : await client.partner.offboardOrganization(id)
-        }))
-      );
-    });
-  }
-  registerIfAllowed("shipmail_consume_partner_mailbox_credential_grant", () => {
-    server.registerTool(
-      "shipmail_consume_partner_mailbox_credential_grant",
-      {
-        title: "Consume Partner Mailbox Credential Grant",
-        description: "Consume a single-use grant and issue an embedded-webmail credential. The secret appears once and the operator receives a notification.",
-        inputSchema: consumePartnerMailboxCredentialGrantInputSchema,
-        outputSchema: partnerMailboxCredentialOutputSchema,
-        annotations: {
-          readOnlyHint: false,
-          destructiveHint: true,
-          idempotentHint: false,
-          openWorldHint: true
-        }
-      },
-      async (args) => runTool(
-        "shipmail_consume_partner_mailbox_credential_grant",
-        partnerMailboxCredentialOutputSchema,
-        async () => ({
-          credential: await client.partner.consumeMailboxCredentialGrant(args.grant_id, {
-            ...args.name ? { name: args.name } : {},
-            ...args.expires_at ? { expires_at: args.expires_at } : {},
-            ...args.allowed_cidrs ? { allowed_cidrs: args.allowed_cidrs } : {}
-          })
-        })
-      )
-    );
-  });
-  registerIfAllowed("shipmail_list_partner_mailbox_credential_grants", () => {
-    server.registerTool(
-      "shipmail_list_partner_mailbox_credential_grants",
-      {
-        title: "List Partner Mailbox Credential Grants",
-        description: "List active ten-minute mailbox approvals created by operator owners. Grant metadata contains no app-password secret.",
-        outputSchema: partnerMailboxCredentialGrantsOutputSchema,
-        annotations: { readOnlyHint: true, openWorldHint: false }
-      },
-      async () => runTool(
-        "shipmail_list_partner_mailbox_credential_grants",
-        partnerMailboxCredentialGrantsOutputSchema,
-        async () => ({ grants: await client.partner.listMailboxCredentialGrants() })
-      )
-    );
-  });
-  registerIfAllowed("shipmail_get_partner_usage", () => {
-    server.registerTool(
-      "shipmail_get_partner_usage",
-      {
-        title: "Get Partner Usage",
-        description: "Get consolidated child and mailbox usage for the current UTC month.",
-        outputSchema: partnerUsageOutputSchema,
-        annotations: { readOnlyHint: true, openWorldHint: false }
-      },
-      async () => runTool("shipmail_get_partner_usage", partnerUsageOutputSchema, async () => ({
-        usage: await client.partner.usage()
-      }))
-    );
-  });
   if (allowedTools) {
     const unknown = [...allowedTools].filter((name) => !knownTools.includes(name));
     if (unknown.length > 0) {
@@ -8804,7 +8468,7 @@ function registerTools(rawServer, client, allowedTools, grantedOrganizations = [
 }
 
 // src/version.ts
-var VERSION = "0.8.8";
+var VERSION = "0.9.0";
 
 // src/server.ts
 var SHIPMAIL_MCP_INSTRUCTIONS = `Shipmail MCP exposes the business email and calendar tools authorized by the connection's current Shipmail permissions.
@@ -8818,7 +8482,7 @@ Operational instructions:
 - Do not create or change mailbox rules without explicit user intent. List rules and folders before rule changes; custom folder IDs must belong to the target mailbox. Read the latest rule before updating or deleting it, and retain expected_position to detect concurrent reordering.
 - Do not create or delete a custom mailbox folder without explicit user intent. List folders before creating or deleting one. Deleting a custom folder moves its remaining messages to Trash and conflicts while an inbox rule or automation references it. For inbox messages, use the exact inbox ID, list folders before a custom-folder move, and move a message to Trash before permanent deletion.
 - Do not change a domain catch-all or enable an auto-reply without explicit user intent. A catch-all retargets unmatched-recipient mail, and an enabled auto-reply can send replies.
-- Do not reset a mailbox password unless the operator supplied the replacement password. Do not create an app password without explicit operator approval; store its one-time secret securely. Do not consume a partner mailbox credential grant without explicit partner approval.
+- Do not reset a mailbox password unless the operator supplied the replacement password. Do not create an app password without explicit operator approval; store its one-time secret securely.
 - Webhook signing secrets appear once in the conversation log. Treat that log as sensitive and store each secret in the user's chosen secret manager.
 - Confirm that a recipient should receive mail again before removing a suppression. Use the subscriber state tools for subscription changes rather than a profile update. Prefer unsubscribing to removing a subscriber when opt-out history must be preserved.
 - Do not create, send, schedule, resume, or otherwise mutate a newsletter without the user's explicit approval. A test send requires approval of the exact draft and test recipient. Scheduling requires approval of the content, audience, and scheduled time. Resume requires confirmation that delivery should continue. Run newsletter preflight before test sending or scheduling, and obtain sender identities and existing asset IDs from their list tools.
@@ -8846,7 +8510,6 @@ function createShipmailMcpServer(config, allowedTools, organizationGrants = [])
   const client = new ShipmailClient({
     apiKey: config.apiKey,
     ...config.baseUrl ? { baseUrl: config.baseUrl } : {},
-    ...config.organizationId ? { organizationId: config.organizationId } : {},
     defaultHeaders
   });
   const server = new McpServer5(
@@ -8953,7 +8616,6 @@ async function main() {
   const client = new ShipmailClient2({
     apiKey: config.apiKey,
     ...config.baseUrl ? { baseUrl: config.baseUrl } : {},
-    ...config.organizationId ? { organizationId: config.organizationId } : {},
     defaultHeaders: {
       "User-Agent": `shipmail-mcp/${VERSION}`,
       "X-Shipmail-Client": "mcp",