whatsapp-pi 1.0.59 → 1.0.61

package/README.md

@@ -5,7 +5,7 @@
 # WhatsApp-Pi
 [![GitHub](https://img.shields.io/badge/github-repo-black.svg?style=flat-square&logo=github)](https://github.com/RaphaCastelloes/whatsapp-pi)
 
-A WhatsApp integration extension for the **[Pi Coding Agent](https://github.com/mariozechner/pi-coding-agent)**. 
+A WhatsApp integration extension for the **[Pi Coding Agent](https://pi.dev)**. 
 
 Pi is a powerful agentic AI coding assistant that operates in your terminal. This extension lets you chat and pair-program with your Pi agent through WhatsApp, with message filtering, allowed contacts/groups, recents/history browsing, message detail/reply, group-only binding, and reliable message delivery.
 
@@ -32,6 +32,34 @@ Pi is a powerful agentic AI coding assistant that operates in your terminal. Thi
 
 ## Prerequisites
 
+### Pi Coding Agent
+
+Install Pi from [pi.dev](https://pi.dev):
+
+**Linux / macOS (recommended):**
+```bash
+curl -fsSL https://pi.dev/install.sh | sh
+```
+
+**Or via npm (requires Node.js 20+):**
+```bash
+npm install -g @earendil-works/pi-coding-agent
+```
+
+Then authenticate or set an API key before starting:
+```bash
+# Use /login inside Pi for subscription providers, or set an API key:
+export ANTHROPIC_API_KEY=sk-ant-...
+# OpenAI
+export OPENAI_API_KEY=sk-...
+# Google Gemini
+export GEMINI_API_KEY=...
+```
+
+See the [Pi documentation](https://pi.dev/docs/latest) for full setup, providers, and model configuration details.
+
+### Audio Transcription
+
 To enable audio transcription features:
 ```bash
 python -m pip install -U openai-whisper
@@ -120,12 +148,12 @@ pi -e whatsapp-pi.ts --whatsapp-pi-online
 
 ### Allowed Contacts Management
 - **Add Contact** - Add a new contact to the allowed contacts list (format: +5511999999999)
-- **Select a contact** - Open a submenu with **History**, **Send Message**, **Print Contact**, alias actions, **Remove Contact**, and **Back**
+- **Select a contact** - Open a submenu with **History**, **Send Message**, **Print Contact**, **Add Alias**, **Remove Alias**, **Add Number**, **Remove Number**, **Remove Contact**, and **Back**
 - **Back** - Return to main menu
 
 ### Allowed Groups Management
 - **Add Group** - Add a WhatsApp group JID to the allowed groups list (format: 120363012345@g.us)
-- **Select a group** - Open a submenu with **History**, **Send Message**, **Print Group JID**, **Reaction Mode**, alias actions, **Remove Group**, and **Back**
+- **Select a group** - Open a submenu with **History**, **Send Message**, **Print Group JID**, **Reaction Mode**, **Add Alias**, **Remove Alias**, **Remove Group**, and **Back**
 - **Reaction Mode** - Switch between **Active** and **Passive** behavior for that group
 - **Back** - Return to main menu
 
@@ -137,6 +165,11 @@ pi -e whatsapp-pi.ts --whatsapp-pi-online
 - **Remove Alias** - Clear saved alias for that sender
 - **Back** - Return to main menu
 
+### WhatsApp Chat Commands
+Send these commands directly in WhatsApp to control the agent session:
+- **`/compact`** - Compact the current Pi session context
+- **`/abort`** - Abort the current Pi agent operation
+
 ## Project Structure
 
 ```
@@ -169,4 +202,4 @@ npm test
 - **Session Handling**: Saved state, allow list, and startup reconnects are restored automatically when available.
 - **Intelligent Message Filtering**: Messages ending with `π` are ignored to prevent bot loops.
 - **Storage Management**: Persistent data lives under `.pi-data/` plus the recents store in the user home directory.
-- **Improved Test Coverage (v1.0.56)**: Added unit tests for the `message_end` auto-reply handler, covering the happy path, disconnected guard, role guard, send failure, thrown exceptions, and the `send_wa_message` dedup flag. Fixed a Windows path separator bug in the recents service test suite.
+- **Improved Test Coverage (v1.0.59)**: Added unit tests for the `message_end` auto-reply handler, covering the happy path, disconnected guard, role guard, send failure, thrown exceptions, and the `send_wa_message` dedup flag. Fixed a Windows path separator bug in the recents service test suite.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whatsapp-pi",
-  "version": "1.0.59",
+  "version": "1.0.61",
   "type": "module",
   "description": "WhatsApp integration extension for Pi",
   "main": "whatsapp-pi.ts",

package/src/i18n.ts

@@ -1,13 +1,9 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
-
 type Locale = "pt-BR" | "es" | "fr";
 type Key = keyof typeof fallback;
 type Params = Record<string, string | number | undefined>;
 
 let currentLocale: string | undefined;
 
-const namespace = "whatsapp-pi";
-
 const fallback = {
     "tool.label": "Send WhatsApp Message",
     "tool.description": "Send a WhatsApp message to a contact identified by their JID (e.g. 5511999998888@s.whatsapp.net). Returns a JSON result with success status and messageId or error.",
@@ -32,7 +28,7 @@ const fallback = {
     "service.whatsapp.typeToConnect": "| WhatsApp: type /whatsapp to connect",
     "service.whatsapp.connected": "| WhatsApp: Connected",
     "service.whatsapp.qrConnected": "WhatsApp connected",
-    "service.whatsapp.qrWelcomeMessage": "👋 To get started, send a message, enter in /whatsapp > Recents to Allow Contact with LID code, then add the whatsapp number in the Allowed Contact list.",
+    "service.whatsapp.qrWelcomeMessage": "😊 Hi! Send me a message, enter in '/whatsapp > Recents' to Allow Contact or Group with LID code. For Contact, consider adding the whatsapp number to the Allowed Contact list.",
     "service.whatsapp.sessionErrorBadMac": "| WhatsApp: Session Error (Bad MAC)",
     "service.whatsapp.loggedOut": "| WhatsApp: Logged out",
     "service.whatsapp.conflict": "| WhatsApp: Conflict (Another Instance)",
@@ -710,41 +706,9 @@ export function resetI18n(): void {
     currentLocale = undefined;
 }
 
-export function initI18n(pi: ExtensionAPI): void {
+export function initI18n(_pi: unknown): void {
     const forcedLocale = getLocaleOverride();
     if (forcedLocale) {
         currentLocale = forcedLocale;
     }
-
-    pi.events?.emit?.("pi-core/i18n/registerBundle", {
-        namespace,
-        defaultLocale: "en",
-        fallback,
-        translations,
-    });
-    pi.events?.on?.("pi-core/i18n/localeChanged", (event: unknown) => {
-        if (forcedLocale) {
-            return;
-        }
-
-        if (event && typeof event === "object" && "locale" in event) {
-            const locale = String((event as { locale?: unknown }).locale ?? "");
-            if (locale) {
-                currentLocale = locale;
-            }
-        }
-    });
-    pi.events?.emit?.("pi-core/i18n/requestApi", {
-        namespace,
-        onApi(api: { getLocale?: () => string | undefined }) {
-            if (forcedLocale) {
-                return;
-            }
-
-            const locale = api.getLocale?.();
-            if (locale) {
-                currentLocale = locale;
-            }
-        },
-    });
 }

package/src/services/recents.service.ts

@@ -125,12 +125,12 @@ export class RecentsService {
         });
     }
 
-    private stripSpecialCharacters(text: string): string {
-        return text
-            .replace(/[\p{Extended_Pictographic}\p{Emoji_Modifier}\p{Regional_Indicator}\u200D\uFE0F]/gu, '')
-            .replace(/\s+/g, ' ')
-            .trim();
-    }
+    private stripSpecialCharacters(text: string): string {
+        return text
+            .replace(/\p{Extended_Pictographic}|\p{Emoji_Modifier}|\p{Regional_Indicator}|\u200D|\uFE0F/gu, '')
+            .replace(/\s+/g, ' ')
+            .trim();
+    }
 
     private buildPreview(text: string): string {
         const normalized = this.stripSpecialCharacters(text);

package/src/services/session.manager.ts

@@ -1,6 +1,6 @@
-import { useMultiFileAuthState } from 'baileys';
-import { join } from 'path';
-import { readFile, writeFile, mkdir, rm, rename } from 'fs/promises';
+import { useMultiFileAuthState } from 'baileys';
+import { basename, join } from 'path';
+import { readFile, writeFile, mkdir, rm, rename, readdir } from 'fs/promises';
 import { homedir } from 'os';
 import { SessionStatus } from '../models/whatsapp.types.js';
 import { t } from '../i18n.js';
@@ -34,10 +34,11 @@ export class SessionManager {
     private allowList: Contact[] = [];
     private allowedGroups: Contact[] = [];
     private ignoredNumbers: Contact[] = [];
-    private hasAuthState = false;
-    private openaiKey: string = '';
-    private visionModel: string = 'gpt-4o';
-    private operatorJid: string = '';
+    private hasAuthState = false;
+    private openaiKey: string = '';
+    private visionModel: string = 'gpt-4o';
+    private operatorJid: string = '';
+    private configLoaded = false;
 
     constructor(baseDir = join(homedir(), '.pi', 'whatsapp-pi')) {
         this.baseDir = baseDir;
@@ -45,20 +46,24 @@ export class SessionManager {
         this.configPath = join(this.baseDir, 'config.json');
     }
 
-    private async ensureStorageDirectories() {
-        await mkdir(this.baseDir, { recursive: true });
-        await mkdir(this.authStateDir, { recursive: true });
-    }
-
-    public async ensureInitialized() {
-        try {
-            await this.ensureStorageDirectories();
-            await this.loadConfig();
-            await this.syncAuthStateFromDisk();
-        } catch {
-            // Initialization is best-effort; callers can continue with defaults.
-        }
-    }
+    private async ensureStorageDirectories() {
+        await mkdir(this.baseDir, { recursive: true });
+        await mkdir(this.authStateDir, { recursive: true });
+    }
+
+    public async ensureInitialized() {
+        try {
+            await this.ensureStorageDirectories();
+            await this.cleanupStaleConfigTempFiles();
+            if (!this.configLoaded) {
+                await this.loadConfig();
+                this.configLoaded = true;
+            }
+            await this.syncAuthStateFromDisk();
+        } catch {
+            // Initialization is best-effort; callers can continue with defaults.
+        }
+    }
 
     private async loadConfig() {
         try {
@@ -172,21 +177,47 @@ export class SessionManager {
             const serialized = JSON.stringify(config, null, 2);
             await writeFile(tempPath, serialized);
             try {
-                await rename(tempPath, this.configPath);
-            } catch {
-                // Windows EPERM: atomic rename failed (file locked). Fall back to direct write.
-                await writeFile(this.configPath, serialized);
-                await rm(tempPath, { force: true }).catch(() => {});
-            }
-        } catch (error) {
-            await rm(tempPath, { force: true }).catch(() => {});
-            console.error(t('session.manager.failedSaveConfig'), error);
-        }
-    }
-
-    getAllowList(): Contact[] {
-        return this.allowList;
-    }
+                await rename(tempPath, this.configPath);
+            } catch {
+                // Windows EPERM: atomic rename failed (file locked). Fall back to direct write.
+                await writeFile(this.configPath, serialized);
+                await this.removeConfigTempFile(tempPath);
+            }
+        } catch (error) {
+            await this.removeConfigTempFile(tempPath);
+            console.error(t('session.manager.failedSaveConfig'), error);
+        }
+    }
+
+    private async cleanupStaleConfigTempFiles() {
+        const configFileName = basename(this.configPath);
+        let files: string[];
+
+        try {
+            files = await readdir(this.baseDir);
+        } catch {
+            return;
+        }
+
+        await Promise.all(files
+            .filter(fileName => fileName.startsWith(`${configFileName}.`) && fileName.endsWith('.tmp'))
+            .map(fileName => this.removeConfigTempFile(join(this.baseDir, fileName))));
+    }
+
+    private async removeConfigTempFile(tempPath: string) {
+        for (let attempt = 0; attempt < 3; attempt++) {
+            try {
+                await rm(tempPath, { force: true });
+                return;
+            } catch {
+                await new Promise(resolve => setTimeout(resolve, 25));
+            }
+        }
+    }
+
+    getAllowList(): Contact[] {
+        return this.allowList;
+    }
 
     getAllowedContact(number: string): Contact | undefined {
         return this.allowList.find(c => c.number === number);

package/src/services/whatsapp.service.ts

@@ -185,11 +185,27 @@ export class WhatsAppService {
         return value;
     }
 
-    private normalizeRecipientJid(jid: string): string {
-        if (jid.includes('@')) return jid;
-        const digits = jid.startsWith('+') ? jid.slice(1) : jid;
-        return `${digits}@s.whatsapp.net`;
-    }
+    private normalizeRecipientJid(jid: string): string {
+        if (jid.includes('@')) return jid;
+        const digits = jid.startsWith('+') ? jid.slice(1) : jid;
+        return `${digits}@s.whatsapp.net`;
+    }
+
+    public resolveOutboundRecipientJid(recipient: string): string {
+        if (SessionManager.isGroupJid(recipient)) {
+            return recipient;
+        }
+
+        const senderNumber = this.normalizeContactNumber(recipient.split('@')[0]);
+        const allowedContact = this.sessionManager.getAllowedContact(recipient)
+            ?? this.sessionManager.getAllowedContact(senderNumber);
+
+        if (allowedContact?.sendNumber) {
+            return this.normalizeRecipientJid(allowedContact.sendNumber);
+        }
+
+        return this.normalizeRecipientJid(recipient);
+    }
 
     private normalizeJidForComparison(jid: string): string {
         const [localPart, domain = ''] = jid.split('@');
@@ -397,7 +413,7 @@ export class WhatsAppService {
     }
 
     private async handlePairingQr(qr: string) {
-        this.sessionManager.setStatus('pairing');
+        await this.sessionManager.setStatus('pairing');
         this.onQRCode?.(qr);
         this.onStatusUpdate?.(t('service.whatsapp.typeToConnect'));
         this.qrWasShown = true;
@@ -413,7 +429,7 @@ export class WhatsAppService {
         this.clearReconnectTimeout();
         await this.saveCreds?.();
         await this.sessionManager.markAuthStateAvailable();
-        this.sessionManager.setStatus('connected');
+        await this.sessionManager.setStatus('connected');
         this.onStatusUpdate?.(t('service.whatsapp.connected'));
 
         if (this.qrWasShown) {
@@ -513,7 +529,7 @@ export class WhatsAppService {
             this.scheduleReconnect(options);
         } else if (!shouldReconnect) {
             this.reconnectAttempts = 0;
-            this.sessionManager.setStatus('logged-out');
+            await this.sessionManager.setStatus('logged-out');
             this.onStatusUpdate?.(t('service.whatsapp.disconnected'));
         }
     }
@@ -596,7 +612,7 @@ export class WhatsAppService {
 
         if (!this.sessionManager.isConversationAllowed(senderJid)) {
             if (this.isVerbose()) {
-                console.log(`Ignoring message from ${senderJid} (not in allow list)`);
+                console.log(t('service.whatsapp.ignoredNotAllowed', { senderJid }));
             }
             await this.sessionManager.trackIgnoredNumber(senderJid, pushName);
             return;
@@ -653,27 +669,29 @@ export class WhatsAppService {
         }
     }
 
-    async sendMessage(jid: string, text: string) {
-        // Ensure we show the typing indicator before sending
-        await this.sendPresence(jid, 'composing');
-
-        const result = await this.messageSender.send({
-            recipientJid: jid,
-            text: text
-        });
-
-        // After sending, we can stop the typing indicator
-        await this.sendPresence(jid, 'paused');
-
-        if (!result.success) {
-            console.error(t('service.whatsapp.failedSendMessage', { jid, error: result.error ?? t('message.sender.unknownError') }));
-        }
-
-        return result;
-    }
-
-    async sendMenuMessage(jid: string, text: string) {
-        const normalizedJid = this.normalizeRecipientJid(jid);
+    async sendMessage(jid: string, text: string) {
+        const recipientJid = this.resolveOutboundRecipientJid(jid);
+
+        // Ensure we show the typing indicator before sending
+        await this.sendPresence(recipientJid, 'composing');
+
+        const result = await this.messageSender.send({
+            recipientJid,
+            text: text
+        });
+
+        // After sending, we can stop the typing indicator
+        await this.sendPresence(recipientJid, 'paused');
+
+        if (!result.success) {
+            console.error(t('service.whatsapp.failedSendMessage', { jid: recipientJid, error: result.error ?? t('message.sender.unknownError') }));
+        }
+
+        return result;
+    }
+
+    async sendMenuMessage(jid: string, text: string) {
+        const normalizedJid = this.resolveOutboundRecipientJid(jid);
         const socket = this.getActiveSocket();
 
         if (!socket) {

package/src/ui/message-reply.view.ts

@@ -41,13 +41,21 @@ const buildReplyWidget = (selectedMessage: SelectedMessageContext): string[] =>
     ];
 };
 
-const buildReplyTitle = (selectedMessage: SelectedMessageContext): string => {
+const buildReplyTitle = (selectedMessage: SelectedMessageContext): string => {
     const sender = selectedMessage.senderName
         ? `${selectedMessage.senderName} (${selectedMessage.senderNumber})`
         : selectedMessage.senderNumber;
 
-    return truncateToWidth(`${t('message.reply.title')} ${sender}`, 120);
-};
+    return truncateToWidth(`${t('message.reply.title')} ${sender}`, 120);
+};
+
+const toRecentSenderNumber = (recipientJid: string): string => {
+    if (recipientJid.endsWith('@g.us')) {
+        return recipientJid;
+    }
+
+    return `+${recipientJid.split('@')[0]}`;
+};
 
 export async function showMessageReplyView(
     ctx: MessageReplyContext,
@@ -70,24 +78,27 @@ export async function showMessageReplyView(
                 continue;
             }
 
-            const draft: ReplyDraft = {
-                text,
-                targetMessageId: props.selectedMessage.messageId,
-                targetConversation: props.selectedMessage.senderNumber
-            };
-
-            const result: ReplySendResult = await props.whatsappService.sendMenuMessage(
-                props.selectedMessage.senderNumber,
-                draft.text
-            );
-
-            if (result.success) {
-                await props.recentsService.recordMessage({
-                    messageId: result.messageId ?? `${Date.now()}`,
-                    senderNumber: props.selectedMessage.senderNumber,
-                    senderName: props.selectedMessage.senderName,
-                    text: draft.text,
-                    direction: 'outgoing',
+            const draft: ReplyDraft = {
+                text,
+                targetMessageId: props.selectedMessage.messageId,
+                targetConversation: props.selectedMessage.senderNumber
+            };
+            const recipientJid = props.whatsappService.resolveOutboundRecipientJid(
+                props.selectedMessage.senderNumber
+            );
+
+            const result: ReplySendResult = await props.whatsappService.sendMenuMessage(
+                recipientJid,
+                draft.text
+            );
+
+            if (result.success) {
+                await props.recentsService.recordMessage({
+                    messageId: result.messageId ?? `${Date.now()}`,
+                    senderNumber: toRecentSenderNumber(recipientJid),
+                    senderName: props.selectedMessage.senderName,
+                    text: draft.text,
+                    direction: 'outgoing',
                     timestamp: Date.now()
                 });
                 ctx.ui.notify(t('message.reply.sent', { preview: buildPreview(props.selectedMessage.text) }), 'info');

package/whatsapp-pi.ts

@@ -48,6 +48,26 @@ export default function (pi: ExtensionAPI) {
     const menuHandler = new MenuHandler(whatsappService, sessionManager, recentsService);
     let _ctx: ExtensionContext | undefined;
 
+    const formatFooterStatus = (status: string) => {
+        if (status !== t("service.whatsapp.connected")) {
+            return status;
+        }
+
+        const allowedChats = sessionManager.getAllowList().length + sessionManager.getAllowedGroups().length;
+        if (allowedChats === 0) {
+            return `${status} - No chats`;
+        }
+
+        return `${status} to ${allowedChats} chat${allowedChats === 1 ? '' : 's'}`;
+    };
+
+    const refreshFooterStatus = () => {
+        if (!_ctx) return;
+        _ctx.ui.setStatus('whatsapp', formatFooterStatus(whatsappService.getStatus() === 'connected'
+            ? t("service.whatsapp.connected")
+            : t("service.whatsapp.disconnected")));
+    };
+
     const installGracefulShutdownHandlers = () => {
         shutdownState.__whatsappPiShutdown ??= { installed: false };
         if (shutdownState.__whatsappPiShutdown.installed) {
@@ -84,7 +104,7 @@ export default function (pi: ExtensionAPI) {
         }
         ctx.ui.setStatus('whatsapp', '| WhatsApp: Disconnected');
         whatsappService.setStatusCallback((status) => {
-            ctx.ui.setStatus('whatsapp', status);
+            ctx.ui.setStatus('whatsapp', formatFooterStatus(status));
         });
 
         // Set up group binding if configured
@@ -185,8 +205,16 @@ export default function (pi: ExtensionAPI) {
         ctx.ui.notify('WhatsApp: Session reset via /new is now fully supported.', 'info');
     });
 
-    // Track whether send_wa_message tool already sent a reply this turn
-    let toolSentToJid: string | null = null;
+    // Track whether send_wa_message tool already sent a reply this turn
+    let toolSentToJid: string | null = null;
+
+    const toRecentSenderNumber = (recipientJid: string): string => {
+        if (recipientJid.endsWith('@g.us')) {
+            return recipientJid;
+        }
+
+        return `+${recipientJid.split('@')[0]}`;
+    };
 
     // Handle incoming messages by injecting them as user prompts
     whatsappService.setMessageCallback(async (m) => {
@@ -298,16 +326,15 @@ export default function (pi: ExtensionAPI) {
                 formattedMessage
             ].join('\n'));
 
-            const result = await whatsappService.sendMessage(resolvedJid, params.message);
+            const outboundJid = whatsappService.resolveOutboundRecipientJid(resolvedJid);
+            const result = await whatsappService.sendMessage(outboundJid, params.message);
 
             if (result.success) {
                 // Mark that tool already sent to this JID — prevents message_end from re-sending
-                toolSentToJid = resolvedJid;
-                const isGroupJid = resolvedJid.endsWith('@g.us');
-                const senderNumber = isGroupJid ? resolvedJid : `+${resolvedJid.split('@')[0]}`;
-                await recentsService.recordMessage({
-                    messageId: result.messageId!,
-                    senderNumber,
+                toolSentToJid = outboundJid;
+                await recentsService.recordMessage({
+                    messageId: result.messageId!,
+                    senderNumber: toRecentSenderNumber(outboundJid),
                     text: params.message,
                     direction: 'outgoing',
                     timestamp: Date.now()
@@ -351,16 +378,17 @@ export default function (pi: ExtensionAPI) {
                 allowList: sessionManager.getAllowList(),
                 allowedGroups: sessionManager.getAllowedGroups()
             });
+            refreshFooterStatus();
         }
     });
 
     // Handle outgoing messages (Agent -> WhatsApp)
     pi.on("agent_start", async (_event, _ctx) => {
         if (sessionManager.getStatus() !== 'connected') return;
-        const lastJid = whatsappService.getLastRemoteJid();
-        if (lastJid) {
-            await whatsappService.sendPresence(lastJid, 'composing');
-        }
+        const lastJid = whatsappService.getLastRemoteJid();
+        if (lastJid) {
+            await whatsappService.sendPresence(whatsappService.resolveOutboundRecipientJid(lastJid), 'composing');
+        }
     });
 
     pi.on("message_end", async (event, ctx) => {
@@ -368,23 +396,26 @@ export default function (pi: ExtensionAPI) {
 
         const { message } = event;
         // Only reply if it's the assistant and we have a valid target
-        if (message.role === "assistant") {
-            const lastJid = whatsappService.getLastRemoteJid();
-            const text = message.content.filter(c => c.type === "text").map(c => c.text).join("\n");
-
-            // Skip if send_wa_message tool already sent a reply to this JID
-            if (toolSentToJid === lastJid) {
-                toolSentToJid = null;
-                return;
-            }
-
-            if (lastJid && text) {
-                try {
-                    const result = await whatsappService.sendMessage(lastJid, text);
-                    if (result.success) {
-                        await recentsService.recordMessage({
-                            messageId: result.messageId ?? `${Date.now()}`,
-                            senderNumber: `+${lastJid.split('@')[0]}`,
+        if (message.role === "assistant") {
+            const lastJid = whatsappService.getLastRemoteJid();
+            const text = message.content.filter(c => c.type === "text").map(c => c.text).join("\n");
+            const outboundJid = lastJid
+                ? whatsappService.resolveOutboundRecipientJid(lastJid)
+                : null;
+
+            // Skip if send_wa_message tool already sent a reply to this JID
+            if (toolSentToJid === outboundJid) {
+                toolSentToJid = null;
+                return;
+            }
+
+            if (outboundJid && text) {
+                try {
+                    const result = await whatsappService.sendMessage(outboundJid, text);
+                    if (result.success) {
+                        await recentsService.recordMessage({
+                            messageId: result.messageId ?? `${Date.now()}`,
+                            senderNumber: toRecentSenderNumber(outboundJid),
                             text,
                             direction: 'outgoing',
                             timestamp: Date.now()