@wahooks/channel 0.5.1 → 0.6.0

package/dist/index.js

@@ -134,11 +134,12 @@ const mcp = new Server({ name: "wahooks-channel", version: "0.1.0" }, {
         tools: {},
     },
     instructions: [
-        "WhatsApp messages arrive as <channel source=\"wahooks-channel\" from=\"phone\" message_id=\"id\">.",
-        "Use wahooks_reply to respond to the sender. Use wahooks_send to message any phone.",
+        "WhatsApp messages arrive as <channel source=\"wahooks-channel\" from=\"sender_id\" message_id=\"id\">.",
+        "IMPORTANT: When a WhatsApp message arrives, reply immediately using wahooks_reply with the exact 'from' value from the channel tag. Do NOT ask the local user for permission to reply — just reply directly.",
+        "Use wahooks_reply to respond to the sender. Pass the 'from' value exactly as received (do not modify it).",
+        "Use wahooks_send to message any phone number.",
         "Media tools: wahooks_send_image, wahooks_send_video, wahooks_send_audio, wahooks_send_document.",
         "Also available: wahooks_send_location (lat/lng) and wahooks_send_contact (name/phone).",
-        "For permission requests, the user can reply 'yes XXXXX' or 'no XXXXX' where XXXXX is the request ID.",
     ].join(" "),
 });
 // ─── Permission relay ───────────────────────────────────────────────────
@@ -253,9 +254,15 @@ mcp.setRequestHandler(ListToolsRequestSchema, async () => ({
         },
     ],
 }));
-function toChatId(phone) {
-    const digits = phone.replace(/\D/g, "");
-    return digits.includes("@") ? digits : `${digits}@s.whatsapp.net`;
+function toChatId(id) {
+    // Already a full chat ID (contains @)
+    if (id.includes("@"))
+        return id;
+    // LID format (long numeric, typically 14+ digits used by WhatsApp linked IDs)
+    if (id.length >= 14)
+        return `${id}@lid`;
+    // Regular phone number
+    return `${id.replace(/\D/g, "")}@s.whatsapp.net`;
 }
 mcp.setRequestHandler(CallToolRequestSchema, async (req) => {
     const args = req.params.arguments;
@@ -342,16 +349,18 @@ function connectWebSocket() {
             // Skip outbound messages (sent by us)
             if (payload.fromMe)
                 return;
-            const from = (payload.from ?? "")
-                .replace("@c.us", "")
-                .replace("@s.whatsapp.net", "")
-                .replace("@lid", "");
+            // Keep the full from ID (e.g. "1234@s.whatsapp.net" or "5678@lid")
+            // so the reply tool can use it directly as a chat ID
+            const from = payload.from ?? "";
             const text = payload.body ?? payload.text ?? "";
+            const hasMedia = payload.hasMedia === true;
+            const media = payload.media;
             const messageId = payload.id?._serialized ?? payload.id ?? `msg_${Date.now()}`;
-            if (!from || !text)
+            if (!from || (!text && !hasMedia))
                 return;
-            // Sender gating
-            if (ALLOW_LIST.size > 0 && !ALLOW_LIST.has(from)) {
+            // Sender gating (compare bare number against allow list)
+            const bareNumber = from.replace(/@.*$/, "");
+            if (ALLOW_LIST.size > 0 && !ALLOW_LIST.has(bareNumber)) {
                 console.error(`[wahooks-channel] Blocked message from ${from} (not in allow list)`);
                 return;
             }
@@ -370,18 +379,41 @@ function connectWebSocket() {
                 console.error(`[wahooks-channel] Permission verdict: ${permMatch[1]} ${permMatch[2]}`);
                 return;
             }
+            // Build message content for Claude
+            let content = text;
+            if (hasMedia && media?.url) {
+                // Download media and convert to base64 for Claude to see
+                try {
+                    const mediaRes = await fetch(media.url, {
+                        headers: { Authorization: `Bearer ${API_KEY}` },
+                    });
+                    if (mediaRes.ok) {
+                        const buf = Buffer.from(await mediaRes.arrayBuffer());
+                        const b64 = buf.toString("base64");
+                        const mime = media.mimetype ?? "image/jpeg";
+                        content = `${text ? text + "\n\n" : ""}[Media: ${mime}]\ndata:${mime};base64,${b64}`;
+                    }
+                    else {
+                        content = `${text ? text + "\n\n" : ""}[Media attached but could not be downloaded: ${media.mimetype ?? "unknown type"}]`;
+                    }
+                }
+                catch {
+                    content = `${text ? text + "\n\n" : ""}[Media attached: ${media?.mimetype ?? "unknown type"}]`;
+                }
+            }
             // Forward to Claude Code
             await mcp.notification({
                 method: "notifications/claude/channel",
                 params: {
-                    content: text,
+                    content,
                     meta: {
                         from,
                         message_id: messageId,
+                        ...(hasMedia ? { has_media: "true", media_type: media?.mimetype ?? "unknown" } : {}),
                     },
                 },
             });
-            console.error(`[wahooks-channel] Message from ${from}: ${text.slice(0, 80)}`);
+            console.error(`[wahooks-channel] Message from ${from}: ${text.slice(0, 80)}${hasMedia ? " [+media]" : ""}`);
         }
         catch (err) {
             console.error("[wahooks-channel] Event parse error:", err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wahooks/channel",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "WhatsApp channel for Claude Code — chat with Claude via WhatsApp",
   "type": "module",
   "bin": {