whatsapp-pi 1.0.56 → 1.0.58

package/package.json

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

package/src/i18n.ts

@@ -31,6 +31,8 @@ const fallback = {
     "service.whatsapp.connecting": "| WhatsApp: Connecting...",
     "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.sessionErrorBadMac": "| WhatsApp: Session Error (Bad MAC)",
     "service.whatsapp.loggedOut": "| WhatsApp: Logged out",
     "service.whatsapp.conflict": "| WhatsApp: Conflict (Another Instance)",
@@ -107,11 +109,6 @@ const fallback = {
     "menu.allowedGroups.group.history": "History",
     "menu.allowedGroups.group.sendMessage": "Send Message",
     "menu.allowedGroups.group.printGroup": "Print Group JID",
-    "menu.allowedGroups.group.reactionMode": "Reaction Mode",
-    "menu.allowedGroups.group.reactionMode.title": "Reaction Mode • {displayName}",
-    "menu.allowedGroups.group.reactionMode.active": "Active",
-    "menu.allowedGroups.group.reactionMode.passive": "Passive",
-    "menu.allowedGroups.group.reactionMode.updated": "Reaction mode set to {mode} for {displayName}",
     "menu.allowedGroups.group.removeAlias": "Remove Alias",
     "menu.allowedGroups.group.addAlias": "Add Alias",
     "menu.allowedGroups.group.removeGroup": "Remove Group",
@@ -247,6 +244,8 @@ const translations: Record<Locale, Partial<Record<Key, string>>> = {
         "service.whatsapp.connecting": "| WhatsApp: Conectando...",
         "service.whatsapp.typeToConnect": "| WhatsApp: digite /whatsapp para conectar",
         "service.whatsapp.connected": "| WhatsApp: Conectado",
+        "service.whatsapp.qrConnected": "WhatsApp conectado",
+        "service.whatsapp.qrWelcomeMessage": "👋 Para começar, envie uma mensagem, entre em /whatsapp > Recentes para Permitir o Contato com o código LID, depois adicione o número do whatsapp na lista de Contatos Permitidos.",
         "service.whatsapp.sessionErrorBadMac": "| WhatsApp: Erro de sessão (Bad MAC)",
         "service.whatsapp.loggedOut": "| WhatsApp: Desconectado",
         "service.whatsapp.conflict": "| WhatsApp: Conflito (Outra instância)",
@@ -323,11 +322,6 @@ const translations: Record<Locale, Partial<Record<Key, string>>> = {
         "menu.allowedGroups.group.history": "Histórico",
         "menu.allowedGroups.group.sendMessage": "Enviar mensagem",
         "menu.allowedGroups.group.printGroup": "Mostrar JID do grupo",
-        "menu.allowedGroups.group.reactionMode": "Modo de reação",
-        "menu.allowedGroups.group.reactionMode.title": "Modo de reação • {displayName}",
-        "menu.allowedGroups.group.reactionMode.active": "Ativo",
-        "menu.allowedGroups.group.reactionMode.passive": "Passivo",
-        "menu.allowedGroups.group.reactionMode.updated": "Modo de reação definido como {mode} para {displayName}",
         "menu.allowedGroups.group.removeAlias": "Remover apelido",
         "menu.allowedGroups.group.addAlias": "Adicionar apelido",
         "menu.allowedGroups.group.removeGroup": "Remover grupo",
@@ -429,6 +423,8 @@ const translations: Record<Locale, Partial<Record<Key, string>>> = {
         "service.whatsapp.connecting": "| WhatsApp: Conectando...",
         "service.whatsapp.typeToConnect": "| WhatsApp: escribe /whatsapp para conectar",
         "service.whatsapp.connected": "| WhatsApp: Conectado",
+        "service.whatsapp.qrConnected": "WhatsApp conectado",
+        "service.whatsapp.qrWelcomeMessage": "👋 Para empezar, envía un mensaje, entra en /whatsapp > Recientes para Permitir el Contacto con el código LID, luego añade el número de whatsapp en la lista de Contactos Permitidos.",
         "service.whatsapp.sessionErrorBadMac": "| WhatsApp: Error de sesión (Bad MAC)",
         "service.whatsapp.loggedOut": "| WhatsApp: Cerrado sesión",
         "service.whatsapp.conflict": "| WhatsApp: Conflicto (Otra instancia)",
@@ -563,6 +559,8 @@ const translations: Record<Locale, Partial<Record<Key, string>>> = {
         "service.whatsapp.connecting": "| WhatsApp: Connexion...",
         "service.whatsapp.typeToConnect": "| WhatsApp: tapez /whatsapp pour connecter",
         "service.whatsapp.connected": "| WhatsApp: Connecté",
+        "service.whatsapp.qrConnected": "WhatsApp connecté",
+        "service.whatsapp.qrWelcomeMessage": "👋 Pour commencer, envoyez un message, allez dans /whatsapp > Récents pour Autoriser le Contact avec le code LID, puis ajoutez le numéro whatsapp dans la liste des Contacts Autorisés.",
         "service.whatsapp.sessionErrorBadMac": "| WhatsApp: Erreur de session (Bad MAC)",
         "service.whatsapp.loggedOut": "| WhatsApp: Déconnecté",
         "service.whatsapp.conflict": "| WhatsApp: Conflit (Autre instance)",

package/src/models/whatsapp.types.ts

@@ -10,8 +10,6 @@ export interface AllowList {
     numbers: string[];
 }
 
-export type ReactionMode = 'active' | 'passive';
-
 export interface IncomingMessage {
     id: string;
     remoteJid: string;

package/src/services/session.manager.ts

@@ -2,14 +2,13 @@ import { useMultiFileAuthState } from 'baileys';
 import { join } from 'path';
 import { readFile, writeFile, mkdir, rm, rename } from 'fs/promises';
 import { homedir } from 'os';
-import { SessionStatus, type ReactionMode } from '../models/whatsapp.types.js';
+import { SessionStatus } from '../models/whatsapp.types.js';
 import { t } from '../i18n.js';
 
 export interface Contact {
     number: string;
     name?: string;
     sendNumber?: string;
-    reactionMode?: ReactionMode;
 }
 
 export class SessionManager {
@@ -38,6 +37,7 @@ export class SessionManager {
     private hasAuthState = false;
     private openaiKey: string = '';
     private visionModel: string = 'gpt-4o';
+    private operatorJid: string = '';
 
     constructor(baseDir = join(homedir(), '.pi', 'whatsapp-pi')) {
         this.baseDir = baseDir;
@@ -74,11 +74,8 @@ export class SessionManager {
                         num = num.number;
                     }
                     if (typeof num === 'string') {
-                        const reactionMode = item.reactionMode === 'active' || item.reactionMode === 'passive'
-                            ? item.reactionMode
-                            : undefined;
                         const sendNumber = typeof item.sendNumber === 'string' ? item.sendNumber : undefined;
-                        return { number: num, name: item.name, sendNumber, reactionMode };
+                        return { number: num, name: item.name, sendNumber };
                     }
                 }
                 return null;
@@ -87,8 +84,6 @@ export class SessionManager {
             const loadedAllowList = (config.allowList || []).map(cleanContact).filter(Boolean) as Contact[];
             const loadedAllowedGroups = (config.allowedGroups || []).map(cleanContact).filter(Boolean) as Contact[];
             const migratedGroups = loadedAllowList.filter(c => SessionManager.isGroupJid(c.number));
-            const needsReactionModeBackfill = loadedAllowedGroups.some(group => !group.reactionMode)
-                || migratedGroups.some(group => !group.reactionMode);
             this.allowList = loadedAllowList.filter(c => !SessionManager.isGroupJid(c.number));
             this.allowedGroups = this.mergeContacts(loadedAllowedGroups, migratedGroups);
             this.ignoredNumbers = (config.ignoredNumbers || []).map(cleanContact).filter(Boolean) as Contact[];
@@ -96,8 +91,9 @@ export class SessionManager {
             this.hasAuthState = Boolean(config.hasAuthState);
             this.openaiKey = config.openaiKey || '';
             this.visionModel = config.visionModel || 'gpt-4o';
+            this.operatorJid = config.operatorJid || '';
 
-            if (recovered || needsReactionModeBackfill) {
+            if (recovered) {
                 await this.saveConfig();
             }
         } catch {
@@ -169,11 +165,19 @@ export class SessionManager {
                 status: this.status,
                 hasAuthState: this.hasAuthState,
                 openaiKey: this.openaiKey,
-                visionModel: this.visionModel
+                visionModel: this.visionModel,
+                operatorJid: this.operatorJid
             };
             await mkdir(this.baseDir, { recursive: true });
-            await writeFile(tempPath, JSON.stringify(config, null, 2));
-            await rename(tempPath, this.configPath);
+            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);
@@ -248,7 +252,7 @@ export class SessionManager {
 
         const existing = this.allowedGroups.find(c => c.number === groupJid);
         if (!existing) {
-            this.allowedGroups.push({ number: groupJid, name, reactionMode: 'active' });
+            this.allowedGroups.push({ number: groupJid, name });
             this.ignoredNumbers = this.ignoredNumbers.filter(c => c.number !== groupJid);
             await this.saveConfig();
             return;
@@ -258,11 +262,6 @@ export class SessionManager {
             existing.name = name;
             await this.saveConfig();
         }
-
-        if (!existing.reactionMode) {
-            existing.reactionMode = 'active';
-            await this.saveConfig();
-        }
     }
 
     async removeAllowedGroup(groupJid: string) {
@@ -324,20 +323,6 @@ export class SessionManager {
         await this.saveConfig();
     }
 
-    getAllowedGroupReactionMode(groupJid: string): ReactionMode {
-        return this.getAllowedGroup(groupJid)?.reactionMode || 'active';
-    }
-
-    async setAllowedGroupReactionMode(groupJid: string, reactionMode: ReactionMode) {
-        const group = this.getAllowedGroup(groupJid);
-        if (!group) {
-            return;
-        }
-
-        group.reactionMode = reactionMode;
-        await this.saveConfig();
-    }
-
     async removeAllowedGroupAlias(groupJid: string) {
         const group = this.getAllowedGroup(groupJid);
         if (!group || !group.name) {
@@ -381,15 +366,9 @@ export class SessionManager {
                 if (!existing.name && contact.name) {
                     existing.name = contact.name;
                 }
-                if (!existing.reactionMode && contact.reactionMode) {
-                    existing.reactionMode = contact.reactionMode;
-                }
             }
         }
-        return merged.map(contact => ({
-            ...contact,
-            reactionMode: contact.reactionMode || 'active'
-        }));
+        return merged;
     }
 
     public async isRegistered(): Promise<boolean> {
@@ -470,6 +449,15 @@ export class SessionManager {
         await this.saveConfig();
     }
 
+    getOperatorJid(): string {
+        return this.operatorJid;
+    }
+
+    async setOperatorJid(jid: string) {
+        this.operatorJid = jid;
+        await this.saveConfig();
+    }
+
     getAuthStateDir(): string {
         return this.authStateDir;
     }

package/src/services/whatsapp.service.ts

@@ -46,12 +46,23 @@ interface IncomingMessageContextInfo {
     mentionedJid?: string[];
 }
 
+interface IncomingMessageWithContext {
+    contextInfo?: IncomingMessageContextInfo;
+}
+
 interface IncomingMessageContent {
     conversation?: string;
     extendedTextMessage?: {
         text?: string;
         contextInfo?: IncomingMessageContextInfo;
     };
+    imageMessage?: IncomingMessageWithContext;
+    videoMessage?: IncomingMessageWithContext;
+    documentMessage?: IncomingMessageWithContext;
+    audioMessage?: IncomingMessageWithContext;
+    stickerMessage?: IncomingMessageWithContext;
+    buttonsMessage?: IncomingMessageWithContext;
+    templateMessage?: IncomingMessageWithContext;
 }
 
 interface IncomingMessageLike {
@@ -112,6 +123,7 @@ export class WhatsAppService {
     private onMessage?: (m: MessagesUpsertEvent) => void;
     private onStatusUpdate?: (status: string) => void;
     private lastRemoteJid: string | null = null;
+    private qrWasShown = false;
     private boundGroupJid: string | null = null;
     private groupMetadataCache: Map<string, { id: string; subject: string; participants: Array<{ id: string }> }> = new Map();
 
@@ -203,24 +215,6 @@ export class WhatsAppService {
         return [...candidates];
     }
 
-    private messageHasDirectMention(message: IncomingMessageLike): boolean {
-        const mentionedJids = message.message?.extendedTextMessage?.contextInfo?.mentionedJid || [];
-        if (mentionedJids.length === 0) {
-            return false;
-        }
-
-        const agentCandidates = this.getAgentJidCandidates();
-        if (agentCandidates.length === 0) {
-            return false;
-        }
-
-        return mentionedJids.some(jid => {
-            const normalizedMention = this.normalizeJidForComparison(jid);
-            const mentionIdentity = this.normalizeJidIdentity(jid);
-            return agentCandidates.includes(normalizedMention) || agentCandidates.includes(mentionIdentity);
-        });
-    }
-
     private getDisconnectStatusCode(error: unknown): number | undefined {
         if (!error || typeof error !== 'object') {
             return undefined;
@@ -406,6 +400,7 @@ export class WhatsAppService {
         this.sessionManager.setStatus('pairing');
         this.onQRCode?.(qr);
         this.onStatusUpdate?.(t('service.whatsapp.typeToConnect'));
+        this.qrWasShown = true;
     }
 
     private async handleConnectionOpen() {
@@ -420,6 +415,29 @@ export class WhatsAppService {
         await this.sessionManager.markAuthStateAvailable();
         this.sessionManager.setStatus('connected');
         this.onStatusUpdate?.(t('service.whatsapp.connected'));
+
+        if (this.qrWasShown) {
+            this.qrWasShown = false;
+            console.log(t('service.whatsapp.qrConnected'));
+            console.log(t('service.whatsapp.qrWelcomeMessage'));
+            void this.sendQrWelcome();
+        }
+    }
+
+    private async sendQrWelcome(): Promise<void> {
+        const rawId = this.socket?.user?.id;
+        if (!rawId) return;
+        const selfJid = this.normalizeJidForComparison(rawId);
+        await this.sessionManager.setOperatorJid(selfJid);
+        try {
+            await this.socket?.sendMessage(selfJid, { text: t('service.whatsapp.qrWelcomeMessage') });
+        } catch {
+            // Best-effort — welcome send failure must not abort the session.
+        }
+    }
+
+    public getOperatorJid(): string {
+        return this.sessionManager.getOperatorJid();
     }
 
     private isBadMacError(errorMessage: string): boolean {
@@ -564,10 +582,6 @@ export class WhatsAppService {
         void this.recordIncomingMessage(message, remoteJid, text);
 
         const pushName = message.pushName || undefined;
-        const groupAllowed = isGroup && this.sessionManager.isAllowedGroup(remoteJid);
-        const passiveGroupBlocked = groupAllowed
-            && this.sessionManager.getAllowedGroupReactionMode(remoteJid) === 'passive'
-            && !this.messageHasDirectMention(message);
 
         if (this.boundGroupJid) {
             if (!this.sessionManager.isAllowedGroup(this.boundGroupJid)) {
@@ -575,10 +589,6 @@ export class WhatsAppService {
                 return;
             }
 
-            if (this.sessionManager.getAllowedGroupReactionMode(this.boundGroupJid) === 'passive' && !this.messageHasDirectMention(message)) {
-                return;
-            }
-
             this.lastRemoteJid = remoteJid;
             this.onMessage?.(payload);
             return;
@@ -592,10 +602,6 @@ export class WhatsAppService {
             return;
         }
 
-        if (passiveGroupBlocked) {
-            return;
-        }
-
         this.lastRemoteJid = remoteJid;
         this.onMessage?.(payload);
     }

package/src/ui/menu.handler.ts

@@ -291,12 +291,11 @@ export class MenuHandler {
         const historyLabel = t('menu.allowedGroups.group.history');
         const sendMessageLabel = t('menu.allowedGroups.group.sendMessage');
         const printGroupLabel = t('menu.allowedGroups.group.printGroup');
-        const reactionModeLabel = t('menu.allowedGroups.group.reactionMode');
         const removeAliasLabel = t('menu.allowedGroups.group.removeAlias');
         const addAliasLabel = t('menu.allowedGroups.group.addAlias');
         const removeGroupLabel = t('menu.allowedGroups.group.removeGroup');
         const backLabel = t('menu.allowedGroups.group.back');
-        const options = [historyLabel, sendMessageLabel, printGroupLabel, reactionModeLabel];
+        const options = [historyLabel, sendMessageLabel, printGroupLabel];
         if (group.name) {
             options.push(removeAliasLabel);
         } else {
@@ -324,12 +323,6 @@ export class MenuHandler {
             return;
         }
 
-        if (choice === reactionModeLabel) {
-            await this.manageAllowedGroupReactionMode(ctx, group);
-            await this.manageAllowedGroup(ctx, group);
-            return;
-        }
-
         if (choice === addAliasLabel) {
             const alias = await ctx.ui.input(t('menu.allowedGroups.enterAlias', { groupJid: group.number }));
             const trimmedAlias = alias?.trim() || '';
@@ -514,30 +507,6 @@ export class MenuHandler {
         });
     }
 
-    private async manageAllowedGroupReactionMode(ctx: ExtensionCommandContext, group: Contact) {
-        const displayName = this.formatAllowedGroupOption(group);
-        const title = t('menu.allowedGroups.group.reactionMode.title', { displayName });
-        const activeLabel = t('menu.allowedGroups.group.reactionMode.active');
-        const passiveLabel = t('menu.allowedGroups.group.reactionMode.passive');
-        const backLabel = t('menu.allowedGroups.group.back');
-        const currentMode = this.sessionManager.getAllowedGroupReactionMode(group.number);
-        const options = [activeLabel, passiveLabel, backLabel];
-
-        const choice = await ctx.ui.select(title, options);
-
-        if (choice === backLabel || !choice) {
-            return;
-        }
-
-        if (choice === activeLabel || choice === passiveLabel) {
-            const nextMode = choice === activeLabel ? 'active' : 'passive';
-            if (currentMode !== nextMode) {
-                await this.sessionManager.setAllowedGroupReactionMode(group.number, nextMode);
-            }
-            ctx.ui.notify(t('menu.allowedGroups.group.reactionMode.updated', { displayName, mode: choice }), 'info');
-        }
-    }
-
     private async sendPromptedMenuMessage(
         ctx: ExtensionCommandContext,
         options: {

package/whatsapp-pi.ts

@@ -268,8 +268,8 @@ export default function (pi: ExtensionAPI) {
             message: Type.String({ minLength: 1, description: "Plain-text message content to send" })
         }),
         async execute(_toolCallId, params, _signal, _onUpdate, _ctx) {
-            // Resolve JID: jid > recipient_jid > lastRemoteJid
-            const resolvedJid = params.jid || params.recipient_jid || whatsappService.getLastRemoteJid();
+            // Resolve JID: jid > recipient_jid > lastRemoteJid > operatorJid (QR-scanned number)
+            const resolvedJid = params.jid || params.recipient_jid || whatsappService.getLastRemoteJid() || whatsappService.getOperatorJid();
             if (!resolvedJid) {
                 return {
                     isError: true,