@chrysb/alphaclaw 0.9.6 → 0.9.8

package/lib/server/watchdog-notify.js

@@ -2,8 +2,10 @@ const fs = require("fs");
 const path = require("path");
 const { OPENCLAW_DIR } = require("./constants");
 const { createSlackApi } = require("./slack-api");
+const { quoteShellArg } = require("./utils/shell");
 
 const kSlackBotEnvKey = "SLACK_BOT_TOKEN";
+const kWhatsAppOwnerNumberEnvKey = "WHATSAPP_OWNER_NUMBER";
 
 const normalizeAccountId = (value) =>
   String(value || "").trim().toLowerCase() || "default";
@@ -106,6 +108,7 @@ const createWatchdogNotifier = ({
   telegramApi,
   discordApi,
   slackApi,
+  clawCmd = null,
   readEnvFile = () => [],
   createSlackApi: createSlackApiFactory = createSlackApi,
   fsImpl = fs,
@@ -116,7 +119,17 @@ const createWatchdogNotifier = ({
       telegram: { sent: 0, failed: 0, skipped: false, targets: 0 },
       discord: { sent: 0, failed: 0, skipped: false, targets: 0 },
       slack: { sent: 0, failed: 0, skipped: false, targets: 0 },
+      whatsapp: { sent: 0, failed: 0, skipped: false, targets: 0 },
     };
+    const envVars = typeof readEnvFile === "function" ? readEnvFile() : [];
+    const envMap = new Map(
+      (Array.isArray(envVars) ? envVars : [])
+        .map((entry) => [
+          String(entry?.key || "").trim(),
+          String(entry?.value || "").trim(),
+        ])
+        .filter(([key]) => key),
+    );
     const telegramTargets = getPairedIds({
       channel: "telegram",
       fsImpl,
@@ -174,17 +187,6 @@ const createWatchdogNotifier = ({
       summary.slack.skipped = true;
     } else {
       const eventType = opts.eventType || "info"; // crash, recovery, health, info
-      const envVars = typeof readEnvFile === "function" ? readEnvFile() : [];
-
-      const envMap = new Map(
-        (Array.isArray(envVars) ? envVars : [])
-          .map((entry) => [
-            String(entry?.key || "").trim(),
-            String(entry?.value || "").trim(),
-          ])
-          .filter(([key]) => key),
-      );
-
       for (const [accountId, slackTargets] of slackTargetsByAccount.entries()) {
         if (!slackTargets.length) continue;
         const envKey = deriveSlackBotEnvKey(accountId);
@@ -261,8 +263,47 @@ const createWatchdogNotifier = ({
       }
     }
 
-    const sent = summary.telegram.sent + summary.discord.sent + summary.slack.sent;
-    const failed = summary.telegram.failed + summary.discord.failed + summary.slack.failed;
+    const whatsAppOwnerNumber = String(
+      envMap.get(kWhatsAppOwnerNumberEnvKey) ||
+        process.env[kWhatsAppOwnerNumberEnvKey] ||
+        "",
+    ).trim();
+    const whatsappTargets = whatsAppOwnerNumber ? [whatsAppOwnerNumber] : [];
+    summary.whatsapp.targets = whatsappTargets.length;
+    if (!clawCmd || whatsappTargets.length === 0) {
+      summary.whatsapp.skipped = true;
+    } else {
+      for (const target of whatsappTargets) {
+        try {
+          const result = await clawCmd(
+            `message send --channel whatsapp --target ${quoteShellArg(
+              String(target || "").trim(),
+            )} --message ${quoteShellArg(String(message || ""))}`,
+            { quiet: true, timeoutMs: 30000 },
+          );
+          if (!result?.ok) {
+            throw new Error(
+              String(result?.stderr || result?.stdout || "WhatsApp send failed"),
+            );
+          }
+          summary.whatsapp.sent += 1;
+        } catch (err) {
+          summary.whatsapp.failed += 1;
+          console.error(`[watchdog] whatsapp notification failed for ${target}: ${err.message}`);
+        }
+      }
+    }
+
+    const sent =
+      summary.telegram.sent +
+      summary.discord.sent +
+      summary.slack.sent +
+      summary.whatsapp.sent;
+    const failed =
+      summary.telegram.failed +
+      summary.discord.failed +
+      summary.slack.failed +
+      summary.whatsapp.failed;
     return {
       ok: sent > 0,
       sent,

package/lib/server.js

@@ -232,6 +232,7 @@ const watchdogNotifier = createWatchdogNotifier({
   telegramApi,
   discordApi,
   slackApi,
+  clawCmd,
   readEnvFile,
 });
 const watchdog = createWatchdog({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chrysb/alphaclaw",
-  "version": "0.9.6",
+  "version": "0.9.8",
   "publishConfig": {
     "access": "public"
   },