mcp-icloud 2.1.3 → 2.1.5

package/README.md

@@ -103,7 +103,7 @@ Tools marked local only return an error in cloud mode, because the iCloud protoc
 
 Reading requires the [`imsg`](https://github.com/steipete/imsg) CLI and Full Disk Access.
 
-- **list-chats**: `limit` (number, optional)
+- **list-chats**: `limit` (number, optional, max 1000), `since` (ISO 8601, optional — only chats active since that date, e.g. a weekly review)
 - **read-messages**: `chatId` (number); `limit` (number, optional); `start`, `end` (ISO 8601, optional); `attachments` (boolean, optional)
 - **send-message**: `to` (string), `body` (string), `file` (string, optional)
 - **react-message**: `chatId` (number), `type` (`love`, `like`, `dislike`, `laugh`, `emphasis`, `question`)

package/email/index.js

@@ -64,7 +64,7 @@ async function handleReadEmail(args) {
   const local = isLocalMode();
 
   const email = local
-    ? await localClient.readEmail(args.uid)
+    ? await localClient.readEmail(args.uid, folder)
     : await cloudClient.readEmail(args.uid, folder);
 
   // Mail.app returns the body as `body`; mailparser returns `text`.
@@ -167,7 +167,7 @@ async function handleMarkAsRead(args) {
   const isRead = args.isRead !== false;
 
   if (isLocalMode()) {
-    await localClient.markAsRead(args.uid, isRead);
+    await localClient.markAsRead(args.uid, isRead, folder);
   } else {
     await cloudClient.markAsRead(args.uid, folder, isRead);
   }

package/email/local-client.js

@@ -50,15 +50,42 @@ async function listEmails(folder = 'inbox', count = 25) {
   return result ? JSON.parse(result) : [];
 }
 
+/**
+ * JXA statements that set `mail` and `msg` to message `emailId`.
+ * Mail has no application-level messages collection, so
+ * `mail.messages.byId(id)` fails with -1728 (issue #15). A mailbox's
+ * `messages.byId(id)` works; the named folder is tried first.
+ * @param {string|number} emailId - Email ID
+ * @param {string} folder - Folder name
+ * @returns {string}
+ */
+function findMessageJXA(emailId, folder) {
+  const id = asInt(emailId);
+  return `
+    const mail = Application('Mail');
+    let msg = null;
+    for (const account of mail.accounts()) {
+      const mailboxes = [account.mailboxes.byName('${escapeJXA(getMailboxName(folder || 'inbox'))}')].concat(account.mailboxes());
+      for (const mailbox of mailboxes) {
+        if (!mailbox.exists()) continue;
+        const candidate = mailbox.messages.byId(${id});
+        if (candidate.exists()) { msg = candidate; break; }
+      }
+      if (msg) break;
+    }
+    if (!msg) throw new Error('Email not found: ${id}');
+  `;
+}
+
 /**
  * Read a specific email
  * @param {string} emailId - Email ID
+ * @param {string} [folder] - Folder to look in first
  * @returns {Promise<Object>} - Email content
  */
-async function readEmail(emailId) {
+async function readEmail(emailId, folder = 'inbox') {
   const script = `
-    const mail = Application('Mail');
-    const msg = mail.messages.byId(${asInt(emailId)});
+    ${findMessageJXA(emailId, folder)}
 
     JSON.stringify({
       id: msg.id(),
@@ -170,18 +197,18 @@ async function searchEmails({ query, from, subject, folder = 'inbox', count = 25
  * Mark email as read/unread
  * @param {string} emailId - Email ID
  * @param {boolean} isRead - Read status
+ * @param {string} [folder] - Folder to look in first
  * @returns {Promise<Object>} - Result
  */
-async function markAsRead(emailId, isRead = true) {
+async function markAsRead(emailId, isRead = true, folder = 'inbox') {
   const script = `
-    tell application "Mail"
-      set theMessage to message id ${asInt(emailId)}
-      set read status of theMessage to ${asBool(isRead, true)}
-    end tell
-    return "done"
+    ${findMessageJXA(emailId, folder)}
+    msg = msg.mailbox().messages.byId(${asInt(emailId)});
+    msg.readStatus = ${asBool(isRead, true)};
+    'done';
   `;
 
-  await runAppleScript(script);
+  await runJXA(script);
   return { success: true, message: `Email marked as ${isRead ? 'read' : 'unread'}` };
 }
 
@@ -216,18 +243,18 @@ async function listFolders() {
 /**
  * Delete an email
  * @param {string} emailId - Email ID
+ * @param {string} [folder] - Folder to look in first
  * @returns {Promise<Object>} - Result
  */
-async function deleteEmail(emailId) {
+async function deleteEmail(emailId, folder = 'inbox') {
   const script = `
-    tell application "Mail"
-      set theMessage to message id ${asInt(emailId)}
-      delete theMessage
-    end tell
-    return "deleted"
+    ${findMessageJXA(emailId, folder)}
+    msg = msg.mailbox().messages.byId(${asInt(emailId)});
+    mail.delete(msg);
+    'deleted';
   `;
 
-  await runAppleScript(script);
+  await runJXA(script);
   return { success: true, message: 'Email deleted' };
 }
 

package/messages/index.js

@@ -9,7 +9,7 @@ const localClient = require('./local-client');
 const { formatError, formatSuccess, withErrorHandler } = require('../utils/error-handler');
 const { listOutput, listResult } = require('../utils/schemas');
 const { isLocalMode } = require('../mode');
-const { execFileSync } = require('child_process');
+const { execFile } = require('child_process');
 const fs = require('fs');
 
 // Homebrew's prefix differs between Apple Silicon and Intel, and an MCP server
@@ -29,6 +29,9 @@ function resolveImsg() {
   return 'imsg';
 }
 
+// Chats scanned when `since` is set; listing 5,000 takes well under a second.
+const SINCE_FETCH_LIMIT = 5000;
+
 function requireLocalMode(toolName) {
   if (!isLocalMode()) {
     return formatError(new Error(`${toolName} is only available in LOCAL mode. Use set-mode to switch.`));
@@ -36,14 +39,29 @@ function requireLocalMode(toolName) {
   return null;
 }
 
-function runImsg(args) {
-  let output;
-  try {
-    output = execFileSync(resolveImsg(), args, {
-      timeout: 15000,
+// Async on purpose: a synchronous call blocks the whole server, so parallel
+// reads from a client queue behind each other until they time out (#17).
+function execImsg(args) {
+  return new Promise((resolve, reject) => {
+    execFile(resolveImsg(), args, {
+      timeout: 30000,
       encoding: 'utf-8',
-      stdio: ['pipe', 'pipe', 'pipe']
+      maxBuffer: 64 * 1024 * 1024
+    }, (error, stdout, stderr) => {
+      if (error) {
+        error.stderr = stderr;
+        reject(error);
+      } else {
+        resolve(stdout);
+      }
     });
+  });
+}
+
+async function runImsg(args) {
+  let output;
+  try {
+    output = await execImsg(args);
   } catch (error) {
     const detail = (error.stderr || error.message || '').toString();
     if (detail.includes('permissionDenied')) {
@@ -52,6 +70,9 @@ function runImsg(args) {
     if (error.code === 'ENOENT') {
       throw new Error('The imsg CLI was not found. Install it (brew install imsg) or set ICLOUD_MCP_IMSG_PATH.');
     }
+    if (error.killed) {
+      throw new Error('imsg timed out after 30s');
+    }
     throw new Error(detail.trim() || 'imsg failed');
   }
 
@@ -70,17 +91,26 @@ const messagesTools = [
     name: 'list-chats',
     outputSchema: listOutput('Recent conversations'),
     title: 'List Chats',
-    description: 'List recent iMessage/SMS conversations with contact names and last message preview',
+    description: 'List recent iMessage/SMS conversations, most recent first. Use `since` to get only the conversations active after a date (e.g. the last 7 days).',
     inputSchema: {
-      limit: z.number().int().min(1).max(200).optional().describe('Number of conversations to show (default 20)')
+      limit: z.number().int().min(1).max(1000).optional().describe('Maximum number of conversations to return (default 20)'),
+      since: z.string().refine(v => !Number.isNaN(Date.parse(v)), 'since must be an ISO 8601 date')
+        .optional().describe('Only conversations with a message at or after this date (ISO 8601, optional)')
     },
     annotations: {"readOnlyHint":true,"idempotentHint":true,"openWorldHint":false},
-    handler: withErrorHandler(async ({ limit = 20 }) => {
+    handler: withErrorHandler(async ({ limit = 20, since }) => {
       const modeError = requireLocalMode('list-chats');
       if (modeError) return modeError;
-      const result = runImsg(['chats', '--limit', String(limit), '--json']);
+      // imsg has no date filter, but returns chats newest first, so fetch a
+      // wide window and cut it at `since` here.
+      const fetchLimit = since ? Math.max(limit, SINCE_FETCH_LIMIT) : limit;
+      const result = await runImsg(['chats', '--limit', String(fetchLimit), '--json']);
       // imsg emits JSONL, and runImsg unwraps a single line to a bare object.
-      const chats = Array.isArray(result) ? result : (result ? [result] : []);
+      let chats = Array.isArray(result) ? result : (result ? [result] : []);
+      if (since) {
+        const cutoff = Date.parse(since);
+        chats = chats.filter(c => Date.parse(c.last_message_at) >= cutoff).slice(0, limit);
+      }
       return formatSuccess(JSON.stringify(chats, null, 2), listResult(chats));
     }, 'list-chats')
   },
@@ -103,7 +133,7 @@ const messagesTools = [
       if (start) args.push('--start', start);
       if (end) args.push('--end', end);
       if (attachments) args.push('--attachments');
-      const result = runImsg(args);
+      const result = await runImsg(args);
       return formatSuccess(JSON.stringify(result, null, 2));
     }, 'read-messages')
   },
@@ -128,7 +158,7 @@ const messagesTools = [
         try {
           const args = ['send', '--to', to, '--text', body];
           if (file) args.push('--file', file);
-          const result = runImsg(args);
+          const result = await runImsg(args);
           return formatSuccess(JSON.stringify(result, null, 2));
         } catch (e) {
           throw new Error(`${error.message} (imsg fallback also failed: ${e.message})`);
@@ -148,7 +178,7 @@ const messagesTools = [
     handler: withErrorHandler(async ({ chatId, type }) => {
       const modeError = requireLocalMode('react-message');
       if (modeError) return modeError;
-      const result = runImsg(['react', '--chat-id', String(chatId), '--type', type]);
+      const result = await runImsg(['react', '--chat-id', String(chatId), '--type', type]);
       return formatSuccess(JSON.stringify(result, null, 2));
     }, 'react-message')
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mcp-icloud",
   "mcpName": "io.github.MrGo2/icloud-mcp",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "description": "MCP server for Apple services - Email, Calendar, Contacts, Reminders, Notes, Messages and Safari - with dual local (AppleScript) and cloud (IMAP/CalDAV/CardDAV) modes",
   "main": "index.js",
   "bin": {
@@ -27,7 +27,7 @@
   ],
   "scripts": {
     "start": "node index.js",
-    "test": "node test/security.test.js && node test/local-output.test.js",
+    "test": "node test/security.test.js && node test/local-output.test.js && node test/email-read.test.js && node test/messages.test.js",
     "test-mode": "USE_TEST_MODE=true node index.js",
     "inspect": "npx @modelcontextprotocol/inspector node index.js",
     "test:local": "node test/local-output.test.js"