icloud-mcp 1.4.0 → 1.4.2

package/README.md

@@ -13,6 +13,7 @@ A Model Context Protocol (MCP) server that connects Claude Desktop to your iClou
 - ✅ Mark emails as read/unread, flag/unflag in bulk or individually
 - 🗂️ List, create, rename, and delete mailboxes
 - 🔄 Dry run mode for bulk operations — preview before committing
+- 🔐 Safe move — emails are fingerprinted and verified in the destination before being removed from the source
 - 📝 Session logging — Claude tracks progress across long multi-step operations
 
 ## Prerequisites
@@ -42,9 +43,39 @@ Then find the install location:
 npm root -g
 ```
 
-This will return a path like `/opt/homebrew/lib/node_modules` or `/usr/local/lib/node_modules`.
+The path varies by setup:
 
-### 3. Configure Claude Desktop
+| Setup | Typical path |
+|-------|-------------|
+| Mac with Homebrew Node | `/opt/homebrew/lib/node_modules` |
+| Mac with system Node | `/usr/local/lib/node_modules` |
+| nvm | `~/.nvm/versions/node/v20.x.x/lib/node_modules` |
+
+### 3. Verify your setup
+
+Before configuring Claude Desktop, run the doctor command to confirm everything is working:
+
+```bash
+IMAP_USER="you@icloud.com" IMAP_PASSWORD="your-app-specific-password" node $(npm root -g)/icloud-mcp/index.js --doctor
+```
+
+You should see:
+
+```
+icloud-mcp doctor
+─────────────────────────────
+✅ IMAP_USER is set
+✅ IMAP_PASSWORD is set
+✅ Connected to imap.mail.me.com:993
+✅ Authenticated as you@icloud.com
+✅ INBOX opened (12453 messages)
+─────────────────────────────
+All checks passed. Ready to use with Claude Desktop.
+```
+
+If any step fails, a plain-English explanation and suggested fix will be shown.
+
+### 4. Configure Claude Desktop
 
 Open your Claude Desktop config file:
 
@@ -52,7 +83,7 @@ Open your Claude Desktop config file:
 open ~/Library/Application\ Support/Claude/claude_desktop_config.json
 ```
 
-Add the following under `mcpServers`, replacing the path with your npm root path from the previous step:
+Add the following under `mcpServers`, replacing the path with your npm root from step 2:
 
 ```json
 {
@@ -69,9 +100,7 @@ Add the following under `mcpServers`, replacing the path with your npm root path
 }
 ```
 
-> **Note:** If your `npm root -g` returned a different path, replace `/opt/homebrew/lib/node_modules` with that path.
-
-### 4. Add Custom Instructions (Recommended)
+### 5. Add Custom Instructions (Recommended)
 
 For large inbox operations, add the following to Claude Desktop's custom instructions to ensure Claude stays on track and checks in with you regularly. Go to **Claude Desktop → Settings → Custom Instructions** and add:
 
@@ -84,7 +113,7 @@ When using icloud-mail tools:
 5. If you are ever unsure what you have done so far, call log_read before proceeding
 ```
 
-### 5. Restart Claude Desktop
+### 6. Restart Claude Desktop
 
 Fully quit Claude Desktop (Cmd+Q) and reopen it. You should now be able to manage your iCloud inbox through Claude.
 
@@ -120,6 +149,8 @@ Fully quit Claude Desktop (Cmd+Q) and reopen it. You should now be able to manag
 | `rename_mailbox` | Rename an existing folder |
 | `delete_mailbox` | Delete a folder (must be empty first) |
 | `empty_trash` | Permanently delete all emails in Deleted Messages |
+| `get_move_status` | Check the status of the current or most recent bulk move operation |
+| `abandon_move` | Abandon an in-progress move operation so a new one can start |
 | `log_write` | Write a step to the session log |
 | `log_read` | Read the session log to see what has been done so far |
 | `log_clear` | Clear the session log and start fresh |
@@ -141,13 +172,17 @@ Fully quit Claude Desktop (Cmd+Q) and reopen it. You should now be able to manag
 | `smaller` | number | Only emails smaller than this size in KB |
 | `hasAttachment` | boolean | Only emails with attachments |
 
-### Dry Run Mode
+## Dry Run Mode
 
 Pass `dryRun: true` to `bulk_move` or `bulk_delete` to preview how many emails would be affected without making any changes:
 
 > *"How many emails would be deleted if I removed everything from linkedin.com before 2022?"*
 
-### Session Log
+## Safe Move
+
+All bulk move operations use a copy-verify-delete approach. Emails are fingerprinted before copying, confirmed present in the destination, and only then removed from the source. A persistent manifest at `~/.icloud-mcp-move-manifest.json` tracks progress across chunks so that a crash or connection drop mid-operation never results in data loss. Use `get_move_status` to inspect any operation and `abandon_move` to clear a stuck one.
+
+## Session Log
 
 The session log persists to `~/.icloud-mcp-session.json` on your Mac — outside Claude's context window — so progress is never lost during long operations. Claude can write its plan at the start, log each completed step, and read the log back at any point to reorient itself.
 
@@ -174,4 +209,4 @@ Once configured, you can ask Claude things like:
 
 ## License
 
-MIT
+MIT

package/index.js

@@ -15,8 +15,12 @@ const IMAP_USER = process.env.IMAP_USER;
 const IMAP_PASSWORD = process.env.IMAP_PASSWORD;
 
 if (!IMAP_USER || !IMAP_PASSWORD) {
-  process.stderr.write('Error: IMAP_USER and IMAP_PASSWORD environment variables are required\n');
-  process.exit(1);
+  if (process.argv.includes('--doctor')) {
+    // Doctor will handle missing credentials with friendly output
+  } else {
+    process.stderr.write('Error: IMAP_USER and IMAP_PASSWORD environment variables are required\n');
+    process.exit(1);
+  }
 }
 
 function createClient() {
@@ -1426,7 +1430,7 @@ async function main() {
       }
       return { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] };
     } catch (error) {
-      return { content: [{ type: 'text', text: `Error: ${error.message}` }], isError: true };
+      return { content: [{ type: 'text', text: `Error: ${friendlyError(error)}` }], isError: true };
     }
   });
 
@@ -1435,6 +1439,132 @@ async function main() {
   process.stderr.write('iCloud Mail MCP Server running\n');
 }
 
+// ─── Friendly error messages ──────────────────────────────────────────────────
+
+function friendlyError(err) {
+  const msg = err.message ?? '';
+
+  if (msg.includes('AUTHENTICATIONFAILED') || msg.includes('Invalid credentials') || msg.includes('Authentication failed')) {
+    return [
+      'Authentication failed.',
+      '→ Make sure IMAP_PASSWORD is an app-specific password, not your regular iCloud password.',
+      '→ Generate one at: appleid.apple.com → Sign-In and Security → App-Specific Passwords',
+      '→ Also check that IMAP_USER is your full iCloud email address (e.g. you@icloud.com)'
+    ].join('\n');
+  }
+
+  if (msg.includes('ECONNREFUSED') || msg.includes('ENOTFOUND') || msg.includes('ENETUNREACH')) {
+    return [
+      'Could not reach imap.mail.me.com:993.',
+      '→ Check your internet connection.',
+      '→ If you are behind a firewall or VPN, port 993 may be blocked.'
+    ].join('\n');
+  }
+
+  if (msg.includes('ETIMEDOUT') || msg.includes('socket hang up')) {
+    return [
+      'Connection to iCloud timed out.',
+      '→ Check your internet connection and try again.',
+      '→ iCloud IMAP can be slow under load — this is usually transient.'
+    ].join('\n');
+  }
+
+  if (msg.includes('ECONNRESET')) {
+    return [
+      'iCloud closed the connection unexpectedly.',
+      '→ This is usually transient. Try again in a few seconds.'
+    ].join('\n');
+  }
+
+  if (msg.includes('Mailbox does not exist') || msg.includes('does not exist') || msg.includes('NONEXISTENT')) {
+    return [
+      `Mailbox not found: ${msg}`,
+      '→ Check the folder name is correct — iCloud folder names are case-sensitive.',
+      '→ Use list_mailboxes to see all available folders.'
+    ].join('\n');
+  }
+
+  // Fall through — return original message
+  return msg;
+}
+
+// ─── Doctor command ───────────────────────────────────────────────────────────
+
+async function runDoctor() {
+  const divider = '─'.repeat(45);
+  process.stdout.write(`\nicloud-mcp doctor\n${divider}\n`);
+
+  const checks = [
+    {
+      label: 'IMAP_USER is set',
+      run: () => {
+        if (!IMAP_USER) throw new Error('IMAP_USER environment variable is not set.\n→ Add it to your Claude Desktop config env block.');
+      }
+    },
+    {
+      label: 'IMAP_PASSWORD is set',
+      run: () => {
+        if (!IMAP_PASSWORD) throw new Error('IMAP_PASSWORD environment variable is not set.\n→ Add it to your Claude Desktop config env block.');
+      }
+    },
+    {
+      label: 'IMAP_USER looks like an email address',
+      run: () => {
+        if (!IMAP_USER?.includes('@')) throw new Error(`IMAP_USER "${IMAP_USER}" doesn't look like an email address.\n→ Use your full iCloud address, e.g. you@icloud.com`);
+      }
+    },
+    {
+      label: `Connected to imap.mail.me.com:993`,
+      run: async () => {
+        const client = createClient();
+        await client.connect();
+        await client.logout();
+      }
+    },
+    {
+      label: `Authenticated as ${IMAP_USER}`,
+      run: async () => {
+        // Auth is validated as part of connect — if we reach here it passed.
+        // This check exists to give a clearer label in the output.
+      }
+    },
+    {
+      label: 'INBOX opened',
+      run: async () => {
+        const client = createClient();
+        await client.connect();
+        const mb = await client.mailboxOpen('INBOX');
+        await client.logout();
+        return `${mb.exists.toLocaleString()} messages`;
+      }
+    }
+  ];
+
+  let allPassed = true;
+
+  for (const check of checks) {
+    try {
+      const detail = await check.run();
+      const suffix = detail ? ` (${detail})` : '';
+      process.stdout.write(`✅ ${check.label}${suffix}\n`);
+    } catch (err) {
+      process.stdout.write(`❌ ${check.label}\n   ${friendlyError(err).replace(/\n/g, '\n   ')}\n`);
+      allPassed = false;
+      break; // No point continuing after a failure
+    }
+  }
+
+  process.stdout.write(`${divider}\n`);
+  if (allPassed) {
+    process.stdout.write('All checks passed. Ready to use with Claude Desktop.\n\n');
+    process.exit(0);
+  } else {
+    process.stdout.write('Setup is not complete. Fix the issue above and run --doctor again.\n\n');
+    process.exit(1);
+  }
+}
+
+
 process.on('uncaughtException', (err) => {
   process.stderr.write(`Uncaught exception: ${err.message}\n${err.stack}\n`);
   process.exit(1);
@@ -1445,7 +1575,14 @@ process.on('unhandledRejection', (reason) => {
   process.exit(1);
 });
 
-main().catch((err) => {
-  process.stderr.write(`Fatal error: ${err.message}\n${err.stack}\n`);
-  process.exit(1);
-});
+if (process.argv.includes('--doctor')) {
+  runDoctor().catch((err) => {
+    process.stderr.write(`Doctor failed unexpectedly: ${err.message}\n`);
+    process.exit(1);
+  });
+} else {
+  main().catch((err) => {
+    process.stderr.write(`Fatal error: ${err.message}\n${err.stack}\n`);
+    process.exit(1);
+  });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "icloud-mcp",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "A Model Context Protocol (MCP) server for iCloud Mail",
   "main": "index.js",
   "bin": {