@tritard/waterbrother 0.16.79 → 0.16.81

package/package.json

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

package/src/gateway.js

@@ -1900,6 +1900,46 @@ class TelegramGateway {
       const actorId = String(message?.from?.id || "").trim();
       const actorName = peer?.username || [message?.from?.first_name, message?.from?.last_name].filter(Boolean).join(" ").trim() || actorId;
       const session = await loadSession(sessionId);
+      if (/\bsend to reviewer\b/.test(reply) || /\breviewer\b/.test(reply) || /\bsend review\b/.test(reply)) {
+        const targetHost = continuation.context?.reviewerHost && typeof continuation.context.reviewerHost === "object"
+          ? continuation.context.reviewerHost
+          : null;
+        if (!targetHost?.pid) {
+          return {
+            markup: "The assigned reviewer is not live right now. Reply with <code>override</code> or <code>reviewed</code> instead.",
+            remember: {
+              text: String(continuation.lastPrompt || "").trim() || "Reply with override or reviewed.",
+              kind: continuation.kind,
+              source: continuation.source,
+              context: continuation.context || {},
+              force: true
+            }
+          };
+        }
+        const reviewPrompt = String(continuation.context?.reviewPrompt || "").trim();
+        await addSharedRoomNote(session.cwd || this.cwd, `${continuation.context?.ownerName || "Assigned"} blocking review dispatched to reviewer terminal`, {
+          actorId,
+          actorName,
+          type: "review-policy-dispatched",
+          meta: {
+            agentId: String(continuation.context?.agentId || "").trim(),
+            reviewerPid: Number(targetHost.pid || 0)
+          }
+        });
+        const reviewResult = await this.runPromptViaBridge(message, sessionId, reviewPrompt, {
+          explicitExecution: true,
+          targetHost,
+          includeSource: true
+        });
+        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")
+          ].join("\n\n")
+        };
+      }
       if (/\boverride\b/.test(reply)) {
         await addSharedRoomNote(session.cwd || this.cwd, `${continuation.context?.ownerName || "Assigned"} blocking review overridden for now`, {
           actorId,
@@ -1935,7 +1975,7 @@ class TelegramGateway {
         };
       }
       return {
-        markup: "Reply with <code>override</code> to proceed anyway, or <code>reviewed</code> after the blocking review is complete.",
+        markup: "Reply with <code>send to reviewer</code>, <code>override</code>, or <code>reviewed</code> after the blocking review is complete.",
         remember: {
           text: String(continuation.lastPrompt || "").trim() || "Reply with override or reviewed.",
           kind: continuation.kind,
@@ -2687,7 +2727,10 @@ class TelegramGateway {
         if (reply.error) {
           throw new Error(reply.error);
         }
-        return String(reply.content || "").trim() || "(no content)";
+        const content = String(reply.content || "").trim() || "(no content)";
+        return options.includeSource
+          ? { content, sourceHost: host }
+          : content;
       }
 
       const activeHost = nextBridge.activeHost || {};
@@ -2798,8 +2841,12 @@ class TelegramGateway {
     return message || null;
   }
 
-  async deliverPromptResult(chatId, replyToMessageId, previewMessage, content) {
-    const chunks = renderTelegramChunks(content);
+  async deliverPromptResult(chatId, replyToMessageId, previewMessage, content, options = {}) {
+    const sourceHost = options.sourceHost && typeof options.sourceHost === "object" ? options.sourceHost : null;
+    const sourcePrefix = sourceHost
+      ? `<b>Handled by</b>\n<code>${escapeTelegramHtml(formatBridgeHostLabel(sourceHost) || sourceHost.sessionId || "live terminal")}</code>\n\n`
+      : "";
+    const chunks = renderTelegramChunks(`${sourcePrefix}${String(content || "")}`);
     if (!chunks.length) {
       if (previewMessage?.message_id) {
         await this.editMessage(chatId, previewMessage.message_id, "(no content)");
@@ -3814,12 +3861,26 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
       if (blockingReview) {
         const meta = blockingReview.meta && typeof blockingReview.meta === "object" ? blockingReview.meta : {};
         const reviewerName = String(meta.ownerName || meta.agentId || "assigned reviewer").trim();
-        const followUp = `Blocking review is assigned to ${reviewerName}. Reply with override to proceed anyway, or reviewed when the review is done.`;
+        const reviewerAgent = listProjectAgents(operatorGate.project).find((agent) => String(agent?.id || "").trim() === String(meta.agentId || "").trim()) || null;
+        const liveHosts = await this.getLiveBridgeHosts({ cwd: operatorGate.session?.cwd || this.cwd });
+        const reviewerHost = reviewerAgent ? findLiveHostForAgent(liveHosts, reviewerAgent) : null;
+        const reviewPrompt = [
+          `Review this pending Telegram Roundtable request before execution.`,
+          `Requester: ${this.describeTelegramUser(message?.from || {}).displayName || userId}`,
+          `Project: ${operatorGate.project.projectName || path.basename(operatorGate.session?.cwd || this.cwd)}`,
+          "",
+          `Pending request:`,
+          promptText
+        ].join("\n");
+        const followUp = reviewerHost
+          ? `Blocking review is assigned to ${reviewerName}. Reply with send to reviewer to route it there, override to proceed anyway, or reviewed when the review is done.`
+          : `Blocking review is assigned to ${reviewerName}. Reply with override to proceed anyway, or reviewed when the review is done.`;
         await this.sendMarkup(
           message.chat.id,
           [
             "<b>Blocking review in effect</b>",
             `reviewer: <code>${escapeTelegramHtml(reviewerName)}</code>`,
+            reviewerHost ? `reviewer terminal: <code>${escapeTelegramHtml(formatBridgeHostLabel(reviewerHost) || reviewerHost.sessionId || "live terminal")}</code>` : "",
             "Execution is paused until the blocking review is cleared or overridden.",
             followUp
           ].join("\n"),
@@ -3830,7 +3891,21 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
           source: "review-policy-gate",
           context: {
             agentId: String(meta.agentId || "").trim(),
-            ownerName: reviewerName
+            ownerName: reviewerName,
+            reviewPrompt,
+            reviewerHost: reviewerHost
+              ? {
+                  pid: Number(reviewerHost.pid || 0),
+                  sessionId: String(reviewerHost.sessionId || "").trim(),
+                  ownerId: String(reviewerHost.ownerId || "").trim(),
+                  ownerName: String(reviewerHost.ownerName || "").trim(),
+                  label: String(reviewerHost.label || "").trim(),
+                  surface: String(reviewerHost.surface || "").trim(),
+                  provider: String(reviewerHost.provider || "").trim(),
+                  model: String(reviewerHost.model || "").trim(),
+                  runtimeProfile: String(reviewerHost.runtimeProfile || "").trim()
+                }
+              : null
           },
           force: true
         });
@@ -3891,13 +3966,17 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
         return;
       }
       previewMessage = await this.sendProgressMessage(message.chat.id, message.message_id);
-      const content = (await this.runPromptViaBridge(message, sessionId, promptText, {
+      const result = (await this.runPromptViaBridge(message, sessionId, promptText, {
         explicitExecution: shouldExecutePrompt,
-        targetHost: selectedLiveHost || host || null
+        targetHost: selectedLiveHost || host || null,
+        includeSource: true
       }))
         ?? (await this.runPromptFallback(sessionId, promptText));
-      await this.deliverPromptResult(message.chat.id, message.message_id, previewMessage, content);
-      await this.rememberContinuation(message, content);
+      const finalContent = typeof result === "string" ? result : String(result?.content || "").trim();
+      await this.deliverPromptResult(message.chat.id, message.message_id, previewMessage, finalContent, {
+        sourceHost: typeof result === "string" ? null : (result?.sourceHost || null)
+      });
+      await this.rememberContinuation(message, finalContent);
     } catch (error) {
       await this.deliverPromptFailure(message.chat.id, message.message_id, previewMessage, error);
     } finally {