@tritard/waterbrother 0.16.93 → 0.16.95

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tritard/waterbrother",
-  "version": "0.16.93",
+  "version": "0.16.95",
   "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");
 }
 
@@ -786,6 +788,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)) {
@@ -1609,13 +1614,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 +2238,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.";
@@ -3940,6 +3982,7 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
         return;
       }
     }
+    const stateIntent = parseTelegramStateIntent(promptText);
     const groupIntent = this.isGroupChat(message)
       ? (isExplicitRun
           ? { kind: "execution", reason: "explicit /run" }
@@ -3949,7 +3992,6 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
       : { kind: "execution", reason: "private chat" };
     const shouldExecutePrompt = !this.isGroupChat(message) || groupIntent.kind === "execution";
     const sharedBinding = await this.bindSharedRoomForMessage(message, sessionId);
-    const stateIntent = !shouldExecutePrompt ? parseTelegramStateIntent(promptText) : null;
     if (stateIntent) {
       try {
         const markup = await this.handleStateIntent(message, sessionId, stateIntent);