@tritard/waterbrother 0.16.81 → 0.16.83

package/package.json

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

package/src/gateway.js

@@ -483,6 +483,26 @@ function findLiveHostForAgent(hosts = [], agent = {}) {
   }) || null;
 }
 
+function chooseReviewerAgent(project) {
+  const agents = listProjectAgents(project);
+  return agents.find((agent) => String(agent?.role || "").trim() === "reviewer") || null;
+}
+
+function parseReviewerOutcome(text = "") {
+  const value = String(text || "").trim();
+  const lower = value.toLowerCase();
+  if (/^\s*(approved|approve|pass|passed)\b/.test(lower) || /\boverall:\s*approved\b/.test(lower)) {
+    return "approved";
+  }
+  if (/^\s*(blocked|block|reject|rejected)\b/.test(lower) || /\boverall:\s*blocked\b/.test(lower)) {
+    return "blocked";
+  }
+  if (/^\s*(concerns|concern|needs changes|needs-change)\b/.test(lower) || /\boverall:\s*concerns\b/.test(lower)) {
+    return "concerns";
+  }
+  return "";
+}
+
 function getLatestBlockingReviewPolicy(project) {
   const events = Array.isArray(project?.recentEvents) ? [...project.recentEvents] : [];
   const ordered = events
@@ -875,6 +895,11 @@ function formatTelegramRoomMarkup(project, options = {}) {
     : ["• none"];
   const runtimeConflict = summarizeRuntimeConflict(project, executor);
   const liveHosts = Array.isArray(options.liveHosts) ? options.liveHosts : [];
+  const selectedExecutor = chooseExecutorAgent(project, executor);
+  const selectedReviewer = chooseReviewerAgent(project);
+  const blockingReview = getLatestBlockingReviewPolicy(project);
+  const selectedExecutorLiveHost = selectedExecutor ? findLiveHostForAgent(liveHosts, selectedExecutor) : null;
+  const selectedReviewerLiveHost = selectedReviewer ? findLiveHostForAgent(liveHosts, selectedReviewer) : null;
   const executorBits = [
     `surface: <code>${escapeTelegramHtml(executor.surface || "telegram")}</code>`,
     `provider: <code>${escapeTelegramHtml(executor.provider || "unknown")}</code>`,
@@ -897,6 +922,12 @@ function formatTelegramRoomMarkup(project, options = {}) {
     `room: <code>${escapeTelegramHtml(roomLabel)}</code>`,
     `active operator: <code>${escapeTelegramHtml(active)}</code>`,
     `pending invites: <code>${pendingInviteCount}</code>`,
+    "<b>Coordination</b>",
+    `selected executor: <code>${escapeTelegramHtml(selectedExecutor ? (selectedExecutor.ownerName || selectedExecutor.label || selectedExecutor.ownerId || selectedExecutor.id || "unknown") : "none")}</code>`,
+    `executor live: <code>${escapeTelegramHtml(selectedExecutorLiveHost ? "yes" : "no")}</code>`,
+    `reviewer: <code>${escapeTelegramHtml(selectedReviewer ? (selectedReviewer.ownerName || selectedReviewer.label || selectedReviewer.ownerId || selectedReviewer.id || "none") : "none")}</code>`,
+    `reviewer live: <code>${escapeTelegramHtml(selectedReviewerLiveHost ? "yes" : "no")}</code>`,
+    `blocking review: <code>${escapeTelegramHtml(blockingReview ? "yes" : "no")}</code>`,
     "<b>Executor</b>",
     ...executorBits,
     "<b>Runtime Split</b>",
@@ -1931,12 +1962,41 @@ class TelegramGateway {
           targetHost,
           includeSource: true
         });
+        const reviewContent = String(reviewResult?.content || "").trim() || "(no content)";
+        const outcome = parseReviewerOutcome(reviewContent);
+        if (outcome) {
+          await addSharedRoomNote(session.cwd || this.cwd, `${continuation.context?.ownerName || "Assigned"} reviewer returned ${outcome}`, {
+            actorId,
+            actorName,
+            type: "review-result",
+            meta: {
+              agentId: String(continuation.context?.agentId || "").trim(),
+              outcome
+            }
+          });
+          if (outcome === "approved") {
+            await addSharedRoomNote(session.cwd || this.cwd, `${continuation.context?.ownerName || "Assigned"} blocking review marked complete`, {
+              actorId,
+              actorName,
+              type: "review-policy-cleared",
+              meta: {
+                agentId: String(continuation.context?.agentId || "").trim()
+              }
+            });
+          }
+        }
         return {
           markup: [
             "<b>Reviewer response</b>",
             `reviewer: <code>${escapeTelegramHtml(continuation.context?.ownerName || "unknown")}</code>`,
             targetHost ? `terminal: <code>${escapeTelegramHtml(formatBridgeHostLabel(targetHost) || targetHost.sessionId || "live terminal")}</code>` : "",
-            renderTelegramChunks(reviewResult?.content || "(no content)").join("\n\n")
+            outcome ? `outcome: <code>${escapeTelegramHtml(outcome)}</code>` : "",
+            outcome === "approved"
+              ? "Blocking review has been cleared."
+              : outcome
+                ? "Blocking review remains in effect until the room overrides or marks it reviewed."
+                : "No structured reviewer outcome was detected. Blocking review remains in effect.",
+            renderTelegramChunks(reviewContent).join("\n\n")
           ].join("\n\n")
         };
       }
@@ -3866,6 +3926,7 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
         const reviewerHost = reviewerAgent ? findLiveHostForAgent(liveHosts, reviewerAgent) : null;
         const reviewPrompt = [
           `Review this pending Telegram Roundtable request before execution.`,
+          `Start your answer with one of: APPROVED, CONCERNS, or BLOCKED.`,
           `Requester: ${this.describeTelegramUser(message?.from || {}).displayName || userId}`,
           `Project: ${operatorGate.project.projectName || path.basename(operatorGate.session?.cwd || this.cwd)}`,
           "",