@tritard/waterbrother 0.16.73 → 0.16.75

package/package.json

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

package/src/gateway-state.js

@@ -35,6 +35,7 @@ function normalizeGatewayState(parsed = {}) {
           lastPrompt: String(item?.lastPrompt || "").trim(),
           kind: String(item?.kind || "follow-up").trim() || "follow-up",
           source: String(item?.source || "assistant-question").trim() || "assistant-question",
+          context: item?.context && typeof item.context === "object" ? { ...item.context } : {},
           expiresAt: String(item?.expiresAt || "").trim()
         }
       ])

package/src/gateway.js

@@ -9,7 +9,7 @@ import { DEFAULT_PENDING_PAIRING_TTL_MINUTES, loadGatewayBridge, loadGatewayStat
 import { getGatewayStatus, getChannelSpec } from "./channels.js";
 import { getConfigPath, loadConfigLayers, saveConfig } from "./config.js";
 import { canonicalizeLoosePath } from "./path-utils.js";
-import { acceptSharedInvite, addSharedTask, approveSharedInvite, assignSharedTask, claimSharedOperator, claimSharedTask, commentSharedTask, createSharedInvite, enableSharedProject, getSharedTaskHistory, listSharedEvents, listSharedInvites, listSharedTasks, loadSharedProject, moveSharedTask, rejectSharedInvite, releaseSharedOperator, setSharedRoom, setSharedRoomMode, setSharedRuntimeProfile, removeSharedMember, upsertSharedAgent, upsertSharedMember } from "./shared-project.js";
+import { acceptSharedInvite, addSharedRoomNote, addSharedTask, approveSharedInvite, assignSharedTask, claimSharedOperator, claimSharedTask, commentSharedTask, createSharedInvite, enableSharedProject, getSharedTaskHistory, listSharedEvents, listSharedInvites, listSharedTasks, loadSharedProject, moveSharedTask, rejectSharedInvite, releaseSharedOperator, setSharedRoom, setSharedRoomMode, setSharedRuntimeProfile, removeSharedMember, upsertSharedAgent, upsertSharedMember } from "./shared-project.js";
 import { buildSelfAwarenessManifest, formatAboutWaterbrother, formatSelfState, resolveLocalConceptQuestion } from "./self-awareness.js";
 
 const execFileAsync = promisify(execFile);
@@ -419,6 +419,28 @@ function chooseExecutorAgent(project, fallbackExecutor = {}) {
   return null;
 }
 
+function getLatestBlockingReviewPolicy(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 || "")));
+  const resolvedAgents = new Set();
+  for (const event of ordered) {
+    const type = String(event?.type || "").trim();
+    const meta = event?.meta && typeof event.meta === "object" ? event.meta : {};
+    const agentId = String(meta.agentId || "").trim();
+    if (!agentId) continue;
+    if (type === "review-policy-cleared" || type === "review-policy-override") {
+      resolvedAgents.add(agentId);
+      continue;
+    }
+    if (type === "review-policy" && String(meta.policy || "").trim() === "blocking" && !resolvedAgents.has(agentId)) {
+      return event;
+    }
+  }
+  return null;
+}
+
 function memberRoleWeight(role = "") {
   const normalized = String(role || "").trim().toLowerCase();
   if (normalized === "owner") return 3;
@@ -1293,9 +1315,15 @@ class TelegramGateway {
   }
 
   async rememberContinuation(message, text = "") {
+    return this.rememberContinuationWithOptions(message, text);
+  }
+
+  async rememberContinuationWithOptions(message, text = "", extra = {}) {
     const body = String(text || "").trim();
     if (!body) return;
-    const asksFollowUp =
+    const asksFollowUp = extra.force === true
+      ? true
+      :
       /\?\s*$/.test(body)
       || /\b(would you like|do you want|which\b|what\b.*\?|how\b.*\?|who\b.*\?|where\b.*\?)\b/i.test(body);
     if (!asksFollowUp) return;
@@ -1304,8 +1332,9 @@ class TelegramGateway {
       chatId: String(message?.chat?.id || "").trim(),
       userId: String(message?.from?.id || "").trim(),
       lastPrompt: body.slice(0, 400),
-      kind: "follow-up",
-      source: "assistant-question",
+      kind: String(extra.kind || "follow-up").trim() || "follow-up",
+      source: String(extra.source || "assistant-question").trim() || "assistant-question",
+      context: extra.context && typeof extra.context === "object" ? { ...extra.context } : {},
       expiresAt: new Date(Date.now() + TELEGRAM_CONTINUATION_TTL_MS).toISOString()
     };
     await this.persistState();
@@ -1698,6 +1727,9 @@ class TelegramGateway {
       : intent.action === "agent-execute"
         ? "This sets the room executor role. Claim/mode rules still control actual execution."
         : "";
+    const followUp = intent.action === "agent-review"
+      ? `Should ${targetAgent.ownerName || targetAgent.label || "that terminal"} review be advisory or blocking?`
+      : "";
     return {
       kind: "agent",
       project: nextProject,
@@ -1708,11 +1740,119 @@ class TelegramGateway {
         `role: <code>${escapeTelegramHtml(intent.role)}</code>`,
         `runtime: <code>${escapeTelegramHtml(runtimeLabel)}</code>`,
         `project: <code>${escapeTelegramHtml(nextProject.projectName || path.basename(session.cwd || this.cwd))}</code>`,
-        note
-      ].join("\n")
+        note,
+        followUp
+      ].filter(Boolean).join("\n"),
+      continuation: followUp
+        ? {
+            text: followUp,
+            kind: "agent-review-policy",
+            source: "agent-delegation",
+            context: {
+              agentId: String(targetAgent.id || "").trim(),
+              ownerName: String(targetAgent.ownerName || targetAgent.label || "").trim(),
+              projectName: String(nextProject.projectName || "").trim()
+            }
+          }
+        : null
     };
   }
 
+  async handleStructuredContinuation(message, sessionId, continuation, peer) {
+    if (!continuation?.kind) return null;
+    const reply = this.stripBotMention(String(message?.text || "").trim()).toLowerCase();
+    if (continuation.kind === "agent-review-policy") {
+      const policy = /\b(blocking|block|required|gate)\b/.test(reply)
+        ? "blocking"
+        : /\b(advisory|advice|optional|non-blocking|nonblocking)\b/.test(reply)
+          ? "advisory"
+          : "";
+      if (!policy) {
+        return {
+          markup: `Reply with <code>advisory</code> or <code>blocking</code> for ${escapeTelegramHtml(continuation.context?.ownerName || "that review")}.`,
+          remember: {
+            text: String(continuation.lastPrompt || "").trim() || "Should this review be advisory or blocking?",
+            kind: continuation.kind,
+            source: continuation.source,
+            context: continuation.context || {},
+            force: true
+          }
+        };
+      }
+      const session = await loadSession(sessionId);
+      const actorId = String(message?.from?.id || "").trim();
+      const actorName = peer?.username || [message?.from?.first_name, message?.from?.last_name].filter(Boolean).join(" ").trim() || actorId;
+      await addSharedRoomNote(session.cwd || this.cwd, `${continuation.context?.ownerName || "Assigned"} review should be ${policy}`, {
+        actorId,
+        actorName,
+        type: "review-policy",
+        meta: {
+          agentId: String(continuation.context?.agentId || "").trim(),
+          policy
+        }
+      });
+      return {
+        markup: [
+          "<b>Review policy noted</b>",
+          `reviewer: <code>${escapeTelegramHtml(continuation.context?.ownerName || "unknown")}</code>`,
+          `policy: <code>${escapeTelegramHtml(policy)}</code>`,
+          "This is recorded in the room as coordination guidance. Automatic enforcement is not wired yet."
+        ].join("\n")
+      };
+    }
+    if (continuation.kind === "blocking-review-override") {
+      const reply = this.stripBotMention(String(message?.text || "").trim()).toLowerCase();
+      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 (/\boverride\b/.test(reply)) {
+        await addSharedRoomNote(session.cwd || this.cwd, `${continuation.context?.ownerName || "Assigned"} blocking review overridden for now`, {
+          actorId,
+          actorName,
+          type: "review-policy-override",
+          meta: {
+            agentId: String(continuation.context?.agentId || "").trim()
+          }
+        });
+        return {
+          markup: [
+            "<b>Blocking review overridden</b>",
+            `reviewer: <code>${escapeTelegramHtml(continuation.context?.ownerName || "unknown")}</code>`,
+            "Execution can proceed for now."
+          ].join("\n")
+        };
+      }
+      if (/\breviewed\b/.test(reply) || /\bdone\b/.test(reply) || /\bcomplete\b/.test(reply)) {
+        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>Blocking review cleared</b>",
+            `reviewer: <code>${escapeTelegramHtml(continuation.context?.ownerName || "unknown")}</code>`,
+            "Execution can proceed."
+          ].join("\n")
+        };
+      }
+      return {
+        markup: "Reply with <code>override</code> to proceed anyway, or <code>reviewed</code> after the blocking review is complete.",
+        remember: {
+          text: String(continuation.lastPrompt || "").trim() || "Reply with override or reviewed.",
+          kind: continuation.kind,
+          source: continuation.source,
+          context: continuation.context || {},
+          force: true
+        }
+      };
+    }
+    return null;
+  }
+
   async handleStateIntent(message, sessionId, intent) {
     const { session, project } = await this.bindSharedRoomForMessage(message, sessionId);
     const cwd = session.cwd || this.cwd;
@@ -3195,6 +3335,21 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
     const isExplicitRun = text.startsWith("/run ");
     const rawPromptText = this.stripBotMention(isExplicitRun ? text.replace("/run", "").trim() : text);
     const promptText = continuation ? buildContinuationPrompt(rawPromptText, continuation) : rawPromptText;
+    if (continuation?.kind && continuation.kind !== "follow-up") {
+      try {
+        const structured = await this.handleStructuredContinuation(message, sessionId, continuation, peer);
+        if (structured?.markup) {
+          await this.sendMarkup(message.chat.id, structured.markup, message.message_id);
+          if (structured.remember) {
+            await this.rememberContinuationWithOptions(message, structured.remember.text, structured.remember);
+          }
+          return;
+        }
+      } catch (error) {
+        await this.sendMessage(message.chat.id, escapeTelegramHtml(error instanceof Error ? error.message : String(error)), message.message_id);
+        return;
+      }
+    }
     const groupIntent = this.isGroupChat(message)
       ? (isExplicitRun
           ? { kind: "execution", reason: "explicit /run" }
@@ -3244,6 +3399,9 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
       try {
         const result = await this.handleConversationalAgentIntent(message, sessionId, agentIntent);
         await this.sendMarkup(message.chat.id, result.markup, message.message_id);
+        if (result.continuation) {
+          await this.rememberContinuationWithOptions(message, result.continuation.text, { ...result.continuation, force: true });
+        }
       } catch (error) {
         await this.sendMessage(message.chat.id, escapeTelegramHtml(error instanceof Error ? error.message : String(error)), message.message_id);
       }
@@ -3381,6 +3539,32 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
         await this.sendMessage(message.chat.id, escapeTelegramHtml(gateReason), message.message_id, { parseMode: "HTML" });
         return;
       }
+      const blockingReview = getLatestBlockingReviewPolicy(operatorGate.project);
+      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.`;
+        await this.sendMarkup(
+          message.chat.id,
+          [
+            "<b>Blocking review in effect</b>",
+            `reviewer: <code>${escapeTelegramHtml(reviewerName)}</code>`,
+            "Execution is paused until the blocking review is cleared or overridden.",
+            followUp
+          ].join("\n"),
+          message.message_id
+        );
+        await this.rememberContinuationWithOptions(message, followUp, {
+          kind: "blocking-review-override",
+          source: "review-policy-gate",
+          context: {
+            agentId: String(meta.agentId || "").trim(),
+            ownerName: reviewerName
+          },
+          force: true
+        });
+        return;
+      }
       previewMessage = await this.sendProgressMessage(message.chat.id, message.message_id);
       const content = (await this.runPromptViaBridge(message, sessionId, promptText, { explicitExecution: shouldExecutePrompt }))
         ?? (await this.runPromptFallback(sessionId, promptText));

package/src/shared-project.js

@@ -663,6 +663,22 @@ export async function upsertSharedAgent(cwd, agent = {}, options = {}) {
   })).project;
 }
 
+export async function addSharedRoomNote(cwd, text = "", options = {}) {
+  const existing = await loadSharedProject(cwd);
+  requireSharedProject(existing);
+  const normalizedText = String(text || "").trim();
+  if (!normalizedText) throw new Error("room note text is required");
+  if (options.actorId) {
+    requireMember(existing, options.actorId);
+  }
+  return (await recordSharedProjectEvent(cwd, existing, normalizedText, {
+    type: String(options.type || "room-note").trim() || "room-note",
+    actorId: String(options.actorId || "").trim(),
+    actorName: String(options.actorName || "").trim(),
+    meta: options.meta && typeof options.meta === "object" ? options.meta : {}
+  })).project;
+}
+
 export async function createSharedInvite(cwd, member = {}, options = {}) {
   const existing = await loadSharedProject(cwd);
   requireOwner(existing, options.actorId);