@tritard/waterbrother 0.16.98 → 0.16.100

package/package.json

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

package/src/gateway.js

@@ -509,6 +509,32 @@ function summarizeRuntimeConflict(project, fallbackExecutor = {}) {
   };
 }
 
+function cleanAgentDisplayValue(value = "") {
+  const cleaned = String(value || "").replace(/\bundefined\b/ig, "").trim();
+  if (!cleaned) return "";
+  if (/^terminal$/i.test(cleaned)) return "";
+  return cleaned;
+}
+
+function getAgentOwnerDisplay(agent = {}, fallback = "") {
+  const ownerName = cleanAgentDisplayValue(agent?.ownerName);
+  const ownerId = cleanAgentDisplayValue(agent?.ownerId);
+  const label = cleanAgentDisplayValue(agent?.label);
+  const fallbackValue = cleanAgentDisplayValue(fallback);
+  return ownerName || ownerId || fallbackValue || label || "unknown";
+}
+
+function getAgentTerminalDisplay(agent = {}, fallback = "") {
+  const label = cleanAgentDisplayValue(agent?.label);
+  const fallbackValue = cleanAgentDisplayValue(fallback);
+  if (label) return label;
+  if (fallbackValue) return fallbackValue;
+  const ownerName = cleanAgentDisplayValue(agent?.ownerName);
+  if (ownerName) return ownerName + " terminal";
+  const ownerId = cleanAgentDisplayValue(agent?.ownerId);
+  if (ownerId) return ownerId + " terminal";
+  return "current terminal";
+}
 function formatBridgeHostLabel(host = {}) {
   const owner = String(host?.ownerName || host?.ownerId || "").trim();
   const label = String(host?.label || "").trim();
@@ -695,7 +721,11 @@ function formatTelegramProjectMarkup({ cwd, project, chatId = "", title = "" })
 }
 
 function normalizeTelegramProjectIntentText(text = "") {
-  return String(text || "").trim().replace(/\s+/g, " ");
+  return String(text || "")
+    .replace(/[‘’′]/g, "'")
+    .replace(/[“”]/g, '"')
+    .trim()
+    .replace(/\s+/g, " ");
 }
 
 function parseTelegramProjectIntent(text = "") {
@@ -869,7 +899,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 is the verifier\b/.test(lower) || /\bwhat is the verifier\b/.test(lower) || /\bwho should verify this\b/.test(lower)) {
+  if (/\bwho(?:'s| is)? the verifier\b/.test(lower) || /\bwhat is the verifier\b/.test(lower) || /\bwho should verify this\b/.test(lower)) {
     return { action: "verifier-status" };
   }
   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)) {
@@ -2019,8 +2049,8 @@ class TelegramGateway {
         )) || {
           id: `agent:telegram-bridge:${String(host.sessionId || host.pid || "current").trim()}`,
           ownerId: String(host.ownerId || actor.userId || "").trim(),
-          ownerName: String(host.ownerName || actor.displayName || "").trim(),
-          label: String(host.label || `${actor.displayName || actor.userId || "current"} terminal`).trim(),
+          ownerName: getAgentOwnerDisplay(host, actor.displayName || actor.userId || "current operator"),
+          label: getAgentTerminalDisplay(host, actor.displayName ? actor.displayName + " terminal" : (actor.userId ? actor.userId + " terminal" : "current terminal")),
           surface: String(host.surface || "live-tui").trim(),
           role: "standby",
           provider: String(host.provider || "").trim(),
@@ -2058,15 +2088,15 @@ class TelegramGateway {
           ? "This sets the room verifier role. Use run verification when you want Waterbrother to run tests or build checks."
           : "";
     const followUp = intent.action === "agent-review" || intent.role === "reviewer"
-      ? `Should ${targetAgent.ownerName || targetAgent.label || "that terminal"} review be advisory or blocking?`
+      ? `Should ${getAgentOwnerDisplay(targetAgent, actor.displayName || actor.userId || "that terminal")} review be advisory or blocking?`
       : "";
     return {
       kind: "agent",
       project: nextProject,
       markup: [
         `<b>${escapeTelegramHtml(actionTitle)}</b>`,
-        `owner: <code>${escapeTelegramHtml(targetAgent.ownerName || targetAgent.ownerId || targetAgent.label || targetAgent.id || "-")}</code>`,
-        `terminal: <code>${escapeTelegramHtml(targetAgent.label || targetAgent.id || "-")}</code>`,
+        `owner: <code>${escapeTelegramHtml(getAgentOwnerDisplay(targetAgent, actor.displayName || actor.userId || "current operator"))}</code>`,
+        `terminal: <code>${escapeTelegramHtml(getAgentTerminalDisplay(targetAgent, actor.displayName ? actor.displayName + " terminal" : "current terminal"))}</code>`,
         `role: <code>${escapeTelegramHtml(intent.role)}</code>`,
         `runtime: <code>${escapeTelegramHtml(runtimeLabel)}</code>`,
         `project: <code>${escapeTelegramHtml(nextProject.projectName || path.basename(session.cwd || this.cwd))}</code>`,
@@ -2375,7 +2405,7 @@ class TelegramGateway {
       }
       return [
         "<b>Verifier</b>",
-        `verifier: <code>${escapeTelegramHtml(verifier.ownerName || verifier.label || verifier.ownerId || verifier.id || "unknown")}</code>`,
+        `verifier: <code>${escapeTelegramHtml(getAgentOwnerDisplay(verifier))}</code>`,
         `role: <code>${escapeTelegramHtml(verifier.role || "verifier")}</code>`,
         `runtime: <code>${escapeTelegramHtml(verifier.provider && verifier.model ? `${verifier.provider}/${verifier.model}` : "unknown")}</code>`,
         `verification mode: <code>${escapeTelegramHtml(String(project.verificationMode || "manual"))}</code>`

package/src/self-awareness.js

@@ -266,13 +266,23 @@ function scoreEntry(question, entry) {
   for (const keyword of entry.keywords || []) {
     const normalized = normalizeQuestion(keyword);
     if (!normalized) continue;
-    if (q.includes(normalized)) score += Math.max(2, normalized.split(" ").length * 2);
     const tokens = normalized.split(" ").filter(Boolean);
-    if (tokens.length > 1 && tokens.every((token) => qTokens.has(token))) {
+    if (tokens.length === 1) {
+      if (qTokens.has(tokens[0])) score += 2;
+      continue;
+    }
+    if (q.includes(normalized)) score += Math.max(2, tokens.length * 2);
+    if (tokens.every((token) => qTokens.has(token))) {
       score += tokens.length + 1;
     }
   }
-  if (entry.id && q.includes(normalizeQuestion(entry.id))) score += 2;
+  if (entry.id) {
+    const normalizedId = normalizeQuestion(entry.id);
+    const idTokens = normalizedId.split(" ").filter(Boolean);
+    if (idTokens.length === 1 ? qTokens.has(idTokens[0]) : q.includes(normalizedId)) {
+      score += 2;
+    }
+  }
   return score;
 }