@tritard/waterbrother 0.16.51 → 0.16.53

package/package.json

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

package/src/gateway.js

@@ -270,19 +270,28 @@ function formatGatewaySessionStatus({ sessionId, userId, username, cwd, runtimeP
   return bits.join("\n");
 }
 
-function formatTelegramProjectMarkup({ cwd, project, chatId = "", title = "" }) {
+function formatTelegramSummaryMarkup({ cwd, project, chatId = "", title = "", executor = {} }) {
+  const roomLabel = project?.room?.chatId
+    ? `${project.room.provider || "telegram"} ${project.room.chatId}${project.room.title ? ` (${project.room.title})` : ""}`
+    : "not linked";
+  const activeOperator = project?.activeOperator?.id
+    ? `${project.activeOperator.name || project.activeOperator.id} (${project.activeOperator.id})`
+    : "none";
   const lines = [
-    "<b>Linked project</b>",
+    "<b>Project summary</b>",
+    `project: <code>${escapeTelegramHtml(project?.projectName || path.basename(cwd || "") || "-")}</code>`,
     `cwd: <code>${escapeTelegramHtml(cwd || "-")}</code>`,
-    `name: <code>${escapeTelegramHtml(project?.projectName || path.basename(cwd || "") || "-")}</code>`,
     `shared: <code>${project?.enabled ? "yes" : "no"}</code>`
   ];
   if (project?.enabled) {
     lines.push(`room mode: <code>${escapeTelegramHtml(project.roomMode || "chat")}</code>`);
-    lines.push(
-      `bound chat: <code>${escapeTelegramHtml(project.room?.provider === "telegram" && project.room?.chatId ? `${project.room.provider} ${project.room.chatId}` : "none")}</code>`
-    );
+    lines.push(`bound chat: <code>${escapeTelegramHtml(roomLabel)}</code>`);
+    lines.push(`active operator: <code>${escapeTelegramHtml(activeOperator)}</code>`);
     lines.push(`members: <code>${escapeTelegramHtml(String((project.members || []).length))}</code>`);
+    if (executor?.surface) lines.push(`executor: <code>${escapeTelegramHtml(executor.surface)}</code>`);
+    if (executor?.provider && executor?.model) {
+      lines.push(`runtime: <code>${escapeTelegramHtml(`${executor.provider}/${executor.model}`)}</code>`);
+    }
   }
   if (!project?.enabled) {
     lines.push("Use <code>/project share</code> to turn on Roundtable for this project in this chat.");
@@ -292,6 +301,10 @@ function formatTelegramProjectMarkup({ cwd, project, chatId = "", title = "" })
   return lines.join("\n");
 }
 
+function formatTelegramProjectMarkup({ cwd, project, chatId = "", title = "" }) {
+  return formatTelegramSummaryMarkup({ cwd, project, chatId, title });
+}
+
 function normalizeTelegramProjectIntentText(text = "") {
   return String(text || "").trim().replace(/\s+/g, " ");
 }
@@ -519,6 +532,31 @@ function formatTelegramRoomMarkup(project, options = {}) {
   ].join("\n");
 }
 
+function formatOwnerActionMarkup({
+  title = "Roundtable update",
+  projectName = "",
+  cwd = "",
+  paired = null,
+  member = null,
+  role = "",
+  targetName = "",
+  targetId = "",
+  note = ""
+} = {}) {
+  const lines = [
+    `<b>${escapeTelegramHtml(title)}</b>`,
+    targetName || targetId ? `person: <code>${escapeTelegramHtml(targetName || targetId)}</code>` : "",
+    targetId ? `user id: <code>${escapeTelegramHtml(targetId)}</code>` : "",
+    paired === null ? "" : `paired: <code>${paired ? "yes" : "no"}</code>`,
+    member === null ? "" : `project member: <code>${member ? "yes" : "no"}</code>`,
+    role ? `role: <code>${escapeTelegramHtml(role)}</code>` : "",
+    projectName ? `project: <code>${escapeTelegramHtml(projectName)}</code>` : "",
+    cwd ? `cwd: <code>${escapeTelegramHtml(cwd)}</code>` : "",
+    note ? escapeTelegramHtml(note) : ""
+  ].filter(Boolean);
+  return lines.join("\n");
+}
+
 function formatTelegramMembersMarkup(project) {
   if (!project?.enabled) {
     return "This project is not shared.";
@@ -1005,6 +1043,15 @@ class TelegramGateway {
     if (!value) {
       throw new Error("member target is required");
     }
+    const replied = this.describeTelegramUser(message?.reply_to_message?.from || {});
+    const normalizedPronoun = value.toLowerCase().replace(/[?.!]+$/g, "").trim();
+    if (["him", "her", "them", "this person", "this user", "that person", "that user"].includes(normalizedPronoun)) {
+      if (replied.userId) {
+        const knownReply = this.listKnownChatPeople(message).find((person) => person.userId === replied.userId) || replied;
+        return { userId: replied.userId, displayName: knownReply.displayName || replied.displayName || replied.userId };
+      }
+      throw new Error("Reply to the person's message first, or use /people to choose them by name or id.");
+    }
     if (/^\d+$/.test(value) || value.startsWith("@")) {
       const match = this.resolveInviteTarget(message, value);
       return { userId: match.userId, displayName: match.displayName };
@@ -1016,6 +1063,17 @@ class TelegramGateway {
     if (exact) {
       return { userId: exact.userId, displayName: exact.displayName || exact.userId };
     }
+    const byFirstName = known.filter((person) => {
+      const display = String(person.displayName || "").trim().toLowerCase();
+      const first = display.split(/\s+/).filter(Boolean)[0] || "";
+      return first === normalized;
+    });
+    if (byFirstName.length === 1) {
+      return { userId: byFirstName[0].userId, displayName: byFirstName[0].displayName || byFirstName[0].userId };
+    }
+    if (byFirstName.length > 1) {
+      throw new Error(`Multiple Telegram users matched first name ${value}. Use /people and choose by id or full name.`);
+    }
     const partial = known.filter((person) => {
       const display = String(person.displayName || "").trim().toLowerCase();
       const handle = String(person.usernameHandle || "").trim().toLowerCase();
@@ -1050,7 +1108,16 @@ class TelegramGateway {
       return {
         kind: "member",
         project: nextProject,
-        markup: `Updated <code>${escapeTelegramHtml(target.displayName || target.userId)}</code> to <code>${escapeTelegramHtml(intent.role)}</code> in this shared project.`
+        markup: formatOwnerActionMarkup({
+          title: "Roundtable member updated",
+          projectName: nextProject.projectName || path.basename(session.cwd || this.cwd),
+          cwd: session.cwd || this.cwd,
+          paired: true,
+          member: true,
+          role: intent.role,
+          targetName: target.displayName || target.userId,
+          targetId: target.userId
+        })
       };
     }
     const known = this.listKnownChatPeople(message);
@@ -1068,7 +1135,16 @@ class TelegramGateway {
     return {
       kind: "member",
       project: nextProject,
-      markup: `${pairedNow ? `Paired <code>${escapeTelegramHtml(target.displayName || target.userId)}</code> <i>(${escapeTelegramHtml(target.userId)})</i> and ` : ""}added <code>${escapeTelegramHtml(target.displayName || target.userId)}</code> to this shared project as <code>${escapeTelegramHtml(intent.role)}</code>.`
+      markup: formatOwnerActionMarkup({
+        title: pairedNow ? "Paired and added to Roundtable" : "Added to Roundtable",
+        projectName: nextProject.projectName || path.basename(session.cwd || this.cwd),
+        cwd: session.cwd || this.cwd,
+        paired: true,
+        member: true,
+        role: intent.role,
+        targetName: target.displayName || target.userId,
+        targetId: target.userId
+      })
     };
   }
 
@@ -1078,7 +1154,7 @@ class TelegramGateway {
     const known = this.listKnownChatPeople(message);
 
     if (intent.action === "project-status") {
-      return formatTelegramProjectMarkup({
+      return formatTelegramSummaryMarkup({
         cwd,
         project,
         chatId: String(message.chat.id),
@@ -1454,7 +1530,15 @@ class TelegramGateway {
       runtimeProfile: project?.runtimeProfile || this.channel.defaultRuntimeProfile || this.gateway.defaultRuntimeProfile || "",
       hostSessionId: host?.sessionId || ""
     };
-    return project?.enabled ? formatTelegramRoomMarkup(project, { executor }) : "<b>Shared room</b>\nThis project is not shared.";
+    return project?.enabled
+      ? `${formatTelegramSummaryMarkup({
+          cwd: project.cwd || this.cwd,
+          project,
+          chatId: String(message.chat.id),
+          title: String(message.chat.title || "").trim(),
+          executor
+        })}\n\n${formatTelegramRoomMarkup(project, { executor })}`
+      : "<b>Shared room</b>\nThis project is not shared.";
   }
 
   async ensureSharedOperator(message, sessionId) {
@@ -1776,9 +1860,18 @@ class TelegramGateway {
       }
       try {
         const result = await this.pairKnownTelegramUser(message, rawTarget);
+        const pairSession = await loadSession(sessionId);
         await this.sendMarkup(
           message.chat.id,
-          `Paired <code>${escapeTelegramHtml(result.displayName)}</code> <i>(${escapeTelegramHtml(result.userId)})</i> via <code>${escapeTelegramHtml(result.configPath)}</code>.`,
+          formatOwnerActionMarkup({
+            title: "Telegram user paired",
+            projectName: path.basename(pairSession.cwd || this.cwd),
+            cwd: pairSession.cwd || this.cwd,
+            paired: true,
+            targetName: result.displayName,
+            targetId: result.userId,
+            note: `via ${result.configPath}`
+          }),
           message.message_id
         );
       } catch (error) {
@@ -1789,13 +1882,19 @@ class TelegramGateway {
 
     if (text === "/project") {
       const { session, project } = await this.bindSharedRoomForMessage(message, sessionId);
+      const host = await this.getLiveBridgeHost();
       await this.sendMarkup(
         message.chat.id,
-        formatTelegramProjectMarkup({
+        formatTelegramSummaryMarkup({
           cwd: session.cwd || this.cwd,
           project,
           chatId: String(message.chat.id),
-          title: String(message.chat.title || "").trim()
+          title: String(message.chat.title || "").trim(),
+          executor: {
+            surface: host ? "live-tui" : "telegram-fallback",
+            provider: this.runtime.provider,
+            model: this.runtime.model
+          }
         }),
         message.message_id
       );
@@ -1807,7 +1906,7 @@ class TelegramGateway {
         const { session, project } = await this.ensureProjectSharedForChat(message, sessionId);
         await this.sendMarkup(
           message.chat.id,
-          `${formatTelegramProjectMarkup({
+          `${formatTelegramSummaryMarkup({
             cwd: session.cwd || this.cwd,
             project,
             chatId: String(message.chat.id),
@@ -1831,7 +1930,7 @@ class TelegramGateway {
         const result = await this.switchPeerProject(message, rawPath);
         await this.sendMarkup(
           message.chat.id,
-          `${formatTelegramProjectMarkup({
+          `${formatTelegramSummaryMarkup({
             cwd: result.cwd,
             project: result.project,
             chatId: String(message.chat.id),
@@ -1855,7 +1954,7 @@ class TelegramGateway {
         const result = await this.switchPeerProject(message, projectName, { create: true });
         await this.sendMarkup(
           message.chat.id,
-          `${formatTelegramProjectMarkup({
+          `${formatTelegramSummaryMarkup({
             cwd: result.cwd,
             project: result.project,
             chatId: String(message.chat.id),
@@ -2425,7 +2524,15 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
         const result = await this.pairKnownTelegramUser(message, pairingIntent.target);
         await this.sendMarkup(
           message.chat.id,
-          `Paired <code>${escapeTelegramHtml(result.displayName)}</code> <i>(${escapeTelegramHtml(result.userId)})</i> via <code>${escapeTelegramHtml(result.configPath)}</code>.`,
+          formatOwnerActionMarkup({
+            title: "Telegram user paired",
+            projectName: sharedBinding.project?.projectName || path.basename(sharedBinding.session.cwd || this.cwd),
+            cwd: sharedBinding.session.cwd || this.cwd,
+            paired: true,
+            targetName: result.displayName,
+            targetId: result.userId,
+            note: `via ${result.configPath}`
+          }),
           message.message_id
         );
       } catch (error) {
@@ -2445,13 +2552,19 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
     }
     const projectIntent = parseTelegramProjectIntent(promptText);
     if (projectIntent?.action === "show-project") {
+      const host = await this.getLiveBridgeHost();
       await this.sendMarkup(
         message.chat.id,
-        formatTelegramProjectMarkup({
+        formatTelegramSummaryMarkup({
           cwd: sharedBinding.session.cwd || this.cwd,
           project: sharedBinding.project,
           chatId: String(message.chat.id),
-          title: String(message.chat.title || "").trim()
+          title: String(message.chat.title || "").trim(),
+          executor: {
+            surface: host ? "live-tui" : "telegram-fallback",
+            provider: this.runtime.provider,
+            model: this.runtime.model
+          }
         }),
         message.message_id
       );
@@ -2462,7 +2575,7 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
         const { session, project } = await this.ensureProjectSharedForChat(message, sessionId);
         await this.sendMarkup(
           message.chat.id,
-          `${formatTelegramProjectMarkup({
+          `${formatTelegramSummaryMarkup({
             cwd: session.cwd || this.cwd,
             project,
             chatId: String(message.chat.id),
@@ -2480,7 +2593,7 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
         const result = await this.switchPeerProject(message, projectIntent.target);
         await this.sendMarkup(
           message.chat.id,
-          `${formatTelegramProjectMarkup({
+          `${formatTelegramSummaryMarkup({
             cwd: result.cwd,
             project: result.project,
             chatId: String(message.chat.id),
@@ -2498,7 +2611,7 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
         const result = await this.switchPeerProject(message, projectIntent.name, { create: true, share: projectIntent.share });
         await this.sendMarkup(
           message.chat.id,
-          `${formatTelegramProjectMarkup({
+          `${formatTelegramSummaryMarkup({
             cwd: result.cwd,
             project: result.project,
             chatId: String(message.chat.id),