@tritard/waterbrother 0.16.95 → 0.16.97

package/package.json

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

package/src/gateway.js

@@ -385,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 = "") {
@@ -486,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 = {}) {
@@ -800,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)) {
@@ -812,7 +834,7 @@ function parseTelegramStateIntent(text = "") {
   if (/\bwhat can i do here\b/.test(lower) || /\bhow do i use this room\b/.test(lower) || /\bhow do i use this chat\b/.test(lower) || /\bwhat do i do here\b/.test(lower)) {
     return { action: "room-guidance" };
   }
-  if (/\bwho are the bots\b/.test(lower) || /\bwho are the agents\b/.test(lower) || /\bwhat bots are here\b/.test(lower) || /\bwhat agents are here\b/.test(lower)) {
+  if (/\bwho are the (?:bots|boys)\b/.test(lower) || /\bwho are the agents\b/.test(lower) || /\bwhat (?:bots|boys) are here\b/.test(lower) || /\bwhat agents are here\b/.test(lower)) {
     return { action: "agent-list" };
   }
   if (/\bwhich terminals are live\b/.test(lower) || /\bwhich bots are live\b/.test(lower) || /\bwho is live\b/.test(lower) || /\bwhat terminals are live\b/.test(lower)) {

package/src/shared-project.js

@@ -54,11 +54,13 @@ function normalizeParticipant(participant = {}) {
 }
 
 function normalizeAgent(agent = {}) {
+  const rawLabel = String(agent.label || agent.name || "").trim();
+  const cleanLabel = rawLabel.replace(/\bundefined\b/ig, "").replace(/\s+/g, " ").trim();
   return {
     id: String(agent.id || "").trim(),
     ownerId: String(agent.ownerId || "").trim(),
     ownerName: String(agent.ownerName || "").trim(),
-    label: String(agent.label || agent.name || "").trim(),
+    label: cleanLabel,
     surface: String(agent.surface || "").trim(),
     role: AGENT_ROLES.includes(String(agent.role || "").trim()) ? String(agent.role).trim() : "standby",
     provider: String(agent.provider || "").trim(),
@@ -71,6 +73,42 @@ function normalizeAgent(agent = {}) {
   };
 }
 
+function isBrokenAgent(agent = {}) {
+  const ownerId = String(agent.ownerId || "").trim();
+  const ownerName = String(agent.ownerName || "").trim();
+  const label = String(agent.label || "").trim();
+  return !ownerId && !ownerName && !label;
+}
+
+function dedupeAgents(agents = []) {
+  const bySemanticKey = new Map();
+  for (const agent of agents) {
+    const normalized = normalizeAgent(agent);
+    if (!normalized.id || isBrokenAgent(normalized)) continue;
+    const semanticKey = [
+      String(normalized.ownerId || "").trim(),
+      String(normalized.ownerName || "").trim().toLowerCase(),
+      String(normalized.label || "").trim().toLowerCase(),
+      String(normalized.surface || "").trim().toLowerCase(),
+      String(normalized.role || "").trim().toLowerCase(),
+      String(normalized.provider || "").trim().toLowerCase(),
+      String(normalized.model || "").trim().toLowerCase(),
+      String(normalized.chatId || "").trim()
+    ].join("|");
+    const prior = bySemanticKey.get(semanticKey);
+    if (!prior) {
+      bySemanticKey.set(semanticKey, normalized);
+      continue;
+    }
+    const priorUpdated = Date.parse(String(prior.updatedAt || "").trim()) || 0;
+    const nextUpdated = Date.parse(String(normalized.updatedAt || "").trim()) || 0;
+    if (nextUpdated >= priorUpdated) {
+      bySemanticKey.set(semanticKey, normalized);
+    }
+  }
+  return [...bySemanticKey.values()];
+}
+
 function areAgentsEquivalent(left = {}, right = {}) {
   return [
     "ownerId",
@@ -119,12 +157,8 @@ function buildProjectParticipants(project = {}) {
 }
 
 function buildProjectAgents(project = {}) {
-  const existing = new Map(
-    (Array.isArray(project.agents) ? project.agents : [])
-      .map((agent) => normalizeAgent(agent))
-      .filter((agent) => agent.id)
-      .map((agent) => [agent.id, agent])
-  );
+  const existingAgents = dedupeAgents(Array.isArray(project.agents) ? project.agents : []);
+  const existing = new Map(existingAgents.map((agent) => [agent.id, agent]));
   const next = [];
   const activeOperatorId = String(project.activeOperator?.id || "").trim();
   if (activeOperatorId) {
@@ -145,7 +179,7 @@ function buildProjectAgents(project = {}) {
     if (next.some((item) => item.id === agent.id)) continue;
     next.push(normalizeAgent(agent));
   }
-  return next;
+  return dedupeAgents(next);
 }
 
 function memberRoleWeight(role = "") {
@@ -433,7 +467,12 @@ async function recordSharedProjectEvent(cwd, project, text, { type = "note", act
 export async function loadSharedProject(cwd) {
   try {
     const raw = await fs.readFile(sharedFilePath(cwd), "utf8");
-    return normalizeSharedProject(JSON.parse(raw), cwd);
+    const parsed = JSON.parse(raw);
+    const normalized = normalizeSharedProject(parsed, cwd);
+    if (JSON.stringify(parsed) !== JSON.stringify(normalized)) {
+      await writeJsonAtomically(sharedFilePath(cwd), normalized);
+    }
+    return normalized;
   } catch (error) {
     if (error?.code === "ENOENT") return null;
     throw error;