@tritard/waterbrother 0.16.68 → 0.16.69

package/package.json

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

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, upsertSharedMember } from "./shared-project.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 { buildSelfAwarenessManifest, formatAboutWaterbrother, formatSelfState, resolveLocalConceptQuestion } from "./self-awareness.js";
 
 const execFileAsync = promisify(execFile);
@@ -340,6 +340,23 @@ function chooseExecutorAgent(project, fallbackExecutor = {}) {
   return null;
 }
 
+function memberRoleWeight(role = "") {
+  const normalized = String(role || "").trim().toLowerCase();
+  if (normalized === "owner") return 3;
+  if (normalized === "editor") return 2;
+  if (normalized === "observer") return 1;
+  return 0;
+}
+
+function memberHasAtLeastRole(project, memberId = "", role = "editor") {
+  const normalizedId = String(memberId || "").trim();
+  if (!normalizedId) return false;
+  const member = Array.isArray(project?.members)
+    ? project.members.find((entry) => String(entry?.id || "").trim() === normalizedId) || null
+    : null;
+  return memberRoleWeight(member?.role) >= memberRoleWeight(role);
+}
+
 function formatAgentLabel(agent = {}) {
   const label = String(agent?.label || agent?.name || "").trim();
   const role = String(agent?.role || "").trim();
@@ -479,6 +496,33 @@ function parseTelegramPairingIntent(text = "") {
   return null;
 }
 
+function parseTelegramAgentIntent(text = "") {
+  const value = normalizeTelegramProjectIntentText(text);
+  const lowered = value.toLowerCase();
+  if (!value) return null;
+  if (/^(how|what|why|when|where|who)\b/.test(lowered)) return null;
+  const roleMatch = lowered.match(/\b(executor|reviewer|standby)\b/);
+  const role = roleMatch?.[1] || "";
+  if (!role) return null;
+
+  const patterns = [
+    /^(?:have|make|set)\s+(.+?)['’]s\s+(?:bot|terminal)\s+(?:be|as|to)?\s*(?:the\s+)?(executor|reviewer|standby)\s*$/i,
+    /^(?:have|make|set)\s+(.+?)\s+(?:bot|terminal)\s+(?:be|as|to)?\s*(?:the\s+)?(executor|reviewer|standby)\s*$/i,
+    /^(.+?)['’]s\s+(?:bot|terminal)\s+should\s+(?:be\s+)?(?:the\s+)?(executor|reviewer|standby)\s*$/i,
+    /^(.+?)\s+(?:bot|terminal)\s+should\s+(?:be\s+)?(?:the\s+)?(executor|reviewer|standby)\s*$/i
+  ];
+  for (const pattern of patterns) {
+    const match = value.match(pattern);
+    if (!match) continue;
+    const target = String(match[1] || "").trim();
+    const nextRole = String(match[2] || role).trim().toLowerCase();
+    if (target && nextRole) {
+      return { action: "agent-role", target, role: nextRole };
+    }
+  }
+  return null;
+}
+
 function parseTelegramStateIntent(text = "") {
   const value = normalizeTelegramProjectIntentText(text);
   const lower = value.toLowerCase();
@@ -1490,6 +1534,41 @@ class TelegramGateway {
     };
   }
 
+  async handleConversationalAgentIntent(message, sessionId, intent) {
+    const { session, project } = await this.bindSharedRoomForMessage(message, sessionId);
+    if (!project?.enabled) {
+      throw new Error("This project is not shared yet. Use /project share first.");
+    }
+    const actorId = String(message?.from?.id || "").trim();
+    if (!memberHasAtLeastRole(project, actorId, "owner")) {
+      throw new Error("Only a shared-project owner can change terminal roles.");
+    }
+    const actor = this.describeTelegramUser(message?.from || {});
+    const targetAgent = resolveProjectAgent(project, intent.target);
+    if (!targetAgent) {
+      throw new Error(`No terminal found for ${intent.target}. Ask them to connect their Waterbrother bot/terminal first.`);
+    }
+    const nextProject = await upsertSharedAgent(session.cwd || this.cwd, {
+      ...targetAgent,
+      role: intent.role
+    }, {
+      actorId,
+      actorName: actor.displayName || actorId
+    });
+    return {
+      kind: "agent",
+      project: nextProject,
+      markup: [
+        "<b>Roundtable terminal updated</b>",
+        `owner: <code>${escapeTelegramHtml(targetAgent.ownerName || targetAgent.ownerId || targetAgent.label || targetAgent.id || "-")}</code>`,
+        `terminal: <code>${escapeTelegramHtml(targetAgent.label || targetAgent.id || "-")}</code>`,
+        `role: <code>${escapeTelegramHtml(intent.role)}</code>`,
+        `runtime: <code>${escapeTelegramHtml(targetAgent.provider && targetAgent.model ? `${targetAgent.provider}/${targetAgent.model}` : "unknown")}</code>`,
+        `project: <code>${escapeTelegramHtml(nextProject.projectName || path.basename(session.cwd || this.cwd))}</code>`
+      ].join("\n")
+    };
+  }
+
   async handleStateIntent(message, sessionId, intent) {
     const { session, project } = await this.bindSharedRoomForMessage(message, sessionId);
     const cwd = session.cwd || this.cwd;
@@ -2962,6 +3041,16 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
       }
       return;
     }
+    const agentIntent = parseTelegramAgentIntent(promptText);
+    if (agentIntent) {
+      try {
+        const result = await this.handleConversationalAgentIntent(message, sessionId, agentIntent);
+        await this.sendMarkup(message.chat.id, result.markup, message.message_id);
+      } catch (error) {
+        await this.sendMessage(message.chat.id, escapeTelegramHtml(error instanceof Error ? error.message : String(error)), message.message_id);
+      }
+      return;
+    }
     const memberIntent = parseTelegramMemberIntent(promptText);
     if (memberIntent) {
       try {