@tritard/waterbrother 0.16.22 → 0.16.23

package/README.md

@@ -264,6 +264,7 @@ Rollout order:
 Shared project foundation is now live:
 - enable it with `waterbrother project share`
 - inspect it with `waterbrother room status`
+- control conversation vs execution with `waterbrother room mode chat|plan|execute`
 - claim or release the shared operator lock with `waterbrother room claim` and `waterbrother room release`
 - shared project metadata lives in `.waterbrother/shared.json`
 - human collaboration notes live in `ROUNDTABLE.md`
@@ -276,7 +277,8 @@ Current Telegram behavior:
 - pending pairings are explicit and expire automatically after 12 hours unless approved
 - paired Telegram users drive the same live session and permissions as the terminal operator when the TUI bridge is attached
 - Telegram now supports remote workspace control with `/cwd`, `/use <path>`, `/desktop`, and `/new-project <name>`
-- shared projects now support `/room`, `/claim`, and `/release` from Telegram with a single active-operator lock
+- shared projects now support `/room`, `/mode`, `/claim`, and `/release` from Telegram with a single active-operator lock
+- shared Telegram execution only runs when the shared room is in `execute` mode
 - pairing is now explicit: first DM creates a pending request, then approve locally with `waterbrother gateway pair telegram <user-id>`
 
 ## Release flow

package/package.json

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

package/src/cli.js

@@ -64,7 +64,8 @@ import {
   formatSharedProjectStatus,
   getSharedProjectPaths,
   loadSharedProject,
-  releaseSharedOperator
+  releaseSharedOperator,
+  setSharedRoomMode
 } from "./shared-project.js";
 
 const execFileAsync = promisify(execFile);
@@ -147,6 +148,7 @@ const INTERACTIVE_COMMANDS = [
   { name: "/share-project", description: "Enable shared-project mode in the current cwd" },
   { name: "/unshare-project", description: "Disable shared-project mode in the current cwd" },
   { name: "/room", description: "Show shared room status for the current project" },
+  { name: "/room mode <chat|plan|execute>", description: "Set collaboration mode for the shared room" },
   { name: "/room claim", description: "Claim operator control for the shared room" },
   { name: "/room release", description: "Release operator control for the shared room" },
   { name: "/cwd", description: "Show current working directory" },
@@ -270,6 +272,7 @@ Usage:
   waterbrother project share
   waterbrother project unshare
   waterbrother room status
+  waterbrother room mode <chat|plan|execute>
   waterbrother room claim
   waterbrother room release
   waterbrother mcp list
@@ -3787,7 +3790,27 @@ async function runRoomCommand(positional, { cwd = process.cwd(), asJson = false
     return;
   }
 
-  throw new Error("Usage: waterbrother room status|claim|release");
+  if (sub === "mode") {
+    const nextMode = String(positional[2] || "").trim().toLowerCase();
+    if (!nextMode) {
+      const project = await loadSharedProject(cwd);
+      if (asJson) {
+        printData({ ok: true, roomMode: project?.roomMode || null, project }, true);
+        return;
+      }
+      console.log(project?.roomMode || "shared project: off");
+      return;
+    }
+    const project = await setSharedRoomMode(cwd, nextMode);
+    if (asJson) {
+      printData({ ok: true, action: "mode", roomMode: project.roomMode, project }, true);
+      return;
+    }
+    console.log(`Room mode set to ${project.roomMode}`);
+    return;
+  }
+
+  throw new Error("Usage: waterbrother room status|mode <chat|plan|execute>|claim|release");
 }
 
 async function runMcpCommand(positional, runtime, { cwd, asJson = false } = {}) {
@@ -7615,6 +7638,20 @@ Be concrete about surfaces — name actual pages/flows. Choose the best stack fo
       continue;
     }
 
+    if (line.startsWith("/room mode ")) {
+      const nextMode = line.replace("/room mode", "").trim().toLowerCase();
+      if (!nextMode) {
+        console.log("Usage: /room mode <chat|plan|execute>");
+        continue;
+      }
+      try {
+        await runRoomCommand(["room", "mode", nextMode], { cwd: context.cwd, asJson: false });
+      } catch (error) {
+        console.log(`room mode failed: ${error instanceof Error ? error.message : String(error)}`);
+      }
+      continue;
+    }
+
     if (line === "/room claim") {
       try {
         await runRoomCommand(["room", "claim"], { cwd: context.cwd, asJson: false });

package/src/gateway.js

@@ -8,7 +8,7 @@ import { createSession, listSessions, loadSession, saveSession } from "./session
 import { DEFAULT_PENDING_PAIRING_TTL_MINUTES, loadGatewayBridge, loadGatewayState, prunePendingPairings, saveGatewayBridge, saveGatewayState } from "./gateway-state.js";
 import { getGatewayStatus, getChannelSpec } from "./channels.js";
 import { canonicalizeLoosePath } from "./path-utils.js";
-import { claimSharedOperator, loadSharedProject, releaseSharedOperator, setSharedRoom } from "./shared-project.js";
+import { claimSharedOperator, loadSharedProject, releaseSharedOperator, setSharedRoom, setSharedRoomMode } from "./shared-project.js";
 
 const execFileAsync = promisify(execFile);
 const PACKAGE_ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
@@ -26,6 +26,7 @@ const TELEGRAM_COMMANDS = [
   { command: "cwd", description: "Show the current remote working directory" },
   { command: "runtime", description: "Show active runtime status" },
   { command: "room", description: "Show shared room status" },
+  { command: "mode", description: "Show or set shared room mode" },
   { command: "claim", description: "Claim operator control for a shared project" },
   { command: "release", description: "Release operator control for a shared project" },
   { command: "sessions", description: "List recent remote sessions" },
@@ -198,6 +199,7 @@ function buildRemoteHelp() {
     "<code>/new-project &lt;name&gt;</code> create a folder on Desktop and switch into it",
     "<code>/runtime</code> show active provider/model/runtime state",
     "<code>/room</code> show shared project room status",
+    "<code>/mode</code> or <code>/mode &lt;chat|plan|execute&gt;</code> inspect or change shared room mode",
     "<code>/claim</code> claim operator control for a shared project",
     "<code>/release</code> release operator control for a shared project",
     "<code>/sessions</code> list recent linked remote sessions",
@@ -282,6 +284,7 @@ function formatTelegramRoomMarkup(project) {
     "<b>Shared room</b>",
     `project: <code>${escapeTelegramHtml(project.projectName || "")}</code>`,
     `mode: <code>${escapeTelegramHtml(project.mode || "single-operator")}</code>`,
+    `room mode: <code>${escapeTelegramHtml(project.roomMode || "chat")}</code>`,
     `room: <code>${escapeTelegramHtml(roomLabel)}</code>`,
     `active operator: <code>${escapeTelegramHtml(active)}</code>`,
     "<b>Members</b>",
@@ -620,6 +623,14 @@ class TelegramGateway {
     const { session, project } = await this.loadSharedProjectForSession(sessionId);
     if (!project?.enabled) return { ok: true, project: null, session };
     const bound = await this.bindSharedRoomForMessage(message, sessionId);
+    if (bound.project?.roomMode !== "execute") {
+      return {
+        ok: false,
+        project: bound.project,
+        session: bound.session,
+        reason: `Shared room is in ${bound.project?.roomMode || "chat"} mode. Switch to /mode execute before running code.`
+      };
+    }
     const userId = String(message?.from?.id || "").trim();
     if (!bound.project?.activeOperator?.id) {
       return { ok: false, project: bound.project, session: bound.session, reason: "No active operator. Use /claim first." };
@@ -869,6 +880,34 @@ class TelegramGateway {
       return;
     }
 
+    if (text === "/mode") {
+      const { project } = await this.bindSharedRoomForMessage(message, sessionId);
+      await this.sendMessage(
+        message.chat.id,
+        project?.enabled
+          ? `<b>Shared room mode</b>\n<code>${escapeTelegramHtml(project.roomMode || "chat")}</code>`
+          : "This project is not shared.",
+        message.message_id
+      );
+      return;
+    }
+
+    if (text.startsWith("/mode ")) {
+      const requestedMode = text.replace("/mode", "").trim().toLowerCase();
+      const { session, project } = await this.bindSharedRoomForMessage(message, sessionId);
+      if (!project?.enabled) {
+        await this.sendMessage(message.chat.id, "This project is not shared.", message.message_id);
+        return;
+      }
+      try {
+        const next = await setSharedRoomMode(session.cwd || this.cwd, requestedMode);
+        await this.sendMessage(message.chat.id, `Shared room mode set to <code>${escapeTelegramHtml(next.roomMode)}</code>`, message.message_id);
+      } catch (error) {
+        await this.sendMessage(message.chat.id, escapeTelegramHtml(error instanceof Error ? error.message : String(error)), message.message_id);
+      }
+      return;
+    }
+
     if (text === "/claim") {
       const { session, project } = await this.bindSharedRoomForMessage(message, sessionId);
       if (!project?.enabled) {

package/src/shared-project.js

@@ -37,6 +37,9 @@ function normalizeSharedProject(project = {}, cwd = process.cwd()) {
       title: String(project.room?.title || "").trim()
     },
     mode: String(project.mode || "single-operator").trim() || "single-operator",
+    roomMode: ["chat", "plan", "execute"].includes(String(project.roomMode || "").trim())
+      ? String(project.roomMode).trim()
+      : "chat",
     members,
     activeOperator: activeOperator?.id ? activeOperator : null,
     approvalPolicy: String(project.approvalPolicy || "owner").trim() || "owner",
@@ -85,6 +88,7 @@ function defaultRoundtableContent(project) {
     "## Project",
     `- Name: ${project.projectName}`,
     `- Mode: ${project.mode}`,
+    `- Room mode: ${project.roomMode}`,
     `- Approval policy: ${project.approvalPolicy}`,
     project.room?.provider ? `- Room: ${project.room.provider} ${project.room.chatId || ""}`.trim() : "- Room: not linked",
     "",
@@ -196,6 +200,21 @@ export async function setSharedRoom(cwd, room = {}) {
   return next;
 }
 
+export async function setSharedRoomMode(cwd, roomMode = "chat") {
+  const existing = await loadSharedProject(cwd);
+  if (!existing?.enabled) throw new Error("Project is not shared.");
+  const normalized = String(roomMode || "").trim().toLowerCase();
+  if (!["chat", "plan", "execute"].includes(normalized)) {
+    throw new Error("Invalid room mode. Expected one of chat, plan, execute.");
+  }
+  const next = await saveSharedProject(cwd, {
+    ...existing,
+    roomMode: normalized
+  });
+  await appendRoundtableEvent(cwd, `- ${new Date().toISOString()}: room mode set to ${normalized}`);
+  return next;
+}
+
 export async function claimSharedOperator(cwd, operator = {}) {
   const existing = await loadSharedProject(cwd);
   if (!existing?.enabled) throw new Error("Project is not shared.");
@@ -245,6 +264,7 @@ export function formatSharedProjectStatus(project) {
     cwd: project.cwd,
     room: project.room,
     mode: project.mode,
+    roomMode: project.roomMode,
     approvalPolicy: project.approvalPolicy,
     activeOperator: project.activeOperator,
     members: project.members