@hasna/contacts 0.2.2 → 0.2.4

package/dist/mcp/index.js

@@ -198,6 +198,20 @@ var MIGRATIONS = [
     group_id TEXT NOT NULL REFERENCES groups(id) ON DELETE CASCADE,
     PRIMARY KEY (contact_id, group_id)
   );
+  `,
+  `
+  ALTER TABLE contacts ADD COLUMN status TEXT DEFAULT 'active';
+  ALTER TABLE contacts ADD COLUMN follow_up_at TEXT;
+  ALTER TABLE contacts ADD COLUMN archived INTEGER NOT NULL DEFAULT 0;
+  ALTER TABLE contacts ADD COLUMN project_id TEXT;
+  ALTER TABLE companies ADD COLUMN archived INTEGER NOT NULL DEFAULT 0;
+  ALTER TABLE companies ADD COLUMN project_id TEXT;
+
+  CREATE TABLE IF NOT EXISTS company_groups (
+    company_id TEXT NOT NULL REFERENCES companies(id) ON DELETE CASCADE,
+    group_id TEXT NOT NULL REFERENCES groups(id) ON DELETE CASCADE,
+    PRIMARY KEY (company_id, group_id)
+  );
   `
 ];
 var _db = null;
@@ -269,11 +283,32 @@ class DuplicateTagNameError extends Error {
 }
 
 // src/db/activity.ts
+function rowToActivity(row) {
+  return { ...row };
+}
 function logActivity(db, input) {
   const id = uuid();
   db.run(`INSERT INTO activity_log (id, contact_id, company_id, action, details) VALUES (?, ?, ?, ?, ?)`, [id, input.contact_id ?? null, input.company_id ?? null, input.action, input.details ?? null]);
   return db.query(`SELECT * FROM activity_log WHERE id = ?`).get(id);
 }
+function listActivity(opts = {}, db) {
+  const d = db || getDatabase();
+  const { limit = 50, offset = 0, contact_id, company_id } = opts;
+  const conditions = [];
+  const params = [];
+  if (contact_id) {
+    conditions.push("contact_id = ?");
+    params.push(contact_id);
+  }
+  if (company_id) {
+    conditions.push("company_id = ?");
+    params.push(company_id);
+  }
+  const where = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
+  const totalRow = d.query(`SELECT COUNT(*) as total FROM activity_log ${where}`).get(...params);
+  const rows = d.query(`SELECT * FROM activity_log ${where} ORDER BY created_at DESC LIMIT ? OFFSET ?`).all(...params, limit, offset);
+  return { entries: rows.map(rowToActivity), total: totalRow.total };
+}
 
 // src/db/contacts.ts
 function rowToContact(row) {
@@ -281,7 +316,11 @@ function rowToContact(row) {
     ...row,
     source: row.source,
     custom_fields: JSON.parse(row.custom_fields || "{}"),
-    preferred_contact_method: row.preferred_contact_method ?? null
+    preferred_contact_method: row.preferred_contact_method ?? null,
+    status: row.status ?? "active",
+    follow_up_at: row.follow_up_at ?? null,
+    archived: !!row.archived,
+    project_id: row.project_id ?? null
   };
 }
 function rowToEmail(row) {
@@ -318,7 +357,9 @@ function rowToTag(row) {
 function rowToCompany(row) {
   return {
     ...row,
-    custom_fields: JSON.parse(row.custom_fields || "{}")
+    custom_fields: JSON.parse(row.custom_fields || "{}"),
+    archived: !!row.archived,
+    project_id: row.project_id ?? null
   };
 }
 function insertEmails(db, contactId, companyId, emails) {
@@ -362,8 +403,8 @@ function createContact(input, db) {
   const firstName = input.first_name ?? "";
   const lastName = input.last_name ?? "";
   const displayName = input.display_name ?? (firstName || lastName ? `${firstName} ${lastName}`.trim() : "Unnamed Contact");
-  d.run(`INSERT INTO contacts (id, first_name, last_name, display_name, nickname, avatar_url, notes, birthday, company_id, job_title, source, custom_fields, last_contacted_at, website, preferred_contact_method, created_at, updated_at)
-     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
+  d.run(`INSERT INTO contacts (id, first_name, last_name, display_name, nickname, avatar_url, notes, birthday, company_id, job_title, source, custom_fields, last_contacted_at, website, preferred_contact_method, status, follow_up_at, project_id, created_at, updated_at)
+     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
     id,
     firstName,
     lastName,
@@ -379,6 +420,9 @@ function createContact(input, db) {
     input.last_contacted_at ?? null,
     input.website ?? null,
     input.preferred_contact_method ?? null,
+    input.status ?? "active",
+    input.follow_up_at ?? null,
+    input.project_id ?? null,
     timestamp,
     timestamp
   ]);
@@ -413,12 +457,21 @@ function listContacts(opts = {}, db) {
     offset = 0,
     company_id,
     tag_id,
+    tag_ids,
     source,
+    status,
+    project_id,
+    archived = false,
+    follow_up_due,
+    last_contacted_after,
+    last_contacted_before,
     order_by = "display_name",
     order_dir = "asc"
   } = opts;
   const conditions = [];
   const params = [];
+  conditions.push("c.archived = ?");
+  params.push(archived ? 1 : 0);
   if (company_id) {
     conditions.push("c.company_id = ?");
     params.push(company_id);
@@ -427,12 +480,37 @@ function listContacts(opts = {}, db) {
     conditions.push("c.source = ?");
     params.push(source);
   }
+  if (status) {
+    conditions.push("c.status = ?");
+    params.push(status);
+  }
+  if (project_id) {
+    conditions.push("c.project_id = ?");
+    params.push(project_id);
+  }
   if (tag_id) {
     conditions.push("EXISTS (SELECT 1 FROM contact_tags ct WHERE ct.contact_id = c.id AND ct.tag_id = ?)");
     params.push(tag_id);
   }
+  if (tag_ids?.length) {
+    for (const tid of tag_ids) {
+      conditions.push("EXISTS (SELECT 1 FROM contact_tags ct WHERE ct.contact_id = c.id AND ct.tag_id = ?)");
+      params.push(tid);
+    }
+  }
+  if (follow_up_due) {
+    conditions.push("c.follow_up_at IS NOT NULL AND c.follow_up_at <= datetime('now')");
+  }
+  if (last_contacted_after) {
+    conditions.push("c.last_contacted_at >= ?");
+    params.push(last_contacted_after);
+  }
+  if (last_contacted_before) {
+    conditions.push("c.last_contacted_at <= ?");
+    params.push(last_contacted_before);
+  }
   const where = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
-  const validOrderBy = ["display_name", "created_at", "updated_at"].includes(order_by) ? order_by : "display_name";
+  const validOrderBy = ["display_name", "created_at", "updated_at", "last_contacted_at", "follow_up_at"].includes(order_by) ? order_by : "display_name";
   const validOrderDir = order_dir === "desc" ? "DESC" : "ASC";
   const totalRow = d.query(`SELECT COUNT(*) as total FROM contacts c ${where}`).get(...params);
   const rows = d.query(`SELECT c.* FROM contacts c ${where} ORDER BY c.${validOrderBy} ${validOrderDir} LIMIT ? OFFSET ?`).all(...params, limit, offset);
@@ -502,8 +580,36 @@ function updateContact(id, input, db) {
     setClauses.push("preferred_contact_method = ?");
     params.push(input.preferred_contact_method);
   }
+  if (input.status !== undefined) {
+    setClauses.push("status = ?");
+    params.push(input.status);
+  }
+  if (input.follow_up_at !== undefined) {
+    setClauses.push("follow_up_at = ?");
+    params.push(input.follow_up_at);
+  }
+  if (input.project_id !== undefined) {
+    setClauses.push("project_id = ?");
+    params.push(input.project_id);
+  }
   params.push(id);
   d.run(`UPDATE contacts SET ${setClauses.join(", ")} WHERE id = ?`, params);
+  if (input.emails_add?.length) {
+    for (const e of input.emails_add) {
+      const exists = d.query(`SELECT id FROM emails WHERE contact_id = ? AND LOWER(address) = LOWER(?)`).get(id, e.address);
+      if (!exists) {
+        d.run(`INSERT INTO emails (id, contact_id, company_id, address, type, is_primary) VALUES (?, ?, NULL, ?, ?, ?)`, [uuid(), id, e.address, e.type ?? "work", e.is_primary ? 1 : 0]);
+      }
+    }
+  }
+  if (input.phones_add?.length) {
+    for (const p of input.phones_add) {
+      const exists = d.query(`SELECT id FROM phones WHERE contact_id = ? AND number = ?`).get(id, p.number);
+      if (!exists) {
+        d.run(`INSERT INTO phones (id, contact_id, company_id, number, country_code, type, is_primary) VALUES (?, ?, NULL, ?, ?, ?, ?)`, [uuid(), id, p.number, p.country_code ?? null, p.type ?? "mobile", p.is_primary ? 1 : 0]);
+      }
+    }
+  }
   logActivity(d, { contact_id: id, action: "contact.updated", details: `Updated contact: ${existing.display_name}` });
   const row = d.query(`SELECT * FROM contacts WHERE id = ?`).get(id);
   return loadContactDetails(d, rowToContact(row));
@@ -521,25 +627,31 @@ function searchContacts(query, db) {
   const ftsRows = d.query(`
     SELECT c.* FROM contacts c
     JOIN contacts_fts fts ON fts.id = c.id
-    WHERE contacts_fts MATCH ?
+    WHERE contacts_fts MATCH ? AND c.archived = 0
     ORDER BY rank
     LIMIT 50
   `).all(`"${query.replace(/"/g, '""')}"*`);
   const emailRows = d.query(`
     SELECT DISTINCT c.* FROM contacts c
     JOIN emails e ON e.contact_id = c.id
-    WHERE e.address LIKE ?
+    WHERE e.address LIKE ? AND c.archived = 0
     LIMIT 20
   `).all(`%${query}%`);
   const phoneRows = d.query(`
     SELECT DISTINCT c.* FROM contacts c
     JOIN phones p ON p.contact_id = c.id
-    WHERE p.number LIKE ?
+    WHERE p.number LIKE ? AND c.archived = 0
+    LIMIT 20
+  `).all(`%${query}%`);
+  const companyRows = d.query(`
+    SELECT DISTINCT c.* FROM contacts c
+    JOIN companies co ON co.id = c.company_id
+    WHERE co.name LIKE ? AND c.archived = 0
     LIMIT 20
   `).all(`%${query}%`);
   const seen = new Set;
   const allRows = [];
-  for (const row of [...ftsRows, ...emailRows, ...phoneRows]) {
+  for (const row of [...ftsRows, ...emailRows, ...phoneRows, ...companyRows]) {
     if (!seen.has(row.id)) {
       seen.add(row.id);
       allRows.push(row);
@@ -555,8 +667,24 @@ function mergeContacts(keepId, mergeId, db) {
   const mergeRow = d.query(`SELECT * FROM contacts WHERE id = ?`).get(mergeId);
   if (!mergeRow)
     throw new ContactNotFoundError(mergeId);
-  d.run(`UPDATE emails SET contact_id = ? WHERE contact_id = ?`, [keepId, mergeId]);
-  d.run(`UPDATE phones SET contact_id = ? WHERE contact_id = ?`, [keepId, mergeId]);
+  const mergeEmailRows = d.query(`SELECT * FROM emails WHERE contact_id = ?`).all(mergeId);
+  for (const e of mergeEmailRows) {
+    const exists = d.query(`SELECT id FROM emails WHERE contact_id = ? AND LOWER(address) = LOWER(?)`).get(keepId, e.address);
+    if (exists) {
+      d.run(`DELETE FROM emails WHERE id = ?`, [e.id]);
+    } else {
+      d.run(`UPDATE emails SET contact_id = ? WHERE id = ?`, [keepId, e.id]);
+    }
+  }
+  const mergePhoneRows = d.query(`SELECT * FROM phones WHERE contact_id = ?`).all(mergeId);
+  for (const p of mergePhoneRows) {
+    const exists = d.query(`SELECT id FROM phones WHERE contact_id = ? AND number = ?`).get(keepId, p.number);
+    if (exists) {
+      d.run(`DELETE FROM phones WHERE id = ?`, [p.id]);
+    } else {
+      d.run(`UPDATE phones SET contact_id = ? WHERE id = ?`, [keepId, p.id]);
+    }
+  }
   d.run(`UPDATE addresses SET contact_id = ? WHERE contact_id = ?`, [keepId, mergeId]);
   d.run(`UPDATE social_profiles SET contact_id = ? WHERE contact_id = ?`, [keepId, mergeId]);
   const mergeTags = d.query(`SELECT tag_id FROM contact_tags WHERE contact_id = ?`).all(mergeId);
@@ -603,6 +731,79 @@ function mergeContacts(keepId, mergeId, db) {
   const finalRow = d.query(`SELECT * FROM contacts WHERE id = ?`).get(keepId);
   return loadContactDetails(d, rowToContact(finalRow));
 }
+function getContactByEmail(email, db) {
+  const d = db || getDatabase();
+  const emailRow = d.query(`SELECT contact_id FROM emails WHERE LOWER(address) = LOWER(?) AND contact_id IS NOT NULL LIMIT 1`).get(email);
+  if (!emailRow)
+    return null;
+  const row = d.query(`SELECT * FROM contacts WHERE id = ?`).get(emailRow.contact_id);
+  if (!row)
+    return null;
+  return loadContactDetails(d, rowToContact(row));
+}
+function addEmailToContact(contactId, email, db) {
+  const d = db || getDatabase();
+  const row = d.query(`SELECT * FROM contacts WHERE id = ?`).get(contactId);
+  if (!row)
+    throw new ContactNotFoundError(contactId);
+  const exists = d.query(`SELECT id FROM emails WHERE contact_id = ? AND LOWER(address) = LOWER(?)`).get(contactId, email.address);
+  if (!exists) {
+    d.run(`INSERT INTO emails (id, contact_id, company_id, address, type, is_primary) VALUES (?, ?, NULL, ?, ?, ?)`, [uuid(), contactId, email.address, email.type ?? "work", email.is_primary ? 1 : 0]);
+  }
+  const updated = d.query(`SELECT * FROM contacts WHERE id = ?`).get(contactId);
+  return loadContactDetails(d, rowToContact(updated));
+}
+function addPhoneToContact(contactId, phone, db) {
+  const d = db || getDatabase();
+  const row = d.query(`SELECT * FROM contacts WHERE id = ?`).get(contactId);
+  if (!row)
+    throw new ContactNotFoundError(contactId);
+  const exists = d.query(`SELECT id FROM phones WHERE contact_id = ? AND number = ?`).get(contactId, phone.number);
+  if (!exists) {
+    d.run(`INSERT INTO phones (id, contact_id, company_id, number, country_code, type, is_primary) VALUES (?, ?, NULL, ?, ?, ?, ?)`, [uuid(), contactId, phone.number, phone.country_code ?? null, phone.type ?? "mobile", phone.is_primary ? 1 : 0]);
+  }
+  const updated = d.query(`SELECT * FROM contacts WHERE id = ?`).get(contactId);
+  return loadContactDetails(d, rowToContact(updated));
+}
+function archiveContact(id, db) {
+  const d = db || getDatabase();
+  const row = d.query(`SELECT * FROM contacts WHERE id = ?`).get(id);
+  if (!row)
+    throw new ContactNotFoundError(id);
+  d.run(`UPDATE contacts SET archived = 1, updated_at = ? WHERE id = ?`, [now(), id]);
+  logActivity(d, { contact_id: id, action: "contact.archived", details: `Archived contact: ${row.display_name}` });
+  const updated = d.query(`SELECT * FROM contacts WHERE id = ?`).get(id);
+  return loadContactDetails(d, rowToContact(updated));
+}
+function unarchiveContact(id, db) {
+  const d = db || getDatabase();
+  const row = d.query(`SELECT * FROM contacts WHERE id = ?`).get(id);
+  if (!row)
+    throw new ContactNotFoundError(id);
+  d.run(`UPDATE contacts SET archived = 0, updated_at = ? WHERE id = ?`, [now(), id]);
+  logActivity(d, { contact_id: id, action: "contact.unarchived", details: `Unarchived contact: ${row.display_name}` });
+  const updated = d.query(`SELECT * FROM contacts WHERE id = ?`).get(id);
+  return loadContactDetails(d, rowToContact(updated));
+}
+function autoLinkContactToCompany(contactId, db) {
+  const d = db || getDatabase();
+  const row = d.query(`SELECT * FROM contacts WHERE id = ?`).get(contactId);
+  if (!row || row.company_id)
+    return null;
+  const emailRow = d.query(`SELECT address FROM emails WHERE contact_id = ? AND contact_id IS NOT NULL LIMIT 1`).get(contactId);
+  if (!emailRow)
+    return null;
+  const domain = emailRow.address.split("@")[1];
+  if (!domain)
+    return null;
+  const companyRow = d.query(`SELECT id FROM companies WHERE domain = ? LIMIT 1`).get(domain);
+  if (!companyRow)
+    return null;
+  d.run(`UPDATE contacts SET company_id = ?, updated_at = ? WHERE id = ?`, [companyRow.id, now(), contactId]);
+  logActivity(d, { contact_id: contactId, action: "contact.auto_linked", details: `Auto-linked to company via email domain: ${domain}` });
+  const updated = d.query(`SELECT * FROM contacts WHERE id = ?`).get(contactId);
+  return loadContactDetails(d, rowToContact(updated));
+}
 
 // src/db/groups.ts
 function createGroup(db, input) {
@@ -614,7 +815,10 @@ function getGroup(db, id) {
   return db.query(`SELECT * FROM groups WHERE id = ?`).get(id);
 }
 function listGroups(db) {
-  return db.query(`SELECT g.*, COUNT(cg.contact_id) as member_count FROM groups g LEFT JOIN contact_groups cg ON g.id = cg.group_id GROUP BY g.id ORDER BY g.name`).all();
+  return db.query(`SELECT g.*,
+       (SELECT COUNT(*) FROM contact_groups cg WHERE cg.group_id = g.id) as member_count,
+       (SELECT COUNT(*) FROM company_groups cog WHERE cog.group_id = g.id) as company_count
+     FROM groups g ORDER BY g.name`).all();
 }
 function updateGroup(db, id, input) {
   const fields = [];
@@ -637,7 +841,11 @@ function deleteGroup(db, id) {
   db.query(`DELETE FROM groups WHERE id = ?`).run(id);
 }
 function addContactToGroup(db, contactId, groupId) {
-  db.query(`INSERT OR IGNORE INTO contact_groups(contact_id, group_id) VALUES(?,?)`).run(contactId, groupId);
+  const existing = db.query(`SELECT 1 FROM contact_groups WHERE contact_id = ? AND group_id = ?`).get(contactId, groupId);
+  if (existing)
+    return { added: false, already_member: true };
+  db.query(`INSERT INTO contact_groups(contact_id, group_id) VALUES(?,?)`).run(contactId, groupId);
+  return { added: true, already_member: false };
 }
 function removeContactFromGroup(db, contactId, groupId) {
   db.query(`DELETE FROM contact_groups WHERE contact_id = ? AND group_id = ?`).run(contactId, groupId);
@@ -649,6 +857,23 @@ function listContactsInGroup(db, groupId) {
 function listGroupsForContact(db, contactId) {
   return db.query(`SELECT g.* FROM groups g JOIN contact_groups cg ON g.id = cg.group_id WHERE cg.contact_id = ? ORDER BY g.name`).all(contactId);
 }
+function addCompanyToGroup(db, companyId, groupId) {
+  const existing = db.query(`SELECT 1 FROM company_groups WHERE company_id = ? AND group_id = ?`).get(companyId, groupId);
+  if (existing)
+    return { added: false, already_member: true };
+  db.query(`INSERT INTO company_groups(company_id, group_id) VALUES(?,?)`).run(companyId, groupId);
+  return { added: true, already_member: false };
+}
+function removeCompanyFromGroup(db, companyId, groupId) {
+  db.query(`DELETE FROM company_groups WHERE company_id = ? AND group_id = ?`).run(companyId, groupId);
+}
+function listCompaniesInGroup(db, groupId) {
+  const rows = db.query(`SELECT company_id FROM company_groups WHERE group_id = ?`).all(groupId);
+  return rows.map((r) => r.company_id);
+}
+function listGroupsForCompany(db, companyId) {
+  return db.query(`SELECT g.* FROM groups g JOIN company_groups cog ON g.id = cog.group_id WHERE cog.company_id = ? ORDER BY g.name`).all(companyId);
+}
 
 // src/db/tags.ts
 function rowToTag2(row) {
@@ -693,12 +918,28 @@ function removeTagFromContact(contactId, tagId, db) {
   const d = db || getDatabase();
   d.run(`DELETE FROM contact_tags WHERE contact_id = ? AND tag_id = ?`, [contactId, tagId]);
 }
+function addTagToCompany(companyId, tagId, db) {
+  const d = db || getDatabase();
+  const company = d.query(`SELECT id FROM companies WHERE id = ?`).get(companyId);
+  if (!company)
+    throw new CompanyNotFoundError(companyId);
+  const tag = d.query(`SELECT id FROM tags WHERE id = ?`).get(tagId);
+  if (!tag)
+    throw new TagNotFoundError(tagId);
+  d.run(`INSERT OR IGNORE INTO company_tags (company_id, tag_id) VALUES (?, ?)`, [companyId, tagId]);
+}
+function removeTagFromCompany(companyId, tagId, db) {
+  const d = db || getDatabase();
+  d.run(`DELETE FROM company_tags WHERE company_id = ? AND tag_id = ?`, [companyId, tagId]);
+}
 
 // src/db/companies.ts
 function rowToCompany2(row) {
   return {
     ...row,
-    custom_fields: JSON.parse(row.custom_fields || "{}")
+    custom_fields: JSON.parse(row.custom_fields || "{}"),
+    archived: !!row.archived,
+    project_id: row.project_id ?? null
   };
 }
 function insertEmails2(db, companyId, emails) {
@@ -808,15 +1049,23 @@ function listCompanies(opts = {}, db) {
     offset = 0,
     industry,
     tag_id,
+    project_id,
+    archived = false,
     order_by = "name",
     order_dir = "asc"
   } = opts;
   const conditions = [];
   const params = [];
+  conditions.push("co.archived = ?");
+  params.push(archived ? 1 : 0);
   if (industry) {
     conditions.push("co.industry = ?");
     params.push(industry);
   }
+  if (project_id) {
+    conditions.push("co.project_id = ?");
+    params.push(project_id);
+  }
   if (tag_id) {
     conditions.push("EXISTS (SELECT 1 FROM company_tags ct WHERE ct.company_id = co.id AND ct.tag_id = ?)");
     params.push(tag_id);
@@ -872,6 +1121,10 @@ function updateCompany(id, input, db) {
     setClauses.push("custom_fields = ?");
     params.push(JSON.stringify(input.custom_fields));
   }
+  if ("project_id" in input && input.project_id !== undefined) {
+    setClauses.push("project_id = ?");
+    params.push(input.project_id);
+  }
   params.push(id);
   d.run(`UPDATE companies SET ${setClauses.join(", ")} WHERE id = ?`, params);
   logActivity(d, { company_id: id, action: "company.updated", details: `Updated company: ${existing.name}` });
@@ -895,6 +1148,26 @@ function searchCompanies(query, db) {
   `).all(`%${query}%`, `%${query}%`, `%${query}%`, `%${query}%`);
   return rows.map((row) => loadCompanyDetails(d, rowToCompany2(row)));
 }
+function archiveCompany(id, db) {
+  const d = db || getDatabase();
+  const row = d.query(`SELECT * FROM companies WHERE id = ?`).get(id);
+  if (!row)
+    throw new CompanyNotFoundError(id);
+  d.run(`UPDATE companies SET archived = 1, updated_at = ? WHERE id = ?`, [now(), id]);
+  logActivity(d, { company_id: id, action: "company.archived", details: `Archived company: ${row.name}` });
+  const updated = d.query(`SELECT * FROM companies WHERE id = ?`).get(id);
+  return loadCompanyDetails(d, rowToCompany2(updated));
+}
+function unarchiveCompany(id, db) {
+  const d = db || getDatabase();
+  const row = d.query(`SELECT * FROM companies WHERE id = ?`).get(id);
+  if (!row)
+    throw new CompanyNotFoundError(id);
+  d.run(`UPDATE companies SET archived = 0, updated_at = ? WHERE id = ?`, [now(), id]);
+  logActivity(d, { company_id: id, action: "company.unarchived", details: `Unarchived company: ${row.name}` });
+  const updated = d.query(`SELECT * FROM companies WHERE id = ?`).get(id);
+  return loadCompanyDetails(d, rowToCompany2(updated));
+}
 
 // src/db/relationships.ts
 function rowToRelationship(row) {
@@ -937,6 +1210,39 @@ function deleteRelationship(id, db) {
   d.run(`DELETE FROM contact_relationships WHERE id = ?`, [id]);
 }
 
+// src/lib/dedup.ts
+function findEmailDuplicates(db) {
+  const rows = db.query(`
+    SELECT e.address as email, GROUP_CONCAT(e.contact_id) as ids
+    FROM emails e
+    WHERE e.contact_id IS NOT NULL
+    GROUP BY LOWER(e.address)
+    HAVING COUNT(*) > 1
+  `).all();
+  return rows.map((r) => ({ email: r.email, contact_ids: r.ids.split(",") }));
+}
+function levenshtein(a, b) {
+  const m = a.length, n = b.length;
+  const dp = Array.from({ length: m + 1 }, (_, i) => Array.from({ length: n + 1 }, (_2, j) => i === 0 ? j : j === 0 ? i : 0));
+  for (let i = 1;i <= m; i++)
+    for (let j = 1;j <= n; j++)
+      dp[i][j] = a[i - 1] === b[j - 1] ? dp[i - 1][j - 1] : 1 + Math.min(dp[i - 1][j], dp[i][j - 1], dp[i - 1][j - 1]);
+  return dp[m][n];
+}
+function findNameDuplicates(db) {
+  const contacts = db.query(`SELECT id, display_name FROM contacts`).all();
+  const pairs = [];
+  for (let i = 0;i < contacts.length; i++) {
+    for (let j = i + 1;j < contacts.length; j++) {
+      const dist = levenshtein(contacts[i].display_name.toLowerCase(), contacts[j].display_name.toLowerCase());
+      if (dist <= 2 && dist > 0) {
+        pairs.push({ contact_ids: [contacts[i].id, contacts[j].id], similarity: dist });
+      }
+    }
+  }
+  return pairs;
+}
+
 // src/lib/import.ts
 function parseCsv(text) {
   const lines = text.split(/\r?\n/);
@@ -1382,6 +1688,152 @@ async function exportContacts(format, contacts) {
   }
 }
 
+// src/lib/gmail-import.ts
+import { existsSync as existsSync2, readFileSync } from "fs";
+import { homedir } from "os";
+import { join as join2 } from "path";
+function loadGmailToken(profile = "default") {
+  const bases = [
+    join2(homedir(), ".connectors", "connect-gmail"),
+    join2(homedir(), ".connect", "connect-gmail")
+  ];
+  for (const base of bases) {
+    const tokenPath = join2(base, "profiles", profile, "tokens.json");
+    if (existsSync2(tokenPath)) {
+      try {
+        const raw = readFileSync(tokenPath, "utf-8");
+        const tokens = JSON.parse(raw);
+        if (tokens.accessToken)
+          return tokens.accessToken;
+      } catch {}
+    }
+  }
+  throw new Error("Gmail not authenticated. Run `connect-gmail auth login` first.");
+}
+function parseAddressHeader(header) {
+  const results = [];
+  const parts = header.split(/,(?![^<>]*>)(?![^"]*")/);
+  for (const part of parts) {
+    const trimmed = part.trim();
+    if (!trimmed)
+      continue;
+    const angleMatch = trimmed.match(/^(.*?)\s*<([^>]+)>\s*$/);
+    if (angleMatch) {
+      const name = angleMatch[1].trim().replace(/^"|"$/g, "");
+      const email = angleMatch[2].trim().toLowerCase();
+      if (email.includes("@"))
+        results.push({ name, email });
+    } else if (trimmed.includes("@")) {
+      results.push({ name: "", email: trimmed.toLowerCase() });
+    }
+  }
+  return results;
+}
+function domainToCompany(email) {
+  const domain = email.split("@")[1];
+  if (!domain)
+    return null;
+  const genericDomains = new Set([
+    "gmail.com",
+    "googlemail.com",
+    "yahoo.com",
+    "yahoo.co.uk",
+    "hotmail.com",
+    "hotmail.co.uk",
+    "outlook.com",
+    "live.com",
+    "icloud.com",
+    "me.com",
+    "mac.com",
+    "protonmail.com",
+    "pm.me",
+    "fastmail.com",
+    "hey.com",
+    "aol.com",
+    "msn.com"
+  ]);
+  if (genericDomains.has(domain.toLowerCase()))
+    return null;
+  const parts = domain.split(".");
+  const name = parts.length > 2 ? parts[parts.length - 2] : parts[0];
+  return name.charAt(0).toUpperCase() + name.slice(1);
+}
+function parseName(displayName) {
+  const name = displayName.trim();
+  if (!name)
+    return {};
+  const parts = name.split(/\s+/);
+  if (parts.length === 1)
+    return { first_name: parts[0] };
+  const last = parts.pop();
+  return { first_name: parts.join(" "), last_name: last };
+}
+async function extractContactsFromGmail(opts) {
+  const maxMessages = Math.min(opts.max_messages ?? 200, 500);
+  const profile = opts.gmail_profile ?? "default";
+  const token = loadGmailToken(profile);
+  const listUrl = new URL("https://gmail.googleapis.com/gmail/v1/users/me/messages");
+  listUrl.searchParams.set("q", opts.query);
+  listUrl.searchParams.set("maxResults", String(maxMessages));
+  const listResp = await fetch(listUrl.toString(), {
+    headers: { Authorization: `Bearer ${token}` }
+  });
+  if (!listResp.ok) {
+    const body = await listResp.text();
+    if (listResp.status === 401) {
+      throw new Error("Gmail token expired. Run `connect-gmail auth login` to re-authenticate.");
+    }
+    throw new Error(`Gmail API error ${listResp.status}: ${body}`);
+  }
+  const listData = await listResp.json();
+  const messageRefs = listData.messages ?? [];
+  if (messageRefs.length === 0) {
+    return [];
+  }
+  const seen = new Map;
+  const batchSize = 20;
+  for (let i = 0;i < messageRefs.length; i += batchSize) {
+    const batch = messageRefs.slice(i, i + batchSize);
+    const fetches = batch.map((ref) => {
+      const url = new URL(`https://gmail.googleapis.com/gmail/v1/users/me/messages/${ref.id}`);
+      url.searchParams.set("format", "metadata");
+      url.searchParams.set("metadataHeaders", "From");
+      url.searchParams.set("metadataHeaders", "To");
+      url.searchParams.set("metadataHeaders", "Cc");
+      return fetch(url.toString(), {
+        headers: { Authorization: `Bearer ${token}` }
+      }).then((r) => r.ok ? r.json() : null);
+    });
+    const results = await Promise.all(fetches);
+    for (const msg of results) {
+      if (!msg?.payload?.headers)
+        continue;
+      const headers = msg.payload.headers;
+      const getHeader = (name) => headers.find((h) => h.name.toLowerCase() === name.toLowerCase())?.value ?? "";
+      const addresses = [
+        ...parseAddressHeader(getHeader("From")),
+        ...parseAddressHeader(getHeader("To")),
+        ...parseAddressHeader(getHeader("Cc"))
+      ];
+      for (const { name, email } of addresses) {
+        if (seen.has(email))
+          continue;
+        const company_hint = domainToCompany(email);
+        const nameParts = parseName(name);
+        const contact_input = {
+          ...nameParts,
+          display_name: name || email.split("@")[0],
+          emails: [{ address: email, type: "work", is_primary: true }],
+          ...opts.tag_ids?.length ? { tag_ids: opts.tag_ids } : {},
+          source: "email"
+        };
+        seen.set(email, { email, name, company_hint, contact_input });
+      }
+    }
+  }
+  return Array.from(seen.values());
+}
+
 // src/mcp/index.ts
 var server = new Server({ name: "contacts", version: "0.1.0" }, { capabilities: { tools: {} } });
 server.setRequestHandler(ListToolsRequestSchema, async () => ({
@@ -1403,6 +1855,9 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
           website: { type: "string", description: "Personal or professional website URL" },
           last_contacted_at: { type: "string", description: "ISO 8601 datetime of last contact" },
           preferred_contact_method: { type: "string", enum: ["email", "phone", "telegram", "whatsapp", "linkedin", "twitter", "other"] },
+          status: { type: "string", enum: ["active", "pending_reply", "converted", "closed", "other"], description: "Contact lifecycle status (default: active)" },
+          follow_up_at: { type: "string", description: "ISO 8601 datetime to follow up with this contact" },
+          project_id: { type: "string", description: "Associate contact with a project ID" },
           emails: {
             type: "array",
             items: {
@@ -1471,7 +1926,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
     },
     {
       name: "update_contact",
-      description: "Update an existing contact's fields. Only provided fields are changed; omitted fields remain unchanged. Supports all contact fields including last_contacted_at, website, preferred_contact_method.",
+      description: "Update an existing contact's fields. Only provided fields are changed. Supports all contact fields including status, follow_up_at, project_id. Use emails_add/phones_add to append new contact methods without replacing existing ones.",
       inputSchema: {
         type: "object",
         properties: {
@@ -1487,7 +1942,12 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
           website: { type: "string" },
           last_contacted_at: { type: "string", description: "ISO 8601 datetime of last contact" },
           preferred_contact_method: { type: "string", enum: ["email", "phone", "telegram", "whatsapp", "linkedin", "twitter", "other"] },
-          source: { type: "string", enum: ["manual", "import", "linkedin", "github", "twitter", "email", "calendar", "crm", "other"] }
+          status: { type: "string", enum: ["active", "pending_reply", "converted", "closed", "other"] },
+          follow_up_at: { type: "string", description: "ISO 8601 datetime for follow-up reminder (null to clear)" },
+          project_id: { type: "string", description: "Project ID to associate this contact with (null to clear)" },
+          source: { type: "string", enum: ["manual", "import", "linkedin", "github", "twitter", "email", "calendar", "crm", "other"] },
+          emails_add: { type: "array", items: { type: "object", properties: { address: { type: "string" }, type: { type: "string" }, is_primary: { type: "boolean" } }, required: ["address"] }, description: "New email addresses to append (duplicates are skipped)" },
+          phones_add: { type: "array", items: { type: "object", properties: { number: { type: "string" }, type: { type: "string" }, country_code: { type: "string" }, is_primary: { type: "boolean" } }, required: ["number"] }, description: "New phone numbers to append (duplicates are skipped)" }
         },
         required: ["id"]
       }
@@ -1503,15 +1963,23 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
     },
     {
       name: "list_contacts",
-      description: "List contacts with optional filters. Supports filtering by company, tag, or source. Returns paginated results with total count.",
+      description: "List contacts with optional filters. Supports filtering by company, tag(s), source, status, project, follow-up due, last_contacted date range, and archived state. Returns paginated results with total count.",
       inputSchema: {
         type: "object",
         properties: {
           company_id: { type: "string" },
-          tag_id: { type: "string", description: "Filter by tag ID" },
+          tag_id: { type: "string", description: "Filter by a single tag ID" },
+          tag_ids: { type: "array", items: { type: "string" }, description: "Filter by multiple tag IDs (AND logic \u2014 contact must have all tags)" },
+          source: { type: "string", enum: ["manual", "import", "linkedin", "github", "twitter", "email", "calendar", "crm", "other"] },
+          status: { type: "string", enum: ["active", "pending_reply", "converted", "closed", "other"] },
+          project_id: { type: "string", description: "Filter by project ID" },
+          archived: { type: "boolean", description: "Include archived contacts (default false)" },
+          follow_up_due: { type: "boolean", description: "Only return contacts whose follow_up_at is in the past" },
+          last_contacted_after: { type: "string", description: "ISO 8601 date \u2014 only contacts last contacted after this date" },
+          last_contacted_before: { type: "string", description: "ISO 8601 date \u2014 only contacts last contacted before this date" },
           limit: { type: "number", description: "Max results (default 50)" },
           offset: { type: "number" },
-          order_by: { type: "string", enum: ["display_name", "created_at", "updated_at"] },
+          order_by: { type: "string", enum: ["display_name", "created_at", "updated_at", "last_contacted_at", "follow_up_at"] },
           order_dir: { type: "string", enum: ["asc", "desc"] }
         }
       }
@@ -1585,12 +2053,14 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
     },
     {
       name: "list_companies",
-      description: "List companies with optional filters by industry or tag. Returns paginated results with total count.",
+      description: "List companies with optional filters by industry, tag, project, or archived state. Returns paginated results with total count.",
       inputSchema: {
         type: "object",
         properties: {
           tag_id: { type: "string" },
           industry: { type: "string" },
+          project_id: { type: "string", description: "Filter by project ID" },
+          archived: { type: "boolean", description: "Include archived companies (default false)" },
           limit: { type: "number" },
           offset: { type: "number" }
         }
@@ -1925,6 +2395,204 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
         properties: { contact_id: { type: "string" } },
         required: ["contact_id"]
       }
+    },
+    {
+      name: "get_contact_by_email",
+      description: "Fast lookup of a contact by exact email address. Returns null if not found. Unlike search_contacts, this is a precise read-only lookup with no side effects.",
+      inputSchema: {
+        type: "object",
+        properties: { email: { type: "string", description: "Exact email address to look up" } },
+        required: ["email"]
+      }
+    },
+    {
+      name: "add_email_to_contact",
+      description: "Append a new email address to a contact. Idempotent \u2014 silently skips if the email already exists on this contact.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          contact_id: { type: "string" },
+          address: { type: "string" },
+          type: { type: "string", enum: ["work", "personal", "other"] },
+          is_primary: { type: "boolean" }
+        },
+        required: ["contact_id", "address"]
+      }
+    },
+    {
+      name: "add_phone_to_contact",
+      description: "Append a new phone number to a contact. Idempotent \u2014 silently skips if the number already exists on this contact.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          contact_id: { type: "string" },
+          number: { type: "string" },
+          type: { type: "string", enum: ["mobile", "work", "home", "fax", "whatsapp", "other"] },
+          country_code: { type: "string" },
+          is_primary: { type: "boolean" }
+        },
+        required: ["contact_id", "number"]
+      }
+    },
+    {
+      name: "archive_contact",
+      description: "Soft-delete a contact by setting archived=true. Archived contacts are excluded from list_contacts and search_contacts by default. Use unarchive_contact to restore.",
+      inputSchema: {
+        type: "object",
+        properties: { id: { type: "string" } },
+        required: ["id"]
+      }
+    },
+    {
+      name: "unarchive_contact",
+      description: "Restore an archived contact. Sets archived=false so the contact reappears in lists and searches.",
+      inputSchema: {
+        type: "object",
+        properties: { id: { type: "string" } },
+        required: ["id"]
+      }
+    },
+    {
+      name: "archive_company",
+      description: "Soft-delete a company by setting archived=true. Archived companies are excluded from list_companies by default.",
+      inputSchema: {
+        type: "object",
+        properties: { id: { type: "string" } },
+        required: ["id"]
+      }
+    },
+    {
+      name: "unarchive_company",
+      description: "Restore an archived company. Sets archived=false.",
+      inputSchema: {
+        type: "object",
+        properties: { id: { type: "string" } },
+        required: ["id"]
+      }
+    },
+    {
+      name: "find_duplicates",
+      description: "Scan contacts for potential duplicates \u2014 by shared email address (exact) or by similar display name (Levenshtein distance \u2264 2). Returns groups of contact IDs that may be the same person.",
+      inputSchema: { type: "object", properties: {} }
+    },
+    {
+      name: "list_interactions",
+      description: "List activity log entries for a contact or company. Shows all logged interactions, creates, updates, and merges in reverse chronological order.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          contact_id: { type: "string" },
+          company_id: { type: "string" },
+          limit: { type: "number", description: "Max results (default 50)" },
+          offset: { type: "number" }
+        }
+      }
+    },
+    {
+      name: "add_tag_to_company",
+      description: "Apply an existing tag to a company. Use list_tags to find tag IDs.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          company_id: { type: "string" },
+          tag_id: { type: "string" }
+        },
+        required: ["company_id", "tag_id"]
+      }
+    },
+    {
+      name: "remove_tag_from_company",
+      description: "Remove a tag from a company. The tag itself is not deleted.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          company_id: { type: "string" },
+          tag_id: { type: "string" }
+        },
+        required: ["company_id", "tag_id"]
+      }
+    },
+    {
+      name: "add_company_to_group",
+      description: "Add a company to a group. Returns { added, already_member } \u2014 idempotent.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          company_id: { type: "string" },
+          group_id: { type: "string" }
+        },
+        required: ["company_id", "group_id"]
+      }
+    },
+    {
+      name: "remove_company_from_group",
+      description: "Remove a company from a group.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          company_id: { type: "string" },
+          group_id: { type: "string" }
+        },
+        required: ["company_id", "group_id"]
+      }
+    },
+    {
+      name: "list_companies_in_group",
+      description: "List all company IDs in a group.",
+      inputSchema: {
+        type: "object",
+        properties: { group_id: { type: "string" } },
+        required: ["group_id"]
+      }
+    },
+    {
+      name: "list_groups_for_company",
+      description: "List all groups that a company belongs to.",
+      inputSchema: {
+        type: "object",
+        properties: { company_id: { type: "string" } },
+        required: ["company_id"]
+      }
+    },
+    {
+      name: "bulk_create_contacts",
+      description: "Create multiple contacts in one call. Each item in the contacts array follows the same schema as create_contact. Returns { created, errors }.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          contacts: {
+            type: "array",
+            items: { type: "object" },
+            description: "Array of contact input objects (same schema as create_contact)"
+          }
+        },
+        required: ["contacts"]
+      }
+    },
+    {
+      name: "auto_link_to_company",
+      description: "Auto-link a contact to a company by matching the contact's email domain against known company domains. Only sets company_id if the contact has no company yet and a matching company exists. Returns the updated contact, or null if no match.",
+      inputSchema: {
+        type: "object",
+        properties: { contact_id: { type: "string" } },
+        required: ["contact_id"]
+      }
+    },
+    {
+      name: "import_contacts_from_gmail",
+      description: "Extract unique contacts from Gmail messages matching a search query and batch-upsert them. Requires connect-gmail auth login first. Returns { imported, skipped, errors }.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          query: { type: "string", description: "Gmail search query, e.g. 'from:(company.com) newer_than:30d'" },
+          max_messages: { type: "number", description: "Max messages to scan (default 200, max 500)" },
+          gmail_profile: { type: "string", description: "connect-gmail profile to use (default: 'default')" },
+          tag_ids: { type: "array", items: { type: "string" }, description: "Tag IDs to apply to all imported contacts" },
+          group_id: { type: "string", description: "Group ID to add all imported contacts to" },
+          dry_run: { type: "boolean", description: "If true, extract contacts but do not save to database" }
+        },
+        required: ["query"]
+      }
     }
   ]
 }));
@@ -1946,6 +2614,9 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           website: a.website,
           last_contacted_at: a.last_contacted_at,
           preferred_contact_method: a.preferred_contact_method,
+          status: a.status,
+          follow_up_at: a.follow_up_at,
+          project_id: a.project_id,
           emails: a.emails,
           phones: a.phones,
           addresses: a.addresses,
@@ -1974,7 +2645,12 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           website: rest.website,
           last_contacted_at: rest.last_contacted_at,
           preferred_contact_method: rest.preferred_contact_method,
-          source: rest.source
+          status: rest.status,
+          follow_up_at: rest.follow_up_at,
+          project_id: rest.project_id,
+          source: rest.source,
+          emails_add: rest.emails_add,
+          phones_add: rest.phones_add
         };
         const contact = updateContact(id, input);
         return { content: [{ type: "text", text: JSON.stringify(contact, null, 2) }] };
@@ -1987,6 +2663,14 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         const result = listContacts({
           company_id: a.company_id,
           tag_id: a.tag_id,
+          tag_ids: a.tag_ids,
+          source: a.source,
+          status: a.status,
+          project_id: a.project_id,
+          archived: a.archived,
+          follow_up_due: a.follow_up_due,
+          last_contacted_after: a.last_contacted_after,
+          last_contacted_before: a.last_contacted_before,
           limit: a.limit,
           offset: a.offset,
           order_by: a.order_by,
@@ -1999,6 +2683,8 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         return { content: [{ type: "text", text: JSON.stringify(contacts, null, 2) }] };
       }
       case "create_company": {
+        const rawTagIds = a.tag_ids;
+        const tagIds = typeof rawTagIds === "string" ? JSON.parse(rawTagIds) : rawTagIds;
         const input = {
           name: a.name,
           domain: a.domain,
@@ -2011,7 +2697,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           phones: a.phones,
           addresses: a.addresses,
           social_profiles: a.social_profiles,
-          tag_ids: a.tag_ids
+          tag_ids: tagIds
         };
         const company = createCompany(input);
         return { content: [{ type: "text", text: JSON.stringify(company, null, 2) }] };
@@ -2045,6 +2731,8 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         const result = listCompanies({
           tag_id: a.tag_id,
           industry: a.industry,
+          project_id: a.project_id,
+          archived: a.archived,
           limit: a.limit,
           offset: a.offset
         });
@@ -2168,21 +2856,24 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         const emailAddresses = a.emails?.map((e) => e.address) ?? [];
         let found = null;
         for (const addr of emailAddresses) {
-          const emailRow = db.prepare(`SELECT contact_id FROM emails WHERE address = ? AND contact_id IS NOT NULL LIMIT 1`).get(addr);
+          const emailRow = db.prepare(`SELECT contact_id FROM emails WHERE LOWER(address) = LOWER(?) AND contact_id IS NOT NULL LIMIT 1`).get(addr);
           if (emailRow) {
             found = getContact(emailRow.contact_id);
             break;
           }
         }
-        if (!found && a.display_name) {
-          const results = searchContacts(a.display_name);
-          if (results.length > 0)
-            found = results[0];
+        if (!found) {
+          const nameQuery = a.display_name ?? (a.first_name || a.last_name ? `${a.first_name ?? ""} ${a.last_name ?? ""}`.trim() : null);
+          if (nameQuery) {
+            const results = searchContacts(nameQuery);
+            if (results.length > 0)
+              found = results[0];
+          }
         }
         if (found) {
           return { content: [{ type: "text", text: JSON.stringify({ contact: found, found: true, created: false }, null, 2) }] };
         }
-        const input = {
+        const focInput = {
           first_name: a.first_name,
           last_name: a.last_name,
           display_name: a.display_name,
@@ -2194,6 +2885,9 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           website: a.website,
           last_contacted_at: a.last_contacted_at,
           preferred_contact_method: a.preferred_contact_method,
+          status: a.status,
+          follow_up_at: a.follow_up_at,
+          project_id: a.project_id,
           emails: a.emails,
           phones: a.phones,
           addresses: a.addresses,
@@ -2201,7 +2895,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           tag_ids: a.tag_ids,
           source: a.source
         };
-        const contact = createContact(input);
+        const contact = createContact(focInput);
         return { content: [{ type: "text", text: JSON.stringify({ contact, found: false, created: true }, null, 2) }] };
       }
       case "upsert_contact": {
@@ -2325,8 +3019,8 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       }
       case "add_contact_to_group": {
         const db = getDatabase();
-        addContactToGroup(db, a.contact_id, a.group_id);
-        return { content: [{ type: "text", text: `Contact ${a.contact_id} added to group ${a.group_id}` }] };
+        const result = addContactToGroup(db, a.contact_id, a.group_id);
+        return { content: [{ type: "text", text: JSON.stringify(result, null, 2) }] };
       }
       case "remove_contact_from_group": {
         const db = getDatabase();
@@ -2343,6 +3037,156 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         const groups = listGroupsForContact(db, a.contact_id);
         return { content: [{ type: "text", text: JSON.stringify(groups, null, 2) }] };
       }
+      case "get_contact_by_email": {
+        const contact = getContactByEmail(a.email);
+        if (!contact)
+          return { content: [{ type: "text", text: "null" }] };
+        return { content: [{ type: "text", text: JSON.stringify(contact, null, 2) }] };
+      }
+      case "add_email_to_contact": {
+        const contact = addEmailToContact(a.contact_id, {
+          address: a.address,
+          type: a.type,
+          is_primary: a.is_primary
+        });
+        return { content: [{ type: "text", text: JSON.stringify(contact, null, 2) }] };
+      }
+      case "add_phone_to_contact": {
+        const contact = addPhoneToContact(a.contact_id, {
+          number: a.number,
+          type: a.type,
+          country_code: a.country_code,
+          is_primary: a.is_primary
+        });
+        return { content: [{ type: "text", text: JSON.stringify(contact, null, 2) }] };
+      }
+      case "archive_contact": {
+        const contact = archiveContact(a.id);
+        return { content: [{ type: "text", text: JSON.stringify(contact, null, 2) }] };
+      }
+      case "unarchive_contact": {
+        const contact = unarchiveContact(a.id);
+        return { content: [{ type: "text", text: JSON.stringify(contact, null, 2) }] };
+      }
+      case "archive_company": {
+        const company = archiveCompany(a.id);
+        return { content: [{ type: "text", text: JSON.stringify(company, null, 2) }] };
+      }
+      case "unarchive_company": {
+        const company = unarchiveCompany(a.id);
+        return { content: [{ type: "text", text: JSON.stringify(company, null, 2) }] };
+      }
+      case "find_duplicates": {
+        const db = getDatabase();
+        const byEmail = findEmailDuplicates(db);
+        const byName = findNameDuplicates(db);
+        return { content: [{ type: "text", text: JSON.stringify({ by_email: byEmail, by_name: byName }, null, 2) }] };
+      }
+      case "list_interactions": {
+        const result = listActivity({
+          contact_id: a.contact_id,
+          company_id: a.company_id,
+          limit: a.limit,
+          offset: a.offset
+        });
+        return { content: [{ type: "text", text: JSON.stringify(result, null, 2) }] };
+      }
+      case "add_tag_to_company": {
+        addTagToCompany(a.company_id, a.tag_id);
+        return { content: [{ type: "text", text: `Tag ${a.tag_id} added to company ${a.company_id}` }] };
+      }
+      case "remove_tag_from_company": {
+        removeTagFromCompany(a.company_id, a.tag_id);
+        return { content: [{ type: "text", text: `Tag ${a.tag_id} removed from company ${a.company_id}` }] };
+      }
+      case "add_company_to_group": {
+        const db = getDatabase();
+        const result = addCompanyToGroup(db, a.company_id, a.group_id);
+        return { content: [{ type: "text", text: JSON.stringify(result, null, 2) }] };
+      }
+      case "remove_company_from_group": {
+        const db = getDatabase();
+        removeCompanyFromGroup(db, a.company_id, a.group_id);
+        return { content: [{ type: "text", text: `Company ${a.company_id} removed from group ${a.group_id}` }] };
+      }
+      case "list_companies_in_group": {
+        const db = getDatabase();
+        const companyIds = listCompaniesInGroup(db, a.group_id);
+        return { content: [{ type: "text", text: JSON.stringify(companyIds, null, 2) }] };
+      }
+      case "list_groups_for_company": {
+        const db = getDatabase();
+        const groups = listGroupsForCompany(db, a.company_id);
+        return { content: [{ type: "text", text: JSON.stringify(groups, null, 2) }] };
+      }
+      case "bulk_create_contacts": {
+        const contacts = a.contacts;
+        let created = 0;
+        const errors = [];
+        for (const item of contacts) {
+          try {
+            createContact(item);
+            created++;
+          } catch (err) {
+            errors.push(err instanceof Error ? err.message : String(err));
+          }
+        }
+        return { content: [{ type: "text", text: JSON.stringify({ created, errors: errors.length, error_details: errors }, null, 2) }] };
+      }
+      case "auto_link_to_company": {
+        const contact = autoLinkContactToCompany(a.contact_id);
+        if (!contact)
+          return { content: [{ type: "text", text: "null" }] };
+        return { content: [{ type: "text", text: JSON.stringify(contact, null, 2) }] };
+      }
+      case "import_contacts_from_gmail": {
+        const db = getDatabase();
+        const extracted = await extractContactsFromGmail({
+          query: a.query,
+          max_messages: a.max_messages,
+          gmail_profile: a.gmail_profile,
+          tag_ids: a.tag_ids,
+          group_id: a.group_id
+        });
+        if (a.dry_run) {
+          return {
+            content: [{
+              type: "text",
+              text: JSON.stringify({ dry_run: true, would_import: extracted.length, contacts: extracted }, null, 2)
+            }]
+          };
+        }
+        let imported = 0;
+        let skipped = 0;
+        const errors = [];
+        for (const { email, contact_input, company_hint } of extracted) {
+          try {
+            const emailRow = db.prepare(`SELECT contact_id FROM emails WHERE LOWER(address) = LOWER(?) AND contact_id IS NOT NULL LIMIT 1`).get(email);
+            if (emailRow) {
+              skipped++;
+              continue;
+            }
+            const contact = createContact(contact_input);
+            if (a.group_id && typeof a.group_id === "string") {
+              try {
+                db.prepare(`INSERT OR IGNORE INTO contact_groups (contact_id, group_id) VALUES (?, ?)`).run(contact.id, a.group_id);
+              } catch {}
+            }
+            if (company_hint) {
+              autoLinkContactToCompany(contact.id);
+            }
+            imported++;
+          } catch (err) {
+            errors.push(`${email}: ${err instanceof Error ? err.message : String(err)}`);
+          }
+        }
+        return {
+          content: [{
+            type: "text",
+            text: JSON.stringify({ imported, skipped, errors: errors.length, error_details: errors }, null, 2)
+          }]
+        };
+      }
       default:
         return { content: [{ type: "text", text: `Unknown tool: ${name}` }], isError: true };
     }