agent0ai
diff --git a/‎.gitignore‎
Lines changed: 1 addition & 0 deletions b/‎.gitignore‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎plugins/_email_integration/extensions/python/system_prompt/_20_email_context.py‎
Lines changed: 24 additions & 4 deletions b/‎plugins/_email_integration/extensions/python/system_prompt/_20_email_context.py‎
Lines changed: 24 additions & 4 deletions
diff --git a/‎plugins/_email_integration/helpers/handler.py‎
Lines changed: 1 addition & 7 deletions b/‎plugins/_email_integration/helpers/handler.py‎
Lines changed: 1 addition & 7 deletions
diff --git a/‎plugins/_email_integration/prompts/fw.email.user_message_instructions.md‎
Lines changed: 2 additions & 2 deletions b/‎plugins/_email_integration/prompts/fw.email.user_message_instructions.md‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎plugins/_telegram_integration/prompts/fw.telegram.user_message_instructions.md‎
Lines changed: 2 additions & 2 deletions b/‎plugins/_telegram_integration/prompts/fw.telegram.user_message_instructions.md‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎plugins/_whatsapp_integration/README.md‎
Lines changed: 63 additions & 0 deletions b/‎plugins/_whatsapp_integration/README.md‎
Lines changed: 63 additions & 0 deletions
diff --git a/‎plugins/_whatsapp_integration/api/disconnect.py‎
Lines changed: 27 additions & 0 deletions b/‎plugins/_whatsapp_integration/api/disconnect.py‎
Lines changed: 27 additions & 0 deletions
diff --git a/‎plugins/_whatsapp_integration/api/qr_code.py‎
Lines changed: 83 additions & 0 deletions b/‎plugins/_whatsapp_integration/api/qr_code.py‎
Lines changed: 83 additions & 0 deletions
diff --git a/‎plugins/_whatsapp_integration/api/start.py‎
Lines changed: 41 additions & 0 deletions b/‎plugins/_whatsapp_integration/api/start.py‎
Lines changed: 41 additions & 0 deletions
diff --git a/‎plugins/_whatsapp_integration/api/test_connection.py‎
Lines changed: 50 additions & 0 deletions b/‎plugins/_whatsapp_integration/api/test_connection.py‎
Lines changed: 50 additions & 0 deletions
@@ -4,6 +4,7 @@
 **/__pycache__/
 *.py[cod]
 **/.conda/
+**/node_modules/
 
 #Ignore IDE files
 .cursor/
 
@@ -1,10 +1,14 @@
 """Inject email conversation context into system prompt for email sessions."""
 
 from helpers.extension import Extension
+from helpers import plugins
 from agent import LoopData
 from plugins._email_integration.helpers.dispatcher import CTX_EMAIL_HANDLER
 
 
+PLUGIN_NAME = "_email_integration"
+
+
 class EmailContextPrompt(Extension):
 
     async def execute(
@@ -16,7 +20,23 @@ async def execute(
         if not self.agent:
             return
 
-        if self.agent.context.data.get(CTX_EMAIL_HANDLER):
-            system_prompt.append(
-                self.agent.read_prompt("fw.email.system_context_reply.md")
-            )
+        handler_name = self.agent.context.data.get(CTX_EMAIL_HANDLER)
+        if not handler_name:
+            return
+
+        system_prompt.append(
+            self.agent.read_prompt("fw.email.system_context_reply.md")
+        )
+
+        config = plugins.get_plugin_config(PLUGIN_NAME) or {}
+        for h in config.get("handlers", []):
+            if h.get("name") == handler_name:
+                instructions = h.get("agent_instructions", "")
+                if instructions:
+                    system_prompt.append(
+                        self.agent.read_prompt(
+                            "fw.email.user_message_instructions.md",
+                            instructions=instructions,
+                        )
+                    )
+                break
@@ -394,19 +394,13 @@ def _is_own_email(sender: str, own_address: str) -> bool:
 
 def _build_user_message(agent: Agent, msg: InboundMessage, handler_cfg: dict) -> str:
     recipient = handler_cfg.get("username", "")
-    text = agent.read_prompt(
+    return agent.read_prompt(
         "fw.email.user_message.md",
         sender=msg.sender,
         recipient=recipient,
         subject=msg.subject,
         body=msg.body,
     )
-    instructions = handler_cfg.get("agent_instructions", "")
-    if instructions:
-        text += agent.read_prompt(
-            "fw.email.user_message_instructions.md", instructions=instructions,
-        )
-    return text
 
 
 # ------------------------------------------------------------------
 
@@ -1,2 +1,2 @@
-
-[Handler instructions: {{instructions}}]
+# Email custom rules
+{{instructions}}
@@ -1,2 +1,2 @@
-
-[Handler instructions: {{instructions}}]
+# Telegram custom rules
+{{instructions}}
@@ -0,0 +1,63 @@
+# WhatsApp Integration Plugin
+
+Communicate with Agent Zero via WhatsApp using a Baileys-based Node.js bridge.
+
+## Requirements
+
+- **Node.js** (v18+) and npm installed on the system
+- A WhatsApp account on a phone (for QR code pairing)
+
+## Setup
+
+### Install bridge dependencies
+
+```bash
+cd plugins/_whatsapp_integration/whatsapp-bridge
+npm install --production
+```
+
+Dependencies are auto-installed on first bridge start if missing.
+
+### Configure and pair
+
+1. Enable the plugin in Settings > External > WhatsApp Integration
+2. Configure allowed phone numbers
+3. Click Show QR Code and scan with WhatsApp on your phone
+4. Send a message from an allowed number to start a chat
+
+The WhatsApp session persists across restarts in `tmp/whatsapp/session/`. No re-pairing needed unless you disconnect via settings.
+Be careful: if you use your personal number and leave `allowed_numbers` open, other people could misuse your Agent Zero.
+
+## Configuration
+
+| Setting | Description | Default |
+|---------|-------------|---------|
+| `enabled` | Enable bridge and polling | `false` |
+| `mode` | `self-chat` (personal number) or `dedicated` (separate number) | `self-chat` |
+| `allow_group` | Respond in group chats when mentioned or replied to | `false` |
+| `bridge_port` | Local HTTP port for bridge | `3100` |
+| `poll_interval_seconds` | Poll frequency (min 2) | `3` |
+| `allowed_numbers` | Phone numbers without + prefix | `[]` (all) |
+| `project` | Activate project for WA chats | `""` |
+| `agent_instructions` | Extra agent instructions | `""` |
+
+## How It Works
+
+1. The bridge connects to WhatsApp via Baileys and exposes HTTP endpoints on localhost
+2. In personal-number mode, you can message your own WhatsApp number to talk to the agent, and the agent can also handle messages that other people send to that number
+3. The plugin polls the bridge for new messages every few seconds
+4. Incoming messages are routed to existing chats by WhatsApp chat ID or new chats are created
+5. Agent responses are sent back via the bridge as WhatsApp messages
+6. Media (images, documents) is supported in both directions
+
+## Architecture
+
+```
+WhatsApp Phone
+    ↕ (WhatsApp protocol via Baileys)
+whatsapp-bridge/bridge.js  (Node.js subprocess)
+    ↕ (HTTP API on localhost)
+Python helpers (wa_client, handler, bridge_manager)
+    ↕ (Framework extensions)
+Agent Zero
+```
@@ -0,0 +1,27 @@
+"""Disconnect WhatsApp account by stopping bridge and clearing session."""
+
+import os
+import shutil
+
+from helpers.api import ApiHandler, Request
+from helpers.errors import format_error
+
+
+class Disconnect(ApiHandler):
+
+    async def process(self, input: dict, request: Request) -> dict:
+        try:
+            from plugins._whatsapp_integration.helpers import bridge_manager
+            from plugins._whatsapp_integration.helpers.storage_paths import get_bridge_session_dir
+
+            # Stop bridge first
+            await bridge_manager.stop_bridge()
+
+            # Delete session files
+            session_dir = get_bridge_session_dir()
+            if os.path.exists(session_dir):
+                shutil.rmtree(session_dir, ignore_errors=True)
+
+            return {"success": True, "message": "Account disconnected"}
+        except Exception as e:
+            return {"success": False, "message": format_error(e)}
@@ -0,0 +1,83 @@
+"""WhatsApp QR code pairing endpoint."""
+
+from helpers.api import ApiHandler, Request
+from helpers.errors import format_error
+from helpers import plugins
+
+
+PLUGIN_NAME = "_whatsapp_integration"
+
+
+class QrCode(ApiHandler):
+
+    async def process(self, input: dict, request: Request) -> dict:
+        config = plugins.get_plugin_config(PLUGIN_NAME) or {}
+        port = int(config.get("bridge_port", 3100))
+        mode = config.get("mode", "self-chat")
+
+        from plugins._whatsapp_integration.helpers.bridge_manager import (
+            ensure_bridge_http_up,
+            get_bridge_url,
+            is_process_alive,
+        )
+        from plugins._whatsapp_integration.helpers.storage_paths import (
+            get_bridge_media_dir,
+            get_bridge_session_dir,
+        )
+        from plugins._whatsapp_integration.helpers.wa_client import get_qr
+
+        session_dir = get_bridge_session_dir()
+        cache_dir = get_bridge_media_dir()
+        base_url = get_bridge_url(port)
+
+        # Start bridge if not running
+        if not is_process_alive():
+            try:
+                ok = await ensure_bridge_http_up(
+                    port, session_dir, cache_dir, mode=mode,
+                )
+                if not ok:
+                    return {
+                        "status": "error",
+                        "message": "Failed to start bridge",
+                        "qr": None,
+                    }
+            except Exception as e:
+                return {
+                    "status": "error",
+                    "message": format_error(e),
+                    "qr": None,
+                }
+
+        # Fetch QR status from bridge
+        try:
+            data = await get_qr(base_url)
+            status = data.get("status", "error")
+            qr = data.get("qr")
+
+            if status == "connected":
+                return {
+                    "status": "connected",
+                    "message": "WhatsApp is already connected",
+                    "qr": None,
+                }
+
+            if status == "waiting_scan" and qr:
+                return {
+                    "status": "waiting_scan",
+                    "message": "Scan the QR code with WhatsApp",
+                    "qr": qr,
+                }
+
+            return {
+                "status": "waiting_qr",
+                "message": "Generating QR code...",
+                "qr": None,
+            }
+
+        except Exception as e:
+            return {
+                "status": "error",
+                "message": f"Bridge not reachable: {format_error(e)}",
+                "qr": None,
+            }
@@ -0,0 +1,41 @@
+"""Start WhatsApp bridge immediately."""
+
+from helpers.api import ApiHandler, Request
+from helpers.errors import format_error
+from helpers import plugins
+
+
+PLUGIN_NAME = "_whatsapp_integration"
+
+
+class Start(ApiHandler):
+
+    async def process(self, input: dict, request: Request) -> dict:
+        config = plugins.get_plugin_config(PLUGIN_NAME) or {}
+        port = int(config.get("bridge_port", 3100))
+        mode = config.get("mode", "self-chat")
+
+        from plugins._whatsapp_integration.helpers.bridge_manager import (
+            ensure_bridge_http_up,
+            is_process_alive,
+        )
+        from plugins._whatsapp_integration.helpers.storage_paths import (
+            get_bridge_media_dir,
+            get_bridge_session_dir,
+        )
+
+        session_dir = get_bridge_session_dir()
+        cache_dir = get_bridge_media_dir()
+
+        if is_process_alive():
+            return {"success": True, "message": "Bridge already running"}
+
+        try:
+            ok = await ensure_bridge_http_up(
+                port, session_dir, cache_dir, mode=mode,
+            )
+            if ok:
+                return {"success": True, "message": "Bridge started"}
+            return {"success": False, "message": "Failed to start bridge"}
+        except Exception as e:
+            return {"success": False, "message": format_error(e)}
@@ -0,0 +1,50 @@
+"""Test WhatsApp bridge connection health."""
+
+from helpers.api import ApiHandler, Request
+from helpers.errors import format_error
+from helpers import plugins
+
+
+PLUGIN_NAME = "_whatsapp_integration"
+
+
+class TestConnection(ApiHandler):
+
+    async def process(self, input: dict, request: Request) -> dict:
+        config = input.get("config") or plugins.get_plugin_config(PLUGIN_NAME) or {}
+        port = int(config.get("bridge_port", 3100))
+        results: list[dict] = []
+
+        await self._test_bridge(port, results)
+
+        ok = all(r["ok"] for r in results)
+        return {"success": ok, "results": results}
+
+    async def _test_bridge(self, port: int, results: list[dict]) -> None:
+        from plugins._whatsapp_integration.helpers.wa_client import get_health
+        from plugins._whatsapp_integration.helpers.bridge_manager import get_bridge_url
+
+        try:
+            health = await get_health(get_bridge_url(port))
+            status = health.get("status", "unknown")
+            queue = health.get("queueLength", 0)
+            uptime = health.get("uptime", 0)
+
+            if status == "connected":
+                results.append({
+                    "test": "Bridge",
+                    "ok": True,
+                    "message": f"Connected (uptime: {uptime:.0f}s, queue: {queue})",
+                })
+            else:
+                results.append({
+                    "test": "Bridge",
+                    "ok": False,
+                    "message": f"Bridge running but status: {status}",
+                })
+        except Exception as e:
+            results.append({
+                "test": "Bridge",
+                "ok": False,
+                "message": f"Bridge not reachable: {format_error(e)}",
+            })