@tritard/waterbrother 0.16.91 → 0.16.93

package/package.json

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

package/src/gateway.js

@@ -786,6 +786,12 @@ function parseTelegramStateIntent(text = "") {
   const lower = value.toLowerCase();
   if (!value) return null;
 
+  if (/^(?:are you|you(?:'re| are)?|wb|waterbrother)\s+(?:online|running|alive|there)\??$/.test(lower)
+    || /^(?:you online|you running|you there)\??$/.test(lower)
+    || /^(?:are you online|are you running|are you there)\??$/.test(lower)) {
+    return { action: "bot-status" };
+  }
+
   if (/\bwhat project\b/.test(lower) || /\bwhich project\b/.test(lower) || /\bproject is this chat\b/.test(lower) || /\bchat bound to\b/.test(lower)) {
     return { action: "project-status" };
   }
@@ -2188,6 +2194,20 @@ class TelegramGateway {
       hostSessionId: host?.sessionId || ""
     };
 
+    if (intent.action === "bot-status") {
+      const lines = [
+        "<b>Waterbrother status</b>",
+        "status: <code>online</code>",
+        `surface: <code>${escapeTelegramHtml(host ? "live-tui" : "telegram-fallback")}</code>`,
+        `room mode: <code>${escapeTelegramHtml(project?.enabled ? (project.roomMode || "chat") : "off")}</code>`,
+        project?.activeOperator?.id
+          ? `active operator: <code>${escapeTelegramHtml(project.activeOperator.name || project.activeOperator.id)}</code>`
+          : "active operator: <code>none</code>",
+        `runtime: <code>${escapeTelegramHtml(`${executor.provider || "unknown"}/${executor.model || "unknown"}`)}</code>`
+      ];
+      return lines.join("\n");
+    }
+
     if (intent.action === "accept-reviewer-concerns") {
       if (!project?.enabled) {
         return "This project is not shared.";
@@ -3148,7 +3168,7 @@ class TelegramGateway {
     const userId = String(message.from.id);
 
     if (text === "/help") {
-      await this.sendMessage(message.chat.id, buildRemoteHelp(), message.message_id);
+      await this.sendMarkup(message.chat.id, buildRemoteHelp(), message.message_id);
       return;
     }
 
@@ -3533,7 +3553,11 @@ class TelegramGateway {
       }
       try {
         const released = await releaseSharedOperator(session.cwd || this.cwd, userId, { actorId: userId });
-        await this.sendMessage(message.chat.id, released.activeOperator?.id ? await this.buildRoomMarkup(message, sessionId) : "Shared room released.", message.message_id);
+        if (released.activeOperator?.id) {
+          await this.sendMarkup(message.chat.id, await this.buildRoomMarkup(message, sessionId), message.message_id);
+        } else {
+          await this.sendMessage(message.chat.id, "Shared room released.", message.message_id);
+        }
       } catch (error) {
         await this.sendMessage(message.chat.id, escapeTelegramHtml(error instanceof Error ? error.message : String(error)), message.message_id);
       }
@@ -3689,7 +3713,7 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
         const result = await moveSharedTask(session.cwd || this.cwd, taskId, state, { actorId: userId });
         await this.sendMarkup(message.chat.id, `Moved shared task <code>${escapeTelegramHtml(result.task.id)}</code> to <code>${escapeTelegramHtml(result.task.state)}</code>`, message.message_id);
         const notice = buildTaskOwnershipNotice(result.task, { action: "move", previousAssignee: before?.assignedTo || "", previousState: before?.state || "" });
-        if (notice) await this.sendMessage(message.chat.id, notice, null, { parseMode: "HTML" });
+        if (notice) await this.sendMarkup(message.chat.id, notice);
       } catch (error) {
         await this.sendMessage(message.chat.id, escapeTelegramHtml(error instanceof Error ? error.message : String(error)), message.message_id);
       }
@@ -3712,7 +3736,7 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
         const result = await assignSharedTask(session.cwd || this.cwd, taskId, memberId, { actorId: userId });
         await this.sendMarkup(message.chat.id, `Assigned shared task <code>${escapeTelegramHtml(result.task.id)}</code> to <code>${escapeTelegramHtml(memberId)}</code>`, message.message_id);
         const notice = buildTaskOwnershipNotice(result.task, { action: "assign", previousAssignee: before?.assignedTo || "" });
-        if (notice) await this.sendMessage(message.chat.id, notice, null, { parseMode: "HTML" });
+        if (notice) await this.sendMarkup(message.chat.id, notice);
       } catch (error) {
         await this.sendMessage(message.chat.id, escapeTelegramHtml(error instanceof Error ? error.message : String(error)), message.message_id);
       }
@@ -3757,7 +3781,7 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
       }
       try {
         const result = await getSharedTaskHistory(session.cwd || this.cwd, taskId, { actorId: userId });
-        await this.sendMessage(message.chat.id, formatTelegramTaskHistoryMarkup(result), message.message_id);
+        await this.sendMarkup(message.chat.id, formatTelegramTaskHistoryMarkup(result), message.message_id);
       } catch (error) {
         await this.sendMessage(message.chat.id, escapeTelegramHtml(error instanceof Error ? error.message : String(error)), message.message_id);
       }
@@ -3779,7 +3803,7 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
         const result = await claimSharedTask(session.cwd || this.cwd, taskId, { actorId: userId });
         await this.sendMarkup(message.chat.id, `Claimed shared task <code>${escapeTelegramHtml(result.task.id)}</code>`, message.message_id);
         const notice = buildTaskOwnershipNotice(result.task, { action: "claim" });
-        if (notice) await this.sendMessage(message.chat.id, notice, null, { parseMode: "HTML" });
+        if (notice) await this.sendMarkup(message.chat.id, notice);
       } catch (error) {
         await this.sendMessage(message.chat.id, escapeTelegramHtml(error instanceof Error ? error.message : String(error)), message.message_id);
       }
@@ -3788,7 +3812,7 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
 
     if (text === "/runtime") {
       const status = await this.runRuntimeStatus();
-      await this.sendMessage(message.chat.id, formatRuntimeStatus(status), message.message_id);
+      await this.sendMarkup(message.chat.id, formatRuntimeStatus(status), message.message_id);
       return;
     }
 
@@ -3850,7 +3874,7 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
       const session = await loadSession(freshSessionId);
       session.cwd = target;
       await saveSession(session);
-      await this.sendMessage(
+      await this.sendMarkup(
         message.chat.id,
         `Started new remote session <code>${escapeTelegramHtml(freshSessionId)}</code>\nCwd: <code>${escapeTelegramHtml(target)}</code>`,
         message.message_id
@@ -3860,14 +3884,14 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
 
     if (text === "/sessions") {
       const sessions = await this.listPeerSessions(userId);
-      await this.sendMessage(message.chat.id, formatSessionListMarkup(sessionId, sessions), message.message_id);
+      await this.sendMarkup(message.chat.id, formatSessionListMarkup(sessionId, sessions), message.message_id);
       return;
     }
 
     if (text.startsWith("/resume")) {
       const nextSessionId = text.replace("/resume", "").trim();
       if (!nextSessionId) {
-        await this.sendMessage(
+        await this.sendMarkup(
           message.chat.id,
           "Usage: <code>/resume &lt;session-id&gt;</code>\nUse <code>/sessions</code> to list recent remote session ids.",
           message.message_id
@@ -3875,7 +3899,7 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
         return;
       }
       const resumedId = await this.resumePeerSession(message, nextSessionId);
-      await this.sendMessage(
+      await this.sendMarkup(
         message.chat.id,
         `Linked remote session: <code>${escapeTelegramHtml(resumedId)}</code>`,
         message.message_id
@@ -3885,7 +3909,7 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
 
     if (text === "/clear") {
       await this.clearRemoteConversation(sessionId);
-      await this.sendMessage(
+      await this.sendMarkup(
         message.chat.id,
         `Cleared conversation history for <code>${escapeTelegramHtml(sessionId)}</code>.`,
         message.message_id