@tritard/waterbrother 0.16.56 → 0.16.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tritard/waterbrother",
-  "version": "0.16.56",
+  "version": "0.16.58",
   "description": "Waterbrother: bring-your-own-model coding CLI with local tools, sessions, operator modes, and approval controls",
   "type": "module",
   "bin": {

package/src/cli.js

@@ -7593,7 +7593,9 @@ Be concrete about surfaces — name actual pages/flows. Choose the best stack fo
           runtime: context.runtime,
           currentSession
         });
-        const remoteLocalConceptAnswer = resolveLocalConceptQuestion(remoteRequest.text || "", remoteManifest);
+        const remoteLocalConceptAnswer = remoteRequest.explicitExecution
+          ? null
+          : resolveLocalConceptQuestion(remoteRequest.text || "", remoteManifest);
         if (remoteLocalConceptAnswer) {
           await deliverTelegramBridgeReply(remoteRequest, {
             sessionId: remoteSessionId,

package/src/gateway.js

@@ -88,6 +88,16 @@ function stripTelegramMarkup(text) {
     .replace(/&/g, "&");
 }
 
+function getTelegramBotAliases(me = {}) {
+  const aliases = new Set();
+  const username = String(me?.username || "").trim().toLowerCase();
+  if (username) aliases.add(username);
+  aliases.add("waterbrother");
+  aliases.add("waterbruh_bot");
+  aliases.add("waterbruh");
+  return [...aliases].filter(Boolean);
+}
+
 function splitLongPlainText(text, maxLength = TELEGRAM_MESSAGE_LIMIT) {
   const value = String(text || "").trim();
   if (!value) return [""];
@@ -913,20 +923,24 @@ class TelegramGateway {
 
   normalizeTelegramCommandText(text) {
     const value = String(text || "").trim();
-    const username = String(this.me?.username || "").trim();
-    if (!value || !username) return value;
-    return value.replace(new RegExp(`^(/\\w+)@${username}\\b`, "i"), "$1");
+    const aliases = getTelegramBotAliases(this.me);
+    if (!value || !aliases.length) return value;
+    for (const alias of aliases) {
+      const next = value.replace(new RegExp(`^(/\\w+)@${alias}\\b`, "i"), "$1");
+      if (next !== value) return next;
+    }
+    return value;
   }
 
   messageTargetsBot(message) {
     if (!message?.chat) return false;
     if (String(message.chat.type || "").trim() === "private") return true;
-    const username = String(this.me?.username || "").trim().toLowerCase();
+    const aliases = getTelegramBotAliases(this.me);
     const text = String(message?.text || "").trim();
     if (!text) return false;
     const normalized = this.normalizeTelegramCommandText(text);
     if (normalized.startsWith("/")) return true;
-    if (username && new RegExp(`(^|\\s)@${username}(\\b|\\s|$)`, "i").test(text)) return true;
+    if (aliases.some((alias) => new RegExp(`(^|\\s)@${alias}(\\b|\\s|$)`, "i").test(text))) return true;
     const replyFromId = String(message?.reply_to_message?.from?.id || "").trim();
     const myId = String(this.me?.id || "").trim();
     if (replyFromId && myId && replyFromId === myId) return true;
@@ -935,9 +949,13 @@ class TelegramGateway {
 
   stripBotMention(text) {
     const value = String(text || "").trim();
-    const username = String(this.me?.username || "").trim();
-    if (!value || !username) return value;
-    return value.replace(new RegExp(`(^|\\s)@${username}(\\b|\\s|$)`, "ig"), " ").replace(/\s+/g, " ").trim();
+    const aliases = getTelegramBotAliases(this.me);
+    if (!value || !aliases.length) return value;
+    let next = value;
+    for (const alias of aliases) {
+      next = next.replace(new RegExp(`(^|\\s)@${alias}(\\b|\\s|$)`, "ig"), " ");
+    }
+    return next.replace(/\s+/g, " ").trim();
   }
 
   prunePairings() {
@@ -1630,7 +1648,7 @@ class TelegramGateway {
     return host;
   }
 
-  async runPromptViaBridge(message, sessionId, promptText) {
+  async runPromptViaBridge(message, sessionId, promptText, options = {}) {
     const host = await this.getLiveBridgeHost();
     if (!host) {
       return null;
@@ -1649,6 +1667,7 @@ class TelegramGateway {
       displayName: this.describeTelegramUser(message?.from || {}).displayName,
       sessionId: String(sessionId || "").trim(),
       text: String(promptText || "").trim(),
+      explicitExecution: options.explicitExecution === true,
       runtimeProfile: String(project?.runtimeProfile || "").trim(),
       replyToMessageId: message.message_id,
       requestedAt: new Date().toISOString(),
@@ -2716,7 +2735,7 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
         return;
       }
       previewMessage = await this.sendProgressMessage(message.chat.id, message.message_id);
-      const content = (await this.runPromptViaBridge(message, sessionId, promptText))
+      const content = (await this.runPromptViaBridge(message, sessionId, promptText, { explicitExecution: shouldExecutePrompt }))
         ?? (await this.runPromptFallback(sessionId, promptText));
       await this.deliverPromptResult(message.chat.id, message.message_id, previewMessage, content);
     } catch (error) {