whatsapp-pi 1.0.24 → 1.0.26

package/package.json

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

package/src/services/whatsapp.service.ts

@@ -242,6 +242,44 @@ export class WhatsAppService {
         return result;
     }
 
+    private normalizeRecipientJid(jid: string): string {
+        if (jid.includes('@')) return jid;
+        const digits = jid.startsWith('+') ? jid.slice(1) : jid;
+        return `${digits}@s.whatsapp.net`;
+    }
+
+    async sendMenuMessage(jid: string, text: string) {
+        const normalizedJid = this.normalizeRecipientJid(jid);
+
+        if (!this.socket || this.getStatus() !== 'connected') {
+            return {
+                success: false,
+                error: 'WhatsApp is not connected',
+                attempts: 0
+            };
+        }
+
+        try {
+            await this.sendPresence(normalizedJid, 'composing');
+            const response = await this.socket.sendMessage(normalizedJid, { text });
+            await this.sendPresence(normalizedJid, 'paused');
+
+            return {
+                success: true,
+                messageId: response?.key?.id,
+                attempts: 1
+            };
+        } catch (error: any) {
+            await this.sendPresence(normalizedJid, 'paused');
+            console.error(`Failed to send menu message to ${normalizedJid}:`, error);
+            return {
+                success: false,
+                error: error?.message || 'Unknown error',
+                attempts: 1
+            };
+        }
+    }
+
     async sendPresence(jid: string, presence: 'composing' | 'recording' | 'paused') {
         if (!this.socket || this.getStatus() !== 'connected') return;
         try {

package/src/ui/menu.handler.ts

@@ -17,19 +17,22 @@ export class MenuHandler {
         const registered = await this.sessionManager.isRegistered();
         const options: string[] = [];
 
+        options.push('Recents');
+
         if (status === 'connected') {
+            options.push('Allowed Numbers');
+            options.push('Blocked Numbers');
             options.push('Disconnect WhatsApp');
         } else {
             options.push('Connect / Reconnect WhatsApp');
+            options.push('Allowed Numbers');
+            options.push('Blocked Numbers');
         }
 
         if (registered) {
             options.push('Logoff (Delete Session)');
         }
 
-        options.push('Allowed Numbers');
-        options.push('Blocked Numbers');
-        options.push('Recents');
         options.push('Back');
 
         const choice = await ctx.ui.select(`WhatsApp (Status: ${status})`, options);
@@ -311,7 +314,7 @@ export class MenuHandler {
                 continue;
             }
 
-            const result = await this.whatsappService.sendMessage(this.toJid(conversation.senderNumber), trimmed);
+            const result = await this.whatsappService.sendMenuMessage(this.toJid(conversation.senderNumber), trimmed);
             if (result.success) {
                 await this.recentsService.recordMessage({
                     messageId: result.messageId ?? `${Date.now()}`,
@@ -323,7 +326,7 @@ export class MenuHandler {
                 });
                 ctx.ui.notify(`Sent message to ${displayName}`, 'info');
             } else {
-                ctx.ui.notify(`Failed to send message to ${displayName}`, 'error');
+                ctx.ui.notify(`Failed to send message to ${displayName}: ${result.error ?? 'Unknown error'}`, 'error');
             }
             return;
         }
@@ -332,27 +335,28 @@ export class MenuHandler {
     private async sendMessageToAllowedNumber(ctx: ExtensionCommandContext, contact: Contact) {
         const displayName = contact.name ? `${contact.name} (${contact.number})` : contact.number;
         for (let attempt = 0; attempt < 2; attempt++) {
-            const text = await ctx.ui.input(`Send a message to ${displayName}:`);
-            const trimmed = text?.trim() || '';
+            const inputText = (await ctx.ui.input(`Send a message to ${displayName}:`))?.trim() || '';
 
-            if (!trimmed) {
+            if (!inputText) {
                 ctx.ui.notify('Please enter a message before sending.', 'error');
                 continue;
             }
 
-            const result = await this.whatsappService.sendMessage(this.toJid(contact.number), trimmed);
+            const inputTextWithPiSuffix = inputText + ' π';
+
+            const result = await this.whatsappService.sendMenuMessage(this.toJid(contact.number), inputTextWithPiSuffix);
             if (result.success) {
                 await this.recentsService.recordMessage({
                     messageId: result.messageId ?? `${Date.now()}`,
                     senderNumber: contact.number,
                     senderName: contact.name,
-                    text: trimmed,
+                    text: inputTextWithPiSuffix,
                     direction: 'outgoing',
                     timestamp: Date.now()
                 });
                 ctx.ui.notify(`Sent message to ${displayName}`, 'info');
             } else {
-                ctx.ui.notify(`Failed to send message to ${displayName}`, 'error');
+                ctx.ui.notify(`Failed to send message to ${displayName}: ${result.error ?? 'Unknown error'}`, 'error');
             }
             return;
         }

package/whatsapp-pi.ts

@@ -1,4 +1,5 @@
 import type { ExtensionAPI, ExtensionCommandContext, ExtensionContext } from "@mariozechner/pi-coding-agent";
+import { Type } from "@sinclair/typebox";
 import { extractMessageContent } from '@whiskeysockets/baileys';
 import { SessionManager } from './src/services/session.manager.js';
 import { WhatsAppService } from './src/services/whatsapp.service.js';
@@ -99,7 +100,7 @@ export default function (pi: ExtensionAPI) {
             .find(entry => entry.type === "custom" && entry.customType === "whatsapp-state");
 
         if (savedStateEntry) {
-            const data = savedStateEntry.data as any;
+            const data = (savedStateEntry as { data?: any }).data;
             if (data.status) await sessionManager.setStatus(data.status);
             if (Array.isArray(data.allowList)) {
                 for (const n of data.allowList) {
@@ -428,6 +429,45 @@ export default function (pi: ExtensionAPI) {
         
     });
 
+    // Register send_wa_message tool (LLM-callable)
+    pi.registerTool({
+        name: "send_wa_message",
+        label: "Send WhatsApp Message",
+        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.",
+        promptSnippet: "send_wa_message(jid, message) - Send a WhatsApp message to a contact by JID",
+        parameters: Type.Object({
+            jid: Type.String({ minLength: 1, description: "WhatsApp JID of the recipient, e.g. 5511999998888@s.whatsapp.net" }),
+            message: Type.String({ minLength: 1, description: "Plain-text message content to send" })
+        }),
+        async execute(_toolCallId, params, _signal, _onUpdate, _ctx) {
+            if (whatsappService.getStatus() !== 'connected') {
+                return {
+                    isError: true,
+                    details: undefined,
+                    content: [{ type: "text" as const, text: JSON.stringify({ success: false, error: "WhatsApp not connected", attempts: 0 }) }]
+                };
+            }
+
+            const result = await whatsappService.sendMessage(params.jid, params.message);
+
+            if (result.success) {
+                await recentsService.recordMessage({
+                    messageId: result.messageId!,
+                    senderNumber: `+${params.jid.split('@')[0]}`,
+                    text: params.message,
+                    direction: 'outgoing',
+                    timestamp: Date.now()
+                });
+            }
+
+            return {
+                isError: !result.success,
+                details: undefined,
+                content: [{ type: "text" as const, text: JSON.stringify({ success: result.success, messageId: result.messageId, error: result.error, attempts: result.attempts }) }]
+            };
+        }
+    });
+
     // Register commands
     pi.registerCommand("whatsapp", {
         description: "Manage WhatsApp integration",