@tritard/waterbrother 0.16.63 → 0.16.64

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tritard/waterbrother",
-  "version": "0.16.63",
+  "version": "0.16.64",
   "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

@@ -18,11 +18,24 @@ function gatewayBridgePath(serviceId) {
 }
 
 function normalizeGatewayState(parsed = {}) {
+  const continuations = parsed?.continuations && typeof parsed.continuations === "object" ? parsed.continuations : {};
   return {
     offset: Number.isFinite(Number(parsed?.offset)) ? Math.max(0, Math.floor(Number(parsed.offset))) : 0,
     peers: parsed?.peers && typeof parsed.peers === "object" ? parsed.peers : {},
     pendingPairings: parsed?.pendingPairings && typeof parsed.pendingPairings === "object" ? parsed.pendingPairings : {},
-    continuations: parsed?.continuations && typeof parsed.continuations === "object" ? parsed.continuations : {}
+    continuations: Object.fromEntries(
+      Object.entries(continuations).map(([key, item]) => [
+        key,
+        {
+          chatId: String(item?.chatId || "").trim(),
+          userId: String(item?.userId || "").trim(),
+          lastPrompt: String(item?.lastPrompt || "").trim(),
+          kind: String(item?.kind || "follow-up").trim() || "follow-up",
+          source: String(item?.source || "assistant-question").trim() || "assistant-question",
+          expiresAt: String(item?.expiresAt || "").trim()
+        }
+      ])
+    )
   };
 }
 

package/src/gateway.js

@@ -754,6 +754,16 @@ function classifyTelegramGroupIntent(text = "") {
   return { kind: "chat", reason: "default non-execution" };
 }
 
+function buildContinuationPrompt(text = "", continuation = null) {
+  const body = String(text || "").trim();
+  if (!continuation?.lastPrompt) return body;
+  return [
+    `Continue the active Telegram follow-up.`,
+    `Your last question/request to this user was: ${continuation.lastPrompt}`,
+    `User reply: ${body}`
+  ].join("\n");
+}
+
 function suggestTaskText(text = "") {
   return String(text || "")
     .replace(/^@[\w_]+\s*/g, "")
@@ -991,6 +1001,15 @@ class TelegramGateway {
     return Number.isFinite(expiresAtMs) && expiresAtMs > Date.now();
   }
 
+  getPendingContinuation(message) {
+    const key = continuationKey(message?.chat?.id, message?.from?.id);
+    const item = this.state?.continuations?.[key];
+    if (!item) return null;
+    const expiresAtMs = Date.parse(String(item.expiresAt || ""));
+    if (!Number.isFinite(expiresAtMs) || expiresAtMs <= Date.now()) return null;
+    return item;
+  }
+
   clearContinuation(message) {
     const key = continuationKey(message?.chat?.id, message?.from?.id);
     if (this.state?.continuations?.[key]) {
@@ -1010,6 +1029,8 @@ 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",
       expiresAt: new Date(Date.now() + TELEGRAM_CONTINUATION_TTL_MS).toISOString()
     };
     await this.persistState();
@@ -1102,7 +1123,8 @@ class TelegramGateway {
       project.activeOperator?.id
         ? `active operator: <code>${escapeTelegramHtml(project.activeOperator.name || project.activeOperator.id)}</code>`
         : "active operator: <code>none</code>",
-      "Ask naturally here.",
+      "As observer, you can ask questions, discuss plans, and review work here.",
+      "An owner can promote you to editor or owner conversationally.",
       "Examples: <code>what project is this chat bound to?</code>, <code>who is in the room?</code>, <code>what can I do here?</code>"
     ].join("\n");
   }
@@ -1985,9 +2007,10 @@ class TelegramGateway {
     if (trustedOnboarding) {
       await this.sendMarkup(message.chat.id, this.buildTrustedRoomIntroMarkup(trustedOnboarding), message.message_id);
     }
-    this.clearContinuation(message);
 
     const text = this.normalizeTelegramCommandText(String(message.text || "").trim());
+    const continuation = this.getPendingContinuation(message);
+    this.clearContinuation(message);
     const userId = String(message.from.id);
 
     if (text === "/help" || text === "/start") {
@@ -2706,9 +2729,14 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
     }
 
     const isExplicitRun = text.startsWith("/run ");
-    const promptText = this.stripBotMention(isExplicitRun ? text.replace("/run", "").trim() : text);
+    const rawPromptText = this.stripBotMention(isExplicitRun ? text.replace("/run", "").trim() : text);
+    const promptText = continuation ? buildContinuationPrompt(rawPromptText, continuation) : rawPromptText;
     const groupIntent = this.isGroupChat(message)
-      ? (isExplicitRun ? { kind: "execution", reason: "explicit /run" } : classifyTelegramGroupIntent(promptText))
+      ? (isExplicitRun
+          ? { kind: "execution", reason: "explicit /run" }
+          : continuation
+            ? { kind: "execution", reason: "follow-up continuation" }
+            : classifyTelegramGroupIntent(rawPromptText))
       : { kind: "execution", reason: "private chat" };
     const shouldExecutePrompt = !this.isGroupChat(message) || groupIntent.kind === "execution";
     const sharedBinding = await this.bindSharedRoomForMessage(message, sessionId);