@c4t4/heyamigo 0.10.1 → 0.10.2

package/dist/gateway/triggers.js

@@ -1,4 +1,3 @@
-import { jidDecode } from 'baileys';
 import { config } from '../config.js';
 function escapeRegex(s) {
     return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
@@ -11,20 +10,8 @@ function aliasMatches(text, aliases) {
     }
     return null;
 }
-function ownerNumbers(sock) {
-    const out = new Set();
-    if (config.owner.number)
-        out.add(config.owner.number);
-    const pn = sock.user?.id ? jidDecode(sock.user.id)?.user : undefined;
-    if (pn)
-        out.add(pn);
-    const lid = sock.user?.lid ? jidDecode(sock.user.lid)?.user : undefined;
-    if (lid)
-        out.add(lid);
-    return out;
-}
 export function checkTrigger(params) {
-    const { isGroup, text, msg, sock } = params;
+    const { isGroup, text } = params;
     const mode = isGroup
         ? config.triggers.groupMode
         : config.triggers.dmMode;
@@ -43,33 +30,13 @@ export function checkTrigger(params) {
     const alias = aliasMatches(text, config.triggers.aliases);
     if (alias)
         return { triggered: true, reason: `alias:${alias}` };
-    // Extract contextInfo from any message type (text, image, video, etc.)
-    const content = msg.message ?? {};
-    const contextInfo = (content.extendedTextMessage?.contextInfo) ??
-        (content.imageMessage?.contextInfo) ??
-        (content.videoMessage?.contextInfo) ??
-        (content.audioMessage?.contextInfo) ??
-        (content.documentMessage?.contextInfo) ??
-        (content.documentWithCaptionMessage?.message?.documentMessage?.contextInfo) ??
-        (content.stickerMessage?.contextInfo);
-    // 2. WA @mention pointing at owner
-    const owners = ownerNumbers(sock);
-    const mentioned = contextInfo?.mentionedJid ?? [];
-    for (const m of mentioned) {
-        const user = jidDecode(m)?.user;
-        if (user && owners.has(user)) {
-            return { triggered: true, reason: 'wa mention' };
-        }
-    }
+    // 2. Channel-provided mention signal, e.g. WhatsApp @mention or
+    // Telegram bot username mention.
+    if (params.mentionedBot)
+        return { triggered: true, reason: 'mention' };
     // 3. Reply to a bot/owner message
-    if (config.triggers.replyToBotCounts) {
-        const quotedParticipant = contextInfo?.participant;
-        if (quotedParticipant) {
-            const user = jidDecode(quotedParticipant)?.user;
-            if (user && owners.has(user)) {
-                return { triggered: true, reason: 'reply to bot' };
-            }
-        }
+    if (config.triggers.replyToBotCounts && params.replyToBot) {
+        return { triggered: true, reason: 'reply to bot' };
     }
     return { triggered: false, reason: 'no trigger match' };
 }

package/dist/memory/digest.js

@@ -32,8 +32,8 @@ function profilePrompt(params) {
     const personMessages = messages.filter((m) => m.senderNumber === number && m.direction === 'in');
     const replyMessages = messages.filter((m) => m.direction === 'out');
     const lines = [
-        `You are consolidating the long-term profile for a WhatsApp contact.`,
-        `Contact number: ${number}`,
+        `You are consolidating the long-term profile for a chat contact.`,
+        `Contact key: ${number}`,
         ``,
         `Current profile (may be empty):`,
         current || '(empty)',
@@ -51,7 +51,7 @@ function profilePrompt(params) {
             : '(none)',
         ``,
         `Rewrite the profile in markdown. Structure:`,
-        `# <Name if known, else number>`,
+        `# <Name if known, else contact key>`,
         `## Facts`,
         `## Preferences`,
         `## Patterns`,
@@ -69,8 +69,8 @@ function profilePrompt(params) {
 function briefPrompt(params) {
     const { jid, current, messages, reason } = params;
     const lines = [
-        `You are consolidating the long-term brief for a WhatsApp chat.`,
-        `Chat JID: ${jid}`,
+        `You are consolidating the long-term brief for a chat.`,
+        `Chat key: ${jid}`,
         ``,
         `Current brief (may be empty):`,
         current || '(empty)',

package/dist/queue/async-tasks.js

@@ -115,6 +115,7 @@ async function executeAsyncTask(task) {
         logger.error({ err, id: task.id, jid: task.jid, elapsed: elapsedLog() }, 'async task claude call failed');
         await initiate({
             jid: task.jid,
+            address: task.address,
             text: `Heads up: the background task "${truncate(task.description, 80)}" failed. Ask me again and I'll retry.`,
         });
         return;
@@ -188,7 +189,7 @@ async function executeAsyncTask(task) {
     const chatText = clean.trim();
     const anyMarkerFired = appendedCount > 0 || journalCreates.length > 0 || digest !== null;
     if (chatText.length > 0) {
-        await initiate({ jid: task.jid, text: chatText });
+        await initiate({ jid: task.jid, address: task.address, text: chatText });
     }
     else if (anyMarkerFired) {
         // Worker emitted only markers, no chat text. That's contract-breaking
@@ -205,6 +206,7 @@ async function executeAsyncTask(task) {
             bits.push('digest scheduled');
         await initiate({
             jid: task.jid,
+            address: task.address,
             text: `Done. ${bits.join(', ')}.`,
         });
     }
@@ -257,7 +259,7 @@ export function enqueueBrowserTask(input) {
         startedAt: Math.floor(Date.now() / 1000),
     };
     enqueueBrowserJob({
-        address: formatAddress(jidToAddress(task.jid)),
+        address: task.address ?? formatAddress(jidToAddress(task.jid)),
         description: task.description,
         originatingMessage: task.originatingMessage,
         senderNumber: task.senderNumber,
@@ -350,6 +352,7 @@ export async function runBrowserTask(task) {
         logger.error({ err, id: task.id, jid: task.jid, elapsed: elapsedLog() }, 'browser task provider call failed');
         await initiate({
             jid: task.jid,
+            address: task.address,
             text: `Heads up: the browser task "${truncate(task.description, 80)}" failed. Ask me again and I'll retry.`,
         });
         return;
@@ -409,7 +412,7 @@ export async function runBrowserTask(task) {
     }
     const chatText = clean.trim();
     if (chatText.length > 0) {
-        await initiate({ jid: task.jid, text: chatText });
+        await initiate({ jid: task.jid, address: task.address, text: chatText });
     }
     else if (appendedCount > 0 ||
         journalCreates.length > 0 ||
@@ -423,7 +426,11 @@ export async function runBrowserTask(task) {
         }
         if (digest)
             bits.push('digest scheduled');
-        await initiate({ jid: task.jid, text: `Done. ${bits.join(', ')}.` });
+        await initiate({
+            jid: task.jid,
+            address: task.address,
+            text: `Done. ${bits.join(', ')}.`,
+        });
     }
     logger.info({
         id: task.id,

package/dist/queue/browser-worker.js

@@ -11,7 +11,7 @@ import { hostname } from 'os';
 import { eq } from 'drizzle-orm';
 import { config } from '../config.js';
 import { getDb } from '../db/index.js';
-import { parseAddress } from '../db/address.js';
+import { addressToChatKey } from '../db/address.js';
 import { workers } from '../db/schema.js';
 import { logger } from '../logger.js';
 import { claimNextBrowserTask, markBrowserTaskDone, markBrowserTaskRetryOrDlq, } from './browser-queue.js';
@@ -82,7 +82,8 @@ function rowToAsyncTask(row) {
     }
     return {
         id: `browser-${row.id}`,
-        jid: parseAddress(row.address).externalId,
+        jid: addressToChatKey(row.address),
+        address: row.address,
         senderNumber: row.senderNumber,
         senderName: row.senderName ?? undefined,
         description: row.description,
@@ -109,7 +110,8 @@ async function processOne(workerId, row) {
             // User-facing failure ack so the chat isn't left hanging.
             try {
                 await initiate({
-                    jid: parseAddress(row.address).externalId,
+                    jid: addressToChatKey(row.address),
+                    address: row.address,
                     text: `Heads up: the browser task "${row.description.slice(0, 80)}" failed. Ask me again and I'll retry.`,
                 });
             }

package/dist/queue/cron-dispatch.js

@@ -6,6 +6,7 @@
 // worker can attribute token usage back via addCronUsage(). Lets
 // /crons show running totals per recurring schedule.
 import { logger } from '../logger.js';
+import { addressToChatKey } from '../db/address.js';
 import { enqueueBrowserJob } from './browser-queue.js';
 import { getInternalCronHandler } from './cron-handlers.js';
 import { enqueueInbound } from './inbound.js';
@@ -43,7 +44,8 @@ export function dispatchCron(row) {
                     return;
                 }
                 enqueueAsyncTask({
-                    jid: payload.address.replace(/^wa:(dm|group):/, ''), // strip prefix back to raw jid
+                    jid: addressToChatKey(payload.address),
+                    address: payload.address,
                     senderNumber: payload.senderNumber,
                     description: payload.description,
                     originatingMessage: `[cron:${row.name}]`,
@@ -85,18 +87,15 @@ function dispatchInboundPrompt(row, payload) {
         logger.error({ id: row.id, payload }, 'cron prompt payload malformed');
         return;
     }
-    // Address parsing: payload.address is the chat address (formatted),
-    // so we extract the jid form for the synthesized Job.
-    // For wa:dm:1234@s.whatsapp.net → jid is the part after the second :
-    const jidMatch = /^wa:(?:dm|group):(.+)$/.exec(payload.address);
-    const rawJid = jidMatch ? jidMatch[1] : payload.address;
+    const chatKey = addressToChatKey(payload.address);
     const now = Math.floor(Date.now() / 1000);
     // Minimal Job — the chat worker calling processJob will recompute
     // memoryPreamble / recentContext via the existing buildMemoryPreamble
     // path. We just provide the user-facing text + the cronId for
     // cost attribution.
     const job = {
-        jid: rawJid,
+        jid: chatKey,
+        address: payload.address,
         text: payload.prompt,
         input: payload.prompt, // chat worker will wrap with memory preamble
         senderNumber: payload.senderNumber ?? 'system',

package/dist/queue/job-address.js

@@ -0,0 +1,4 @@
+import { formatAddress, jidToAddress } from '../db/address.js';
+export function addressForJob(job) {
+    return job.address ?? formatAddress(jidToAddress(job.jid));
+}

package/dist/queue/outbound-postsend.js

@@ -11,7 +11,7 @@
 import { existsSync, unlinkSync } from 'fs';
 import { isAbsolute, resolve } from 'path';
 import { config } from '../config.js';
-import { addressToExternalId, parseAddress } from '../db/address.js';
+import { addressToChatKey, addressToExternalId, parseAddress } from '../db/address.js';
 import { logger } from '../logger.js';
 import { append } from '../store/messages.js';
 export async function afterSend(row, sentMsgId) {
@@ -26,12 +26,9 @@ async function persistToMessageLog(row, msgId) {
     catch {
         return;
     }
-    // Message log is currently WA-specific (keyed by JID). Only persist
-    // WA-bound replies for now; multi-channel log unification comes in a
-    // later phase.
-    if (address.channel !== 'wa')
-        return;
-    const jid = addressToExternalId(address);
+    const jid = address.channel === 'wa'
+        ? addressToExternalId(address)
+        : addressToChatKey(address);
     const messageType = row.kind === 'text' ? 'conversation' : `${row.kind}Message`;
     try {
         await append({

package/dist/queue/worker.js

@@ -1,7 +1,6 @@
 import { getProvider } from '../ai/providers.js';
 import { clearSession, getSessionInfo, setSession, setUsage, } from '../ai/sessions.js';
 import { config } from '../config.js';
-import { formatAddress, jidToAddress } from '../db/address.js';
 import { logger } from '../logger.js';
 import { addDailyTokens } from '../store/usage.js';
 import { getTimezoneForSenderNumber } from '../db/identity-sync.js';
@@ -13,11 +12,16 @@ import { addCronUsage, enqueueCron } from './crons.js';
 import { compressThread, coolThread, createThread, dropThread, resolveThread, touchThread, updateThread, } from './threads.js';
 import { setCategoryWeight } from './thread-weights.js';
 import { enqueueMemoryWrite } from './memory-writes.js';
+import { addressForJob } from './job-address.js';
 import { enqueueOutbound } from './outbound.js';
 import { formatLocalTime, resolveTimeExpression } from './time-expr.js';
 function isStaleSessionError(err) {
-    return (err instanceof Error &&
-        err.message.includes('No conversation found'));
+    if (!(err instanceof Error))
+        return false;
+    const msg = err.message.toLowerCase();
+    return (msg.includes('no conversation found') ||
+        msg.includes('session not found') ||
+        msg.includes('no session found'));
 }
 async function callClaude(job) {
     const startedAt = Date.now();
@@ -205,6 +209,7 @@ async function callClaude(job) {
         const t = asyncTasks[i];
         enqueueAsyncTask({
             jid: job.jid,
+            address: job.address,
             senderNumber: job.senderNumber,
             description: t.description,
             originatingMessage: job.text,
@@ -225,6 +230,7 @@ async function callClaude(job) {
         const t = asyncBrowserTasks[i];
         enqueueBrowserTask({
             jid: job.jid,
+            address: job.address,
             senderNumber: job.senderNumber,
             description: t.description,
             originatingMessage: job.text,
@@ -259,7 +265,7 @@ async function callClaude(job) {
     // originating chat (job.jid) is the destination for both. Sender's
     // timezone drives "9am" / "today at..." resolution so the schedule
     // lands in their wall-clock time, not the server's.
-    const chatAddress = formatAddress(jidToAddress(job.jid));
+    const chatAddress = addressForJob(job);
     const senderTz = getTimezoneForSenderNumber(job.senderNumber);
     const nowSec = Math.floor(Date.now() / 1000);
     const cronBase = `chat-cron-${job.jid}-${Date.now()}`;
@@ -450,7 +456,7 @@ async function callClaude(job) {
             outputTokens: turnOutput,
             cacheReadTokens: turnCacheRead,
             totalContextTokens,
-            contextWindow: config.claude.contextWindow,
+            contextWindow: provider.contextWindow,
             fresh: wasFresh,
             hasDigest: digest !== null,
             journalSlugs: journals.map((j) => j.slug),

package/dist/wa/whitelist.js

@@ -3,6 +3,7 @@ import { resolve } from 'path';
 import { jidDecode } from 'baileys';
 import { z } from 'zod';
 import { config } from '../config.js';
+import { actorKeyFromAddress, parseAddress } from '../db/address.js';
 import { logger } from '../logger.js';
 const AccessModeSchema = z.enum(['off', 'silent', 'active']);
 const RoleNameSchema = z.enum(['admin', 'user', 'guest']);
@@ -163,12 +164,21 @@ export function getAccess() {
 // consents to the bot nudging them in their own DM. Other DMs and groups
 // require an explicit `proactive: true` entry in access.json.
 export function canSendProactive(jid) {
-    const isGroup = jid.endsWith('@g.us');
+    let parsedAddress = null;
+    try {
+        parsedAddress = parseAddress(jid);
+    }
+    catch {
+        parsedAddress = null;
+    }
+    const isGroup = parsedAddress ? parsedAddress.scope === 'group' : jid.endsWith('@g.us');
     if (isGroup) {
         const entry = current.groups.find((g) => g.jid === jid);
         return entry?.proactive === true;
     }
-    const number = jidDecode(jid)?.user;
+    const number = parsedAddress
+        ? actorKeyFromAddress(parsedAddress)
+        : jidDecode(jid)?.user;
     if (!number)
         return false;
     // Owner's self-DM is always allowed.
@@ -254,10 +264,10 @@ const storeAndRespond = (reason) => ({
     reason,
 });
 export function checkAccess(params) {
-    const { jid, isGroup, senderNumber, fromMe } = params;
+    const { jid, address, isGroup, senderNumber, fromMe } = params;
     const ownerAllowed = fromMe && config.owner.treatAsAllowedEverywhere;
     if (isGroup) {
-        const group = current.groups.find((g) => g.jid === jid);
+        const group = current.groups.find((g) => g.jid === jid || (address && g.jid === address));
         if (!group)
             return DROP;
         if (group.mode === 'off')
@@ -273,7 +283,15 @@ export function checkAccess(params) {
         }
         return storeOnly('group sender not in allowedSenders');
     }
-    const partnerNumber = jidDecode(jid)?.user ?? '';
+    let partnerNumber = jidDecode(jid)?.user ?? '';
+    if (!partnerNumber && address) {
+        try {
+            partnerNumber = actorKeyFromAddress(address);
+        }
+        catch {
+            partnerNumber = '';
+        }
+    }
     // Self-chat: owner messaging themselves — respond like a direct conversation with the bot
     const isSelfChat = fromMe && partnerNumber === config.owner.number;
     if (fromMe && !isSelfChat)
@@ -286,6 +304,23 @@ export function checkAccess(params) {
         return storeOnly('dm silent');
     return storeAndRespond('dm active');
 }
+export async function discoverAddressGroupIfNew(params) {
+    const parsed = parseAddress(params.address);
+    if (parsed.scope !== 'group')
+        return false;
+    if (current.groups.some((g) => g.jid === params.address))
+        return false;
+    const entry = {
+        jid: params.address,
+        name: params.name || 'Unknown group',
+        mode: 'off',
+        allowedSenders: params.ownerSender ? [params.ownerSender] : [],
+        proactive: false,
+    };
+    save({ ...current, groups: [...current.groups, entry] });
+    logger.info({ address: params.address, name: entry.name }, 'discovered new channel group — added to access.json with mode=off');
+    return true;
+}
 export async function discoverGroupIfNew(sock, jid) {
     if (!jid.endsWith('@g.us'))
         return false;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@c4t4/heyamigo",
-  "version": "0.10.1",
-  "description": "WhatsApp AI bot powered by Claude with long-term memory, browser control, and role-based access",
+  "version": "0.10.2",
+  "description": "WhatsApp and Telegram AI bot powered by Claude, Codex, or Grok with long-term memory, browser control, and role-based access",
   "type": "module",
   "main": "dist/index.js",
   "bin": {
@@ -30,6 +30,7 @@
   },
   "keywords": [
     "whatsapp",
+    "telegram",
     "chatbot",
     "claude",
     "ai",