@tritard/waterbrother 0.16.89 → 0.16.91

package/package.json

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

package/src/gateway.js

@@ -2192,11 +2192,19 @@ class TelegramGateway {
       if (!project?.enabled) {
         return "This project is not shared.";
       }
+      const blockingReview = getLatestBlockingReviewPolicy(project);
+      if (!blockingReview) {
+        return "<b>Reviewer concerns</b>\nNo blocking review is active.";
+      }
       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 : {};
+      const blockingMeta = blockingReview.meta && typeof blockingReview.meta === "object" ? blockingReview.meta : {};
+      if (String(meta.agentId || "").trim() !== String(blockingMeta.agentId || "").trim()) {
+        return "<b>Reviewer concerns</b>\nThe latest reviewer result does not match the current blocking reviewer.";
+      }
       if (String(meta.outcome || "").trim() !== "concerns") {
         return "<b>Reviewer concerns</b>\nThe latest reviewer result is not concerns.";
       }
@@ -2227,8 +2235,16 @@ class TelegramGateway {
       if (!project?.enabled) {
         return "This project is not shared.";
       }
+      const blockingReview = getLatestBlockingReviewPolicy(project);
+      if (!blockingReview) {
+        return "<b>Reviewer override</b>\nNo blocking review is active.";
+      }
       const result = getLatestReviewResult(project);
       const meta = result?.meta && typeof result.meta === "object" ? result.meta : {};
+      const blockingMeta = blockingReview.meta && typeof blockingReview.meta === "object" ? blockingReview.meta : {};
+      if (String(meta.agentId || "").trim() !== String(blockingMeta.agentId || "").trim()) {
+        return "<b>Reviewer override</b>\nThe latest reviewer result does not match the current blocking reviewer.";
+      }
       await addSharedRoomNote(cwd, "Reviewer outcome overridden by the room", {
         actorId,
         actorName,
@@ -3172,7 +3188,7 @@ class TelegramGateway {
 
     if (text === "/new") {
       const sessionId = await this.startFreshSession(message);
-      await this.sendMessage(message.chat.id, `Started new remote session: <code>${escapeTelegramHtml(sessionId)}</code>`, message.message_id);
+      await this.sendMarkup(message.chat.id, `Started new remote session: <code>${escapeTelegramHtml(sessionId)}</code>`, message.message_id);
       return;
     }
 
@@ -3494,7 +3510,7 @@ class TelegramGateway {
     if (text === "/claim") {
       const { session, project } = await this.bindSharedRoomForMessage(message, sessionId);
       if (!project?.enabled) {
-        await this.sendMessage(message.chat.id, "This project is not shared. Enable sharing from the terminal first with <code>waterbrother project share</code>.", message.message_id);
+        await this.sendMarkup(message.chat.id, "This project is not shared. Enable sharing from the terminal first with <code>waterbrother project share</code>.", message.message_id);
         return;
       }
       try {
@@ -3502,7 +3518,7 @@ class TelegramGateway {
           id: userId,
           name: peer?.username || [message?.from?.first_name, message?.from?.last_name].filter(Boolean).join(" ").trim() || userId
         });
-        await this.sendMessage(message.chat.id, `Shared room claimed by <code>${escapeTelegramHtml(claimed.activeOperator?.name || claimed.activeOperator?.id || userId)}</code>`, message.message_id);
+        await this.sendMarkup(message.chat.id, `Shared room claimed by <code>${escapeTelegramHtml(claimed.activeOperator?.name || claimed.activeOperator?.id || userId)}</code>`, message.message_id);
       } catch (error) {
         await this.sendMessage(message.chat.id, escapeTelegramHtml(error instanceof Error ? error.message : String(error)), message.message_id);
       }
@@ -3563,7 +3579,7 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
       }
       try {
         const result = await approveSharedInvite(session.cwd || this.cwd, inviteId, { actorId: userId });
-        await this.sendMessage(message.chat.id, `Approved invite <code>${escapeTelegramHtml(result.invite.id)}</code>`, message.message_id);
+        await this.sendMarkup(message.chat.id, `Approved invite <code>${escapeTelegramHtml(result.invite.id)}</code>`, message.message_id);
       } catch (error) {
         await this.sendMessage(message.chat.id, escapeTelegramHtml(error instanceof Error ? error.message : String(error)), message.message_id);
       }
@@ -3586,7 +3602,7 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
           actorId: userId,
           actorName: peer?.username || [message?.from?.first_name, message?.from?.last_name].filter(Boolean).join(" ").trim() || userId
         });
-        await this.sendMessage(message.chat.id, `Accepted invite <code>${escapeTelegramHtml(result.invite.id)}</code>`, message.message_id);
+        await this.sendMarkup(message.chat.id, `Accepted invite <code>${escapeTelegramHtml(result.invite.id)}</code>`, message.message_id);
       } catch (error) {
         await this.sendMessage(message.chat.id, escapeTelegramHtml(error instanceof Error ? error.message : String(error)), message.message_id);
       }
@@ -3606,7 +3622,7 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
       }
       try {
         const result = await rejectSharedInvite(session.cwd || this.cwd, inviteId, { actorId: userId });
-        await this.sendMessage(message.chat.id, `Rejected invite <code>${escapeTelegramHtml(result.invite.id)}</code>`, message.message_id);
+        await this.sendMarkup(message.chat.id, `Rejected invite <code>${escapeTelegramHtml(result.invite.id)}</code>`, message.message_id);
       } catch (error) {
         await this.sendMessage(message.chat.id, escapeTelegramHtml(error instanceof Error ? error.message : String(error)), message.message_id);
       }
@@ -3650,7 +3666,7 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
       }
       try {
         const result = await addSharedTask(session.cwd || this.cwd, taskText, { actorId: userId });
-        await this.sendMessage(message.chat.id, `Added shared task <code>${escapeTelegramHtml(result.task.id)}</code>`, message.message_id);
+        await this.sendMarkup(message.chat.id, `Added shared task <code>${escapeTelegramHtml(result.task.id)}</code>`, message.message_id);
       } catch (error) {
         await this.sendMessage(message.chat.id, escapeTelegramHtml(error instanceof Error ? error.message : String(error)), message.message_id);
       }
@@ -3671,7 +3687,7 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
       try {
         const before = (project?.tasks || []).find((task) => task.id === taskId) || null;
         const result = await moveSharedTask(session.cwd || this.cwd, taskId, state, { actorId: userId });
-        await this.sendMessage(message.chat.id, `Moved shared task <code>${escapeTelegramHtml(result.task.id)}</code> to <code>${escapeTelegramHtml(result.task.state)}</code>`, message.message_id);
+        await this.sendMarkup(message.chat.id, `Moved shared task <code>${escapeTelegramHtml(result.task.id)}</code> to <code>${escapeTelegramHtml(result.task.state)}</code>`, message.message_id);
         const notice = buildTaskOwnershipNotice(result.task, { action: "move", previousAssignee: before?.assignedTo || "", previousState: before?.state || "" });
         if (notice) await this.sendMessage(message.chat.id, notice, null, { parseMode: "HTML" });
       } catch (error) {
@@ -3694,7 +3710,7 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
       try {
         const before = (project?.tasks || []).find((task) => task.id === taskId) || null;
         const result = await assignSharedTask(session.cwd || this.cwd, taskId, memberId, { actorId: userId });
-        await this.sendMessage(message.chat.id, `Assigned shared task <code>${escapeTelegramHtml(result.task.id)}</code> to <code>${escapeTelegramHtml(memberId)}</code>`, message.message_id);
+        await this.sendMarkup(message.chat.id, `Assigned shared task <code>${escapeTelegramHtml(result.task.id)}</code> to <code>${escapeTelegramHtml(memberId)}</code>`, message.message_id);
         const notice = buildTaskOwnershipNotice(result.task, { action: "assign", previousAssignee: before?.assignedTo || "" });
         if (notice) await this.sendMessage(message.chat.id, notice, null, { parseMode: "HTML" });
       } catch (error) {
@@ -3721,7 +3737,7 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
           actorId: userId,
           actorName: peer?.username || [message?.from?.first_name, message?.from?.last_name].filter(Boolean).join(" ").trim() || userId
         });
-        await this.sendMessage(message.chat.id, `Commented on shared task <code>${escapeTelegramHtml(result.task.id)}</code>`, message.message_id);
+        await this.sendMarkup(message.chat.id, `Commented on shared task <code>${escapeTelegramHtml(result.task.id)}</code>`, message.message_id);
       } catch (error) {
         await this.sendMessage(message.chat.id, escapeTelegramHtml(error instanceof Error ? error.message : String(error)), message.message_id);
       }
@@ -3761,7 +3777,7 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
       }
       try {
         const result = await claimSharedTask(session.cwd || this.cwd, taskId, { actorId: userId });
-        await this.sendMessage(message.chat.id, `Claimed shared task <code>${escapeTelegramHtml(result.task.id)}</code>`, message.message_id);
+        await this.sendMarkup(message.chat.id, `Claimed shared task <code>${escapeTelegramHtml(result.task.id)}</code>`, message.message_id);
         const notice = buildTaskOwnershipNotice(result.task, { action: "claim" });
         if (notice) await this.sendMessage(message.chat.id, notice, null, { parseMode: "HTML" });
       } catch (error) {
@@ -3878,7 +3894,7 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
     }
 
     if (text === "/run") {
-      await this.sendMessage(message.chat.id, "Usage: <code>/run &lt;prompt&gt;</code>", message.message_id);
+      await this.sendMarkup(message.chat.id, "Usage: <code>/run &lt;prompt&gt;</code>", message.message_id);
       return;
     }
 
@@ -4053,7 +4069,7 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
       if (taskText) {
         try {
           const result = await addSharedTask(sharedBinding.session.cwd || this.cwd, taskText, { actorId: userId });
-          await this.sendMessage(message.chat.id, `Planner captured task <code>${escapeTelegramHtml(result.task.id)}</code>`, message.message_id);
+          await this.sendMarkup(message.chat.id, `Planner captured task <code>${escapeTelegramHtml(result.task.id)}</code>`, message.message_id);
         } catch (error) {
           await this.sendMessage(message.chat.id, escapeTelegramHtml(error instanceof Error ? error.message : String(error)), message.message_id);
         }