@tritard/waterbrother 0.16.94 → 0.16.96

package/package.json

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

package/src/gateway.js

@@ -342,8 +342,10 @@ function buildTelegramRoomGuidanceMarkup({ project = null, member = null, execut
 
 function buildTelegramAgentAnnouncementMarkup(event = {}) {
   const meta = event?.meta && typeof event.meta === "object" ? event.meta : {};
-  const ownerName = String(meta.ownerName || "").trim() || String(meta.ownerId || "").trim() || "unknown";
-  const label = String(meta.label || meta.agentId || "").trim() || "terminal";
+  const rawOwnerName = String(meta.ownerName || "").trim() || String(meta.ownerId || "").trim();
+  const rawLabel = String(meta.label || meta.agentId || "").trim();
+  const ownerName = rawOwnerName && !/^unknown$/i.test(rawOwnerName) ? rawOwnerName : "this room";
+  const label = rawLabel && !/\bundefined\b/i.test(rawLabel) ? rawLabel : (ownerName !== "this room" ? `${ownerName} terminal` : "live terminal");
   const runtime = meta.provider && meta.model ? `${meta.provider}/${meta.model}` : "";
   const title = meta.isNew ? "Roundtable terminal joined" : "Roundtable terminal updated";
   const role = String(meta.role || "standby").trim() || "standby";
@@ -361,7 +363,7 @@ function buildTelegramAgentAnnouncementMarkup(event = {}) {
     runtime ? `runtime: <code>${escapeTelegramHtml(runtime)}</code>` : "",
     meta.runtimeProfile ? `runtime profile: <code>${escapeTelegramHtml(String(meta.runtimeProfile || ""))}</code>` : "",
     roleGuidance,
-    "Examples: <code>which terminals are live?</code>, <code>have Austin's bot be reviewer</code>, <code>have Phillip's bot take execution</code>"
+    "Examples: <code>which terminals are live?</code>, <code>make this terminal the reviewer</code>, <code>make this terminal the executor</code>"
   ].filter(Boolean).join("\n");
 }
 
@@ -383,7 +385,27 @@ function listProjectParticipants(project) {
 }
 
 function listProjectAgents(project) {
-  return Array.isArray(project?.agents) ? project.agents : [];
+  const agents = Array.isArray(project?.agents) ? project.agents : [];
+  const seen = new Set();
+  return agents.filter((agent) => {
+    const ownerId = String(agent?.ownerId || "").trim();
+    const ownerName = String(agent?.ownerName || "").trim();
+    const label = String(agent?.label || "").trim();
+    const runtime = agent?.provider && agent?.model ? `${agent.provider}/${agent.model}` : "";
+    if (!String(agent?.id || "").trim()) return false;
+    if (!ownerId && !ownerName && (!label || /\bundefined\b/i.test(label))) return false;
+    const key = [
+      ownerId,
+      ownerName.toLowerCase(),
+      label.replace(/\bundefined\b/ig, "").trim().toLowerCase(),
+      String(agent?.role || "").trim().toLowerCase(),
+      String(agent?.surface || "").trim().toLowerCase(),
+      runtime.toLowerCase()
+    ].join("|");
+    if (seen.has(key)) return false;
+    seen.add(key);
+    return true;
+  });
 }
 
 function findProjectParticipant(project, memberId = "") {
@@ -484,7 +506,9 @@ function formatBridgeHostLabel(host = {}) {
   const owner = String(host?.ownerName || host?.ownerId || "").trim();
   const label = String(host?.label || "").trim();
   const runtime = host?.provider && host?.model ? `${host.provider}/${host.model}` : "";
-  return [owner || label, label && label !== owner ? `(${label})` : "", runtime ? `[${runtime}]` : ""].filter(Boolean).join(" ").trim();
+  const safeLabel = label && !/\bundefined\b/i.test(label) ? label : "";
+  const primary = owner || safeLabel || "live terminal";
+  return [primary, safeLabel && safeLabel !== owner ? `(${safeLabel})` : "", runtime ? `[${runtime}]` : ""].filter(Boolean).join(" ").trim();
 }
 
 function findLiveHostForAgent(hosts = [], agent = {}) {
@@ -786,6 +810,9 @@ function parseTelegramStateIntent(text = "") {
   const lower = value.toLowerCase();
   if (!value) return null;
 
+  if (/^(?:hi|hello|hey|yo|sup|suh|wazzup|whazzup|what'?s up|whats up|how are you)\b.*$/i.test(value)) {
+    return { action: "bot-greeting" };
+  }
   if (/^(?:are you|you(?:'re| are)?|wb|waterbrother)\s+(?:online|running|alive|there)\??$/.test(lower)
     || /^(?:you online|you running|you there)\??$/.test(lower)
     || /^(?:are you online|are you running|are you there)\??$/.test(lower)) {
@@ -795,7 +822,7 @@ function parseTelegramStateIntent(text = "") {
   if (/\bwhat project\b/.test(lower) || /\bwhich project\b/.test(lower) || /\bproject is this chat\b/.test(lower) || /\bchat bound to\b/.test(lower)) {
     return { action: "project-status" };
   }
-  if (/\bwho is in the room\b/.test(lower) || /\bwho(?:'s| is) in the project\b/.test(lower) || /\bwho are the members\b/.test(lower) || /\bshow members\b/.test(lower)) {
+  if (/\bwho(?:'s| is)? in (?:the )?room\b/.test(lower) || /\bwho(?:'s| is)? in (?:the )?project\b/.test(lower) || /\bwho are the members\b/.test(lower) || /\bshow members\b/.test(lower)) {
     return { action: "room-members" };
   }
   if (/\bwhat mode\b/.test(lower) || /\broom mode\b/.test(lower) || /\bmode are we in\b/.test(lower)) {
@@ -1609,13 +1636,38 @@ class TelegramGateway {
     if (String(project?.room?.chatId || "").trim() !== String(message?.chat?.id || "").trim()) return;
     const events = Array.isArray(project.recentEvents) ? project.recentEvents : [];
     const announced = new Set(Array.isArray(this.state.announcedEvents) ? this.state.announcedEvents : []);
+    const agents = listProjectAgents(project);
+    const freshThresholdMs = 2 * 60 * 1000;
+    const now = Date.now();
     const pending = events
       .filter((event) => String(event?.type || "").trim() === "agent-upsert")
       .filter((event) => event?.id && !announced.has(String(event.id)))
+      .filter((event) => {
+        const createdAtMs = Date.parse(String(event?.createdAt || "").trim());
+        return Number.isFinite(createdAtMs) ? now - createdAtMs <= freshThresholdMs : true;
+      })
       .slice(-3);
     if (!pending.length) return;
     for (const event of pending) {
-      await this.sendMarkup(message.chat.id, buildTelegramAgentAnnouncementMarkup(event), message.message_id);
+      const meta = event?.meta && typeof event.meta === "object" ? { ...event.meta } : {};
+      const agent = agents.find((item) => String(item?.id || "").trim() === String(meta.agentId || "").trim()) || null;
+      const enrichedEvent = agent
+        ? {
+            ...event,
+            meta: {
+              ...meta,
+              ownerId: String(meta.ownerId || agent.ownerId || "").trim(),
+              ownerName: String(meta.ownerName || agent.ownerName || "").trim(),
+              label: String(meta.label || agent.label || "").trim(),
+              role: String(meta.role || agent.role || "").trim(),
+              surface: String(meta.surface || agent.surface || "").trim(),
+              provider: String(meta.provider || agent.provider || "").trim(),
+              model: String(meta.model || agent.model || "").trim(),
+              runtimeProfile: String(meta.runtimeProfile || agent.runtimeProfile || "").trim()
+            }
+          }
+        : event;
+      await this.sendMarkup(message.chat.id, buildTelegramAgentAnnouncementMarkup(enrichedEvent), message.message_id);
       announced.add(String(event.id));
     }
     this.state.announcedEvents = [...announced].slice(-100);
@@ -2208,6 +2260,18 @@ class TelegramGateway {
       return lines.join("\n");
     }
 
+    if (intent.action === "bot-greeting") {
+      return [
+        "<b>Waterbrother</b>",
+        "I’m here.",
+        `room mode: <code>${escapeTelegramHtml(project?.enabled ? (project.roomMode || "chat") : "off")}</code>`,
+        project?.activeOperator?.id
+          ? `active operator: <code>${escapeTelegramHtml(project.activeOperator.name || project.activeOperator.id)}</code>`
+          : "active operator: <code>none</code>",
+        "Ask a question, discuss a plan, or give me a task when you want me to act."
+      ].join("\n");
+    }
+
     if (intent.action === "accept-reviewer-concerns") {
       if (!project?.enabled) {
         return "This project is not shared.";