@tritard/waterbrother 0.16.52 → 0.16.54

package/package.json

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

package/src/gateway.js

@@ -1043,17 +1043,50 @@ class TelegramGateway {
     if (!value) {
       throw new Error("member target is required");
     }
+    const known = this.listKnownChatPeople(message);
+    const replied = this.describeTelegramUser(message?.reply_to_message?.from || {});
+    const normalizedPronoun = value.toLowerCase().replace(/[?.!]+$/g, "").trim();
+    if (["him", "her", "them", "this person", "this user", "that person", "that user"].includes(normalizedPronoun)) {
+      if (replied.userId) {
+        const knownReply = known.find((person) => person.userId === replied.userId) || replied;
+        return { userId: replied.userId, displayName: knownReply.displayName || replied.displayName || replied.userId };
+      }
+      const senderId = String(message?.from?.id || "").trim();
+      const fallbackCandidates = known.filter((person) => {
+        const userId = String(person.userId || "").trim();
+        if (!userId || userId === senderId) return false;
+        if (String(person.usernameHandle || "").trim().toLowerCase() === String(this.me?.username || "").trim().toLowerCase()) return false;
+        return true;
+      });
+      if (fallbackCandidates.length === 1) {
+        return {
+          userId: fallbackCandidates[0].userId,
+          displayName: fallbackCandidates[0].displayName || fallbackCandidates[0].userId
+        };
+      }
+      throw new Error("Reply to the person's message first, or use /people to choose them by name or id.");
+    }
     if (/^\d+$/.test(value) || value.startsWith("@")) {
       const match = this.resolveInviteTarget(message, value);
       return { userId: match.userId, displayName: match.displayName };
     }
 
     const normalized = value.toLowerCase();
-    const known = this.listKnownChatPeople(message);
     const exact = known.find((person) => String(person.displayName || "").trim().toLowerCase() === normalized);
     if (exact) {
       return { userId: exact.userId, displayName: exact.displayName || exact.userId };
     }
+    const byFirstName = known.filter((person) => {
+      const display = String(person.displayName || "").trim().toLowerCase();
+      const first = display.split(/\s+/).filter(Boolean)[0] || "";
+      return first === normalized;
+    });
+    if (byFirstName.length === 1) {
+      return { userId: byFirstName[0].userId, displayName: byFirstName[0].displayName || byFirstName[0].userId };
+    }
+    if (byFirstName.length > 1) {
+      throw new Error(`Multiple Telegram users matched first name ${value}. Use /people and choose by id or full name.`);
+    }
     const partial = known.filter((person) => {
       const display = String(person.displayName || "").trim().toLowerCase();
       const handle = String(person.usernameHandle || "").trim().toLowerCase();