@marlinjai/email-mcp 1.7.1 → 1.7.2

package/dist/setup/wizard.js

@@ -245,6 +245,18 @@ var CredentialStore = class {
     const data = this.read();
     return Object.values(data.accounts);
   }
+  /**
+   * The account already configured for this mailbox, if any. Provider plus
+   * address identifies a mailbox; the address comparison is case-insensitive
+   * because providers report it in varying case.
+   */
+  async findByProviderAndEmail(provider, email) {
+    const wanted = email.trim().toLowerCase();
+    const data = this.read();
+    return Object.values(data.accounts).find(
+      (a) => a.provider === provider && a.email.trim().toLowerCase() === wanted
+    ) ?? null;
+  }
   async remove(id) {
     const data = this.read();
     delete data.accounts[id];
@@ -2881,6 +2893,14 @@ async function testAndSave(creds) {
 async function promptAccountName(defaultName) {
   return askText("Account name:", defaultName);
 }
+async function resolveAccountIdentity(provider, email, defaultName) {
+  const existing = await store.findByProviderAndEmail(provider, email);
+  if (existing) {
+    console.log(`An account for ${email} already exists ("${existing.name}"), updating it in place.`);
+    return { id: existing.id, name: await promptAccountName(existing.name) };
+  }
+  return { id: crypto4.randomUUID(), name: await promptAccountName(defaultName) };
+}
 async function setupGmail(scopeModeFlag) {
   console.log("\n--- Gmail Setup ---");
   if (process.env.EMAIL_MCP_GMAIL_CLIENT_ID) {
@@ -2927,8 +2947,7 @@ ${url}
   const email = profile.emailAddress ?? "";
   if (!email) throw new Error("Could not retrieve Gmail address from profile");
   console.log(`Authenticated as ${email}`);
-  const name = await promptAccountName("Gmail");
-  const id = crypto4.randomUUID();
+  const { id, name } = await resolveAccountIdentity(ProviderType.Gmail, email.trim(), "Gmail");
   const creds = {
     id,
     name,
@@ -2965,8 +2984,7 @@ ${url}
   const email = account?.username ?? "";
   if (!email) throw new Error("Could not retrieve email from Microsoft account");
   console.log(`Authenticated as ${email}`);
-  const name = await promptAccountName("Outlook");
-  const id = crypto4.randomUUID();
+  const { id, name } = await resolveAccountIdentity(ProviderType.Outlook, email.trim(), "Outlook");
   const creds = {
     id,
     name,
@@ -2997,8 +3015,7 @@ async function setupICloud() {
     console.log("  Password is required");
     password = await askPassword("App-specific password:");
   }
-  const name = await promptAccountName("iCloud");
-  const id = crypto4.randomUUID();
+  const { id, name } = await resolveAccountIdentity(ProviderType.ICloud, email.trim(), "iCloud");
   const creds = {
     id,
     name,
@@ -3038,8 +3055,7 @@ async function setupIMAP() {
     const smtpPortStr = await askValidated("SMTP port:", "587", portValidator);
     smtpPort = parseInt(smtpPortStr, 10);
   }
-  const name = await promptAccountName("IMAP");
-  const id = crypto4.randomUUID();
+  const { id, name } = await resolveAccountIdentity(ProviderType.IMAP, email.trim(), "IMAP");
   const creds = {
     id,
     name,