@sjawhar/whatsapp-mcp 2.1.1 → 2.2.0

package/dist/import-contacts.js

@@ -83,27 +83,41 @@ function phoneToJid(phone) {
     return `${digits}@s.whatsapp.net`;
 }
 /**
- * Import contacts from a VCF file into the database.
+ * Import contacts from a VCF file or string into the database.
  * Can be called from the MCP tool or standalone CLI.
  *
  * @param dbInstance - An open better-sqlite3 database instance.
  *   When called from the MCP server, pass the shared DB.
  *   When called from CLI, opens its own connection.
- * @param vcfPath - Path to the .vcf file. Defaults to contacts/contacts.vcf.
+ * @param vcfContent - Optional VCF content as a string. If provided, parses this directly.
+ *   If not provided, reads from vcfPath (defaults to contacts/contacts.vcf).
+ * @param vcfPath - Path to the .vcf file. Only used if vcfContent is not provided.
+ *   Defaults to contacts/contacts.vcf.
  */
-export function importContactsFromVcf(dbInstance, vcfPath) {
-    const absPath = path.resolve(vcfPath || DEFAULT_VCF);
-    // Containment check: VCF path must be inside the allowed contacts directory
-    const allowedBase = path.resolve(process.env.CONTACTS_DIR || CONTACTS_DIR);
-    const allowedPrefix = `${allowedBase}${path.sep}`;
-    if (!absPath.startsWith(allowedPrefix)) {
-        throw new Error(`VCF path not allowed: must be within ${allowedBase}`);
+export function importContactsFromVcf(dbInstance, vcfContent, vcfPath) {
+    let content;
+    let absPath;
+    if (vcfContent) {
+        // Use provided VCF content directly
+        content = vcfContent;
+        absPath = "[provided-content]";
     }
-    if (!fs.existsSync(absPath)) {
-        throw new Error(`VCF file not found: ${absPath}`);
+    else {
+        // Read from file
+        const filePath = vcfPath || DEFAULT_VCF;
+        absPath = path.resolve(filePath);
+        // Containment check: VCF path must be inside the allowed contacts directory
+        const allowedBase = path.resolve(process.env.CONTACTS_DIR || CONTACTS_DIR);
+        const allowedPrefix = `${allowedBase}${path.sep}`;
+        if (!absPath.startsWith(allowedPrefix)) {
+            throw new Error(`VCF path not allowed: must be within ${allowedBase}`);
+        }
+        if (!fs.existsSync(absPath)) {
+            throw new Error(`VCF file not found: ${absPath}`);
+        }
+        // Parse VCF
+        content = fs.readFileSync(absPath, "utf-8");
     }
-    // Parse VCF
-    const content = fs.readFileSync(absPath, "utf-8");
     const contacts = parseVcf(content);
     // Build lookup maps for all known JIDs (from chats and contacts tables)
     const knownJids = new Set();
@@ -224,7 +238,7 @@ function main() {
     }
     const db = new Database(DB_PATH);
     db.pragma("journal_mode = WAL");
-    const result = importContactsFromVcf(db, absPath);
+    const result = importContactsFromVcf(db, undefined, absPath);
     console.log(`Parsed ${result.totalParsed} contacts with phone numbers from VCF`);
     console.log(`\nMatched ${result.totalUpdated} phone numbers to existing WhatsApp JIDs`);
     console.log(`  Exact matches: ${result.exactMatches}`);

package/dist/import-contacts.js.map

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

package/dist/index.js

@@ -1,91 +1,214 @@
 #!/usr/bin/env node
+import { randomUUID } from "node:crypto";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import fs from "fs";
 import { initDb, closeDb } from "./db.js";
-import { initWhatsApp, closeWhatsApp, resolveConnectionAsReadOnly } from "./whatsapp.js";
+import { initWhatsApp, closeWhatsApp, resolveConnectionAsReadOnly, setMessageNotificationHandler, } from "./whatsapp.js";
 import { registerTools } from "./tools.js";
 import { acquireWhatsAppLock, releaseWhatsAppLock } from "./lock.js";
 import { LOCK_FILE, DATA_DIR } from "./paths.js";
+import { createHttpServer } from "./http-server.js";
+import { NEW_MESSAGES_RESOURCE_URI, createResourceSubscriptionStore, registerResourceSubscriptionHandlers, registerResources, } from "./resources.js";
 console.error(`Data directory: ${DATA_DIR}`);
+function parseCliOptions(argv) {
+    let http = false;
+    let port = 3456;
+    let host = "0.0.0.0";
+    for (let i = 0; i < argv.length; i += 1) {
+        const arg = argv[i];
+        if (arg === "--http") {
+            http = true;
+            continue;
+        }
+        if (arg === "--port") {
+            const value = argv[i + 1];
+            if (!value) {
+                throw new Error("--port requires a value");
+            }
+            const parsedPort = Number.parseInt(value, 10);
+            if (Number.isNaN(parsedPort) || parsedPort < 0 || parsedPort > 65_535) {
+                throw new Error(`Invalid --port value: ${value}`);
+            }
+            port = parsedPort;
+            i += 1;
+            continue;
+        }
+        if (arg.startsWith("--port=")) {
+            const value = arg.slice("--port=".length);
+            const parsedPort = Number.parseInt(value, 10);
+            if (Number.isNaN(parsedPort) || parsedPort < 0 || parsedPort > 65_535) {
+                throw new Error(`Invalid --port value: ${value}`);
+            }
+            port = parsedPort;
+            continue;
+        }
+        if (arg === "--host") {
+            const value = argv[i + 1];
+            if (!value) {
+                throw new Error("--host requires a value");
+            }
+            host = value;
+            i += 1;
+            continue;
+        }
+        if (arg.startsWith("--host=")) {
+            host = arg.slice("--host=".length);
+        }
+    }
+    return { http, port, host };
+}
 async function main() {
     console.error("Starting WhatsApp MCP Server...");
+    const options = parseCliOptions(process.argv.slice(2));
+    let stdioServer;
+    let httpController;
+    let stdioSessionId;
+    let parentWatchdog;
+    let lockRetryInterval;
+    let ownsWhatsAppLock = false;
+    let shuttingDown = false;
+    const resourceSubscriptions = createResourceSubscriptionStore();
+    let debouncedNotificationTimer;
+    setMessageNotificationHandler(() => {
+        if (debouncedNotificationTimer) {
+            clearTimeout(debouncedNotificationTimer);
+        }
+        debouncedNotificationTimer = setTimeout(() => {
+            debouncedNotificationTimer = undefined;
+            void resourceSubscriptions.notifyResourceUpdated(NEW_MESSAGES_RESOURCE_URI);
+        }, 500);
+    });
     // 1. Initialize SQLite database (synchronous, instant).
     initDb();
-    // 2. Create MCP server and connect to stdio transport FIRST
-    //    so the client doesn't time out waiting for the initialize handshake.
-    const server = new McpServer({
-        name: "whatsapp",
-        version: "1.0.0",
-    });
-    registerTools(server);
-    const transport = new StdioServerTransport();
-    await server.connect(transport);
-    console.error("MCP server running on stdio");
-    // Detect parent death via two mechanisms:
-    // 1. stdin EOF — works when process is spawned directly (not via npm wrapper chain)
-    process.stdin.on('end', () => {
-        console.error('stdin closed (parent disconnected) — shutting down');
-        shutdown();
-    });
-    // 2. Parent PID polling — catches cases where npm/sh wrapper absorbs the signal
-    //    but the actual parent (OpenCode) is gone. On Linux, orphaned processes get
-    //    reparented to PID 1 (init/systemd).
-    //    Note: process.ppid is cached at startup and doesn't update, so we read
-    //    the live value from /proc/self/stat.
-    const originalPpid = process.ppid;
-    const getLivePpid = () => {
-        try {
-            const stat = fs.readFileSync('/proc/self/stat', 'utf8');
-            return parseInt(stat.split(' ')[3], 10);
-        }
-        catch {
-            return process.ppid; // Fallback for non-Linux
+    const shutdown = async () => {
+        if (shuttingDown) {
+            return;
         }
-    };
-    const parentWatchdog = setInterval(() => {
-        const currentPpid = getLivePpid();
-        if (currentPpid !== originalPpid) {
-            console.error(`Parent changed (${originalPpid} → ${currentPpid}) — shutting down`);
+        shuttingDown = true;
+        console.error("Shutting down...");
+        if (parentWatchdog) {
             clearInterval(parentWatchdog);
-            shutdown();
+            parentWatchdog = undefined;
+        }
+        if (lockRetryInterval) {
+            clearInterval(lockRetryInterval);
+            lockRetryInterval = undefined;
+        }
+        if (debouncedNotificationTimer) {
+            clearTimeout(debouncedNotificationTimer);
+            debouncedNotificationTimer = undefined;
         }
-    }, 5_000);
-    // 3. Initialize WhatsApp in the background — but only if no other instance
-    //    already owns the WhatsApp connection. This prevents status 515/440
-    //    when the host spawns multiple MCP server instances.
-    if (acquireWhatsAppLock(LOCK_FILE)) {
-        console.error("WhatsApp lock acquired — connecting...");
+        setMessageNotificationHandler(undefined);
+        await closeWhatsApp();
+        if (ownsWhatsAppLock) {
+            releaseWhatsAppLock(LOCK_FILE);
+        }
+        closeDb();
+        if (httpController) {
+            await httpController.closeHttpServer();
+        }
+        if (stdioServer) {
+            if (stdioSessionId) {
+                resourceSubscriptions.removeSession(stdioSessionId);
+                stdioSessionId = undefined;
+            }
+            await stdioServer.close();
+        }
+        process.exit(0);
+    };
+    if (options.http) {
+        const apiKey = process.env.MCP_API_KEY;
+        if (!apiKey) {
+            throw new Error("MCP_API_KEY is required when using --http mode");
+        }
+        httpController = await createHttpServer(options.port, options.host, apiKey, resourceSubscriptions);
+        console.error(`MCP server running on HTTP ${options.host}:${httpController.port}`);
         initWhatsApp().catch((err) => {
             console.error("Failed to initialize WhatsApp:", err);
         });
     }
     else {
-        console.error("Another instance owns the WhatsApp connection — running as read-only from SQLite");
-        resolveConnectionAsReadOnly();
-        // Periodically check if the lock holder died — if so, take over
-        const lockRetryInterval = setInterval(() => {
-            if (acquireWhatsAppLock(LOCK_FILE)) {
-                console.error("Lock holder died — upgrading to read-write mode");
-                clearInterval(lockRetryInterval);
-                initWhatsApp().catch((err) => {
-                    console.error("Failed to initialize WhatsApp after lock takeover:", err);
-                });
+        // 2. Create MCP server and connect to stdio transport FIRST
+        //    so the client doesn't time out waiting for the initialize handshake.
+        stdioServer = new McpServer({
+            name: "whatsapp",
+            version: "1.0.0",
+        }, {
+            capabilities: {
+                resources: {
+                    subscribe: true,
+                    listChanged: true,
+                },
+            },
+        });
+        const activeStdioServer = stdioServer;
+        registerTools(activeStdioServer);
+        registerResources(activeStdioServer);
+        stdioSessionId = `stdio-${randomUUID()}`;
+        resourceSubscriptions.registerSession(stdioSessionId, (uri) => activeStdioServer.server.sendResourceUpdated({ uri }));
+        registerResourceSubscriptionHandlers(activeStdioServer, stdioSessionId, resourceSubscriptions);
+        const transport = new StdioServerTransport();
+        await activeStdioServer.connect(transport);
+        console.error("MCP server running on stdio");
+        // Detect parent death via two mechanisms:
+        // 1. stdin EOF — works when process is spawned directly (not via npm wrapper chain)
+        process.stdin.on("end", () => {
+            console.error("stdin closed (parent disconnected) — shutting down");
+            shutdown();
+        });
+        // 2. Parent PID polling — catches cases where npm/sh wrapper absorbs the signal
+        //    but the actual parent (OpenCode) is gone. On Linux, orphaned processes get
+        //    reparented to PID 1 (init/systemd).
+        //    Note: process.ppid is cached at startup and doesn't update, so we read
+        //    the live value from /proc/self/stat.
+        const originalPpid = process.ppid;
+        const getLivePpid = () => {
+            try {
+                const stat = fs.readFileSync("/proc/self/stat", "utf8");
+                return parseInt(stat.split(" ")[3], 10);
+            }
+            catch {
+                return process.ppid; // Fallback for non-Linux
+            }
+        };
+        parentWatchdog = setInterval(() => {
+            const currentPpid = getLivePpid();
+            if (currentPpid !== originalPpid) {
+                console.error(`Parent changed (${originalPpid} → ${currentPpid}) — shutting down`);
+                shutdown();
             }
-        }, 10_000); // Check every 10 seconds
-        // Clean up the interval on shutdown
-        process.on("SIGINT", () => clearInterval(lockRetryInterval));
-        process.on("SIGTERM", () => clearInterval(lockRetryInterval));
+        }, 5_000);
+        // 3. Initialize WhatsApp in the background — but only if no other instance
+        //    already owns the WhatsApp connection. This prevents status 515/440
+        //    when the host spawns multiple MCP server instances.
+        if (acquireWhatsAppLock(LOCK_FILE)) {
+            ownsWhatsAppLock = true;
+            console.error("WhatsApp lock acquired — connecting...");
+            initWhatsApp().catch((err) => {
+                console.error("Failed to initialize WhatsApp:", err);
+            });
+        }
+        else {
+            console.error("Another instance owns the WhatsApp connection — running as read-only from SQLite");
+            resolveConnectionAsReadOnly();
+            // Periodically check if the lock holder died — if so, take over
+            lockRetryInterval = setInterval(() => {
+                if (acquireWhatsAppLock(LOCK_FILE)) {
+                    ownsWhatsAppLock = true;
+                    console.error("Lock holder died — upgrading to read-write mode");
+                    if (lockRetryInterval) {
+                        clearInterval(lockRetryInterval);
+                        lockRetryInterval = undefined;
+                    }
+                    initWhatsApp().catch((err) => {
+                        console.error("Failed to initialize WhatsApp after lock takeover:", err);
+                    });
+                }
+            }, 10_000); // Check every 10 seconds
+        }
     }
     // 4. Graceful shutdown
-    const shutdown = async () => {
-        console.error("Shutting down...");
-        await closeWhatsApp();
-        releaseWhatsAppLock(LOCK_FILE);
-        closeDb();
-        await server.close();
-        process.exit(0);
-    };
     process.on("SIGINT", shutdown);
     process.on("SIGTERM", shutdown);
     process.on("unhandledRejection", (reason) => {

package/dist/index.js.map

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

package/dist/resources.d.ts

@@ -0,0 +1,16 @@
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+export declare const NEW_MESSAGES_RESOURCE_URI = "whatsapp://messages/new";
+type ResourceUpdateSender = (uri: string) => Promise<void> | void;
+export type ResourceSubscriptionStore = {
+    registerSession: (sessionId: string, sendResourceUpdated: ResourceUpdateSender) => void;
+    removeSession: (sessionId: string) => void;
+    subscribe: (sessionId: string, uri: string) => void;
+    unsubscribe: (sessionId: string, uri: string) => void;
+    notifyResourceUpdated: (uri: string) => Promise<void>;
+    getSubscriberCount: (uri: string) => number;
+};
+export declare function createResourceSubscriptionStore(): ResourceSubscriptionStore;
+export declare function registerResources(server: McpServer): void;
+export declare function registerResourceSubscriptionHandlers(server: McpServer, sessionId: string, store: ResourceSubscriptionStore): void;
+export {};
+//# sourceMappingURL=resources.d.ts.map

package/dist/resources.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../src/resources.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAIpE,eAAO,MAAM,yBAAyB,4BAA4B,CAAC;AAEnE,KAAK,oBAAoB,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAElE,MAAM,MAAM,yBAAyB,GAAG;IACtC,eAAe,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,mBAAmB,EAAE,oBAAoB,KAAK,IAAI,CAAC;IACxF,aAAa,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,SAAS,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACpD,WAAW,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACtD,qBAAqB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,kBAAkB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;CAC7C,CAAC;AAEF,wBAAgB,+BAA+B,IAAI,yBAAyB,CAgE3E;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAiBzD;AAED,wBAAgB,oCAAoC,CAClD,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,yBAAyB,GAC/B,IAAI,CAUN"}

package/dist/resources.js

@@ -0,0 +1,84 @@
+import { SubscribeRequestSchema, UnsubscribeRequestSchema } from "@modelcontextprotocol/sdk/types.js";
+import { getRecentMessages } from "./db.js";
+export const NEW_MESSAGES_RESOURCE_URI = "whatsapp://messages/new";
+export function createResourceSubscriptionStore() {
+    const subscriptions = new Map();
+    const sessionSenders = new Map();
+    const subscribe = (sessionId, uri) => {
+        const sessionIds = subscriptions.get(uri) ?? new Set();
+        sessionIds.add(sessionId);
+        subscriptions.set(uri, sessionIds);
+    };
+    const unsubscribe = (sessionId, uri) => {
+        const sessionIds = subscriptions.get(uri);
+        if (!sessionIds) {
+            return;
+        }
+        sessionIds.delete(sessionId);
+        if (sessionIds.size === 0) {
+            subscriptions.delete(uri);
+        }
+    };
+    const removeSession = (sessionId) => {
+        sessionSenders.delete(sessionId);
+        for (const [uri, sessionIds] of subscriptions) {
+            sessionIds.delete(sessionId);
+            if (sessionIds.size === 0) {
+                subscriptions.delete(uri);
+            }
+        }
+    };
+    return {
+        registerSession(sessionId, sendResourceUpdated) {
+            sessionSenders.set(sessionId, sendResourceUpdated);
+        },
+        removeSession,
+        subscribe,
+        unsubscribe,
+        async notifyResourceUpdated(uri) {
+            const sessionIds = subscriptions.get(uri);
+            if (!sessionIds || sessionIds.size === 0) {
+                return;
+            }
+            for (const sessionId of [...sessionIds]) {
+                const sender = sessionSenders.get(sessionId);
+                if (!sender) {
+                    sessionIds.delete(sessionId);
+                    continue;
+                }
+                await sender(uri);
+            }
+            if (sessionIds.size === 0) {
+                subscriptions.delete(uri);
+            }
+        },
+        getSubscriberCount(uri) {
+            return subscriptions.get(uri)?.size ?? 0;
+        },
+    };
+}
+export function registerResources(server) {
+    server.resource("new_messages", NEW_MESSAGES_RESOURCE_URI, async (uri) => {
+        const messages = getRecentMessages(10);
+        return {
+            contents: [
+                {
+                    uri: uri.href,
+                    mimeType: "application/json",
+                    text: JSON.stringify(messages),
+                },
+            ],
+        };
+    });
+}
+export function registerResourceSubscriptionHandlers(server, sessionId, store) {
+    server.server.setRequestHandler(SubscribeRequestSchema, async (request) => {
+        store.subscribe(sessionId, request.params.uri);
+        return {};
+    });
+    server.server.setRequestHandler(UnsubscribeRequestSchema, async (request) => {
+        store.unsubscribe(sessionId, request.params.uri);
+        return {};
+    });
+}
+//# sourceMappingURL=resources.js.map

package/dist/resources.js.map

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

package/dist/tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AA0BpE;;GAEG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAmdrD"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AA4BpE;;GAEG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAidrD"}

package/dist/tools.js

@@ -1,16 +1,17 @@
 import { z } from "zod";
 import fs from "fs";
 import path from "path";
-import { getChats, getChat, getMessages, searchMessages, searchContacts, getMessageContext, getRecipientInfo, sendTextMessage, sendFileMessage, downloadMessageMedia, transcribeVoiceNote, deleteMessage, deleteChat, updateContact, getMyInfo, resolveUnknownContacts, } from "./whatsapp.js";
+import { getChats, getChat, getMessages, searchMessages, searchContacts, getMessageContext, getRecipientInfo, sendTextMessage, sendFileMessage, downloadMessageMedia, transcribeVoiceNote, deleteMessage, deleteChat, updateContact, getMyInfo, resolveUnknownContacts, getReadOnlyErrorMessage, } from "./whatsapp.js";
 import { getDb, getUnreadChats } from "./db.js";
 import { importContactsFromVcf } from "./import-contacts.js";
 import { validateFilePath } from "./utils.js";
+import { LOCK_FILE } from "./paths.js";
 /**
  * Register all WhatsApp MCP tools on the server.
  */
 export function registerTools(server) {
     // ─── Reading Tools ──────────────────────────────────────────
-    server.tool("list_chats", "List all WhatsApp chats sorted by last activity. Optionally filter by name.", {
+    server.tool("list_chats", "List all WhatsApp chats sorted by last activity. Optionally filter by name. Contacts with multiple WhatsApp identities are automatically merged into a single entry.", {
         nameFilter: z.string().optional().describe("Filter chats by name (case-insensitive substring match)"),
         limit: z.number().min(1).max(100).default(20).describe("Max number of chats to return"),
     }, async ({ nameFilter, limit }) => {
@@ -42,7 +43,7 @@ export function registerTools(server) {
             return { content: [{ type: "text", text: `Error: ${err.message}` }], isError: true };
         }
     });
-    server.tool("list_messages", "Get messages from a specific chat. Returns most recent messages first.", {
+    server.tool("list_messages", "Get messages from a specific chat. Returns most recent messages first. Accepts any contact identifier. Messages from all of a contact's identities are returned transparently.", {
         jid: z.string().describe("Chat JID or phone number"),
         limit: z.number().min(1).max(100).default(50).describe("Number of messages to return"),
     }, async ({ jid, limit }) => {
@@ -56,7 +57,7 @@ export function registerTools(server) {
             return { content: [{ type: "text", text: `Error: ${err.message}` }], isError: true };
         }
     });
-    server.tool("search_messages", "Substring search across messages. Can search in a specific chat or across all chats.", {
+    server.tool("search_messages", "Substring search across messages. Can search in a specific chat or across all chats. Search results automatically unify contacts with multiple identities into a single canonical entry.", {
         query: z.string().describe("Text to search for (case-insensitive)"),
         jid: z.string().optional().describe("Optional: limit search to a specific chat JID"),
     }, async ({ query, jid }) => {
@@ -80,7 +81,7 @@ export function registerTools(server) {
             return { content: [{ type: "text", text: `Error: ${err.message}` }], isError: true };
         }
     });
-    server.tool("search_contacts", "Find contacts by name or phone number.", {
+    server.tool("search_contacts", "Find contacts by name or phone number. Contacts with multiple WhatsApp identities are automatically deduplicated into a single entry.", {
         query: z.string().describe("Name or phone number to search for"),
     }, async ({ query }) => {
         try {
@@ -123,7 +124,7 @@ export function registerTools(server) {
                 return {
                     content: [{
                             type: "text",
-                            text: "Not connected yet — WhatsApp identity not available. Try again in a moment.",
+                            text: getReadOnlyErrorMessage(LOCK_FILE),
                         }],
                     isError: true,
                 };
@@ -151,11 +152,14 @@ export function registerTools(server) {
             return { content: [{ type: "text", text: `Error: ${err.message}` }], isError: true };
         }
     });
-    server.tool("sync_contacts", "Import phone contacts from the contacts/contacts.vcf file into the database. " +
+    server.tool("sync_contacts", "Import phone contacts from a VCF file or string into the database. " +
         "Matches phone numbers from the VCF to existing WhatsApp JIDs and updates their display names. " +
-        "Use this after a fresh QR code scan to populate contact names from your address book.", {}, async () => {
+        "Use this after a fresh QR code scan to populate contact names from your address book. " +
+        "Optionally pass vcf_content to sync from a string instead of the default file.", {
+        vcf_content: z.string().optional().describe("Optional VCF content as a string. If provided, syncs from this content instead of reading from file."),
+    }, async ({ vcf_content }) => {
         try {
-            const result = importContactsFromVcf(getDb());
+            const result = importContactsFromVcf(getDb(), vcf_content);
             return {
                 content: [{ type: "text", text: JSON.stringify(result, null, 2) }],
             };
@@ -164,9 +168,7 @@ export function registerTools(server) {
             return { content: [{ type: "text", text: `Error: ${err.message}` }], isError: true };
         }
     });
-    server.tool("get_unread_messages", "Get all chats with unread messages and their recent messages in one call. " +
-        "Returns each unread chat with its name, unread count, and the last N messages. " +
-        "Use this for a quick \"what did I miss\" summary.", {
+    server.tool("get_unread_messages", "Get all chats with unread messages and their recent messages in one call. Returns each unread chat with its name, unread count, and the last N messages. Contacts with multiple WhatsApp identities are automatically unified into a single view. Use this for a quick \"what did I miss\" summary.", {
         messagesPerChat: z.number().min(1).max(20).default(5).describe("Number of recent messages to include per chat"),
     }, async ({ messagesPerChat }) => {
         try {
@@ -186,10 +188,7 @@ export function registerTools(server) {
         }
     });
     // ─── Writing Tools ──────────────────────────────────────────
-    server.tool("send_message", "Send a text message to a WhatsApp contact or group. " +
-        "Optionally reply to a specific message by providing its ID. " +
-        "First call without confirmed=true returns a preview for user approval. " +
-        "Call again with confirmed=true to actually send.", {
+    server.tool("send_message", "Send a text message to a WhatsApp contact or group. Optionally reply to a specific message by providing its ID. First call without confirmed=true returns a preview for user approval. Call again with confirmed=true to actually send. Messages are automatically routed to the contact's most recently active thread.", {
         jid: z.string().describe("Recipient JID (phone@s.whatsapp.net), group JID, or phone number"),
         text: z.string().describe("Message text to send"),
         quotedMessageId: z.string().optional().describe("Message ID to reply to / quote. Get this from list_messages or search_messages."),