bloby-bot 0.25.0 → 0.25.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bloby-bot",
-  "version": "0.25.0",
+  "version": "0.25.1",
   "releaseNotes": [
     "1. new stuff",
     "2. ",

package/supervisor/channels/manager.ts

@@ -243,6 +243,11 @@ export class ChannelManager {
 
   // ── Internal ──
 
+  /** Format a bot reply with the agent's name prefix (for admin & assistant messages, NOT customer) */
+  private formatBotReply(text: string, botName: string): string {
+    return `🤖 *${botName}:*\n\n${text}`;
+  }
+
   private handleStatusChange(status: ChannelStatus) {
     for (const listener of this.statusListeners) {
       listener(status);
@@ -286,9 +291,9 @@ export class ChannelManager {
       // Store every message for context (both mine and theirs)
       this.storeAssistantContext(channel, sender, senderName, text, fromMe);
 
-      // Only continue if it's me AND the message has the trigger
+      // Only continue if it's me AND the message contains the trigger
       const botName = loadConfig().username || 'bloby';
-      const triggerPattern = new RegExp(`^@${botName}[:\\s]`, 'i');
+      const triggerPattern = new RegExp(`(?:^|\\n)\\s*@${botName}[:\\s]`, 'i');
       if (!fromMe || !triggerPattern.test(text)) return;
       // Falls through to debounce → flushDebounce → handleAssistantMessage
     }
@@ -498,7 +503,7 @@ export class ChannelManager {
 
         // Agent paused to use a tool — send accumulated text as an intermediate WhatsApp message
         if (type === 'bot:tool' && waChunkBuf.trim()) {
-          this.sendMessage(msg.channel, msg.rawSender, waChunkBuf.trim()).catch((err) => {
+          this.sendMessage(msg.channel, msg.rawSender, this.formatBotReply(waChunkBuf.trim(), botName)).catch((err) => {
             log.warn(`[channels] Failed to send WhatsApp chunk: ${err.message}`);
           });
           waChunkBuf = '';
@@ -508,7 +513,7 @@ export class ChannelManager {
           // Send remaining text
           const remaining = waChunkBuf.trim();
           if (remaining) {
-            this.sendMessage(msg.channel, msg.rawSender, remaining).catch((err) => {
+            this.sendMessage(msg.channel, msg.rawSender, this.formatBotReply(remaining, botName)).catch((err) => {
               log.warn(`[channels] Failed to send WhatsApp reply: ${err.message}`);
             });
             waChunkBuf = '';
@@ -681,17 +686,20 @@ export class ChannelManager {
     text: string,
     fromMe: boolean,
   ) {
-    const bufferKey = `${channel}:${sender}`;
+    // Normalize key to phone number (strip @lid / @s.whatsapp.net) — must match handleAssistantMessage's agentKey
+    const phone = sender.replace(/@.*/, '');
+    const bufferKey = `${channel}:${phone}`;
     let buffer = this.customerBuffers.get(bufferKey);
     if (!buffer) {
       buffer = [];
       this.customerBuffers.set(bufferKey, buffer);
     }
-    const label = fromMe ? 'me' : (senderName || sender.replace(/@.*/, ''));
+    const label = fromMe ? 'me' : (senderName || phone);
     buffer.push({ role: 'user', content: `[${label}]: ${text}` });
     if (buffer.length > MAX_BUFFER_MESSAGES) {
       buffer.splice(0, buffer.length - MAX_BUFFER_MESSAGES);
     }
+    log.info(`[channels] Assistant context stored: ${bufferKey} | ${buffer.length} msgs | [${label}]: "${text.slice(0, 60)}"`);
   }
 
   /** Handle a triggered assistant message — runs one-shot agent with conversation context */
@@ -708,11 +716,15 @@ export class ChannelManager {
     const { workerApi, getModel } = this.opts;
     const model = getModel();
 
-    // Strip trigger prefix: "@bloby: do X" → "do X"
+    // Extract command after trigger: "Ok.\n\n@bloby: do X" → "do X"
     const config = loadConfig();
     const botName = config.username || 'bloby';
-    const triggerRegex = new RegExp(`^@${botName}[:\\s]+`, 'i');
-    const cleanText = msg.text.replace(triggerRegex, '').trim();
+    const triggerRegex = new RegExp(`@${botName}[:\\s]+`, 'i');
+    const triggerMatch = msg.text.match(triggerRegex);
+    let cleanText = msg.text;
+    if (triggerMatch && triggerMatch.index !== undefined) {
+      cleanText = msg.text.slice(triggerMatch.index + triggerMatch[0].length).trim();
+    }
 
     // Load SCRIPT.md from configured skill
     const scriptPrompt = this.loadActiveScript(channelConfig);
@@ -732,6 +744,11 @@ export class ChannelManager {
       this.customerBuffers.set(agentKey, buffer);
     }
 
+    log.info(`[channels] Assistant trigger: agentKey=${agentKey} | buffer=${buffer.length} msgs | cleanText="${cleanText.slice(0, 80)}"`);
+    if (buffer.length > 0) {
+      log.info(`[channels] Assistant context preview: ${buffer.slice(-5).map((m) => `[${m.role}] ${m.content.slice(0, 50)}`).join(' | ')}`);
+    }
+
     // All buffered messages are context for the agent
     const recentMessages: RecentMessage[] = buffer.map((m) => ({
       role: m.role,
@@ -789,7 +806,7 @@ export class ChannelManager {
 
         // Agent paused to use a tool — send accumulated text as intermediate message
         if (type === 'bot:tool' && waChunkBuf.trim()) {
-          this.sendMessage(msg.channel, msg.rawSender, waChunkBuf.trim()).catch((err) => {
+          this.sendMessage(msg.channel, msg.rawSender, this.formatBotReply(waChunkBuf.trim(), agentBotName)).catch((err) => {
             log.warn(`[channels] Failed to send assistant chunk: ${err.message}`);
           });
           waChunkBuf = '';
@@ -805,7 +822,7 @@ export class ChannelManager {
           // Send remaining text
           const remaining = waChunkBuf.trim();
           if (remaining) {
-            this.sendMessage(msg.channel, msg.rawSender, remaining).catch((err) => {
+            this.sendMessage(msg.channel, msg.rawSender, this.formatBotReply(remaining, agentBotName)).catch((err) => {
               log.warn(`[channels] Failed to send assistant reply: ${err.message}`);
             });
             waChunkBuf = '';