@tritard/waterbrother 0.16.80 → 0.16.81

package/package.json

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

package/src/gateway.js

@@ -1926,15 +1926,17 @@ class TelegramGateway {
             reviewerPid: Number(targetHost.pid || 0)
           }
         });
-        const content = await this.runPromptViaBridge(message, sessionId, reviewPrompt, {
+        const reviewResult = await this.runPromptViaBridge(message, sessionId, reviewPrompt, {
           explicitExecution: true,
-          targetHost
+          targetHost,
+          includeSource: true
         });
         return {
           markup: [
             "<b>Reviewer response</b>",
             `reviewer: <code>${escapeTelegramHtml(continuation.context?.ownerName || "unknown")}</code>`,
-            renderTelegramChunks(content || "(no content)").join("\n\n")
+            targetHost ? `terminal: <code>${escapeTelegramHtml(formatBridgeHostLabel(targetHost) || targetHost.sessionId || "live terminal")}</code>` : "",
+            renderTelegramChunks(reviewResult?.content || "(no content)").join("\n\n")
           ].join("\n\n")
         };
       }
@@ -2725,7 +2727,10 @@ class TelegramGateway {
         if (reply.error) {
           throw new Error(reply.error);
         }
-        return String(reply.content || "").trim() || "(no content)";
+        const content = String(reply.content || "").trim() || "(no content)";
+        return options.includeSource
+          ? { content, sourceHost: host }
+          : content;
       }
 
       const activeHost = nextBridge.activeHost || {};
@@ -2836,8 +2841,12 @@ class TelegramGateway {
     return message || null;
   }
 
-  async deliverPromptResult(chatId, replyToMessageId, previewMessage, content) {
-    const chunks = renderTelegramChunks(content);
+  async deliverPromptResult(chatId, replyToMessageId, previewMessage, content, options = {}) {
+    const sourceHost = options.sourceHost && typeof options.sourceHost === "object" ? options.sourceHost : null;
+    const sourcePrefix = sourceHost
+      ? `<b>Handled by</b>\n<code>${escapeTelegramHtml(formatBridgeHostLabel(sourceHost) || sourceHost.sessionId || "live terminal")}</code>\n\n`
+      : "";
+    const chunks = renderTelegramChunks(`${sourcePrefix}${String(content || "")}`);
     if (!chunks.length) {
       if (previewMessage?.message_id) {
         await this.editMessage(chatId, previewMessage.message_id, "(no content)");
@@ -3957,13 +3966,17 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
         return;
       }
       previewMessage = await this.sendProgressMessage(message.chat.id, message.message_id);
-      const content = (await this.runPromptViaBridge(message, sessionId, promptText, {
+      const result = (await this.runPromptViaBridge(message, sessionId, promptText, {
         explicitExecution: shouldExecutePrompt,
-        targetHost: selectedLiveHost || host || null
+        targetHost: selectedLiveHost || host || null,
+        includeSource: true
       }))
         ?? (await this.runPromptFallback(sessionId, promptText));
-      await this.deliverPromptResult(message.chat.id, message.message_id, previewMessage, content);
-      await this.rememberContinuation(message, content);
+      const finalContent = typeof result === "string" ? result : String(result?.content || "").trim();
+      await this.deliverPromptResult(message.chat.id, message.message_id, previewMessage, finalContent, {
+        sourceHost: typeof result === "string" ? null : (result?.sourceHost || null)
+      });
+      await this.rememberContinuation(message, finalContent);
     } catch (error) {
       await this.deliverPromptFailure(message.chat.id, message.message_id, previewMessage, error);
     } finally {