@tritard/waterbrother 0.16.71 → 0.16.73

package/package.json

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

package/src/gateway-state.js

@@ -23,6 +23,9 @@ function normalizeGatewayState(parsed = {}) {
     offset: Number.isFinite(Number(parsed?.offset)) ? Math.max(0, Math.floor(Number(parsed.offset))) : 0,
     peers: parsed?.peers && typeof parsed.peers === "object" ? parsed.peers : {},
     pendingPairings: parsed?.pendingPairings && typeof parsed.pendingPairings === "object" ? parsed.pendingPairings : {},
+    announcedEvents: Array.isArray(parsed?.announcedEvents)
+      ? parsed.announcedEvents.map((value) => String(value || "").trim()).filter(Boolean).slice(-100)
+      : [],
     continuations: Object.fromEntries(
       Object.entries(continuations).map(([key, item]) => [
         key,
@@ -135,7 +138,7 @@ export async function loadGatewayState(serviceId) {
     return normalizeGatewayState(JSON.parse(raw));
   } catch (error) {
     if (error?.code === "ENOENT") {
-      return { offset: 0, peers: {}, pendingPairings: {}, continuations: {} };
+      return { offset: 0, peers: {}, pendingPairings: {}, announcedEvents: [], continuations: {} };
     }
     throw error;
   }

package/src/gateway.js

@@ -334,6 +334,23 @@ function buildTelegramRoomGuidanceMarkup({ project = null, member = null, execut
   ].filter(Boolean).join("\n");
 }
 
+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 runtime = meta.provider && meta.model ? `${meta.provider}/${meta.model}` : "";
+  const title = meta.isNew ? "Roundtable terminal joined" : "Roundtable terminal updated";
+  return [
+    `<b>${escapeTelegramHtml(title)}</b>`,
+    `owner: <code>${escapeTelegramHtml(ownerName)}</code>`,
+    `terminal: <code>${escapeTelegramHtml(label)}</code>`,
+    `role: <code>${escapeTelegramHtml(String(meta.role || "standby"))}</code>`,
+    `surface: <code>${escapeTelegramHtml(String(meta.surface || "unknown"))}</code>`,
+    runtime ? `runtime: <code>${escapeTelegramHtml(runtime)}</code>` : "",
+    meta.runtimeProfile ? `runtime profile: <code>${escapeTelegramHtml(String(meta.runtimeProfile || ""))}</code>` : ""
+  ].filter(Boolean).join("\n");
+}
+
 function formatGatewaySessionStatus({ sessionId, userId, username, cwd, runtimeProfile, provider, model }) {
   const bits = [
     "<b>Telegram remote session</b>",
@@ -565,7 +582,9 @@ function parseTelegramAgentIntent(text = "") {
   if (/^(how|what|why|when|where|who)\b/.test(lowered)) return null;
   const reviewPatterns = [
     /^(?:have|ask|use)\s+(.+?)['’]s\s+(?:bot|terminal)\s+(?:to\s+)?review(?:\s+this)?\s*$/i,
-    /^(?:have|ask|use)\s+(.+?)\s+(?:bot|terminal)\s+(?:to\s+)?review(?:\s+this)?\s*$/i
+    /^(?:have|ask|use)\s+(.+?)\s+(?:bot|terminal)\s+(?:to\s+)?review(?:\s+this)?\s*$/i,
+    /^(.+?),\s*review(?:\s+this)?\s+with\s+(?:your|ur)\s+(?:bot|terminal)\s*$/i,
+    /^(.+?)\s+should\s+review(?:\s+this)?\s+with\s+(?:their|his|her)\s+(?:bot|terminal)\s*$/i
   ];
   for (const pattern of reviewPatterns) {
     const match = value.match(pattern);
@@ -580,7 +599,9 @@ function parseTelegramAgentIntent(text = "") {
     /^(?:have|ask|use)\s+(.+?)['’]s\s+(?:bot|terminal)\s+(?:to\s+)?(?:take execution|execute|handle execution|take this)\s*$/i,
     /^(?:have|ask|use)\s+(.+?)\s+(?:bot|terminal)\s+(?:to\s+)?(?:take execution|execute|handle execution|take this)\s*$/i,
     /^(.+?)['’]s\s+(?:bot|terminal)\s+should\s+(?:take execution|execute|handle execution)\s*$/i,
-    /^(.+?)\s+(?:bot|terminal)\s+should\s+(?:take execution|execute|handle execution)\s*$/i
+    /^(.+?)\s+(?:bot|terminal)\s+should\s+(?:take execution|execute|handle execution)\s*$/i,
+    /^(.+?),\s*(?:take execution|execute|handle execution|take this)\s+with\s+(?:your|ur)\s+(?:bot|terminal)\s*$/i,
+    /^(.+?)\s+should\s+(?:take execution|execute|handle execution)\s+with\s+(?:their|his|her)\s+(?:bot|terminal)\s*$/i
   ];
   for (const pattern of executePatterns) {
     const match = value.match(pattern);
@@ -1369,6 +1390,24 @@ class TelegramGateway {
     };
   }
 
+  async maybeAnnounceRoomAgentEvents(message, project) {
+    if (!this.isGroupChat(message) || !project?.enabled) return;
+    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 pending = events
+      .filter((event) => String(event?.type || "").trim() === "agent-upsert")
+      .filter((event) => event?.id && !announced.has(String(event.id)))
+      .slice(-3);
+    if (!pending.length) return;
+    for (const event of pending) {
+      await this.sendMarkup(message.chat.id, buildTelegramAgentAnnouncementMarkup(event), message.message_id);
+      announced.add(String(event.id));
+    }
+    this.state.announcedEvents = [...announced].slice(-100);
+    await this.persistState();
+  }
+
   buildTrustedRoomIntroMarkup({ project, actor }) {
     const participants = listProjectParticipants(project);
     const agents = listProjectAgents(project);
@@ -2451,6 +2490,8 @@ class TelegramGateway {
     const peer = this.getPeerState(userId);
     const linkedSession = await loadSession(sessionId);
     const sessionCwd = linkedSession.cwd || this.cwd;
+    const linkedProject = await loadSharedProject(sessionCwd).catch(() => null);
+    await this.maybeAnnounceRoomAgentEvents(message, linkedProject);
 
     if (text === "/about") {
       await this.sendMessage(

package/src/shared-project.js

@@ -71,6 +71,22 @@ function normalizeAgent(agent = {}) {
   };
 }
 
+function areAgentsEquivalent(left = {}, right = {}) {
+  return [
+    "ownerId",
+    "ownerName",
+    "label",
+    "surface",
+    "role",
+    "provider",
+    "model",
+    "runtimeProfile",
+    "sessionId",
+    "cwd",
+    "chatId"
+  ].every((key) => String(left?.[key] || "").trim() === String(right?.[key] || "").trim());
+}
+
 function buildProjectParticipants(project = {}) {
   const members = Array.isArray(project.members) ? project.members.map(normalizeMember).filter((item) => item.id) : [];
   const memberIds = new Set(members.map((member) => member.id));
@@ -615,6 +631,10 @@ export async function upsertSharedAgent(cwd, agent = {}, options = {}) {
   }
   const agents = Array.isArray(existing.agents) ? [...existing.agents] : [];
   const index = agents.findIndex((item) => item.id === nextAgent.id);
+  const previousAgent = index >= 0 ? normalizeAgent(agents[index]) : null;
+  if (previousAgent && areAgentsEquivalent(previousAgent, nextAgent)) {
+    return existing;
+  }
   if (index >= 0) {
     agents[index] = normalizeAgent({ ...agents[index], ...nextAgent });
   } else {
@@ -631,8 +651,14 @@ export async function upsertSharedAgent(cwd, agent = {}, options = {}) {
     meta: {
       agentId: nextAgent.id,
       ownerId: nextAgent.ownerId,
+      ownerName: nextAgent.ownerName,
+      label: nextAgent.label,
       role: nextAgent.role,
-      surface: nextAgent.surface
+      surface: nextAgent.surface,
+      provider: nextAgent.provider,
+      model: nextAgent.model,
+      runtimeProfile: nextAgent.runtimeProfile,
+      isNew: !previousAgent
     }
   })).project;
 }