@jbctechsolutions/mcp-office365 3.0.0 → 4.0.1

package/dist/tools/mail.d.ts

@@ -2,39 +2,36 @@
  * Copyright (c) 2026 JBC Tech Solutions, LLC
  * Licensed under the MIT License. See LICENSE file in the project root.
  */
+/**
+ * Mail-related MCP tools.
+ *
+ * Provides tools for listing folders, emails, and searching.
+ */
 import { z } from 'zod';
-import type { IRepository } from '../database/repository.js';
-import type { Folder, EmailSummary, Email, AttachmentInfo } from '../types/index.js';
-import type { IAttachmentReader } from '../applescript/content-readers.js';
 import type { ToolDefinition } from '../registry/types.js';
 import type { GraphMailTools } from './mail-graph.js';
-import type { AppleMailTools } from './mail-apple.js';
 declare module '../registry/types.js' {
     interface GraphToolsets {
         mailGraph: GraphMailTools;
     }
-    interface AppleScriptToolsets {
-        mail: AppleMailTools;
-    }
 }
 export declare const ListFoldersInput: z.ZodObject<{}, z.core.$strict>;
 /**
  * Canonical (advertised) input for the `list_folders` tool. The Graph backend
- * ignores `account_id` and returns the default mailbox's folders; the
- * AppleScript backend uses it to support multi-account grouping.
+ * ignores `account_id` and returns the default mailbox's folders.
  */
 export declare const ListFoldersToolInput: z.ZodObject<{
     account_id: z.ZodOptional<z.ZodUnion<readonly [z.ZodNumber, z.ZodArray<z.ZodNumber>, z.ZodLiteral<"all">]>>;
 }, z.core.$strict>;
 export declare const ListEmailsInput: z.ZodObject<{
-    folder_id: z.ZodNumber;
+    folder_id: z.ZodString;
     limit: z.ZodDefault<z.ZodNumber>;
     offset: z.ZodDefault<z.ZodNumber>;
     unread_only: z.ZodDefault<z.ZodBoolean>;
 }, z.core.$strict>;
 export declare const SearchEmailsInput: z.ZodObject<{
     query: z.ZodString;
-    folder_id: z.ZodOptional<z.ZodNumber>;
+    folder_id: z.ZodOptional<z.ZodString>;
     limit: z.ZodDefault<z.ZodNumber>;
 }, z.core.$strict>;
 /**
@@ -61,38 +58,38 @@ export declare const SearchEmailsAdvancedInput: z.ZodObject<{
     limit: z.ZodDefault<z.ZodNumber>;
 }, z.core.$strict>;
 export declare const GetEmailInput: z.ZodObject<{
-    email_id: z.ZodNumber;
+    email_id: z.ZodString;
     include_body: z.ZodDefault<z.ZodBoolean>;
     strip_html: z.ZodDefault<z.ZodBoolean>;
 }, z.core.$strict>;
 export declare const GetEmailsInput: z.ZodObject<{
-    email_ids: z.ZodArray<z.ZodNumber>;
+    email_ids: z.ZodArray<z.ZodString>;
     include_body: z.ZodDefault<z.ZodBoolean>;
     strip_html: z.ZodDefault<z.ZodBoolean>;
 }, z.core.$strict>;
 export declare const ListConversationInput: z.ZodObject<{
-    message_id: z.ZodNumber;
+    message_id: z.ZodString;
     limit: z.ZodDefault<z.ZodNumber>;
 }, z.core.$strict>;
 export declare const GetUnreadCountInput: z.ZodObject<{
-    folder_id: z.ZodOptional<z.ZodNumber>;
+    folder_id: z.ZodOptional<z.ZodString>;
 }, z.core.$strict>;
 export declare const ListAttachmentsInput: z.ZodObject<{
-    email_id: z.ZodNumber;
+    email_id: z.ZodString;
 }, z.core.$strict>;
 export declare const DownloadAttachmentInput: z.ZodObject<{
-    email_id: z.ZodNumber;
-    attachment_index: z.ZodNumber;
+    email_id: z.ZodString;
+    attachment_id: z.ZodString;
     save_path: z.ZodString;
 }, z.core.$strict>;
 export declare const CheckNewEmailsInput: z.ZodObject<{
-    folder_id: z.ZodNumber;
+    folder_id: z.ZodString;
 }, z.core.$strict>;
 export declare const GetMessageHeadersInput: z.ZodObject<{
-    email_id: z.ZodNumber;
+    email_id: z.ZodString;
 }, z.core.$strict>;
 export declare const GetMessageMimeInput: z.ZodObject<{
-    email_id: z.ZodNumber;
+    email_id: z.ZodString;
 }, z.core.$strict>;
 export declare const GetMailTipsInput: z.ZodObject<{
     email_addresses: z.ZodArray<z.ZodString>;
@@ -113,7 +110,8 @@ export type GetMessageHeadersParams = z.infer<typeof GetMessageHeadersInput>;
 export type GetMessageMimeParams = z.infer<typeof GetMessageMimeInput>;
 export type GetMailTipsParams = z.infer<typeof GetMailTipsInput>;
 /**
- * Interface for reading email body content from data files.
+ * Interface for reading email body content from data files. Implemented by the
+ * Graph content reader.
  */
 export interface IContentReader {
     /**
@@ -123,63 +121,8 @@ export interface IContentReader {
     readEmailBody(dataFilePath: string | null): string | null;
 }
 /**
- * Default content reader that returns null (body reading not implemented yet).
- * Will be replaced with OLK15 parser implementation.
- */
-export declare const nullContentReader: IContentReader;
-/**
- * Mail tools implementation with dependency injection.
- */
-export declare class MailTools {
-    private readonly repository;
-    private readonly contentReader;
-    private readonly attachmentReader?;
-    constructor(repository: IRepository, contentReader?: IContentReader, attachmentReader?: IAttachmentReader | undefined);
-    /**
-     * Lists all mail folders with message and unread counts.
-     */
-    listFolders(_params: ListFoldersParams): Folder[];
-    /**
-     * Lists emails in a folder with pagination.
-     */
-    listEmails(params: ListEmailsParams): EmailSummary[];
-    /**
-     * Searches emails by subject, sender, or preview.
-     */
-    searchEmails(params: SearchEmailsParams): EmailSummary[];
-    /**
-     * Gets a single email by ID with optional body content.
-     */
-    getEmail(params: GetEmailParams): (Email & {
-        attachments: AttachmentInfo[];
-    }) | null;
-    /**
-     * Gets the unread email count.
-     */
-    getUnreadCount(params: GetUnreadCountParams): {
-        count: number;
-    };
-    /**
-     * Lists attachment metadata for an email.
-     */
-    listAttachments(params: ListAttachmentsParams): AttachmentInfo[];
-    /**
-     * Downloads/saves an attachment to disk.
-     */
-    downloadAttachment(params: DownloadAttachmentParams): {
-        name: string;
-        savedTo: string;
-        size: number;
-    };
-}
-/**
- * Creates mail tools with the given repository.
- */
-export declare function createMailTools(repository: IRepository, contentReader?: IContentReader, attachmentReader?: IAttachmentReader): MailTools;
-/**
- * Registry tool definitions for the mail READ domain. Each handler branches on
- * the active backend: Graph delegates to GraphMailTools; AppleScript delegates
- * to AppleMailTools. Both toolsets return MCP content directly.
+ * Registry tool definitions for the mail READ domain. Each handler delegates
+ * to GraphMailTools, which returns MCP content directly.
  */
 export declare const SendEmailInput: z.ZodObject<{
     to: z.ZodArray<z.ZodString>;

package/dist/tools/mail.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mail.d.ts","sourceRoot":"","sources":["../../src/tools/mail.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mail.d.ts","sourceRoot":"","sources":["../../src/tools/mail.ts"],"names":[],"mappings":"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"}

package/dist/tools/mail.js

@@ -7,23 +7,23 @@
  *
  * Provides tools for listing folders, emails, and searching.
  */
-import { existsSync } from 'fs';
-import { dirname } from 'path';
 import { z } from 'zod';
-import { MAX_ATTACHMENT_DOWNLOAD_SIZE } from '../types/mail.js';
-import { appleTimestampToIso } from '../utils/dates.js';
-import { extractPlainText } from '../parsers/html-stripper.js';
-import { NotFoundError, ValidationError, AttachmentTooLargeError, AttachmentSaveError } from '../utils/errors.js';
 import { defineTool } from '../registry/define-tool.js';
-import { requireGraphToolset, requireAppleScriptToolset } from '../registry/context.js';
+import { requireGraphToolset } from '../registry/context.js';
+import { Id } from '../ids/schema.js';
 // =============================================================================
 // Input Schemas
 // =============================================================================
+/**
+ * Shared email/message id schema (U6): the canonical `em_` message-id schema.
+ * A raw Graph id is also accepted; a legacy numeric id is a validation error
+ * (numeric strings still route to resolveId → NUMERIC_ID_UNSUPPORTED).
+ */
+const EmailIdSchema = Id.message;
 export const ListFoldersInput = z.strictObject({});
 /**
  * Canonical (advertised) input for the `list_folders` tool. The Graph backend
- * ignores `account_id` and returns the default mailbox's folders; the
- * AppleScript backend uses it to support multi-account grouping.
+ * ignores `account_id` and returns the default mailbox's folders.
  */
 export const ListFoldersToolInput = z.strictObject({
     account_id: z
@@ -32,7 +32,7 @@ export const ListFoldersToolInput = z.strictObject({
         .describe('Account filter: number (specific account), array (multiple accounts), "all" (all accounts), or omit for default account'),
 });
 export const ListEmailsInput = z.strictObject({
-    folder_id: z.number().int().positive().describe('The folder ID to list emails from'),
+    folder_id: Id.folder.describe('The folder to list emails from — a `fd_` token from list_folders.'),
     limit: z
         .number()
         .int()
@@ -45,12 +45,7 @@ export const ListEmailsInput = z.strictObject({
 });
 export const SearchEmailsInput = z.strictObject({
     query: z.string().min(1).describe('Search query (searches subject, sender, and preview)'),
-    folder_id: z
-        .number()
-        .int()
-        .positive()
-        .optional()
-        .describe('Optional folder ID to limit search to'),
+    folder_id: Id.folder.optional().describe('Optional folder to limit search to — a `fd_` token from list_folders.'),
     limit: z
         .number()
         .int()
@@ -79,278 +74,53 @@ export const SearchEmailsAdvancedInput = z.strictObject({
     limit: z.number().int().min(1).max(100).default(50).describe('Maximum results (1-100)'),
 });
 export const GetEmailInput = z.strictObject({
-    email_id: z.number().int().positive().describe('The email ID to retrieve'),
+    email_id: EmailIdSchema.describe('The email ID to retrieve'),
     include_body: z.boolean().default(true).describe('Include the email body in the response'),
     strip_html: z.boolean().default(true).describe('Strip HTML tags from the body'),
 });
 export const GetEmailsInput = z.strictObject({
-    email_ids: z.array(z.number().int().positive()).min(1).max(25)
+    email_ids: z.array(EmailIdSchema).min(1).max(25)
         .describe('Array of email IDs to fetch (max 25)'),
     include_body: z.boolean().default(false).describe('Include full email body'),
     strip_html: z.boolean().default(false).describe('Strip HTML tags from body'),
 });
 export const ListConversationInput = z.strictObject({
-    message_id: z.number().int().positive().describe('Any message ID from the conversation thread'),
+    message_id: EmailIdSchema.describe('Any message ID from the conversation thread'),
     limit: z.number().int().min(1).max(100).default(25).describe('Maximum messages to return'),
 });
 export const GetUnreadCountInput = z.strictObject({
     folder_id: z
-        .number()
-        .int()
-        .positive()
+        .string()
+        .min(1)
         .optional()
         .describe('Optional folder ID to get unread count for'),
 });
 export const ListAttachmentsInput = z.strictObject({
-    email_id: z.number().int().positive().describe('The email ID to list attachments for'),
+    email_id: EmailIdSchema.describe('The email ID to list attachments for'),
 });
 export const DownloadAttachmentInput = z.strictObject({
-    email_id: z.number().int().positive().describe('The email ID containing the attachment'),
-    attachment_index: z.number().int().positive().describe('The 1-based index of the attachment (from list_attachments)'),
+    email_id: EmailIdSchema.describe('The email ID containing the attachment'),
+    attachment_id: Id.attachment,
     save_path: z.string().min(1).describe('Absolute file path where the attachment should be saved'),
 });
 export const CheckNewEmailsInput = z.strictObject({
-    folder_id: z.number().int().positive().describe('Folder ID to check for new emails'),
+    folder_id: Id.folder.describe('Folder to check for new emails — a `fd_` token from list_folders.'),
 });
 export const GetMessageHeadersInput = z.strictObject({
-    email_id: z.number().int().positive().describe('Email ID'),
+    email_id: EmailIdSchema.describe('Email ID'),
 });
 export const GetMessageMimeInput = z.strictObject({
-    email_id: z.number().int().positive().describe('Email ID'),
+    email_id: EmailIdSchema.describe('Email ID'),
 });
 export const GetMailTipsInput = z.strictObject({
     email_addresses: z.array(z.string().email()).min(1).max(20).describe('Email addresses to check'),
 });
 // =============================================================================
-// Transformers
-// =============================================================================
-/**
- * Transforms a database folder row to domain Folder type.
- */
-function transformFolder(row) {
-    return {
-        id: row.id,
-        name: row.name ?? 'Unnamed',
-        parentId: row.parentId,
-        specialType: row.specialType,
-        folderType: row.folderType,
-        accountId: row.accountId,
-        messageCount: row.messageCount,
-        unreadCount: row.unreadCount,
-    };
-}
-/**
- * Transforms a database email row to domain EmailSummary type.
- */
-function transformEmailSummary(row) {
-    return {
-        id: row.id,
-        folderId: row.folderId,
-        subject: row.subject,
-        sender: row.sender,
-        senderAddress: row.senderAddress,
-        preview: row.preview,
-        isRead: row.isRead === 1,
-        timeReceived: appleTimestampToIso(row.timeReceived),
-        timeSent: appleTimestampToIso(row.timeSent),
-        hasAttachment: row.hasAttachment === 1,
-        priority: row.priority,
-        flagStatus: row.flagStatus,
-        categories: parseCategories(row.categories),
-    };
-}
-/**
- * Parses categories from the database buffer.
- * Outlook stores categories as a null-delimited or comma-delimited buffer.
- */
-function parseCategories(buffer) {
-    if (buffer == null || buffer.length === 0) {
-        return [];
-    }
-    try {
-        const text = buffer.toString('utf-8');
-        // Categories may be stored as null-delimited or comma-delimited strings
-        const categories = text.includes('\0')
-            ? text.split('\0').filter(s => s.length > 0)
-            : text.split(',').map(s => s.trim()).filter(s => s.length > 0);
-        return categories;
-    }
-    catch {
-        return [];
-    }
-}
-/**
- * Transforms a database email row to domain Email type.
- */
-function transformEmail(row, body, stripHtml) {
-    const summary = transformEmailSummary(row);
-    // Process the body
-    let processedBody = null;
-    let htmlBody = null;
-    if (body != null) {
-        htmlBody = body;
-        processedBody = stripHtml ? extractPlainText(body) : body;
-    }
-    return {
-        ...summary,
-        recipients: row.recipients,
-        displayTo: row.displayTo,
-        toAddresses: row.toAddresses,
-        ccAddresses: row.ccAddresses,
-        size: row.size,
-        messageId: row.messageId ?? null,
-        conversationId: row.conversationId ?? null,
-        body: processedBody,
-        htmlBody: stripHtml ? null : htmlBody,
-    };
-}
-/**
- * Default content reader that returns null (body reading not implemented yet).
- * Will be replaced with OLK15 parser implementation.
- */
-export const nullContentReader = {
-    readEmailBody: () => null,
-};
-// =============================================================================
-// Mail Tools Class
+// Registry Definitions (v3 registry-driven architecture)
 // =============================================================================
 /**
- * Mail tools implementation with dependency injection.
- */
-export class MailTools {
-    repository;
-    contentReader;
-    attachmentReader;
-    constructor(repository, contentReader = nullContentReader, attachmentReader) {
-        this.repository = repository;
-        this.contentReader = contentReader;
-        this.attachmentReader = attachmentReader;
-    }
-    /**
-     * Lists all mail folders with message and unread counts.
-     */
-    listFolders(_params) {
-        const rows = this.repository.listFolders();
-        return rows.map(transformFolder);
-    }
-    /**
-     * Lists emails in a folder with pagination.
-     */
-    listEmails(params) {
-        const { folder_id, limit, offset, unread_only } = params;
-        const rows = unread_only
-            ? this.repository.listUnreadEmails(folder_id, limit, offset)
-            : this.repository.listEmails(folder_id, limit, offset);
-        return rows.map(transformEmailSummary);
-    }
-    /**
-     * Searches emails by subject, sender, or preview.
-     */
-    searchEmails(params) {
-        const { query, folder_id, limit } = params;
-        const rows = folder_id != null
-            ? this.repository.searchEmailsInFolder(folder_id, query, limit)
-            : this.repository.searchEmails(query, limit);
-        return rows.map(transformEmailSummary);
-    }
-    /**
-     * Gets a single email by ID with optional body content.
-     */
-    getEmail(params) {
-        const { email_id, include_body, strip_html } = params;
-        const row = this.repository.getEmail(email_id);
-        if (row == null) {
-            return null;
-        }
-        // Get body content if requested
-        let body = null;
-        if (include_body && row.dataFilePath != null) {
-            body = this.contentReader.readEmailBody(row.dataFilePath);
-        }
-        // Get attachment metadata if available
-        let attachments = [];
-        if (this.attachmentReader != null && row.hasAttachment === 1) {
-            attachments = this.attachmentReader.listAttachments(email_id);
-        }
-        return {
-            ...transformEmail(row, body, strip_html),
-            attachments,
-        };
-    }
-    /**
-     * Gets the unread email count.
-     */
-    getUnreadCount(params) {
-        const { folder_id } = params;
-        const count = folder_id != null
-            ? this.repository.getUnreadCountByFolder(folder_id)
-            : this.repository.getUnreadCount();
-        return { count };
-    }
-    /**
-     * Lists attachment metadata for an email.
-     */
-    listAttachments(params) {
-        if (this.attachmentReader == null) {
-            return [];
-        }
-        const { email_id } = params;
-        const row = this.repository.getEmail(email_id);
-        if (row == null) {
-            throw new NotFoundError('Email', email_id);
-        }
-        return this.attachmentReader.listAttachments(email_id);
-    }
-    /**
-     * Downloads/saves an attachment to disk.
-     */
-    downloadAttachment(params) {
-        if (this.attachmentReader == null) {
-            throw new ValidationError('Attachment reader not available');
-        }
-        const { email_id, attachment_index, save_path } = params;
-        const row = this.repository.getEmail(email_id);
-        if (row == null) {
-            throw new NotFoundError('Email', email_id);
-        }
-        // Validate save path directory exists
-        const dir = dirname(save_path);
-        if (!existsSync(dir)) {
-            throw new ValidationError(`Directory does not exist: ${dir}`);
-        }
-        // Get attachment list to validate index and check size
-        const attachments = this.attachmentReader.listAttachments(email_id);
-        const attachment = attachments.find(a => a.index === attachment_index);
-        if (attachment == null) {
-            throw new NotFoundError('Attachment', attachment_index);
-        }
-        if (attachment.size > MAX_ATTACHMENT_DOWNLOAD_SIZE) {
-            throw new AttachmentTooLargeError(attachment.name, attachment.size, MAX_ATTACHMENT_DOWNLOAD_SIZE);
-        }
-        const result = this.attachmentReader.saveAttachment(email_id, attachment_index, save_path);
-        if (!result.success) {
-            throw new AttachmentSaveError(attachment.name, result.error ?? 'Unknown error');
-        }
-        return {
-            name: result.name ?? attachment.name,
-            savedTo: result.savedTo ?? save_path,
-            size: result.fileSize ?? attachment.size,
-        };
-    }
-}
-/**
- * Creates mail tools with the given repository.
- */
-export function createMailTools(repository, contentReader = nullContentReader, attachmentReader) {
-    return new MailTools(repository, contentReader, attachmentReader);
-}
-// =============================================================================
-// Registry Definitions (v3 registry-driven architecture, U2 — dual backend)
-// =============================================================================
-/**
- * Registry tool definitions for the mail READ domain. Each handler branches on
- * the active backend: Graph delegates to GraphMailTools; AppleScript delegates
- * to AppleMailTools. Both toolsets return MCP content directly.
+ * Registry tool definitions for the mail READ domain. Each handler delegates
+ * to GraphMailTools, which returns MCP content directly.
  */
 export const SendEmailInput = z.strictObject({
     to: z.array(z.string()).min(1).describe('Recipient email addresses'),
@@ -379,12 +149,10 @@ export function mailToolDefinitions() {
             annotations: { readOnlyHint: false, destructiveHint: false, openWorldHint: true },
             destructive: true,
             presets: ['mail'],
-            backends: ['graph', 'applescript'],
-            // AppleScript single-shot send. On the Graph backend, direct send is not
-            // available — clients use the two-phase prepare_send_email/confirm_send_email.
-            handler: (ctx, params) => ctx.backend === 'graph'
-                ? { content: [{ type: 'text', text: 'Direct send_email is not available on the Graph backend; use prepare_send_email then confirm_send_email.' }], isError: true }
-                : requireAppleScriptToolset(ctx, 'mail').sendEmail(params),
+            backends: ['graph'],
+            // Direct send is not available on the Graph backend — clients use the
+            // two-phase prepare_send_email/confirm_send_email.
+            handler: () => ({ content: [{ type: 'text', text: 'Direct send_email is not available on the Graph backend; use prepare_send_email then confirm_send_email.' }], isError: true }),
         }),
         defineTool({
             name: 'list_folders',
@@ -393,10 +161,8 @@ export function mailToolDefinitions() {
             annotations: { readOnlyHint: true },
             destructive: false,
             presets: ['mail'],
-            backends: ['graph', 'applescript'],
-            handler: (ctx, params) => ctx.backend === 'graph'
-                ? requireGraphToolset(ctx, 'mailGraph').listFolders(params)
-                : requireAppleScriptToolset(ctx, 'mail').listFolders(params),
+            backends: ['graph'],
+            handler: (ctx, params) => requireGraphToolset(ctx, 'mailGraph').listFolders(params),
         }),
         defineTool({
             name: 'list_emails',
@@ -405,10 +171,8 @@ export function mailToolDefinitions() {
             annotations: { readOnlyHint: true },
             destructive: false,
             presets: ['mail'],
-            backends: ['graph', 'applescript'],
-            handler: (ctx, params) => ctx.backend === 'graph'
-                ? requireGraphToolset(ctx, 'mailGraph').listEmails(params)
-                : requireAppleScriptToolset(ctx, 'mail').listEmails(params),
+            backends: ['graph'],
+            handler: (ctx, params) => requireGraphToolset(ctx, 'mailGraph').listEmails(params),
         }),
         defineTool({
             name: 'search_emails',
@@ -417,10 +181,8 @@ export function mailToolDefinitions() {
             annotations: { readOnlyHint: true },
             destructive: false,
             presets: ['mail'],
-            backends: ['graph', 'applescript'],
-            handler: (ctx, params) => ctx.backend === 'graph'
-                ? requireGraphToolset(ctx, 'mailGraph').searchEmails(params)
-                : requireAppleScriptToolset(ctx, 'mail').searchEmails(params),
+            backends: ['graph'],
+            handler: (ctx, params) => requireGraphToolset(ctx, 'mailGraph').searchEmails(params),
         }),
         defineTool({
             name: 'get_email',
@@ -429,10 +191,8 @@ export function mailToolDefinitions() {
             annotations: { readOnlyHint: true },
             destructive: false,
             presets: ['mail'],
-            backends: ['graph', 'applescript'],
-            handler: (ctx, params) => ctx.backend === 'graph'
-                ? requireGraphToolset(ctx, 'mailGraph').getEmail(params)
-                : requireAppleScriptToolset(ctx, 'mail').getEmail(params),
+            backends: ['graph'],
+            handler: (ctx, params) => requireGraphToolset(ctx, 'mailGraph').getEmail(params),
         }),
         defineTool({
             name: 'get_emails',
@@ -441,10 +201,8 @@ export function mailToolDefinitions() {
             annotations: { readOnlyHint: true },
             destructive: false,
             presets: ['mail'],
-            backends: ['graph', 'applescript'],
-            handler: (ctx, params) => ctx.backend === 'graph'
-                ? requireGraphToolset(ctx, 'mailGraph').getEmails(params)
-                : requireAppleScriptToolset(ctx, 'mail').getEmails(params),
+            backends: ['graph'],
+            handler: (ctx, params) => requireGraphToolset(ctx, 'mailGraph').getEmails(params),
         }),
         defineTool({
             name: 'get_unread_count',
@@ -453,10 +211,8 @@ export function mailToolDefinitions() {
             annotations: { readOnlyHint: true },
             destructive: false,
             presets: ['mail'],
-            backends: ['graph', 'applescript'],
-            handler: (ctx, params) => ctx.backend === 'graph'
-                ? requireGraphToolset(ctx, 'mailGraph').getUnreadCount(params)
-                : requireAppleScriptToolset(ctx, 'mail').getUnreadCount(params),
+            backends: ['graph'],
+            handler: (ctx, params) => requireGraphToolset(ctx, 'mailGraph').getUnreadCount(params),
         }),
         defineTool({
             name: 'list_attachments',
@@ -465,10 +221,8 @@ export function mailToolDefinitions() {
             annotations: { readOnlyHint: true },
             destructive: false,
             presets: ['mail'],
-            backends: ['graph', 'applescript'],
-            handler: (ctx, params) => ctx.backend === 'graph'
-                ? requireGraphToolset(ctx, 'mailGraph').listAttachments(params)
-                : requireAppleScriptToolset(ctx, 'mail').listAttachments(params),
+            backends: ['graph'],
+            handler: (ctx, params) => requireGraphToolset(ctx, 'mailGraph').listAttachments(params),
         }),
         defineTool({
             name: 'download_attachment',
@@ -477,10 +231,8 @@ export function mailToolDefinitions() {
             annotations: { readOnlyHint: false, destructiveHint: false, openWorldHint: true },
             destructive: false,
             presets: ['mail'],
-            backends: ['graph', 'applescript'],
-            handler: (ctx, params) => ctx.backend === 'graph'
-                ? requireGraphToolset(ctx, 'mailGraph').downloadAttachment(params)
-                : requireAppleScriptToolset(ctx, 'mail').downloadAttachment(params),
+            backends: ['graph'],
+            handler: (ctx, params) => requireGraphToolset(ctx, 'mailGraph').downloadAttachment(params),
         }),
         // ---- Graph-only reads ----
         defineTool({