@tritard/waterbrother 0.16.83 → 0.16.85

package/package.json

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

package/src/gateway.js

@@ -488,6 +488,21 @@ function chooseReviewerAgent(project) {
   return agents.find((agent) => String(agent?.role || "").trim() === "reviewer") || null;
 }
 
+function summarizeExecutorReviewerArbitration(project, fallbackExecutor = {}) {
+  const executorAgent = chooseExecutorAgent(project, fallbackExecutor);
+  const reviewerAgent = chooseReviewerAgent(project);
+  const executorRuntime = getAgentRuntimeKey(executorAgent || fallbackExecutor);
+  const reviewerRuntime = getAgentRuntimeKey(reviewerAgent);
+  return {
+    executorAgent,
+    reviewerAgent,
+    executorRuntime,
+    reviewerRuntime,
+    aligned: Boolean(executorRuntime && reviewerRuntime && executorRuntime === reviewerRuntime),
+    split: Boolean(executorRuntime && reviewerRuntime && executorRuntime !== reviewerRuntime)
+  };
+}
+
 function parseReviewerOutcome(text = "") {
   const value = String(text || "").trim();
   const lower = value.toLowerCase();
@@ -525,6 +540,14 @@ function getLatestBlockingReviewPolicy(project) {
   return null;
 }
 
+function getLatestReviewResult(project) {
+  const events = Array.isArray(project?.recentEvents) ? [...project.recentEvents] : [];
+  const ordered = events
+    .filter((event) => event?.createdAt)
+    .sort((a, b) => String(b.createdAt || "").localeCompare(String(a.createdAt || "")));
+  return ordered.find((event) => String(event?.type || "").trim() === "review-result") || null;
+}
+
 function memberRoleWeight(role = "") {
   const normalized = String(role || "").trim().toLowerCase();
   if (normalized === "owner") return 3;
@@ -773,6 +796,9 @@ function parseTelegramStateIntent(text = "") {
   if (/\bmodel conflict\b/.test(lower) || /\bruntime conflict\b/.test(lower) || /\bmodel split\b/.test(lower) || /\bruntime split\b/.test(lower) || /\bcompare models\b/.test(lower) || /\bcompare bots\b/.test(lower)) {
     return { action: "model-conflict" };
   }
+  if (/\bcompare (?:executor|reviewer)\b/.test(lower) || /\bcompare reviewer and executor\b/.test(lower) || /\bcompare executor and reviewer\b/.test(lower) || /\bdo the reviewer and executor agree\b/.test(lower)) {
+    return { action: "executor-reviewer-compare" };
+  }
   if (/\bwhich (?:bot|agent|terminal) should take this\b/.test(lower) || /\bwho should take this\b/.test(lower) || /\bwho should handle this\b/.test(lower)) {
     return { action: "executor-recommendation" };
   }
@@ -799,6 +825,16 @@ function parseTelegramStateIntent(text = "") {
     return { action: "member-status", target: memberMatch[1].trim() };
   }
 
+  if (/\baccept reviewer concerns\b/.test(lower) || /\baccept the reviewer'?s concerns\b/.test(lower)) {
+    return { action: "accept-reviewer-concerns" };
+  }
+  if (/\boverride reviewer\b/.test(lower) || /\boverride the reviewer\b/.test(lower)) {
+    return { action: "override-reviewer" };
+  }
+  if (/\bswitch executor to reviewer\b/.test(lower) || /\bmake reviewer the executor\b/.test(lower) || /\buse reviewer as executor\b/.test(lower)) {
+    return { action: "switch-executor-to-reviewer" };
+  }
+
   return null;
 }
 
@@ -2120,6 +2156,8 @@ class TelegramGateway {
     const { session, project } = await this.bindSharedRoomForMessage(message, sessionId);
     const cwd = session.cwd || this.cwd;
     const known = this.listKnownChatPeople(message);
+    const actorId = String(message?.from?.id || "").trim();
+    const actorName = this.describeTelegramUser(message?.from || {}).displayName || actorId;
     const host = await this.getLiveBridgeHost();
     const executor = {
       surface: host?.surface || (host ? "live-tui" : "telegram-fallback"),
@@ -2129,6 +2167,90 @@ class TelegramGateway {
       hostSessionId: host?.sessionId || ""
     };
 
+    if (intent.action === "accept-reviewer-concerns") {
+      if (!project?.enabled) {
+        return "This project is not shared.";
+      }
+      const result = getLatestReviewResult(project);
+      if (!result) {
+        return "<b>Reviewer concerns</b>\nNo reviewer result is on record yet.";
+      }
+      const meta = result.meta && typeof result.meta === "object" ? result.meta : {};
+      if (String(meta.outcome || "").trim() !== "concerns") {
+        return "<b>Reviewer concerns</b>\nThe latest reviewer result is not concerns.";
+      }
+      await addSharedRoomNote(cwd, "Reviewer concerns accepted; revise before continuing", {
+        actorId,
+        actorName,
+        type: "review-concerns-accepted",
+        meta: {
+          agentId: String(meta.agentId || "").trim()
+        }
+      });
+      await addSharedRoomNote(cwd, "Blocking review cleared after reviewer concerns were accepted", {
+        actorId,
+        actorName,
+        type: "review-policy-cleared",
+        meta: {
+          agentId: String(meta.agentId || "").trim()
+        }
+      });
+      return [
+        "<b>Reviewer concerns accepted</b>",
+        "The room accepted the reviewer concerns.",
+        "Blocking review has been cleared so the team can revise and continue."
+      ].join("\n");
+    }
+
+    if (intent.action === "override-reviewer") {
+      if (!project?.enabled) {
+        return "This project is not shared.";
+      }
+      const result = getLatestReviewResult(project);
+      const meta = result?.meta && typeof result.meta === "object" ? result.meta : {};
+      await addSharedRoomNote(cwd, "Reviewer outcome overridden by the room", {
+        actorId,
+        actorName,
+        type: "review-policy-override",
+        meta: {
+          agentId: String(meta.agentId || "").trim()
+        }
+      });
+      return [
+        "<b>Reviewer overridden</b>",
+        "The room overrode the reviewer outcome.",
+        "Execution may proceed."
+      ].join("\n");
+    }
+
+    if (intent.action === "switch-executor-to-reviewer") {
+      if (!project?.enabled) {
+        return "This project is not shared.";
+      }
+      const reviewer = chooseReviewerAgent(project);
+      if (!reviewer) {
+        return "<b>Executor switch</b>\nNo reviewer is assigned.";
+      }
+      const currentExecutor = chooseExecutorAgent(project, executor);
+      if (currentExecutor?.id && currentExecutor.id !== reviewer.id) {
+        await upsertSharedAgent(cwd, { ...currentExecutor, role: "standby" }, { actorId, actorName });
+      }
+      await upsertSharedAgent(cwd, { ...reviewer, role: "executor" }, { actorId, actorName });
+      await addSharedRoomNote(cwd, `${reviewer.ownerName || reviewer.label || reviewer.ownerId || "Reviewer"} is now the executor`, {
+        actorId,
+        actorName,
+        type: "executor-handoff-reassigned",
+        meta: {
+          currentAgentId: String(reviewer.id || "").trim()
+        }
+      });
+      return [
+        "<b>Executor switched</b>",
+        `executor: <code>${escapeTelegramHtml(reviewer.ownerName || reviewer.label || reviewer.ownerId || reviewer.id || "reviewer")}</code>`,
+        "The reviewer is now the selected executor."
+      ].join("\n");
+    }
+
     if (intent.action === "project-status") {
       return formatTelegramSummaryMarkup({
         cwd,
@@ -2233,6 +2355,35 @@ class TelegramGateway {
       return lines.join("\n");
     }
 
+    if (intent.action === "executor-reviewer-compare") {
+      if (!project?.enabled) {
+        return "This project is not shared.";
+      }
+      const comparison = summarizeExecutorReviewerArbitration(project, executor);
+      if (!comparison.executorAgent && !comparison.reviewerAgent) {
+        return "<b>Executor vs reviewer</b>\nNo executor or reviewer is assigned yet.";
+      }
+      if (!comparison.executorAgent) {
+        return "<b>Executor vs reviewer</b>\nNo executor is assigned yet.";
+      }
+      if (!comparison.reviewerAgent) {
+        return "<b>Executor vs reviewer</b>\nNo reviewer is assigned yet.";
+      }
+      return [
+        "<b>Executor vs reviewer</b>",
+        `executor: <code>${escapeTelegramHtml(comparison.executorAgent.ownerName || comparison.executorAgent.label || comparison.executorAgent.ownerId || comparison.executorAgent.id || "unknown")}</code>`,
+        `executor runtime: <code>${escapeTelegramHtml(comparison.executorRuntime || "unknown")}</code>`,
+        `reviewer: <code>${escapeTelegramHtml(comparison.reviewerAgent.ownerName || comparison.reviewerAgent.label || comparison.reviewerAgent.ownerId || comparison.reviewerAgent.id || "unknown")}</code>`,
+        `reviewer runtime: <code>${escapeTelegramHtml(comparison.reviewerRuntime || "unknown")}</code>`,
+        `alignment: <code>${escapeTelegramHtml(comparison.aligned ? "aligned" : comparison.split ? "split" : "unknown")}</code>`,
+        comparison.split
+          ? "These terminals are on different runtimes. Expect different opinions and use the reviewer outcome to arbitrate."
+          : comparison.aligned
+            ? "These terminals are on the same runtime. Disagreement is still possible, but it is less likely to come from model differences alone."
+            : "One side is missing runtime identity, so Waterbrother cannot compare them yet."
+      ].join("\n");
+    }
+
     if (intent.action === "agent-perspective") {
       if (!project?.enabled) {
         return "This project is not shared.";