@tritard/waterbrother 0.16.103 → 0.16.105

package/package.json

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

package/src/gateway.js

@@ -519,7 +519,7 @@ function getAgentOwnerDisplay(agent = {}, fallback = "") {
   const ownerId = cleanAgentDisplayValue(agent?.ownerId);
   const label = cleanAgentDisplayValue(agent?.label);
   const fallbackValue = cleanAgentDisplayValue(fallback);
-  return ownerName || ownerId || fallbackValue || label || "unknown";
+  return ownerName || fallbackValue || label || ownerId || "unknown";
 }
 
 function getAgentTerminalDisplay(agent = {}, fallback = "") {
@@ -536,9 +536,10 @@ function getAgentTerminalDisplay(agent = {}, fallback = "") {
 function formatBridgeHostLabel(host = {}) {
   const owner = String(host?.ownerName || host?.ownerId || "").trim();
   const label = String(host?.label || "").trim();
+  const sessionSuffix = String(host?.sessionId || "").trim().slice(-6);
   const runtime = host?.provider && host?.model ? `${host.provider}/${host.model}` : "";
   const safeLabel = label && !/\bundefined\b/i.test(label) ? label : "";
-  const primary = owner || safeLabel || "live terminal";
+  const primary = owner || safeLabel || (sessionSuffix ? `terminal ${sessionSuffix}` : "live terminal");
   return [primary, safeLabel && safeLabel !== owner ? `(${safeLabel})` : "", runtime ? `[${runtime}]` : ""].filter(Boolean).join(" ").trim();
 }
 
@@ -2048,6 +2049,23 @@ class TelegramGateway {
     if (!targetAgent) {
       targetAgent = resolveProjectAgent(project, intent.target);
     }
+    if (targetAgent) {
+      const liveHosts = await this.getLiveBridgeHosts({ cwd: session.cwd || this.cwd });
+      const liveHost = findLiveHostForAgent(liveHosts, targetAgent);
+      if (liveHost) {
+        targetAgent = {
+          ...targetAgent,
+          ownerId: String(liveHost.ownerId || targetAgent.ownerId || "").trim(),
+          ownerName: String(liveHost.ownerName || targetAgent.ownerName || "").trim(),
+          label: String(liveHost.label || targetAgent.label || "").trim(),
+          surface: String(liveHost.surface || targetAgent.surface || "").trim(),
+          provider: String(liveHost.provider || targetAgent.provider || "").trim(),
+          model: String(liveHost.model || targetAgent.model || "").trim(),
+          runtimeProfile: String(liveHost.runtimeProfile || targetAgent.runtimeProfile || "").trim(),
+          sessionId: String(liveHost.sessionId || targetAgent.sessionId || "").trim()
+        };
+      }
+    }
     if (!targetAgent && /^(?:this|my)(?:\s+(?:bot|terminal))?$/.test(normalizedTarget)) {
       const host = await this.getLiveBridgeHost();
       if (host) {
@@ -3570,7 +3588,11 @@ class TelegramGateway {
     const linkedSession = await loadSession(sessionId);
     const sessionCwd = linkedSession.cwd || this.cwd;
     const linkedProject = await loadSharedProject(sessionCwd).catch(() => null);
-    await this.maybeAnnounceRoomAgentEvents(message, linkedProject);
+    const preflightText = text.startsWith("/") ? "" : this.stripBotMention(text);
+    const preflightStateIntent = preflightText ? parseTelegramStateIntent(preflightText) : null;
+    if (!preflightStateIntent) {
+      await this.maybeAnnounceRoomAgentEvents(message, linkedProject);
+    }
 
     if (text === "/about") {
       await this.sendMessage(