@tritard/waterbrother 0.16.78 → 0.16.79

package/package.json

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

package/src/cli.js

@@ -3107,23 +3107,49 @@ async function clearTelegramBridgeHost() {
 async function dequeueTelegramBridgeRequest({ cwd }) {
   const bridge = await loadGatewayBridge(TELEGRAM_BRIDGE_SERVICE);
   const activeHost = bridge.activeHost || {};
-  if (Number(activeHost.pid || 0) !== process.pid) {
-    return null;
-  }
-  if (activeHost.cwd && String(activeHost.cwd) !== String(cwd || "")) {
-    return null;
-  }
+  const currentHost = Number(activeHost.pid || 0) === process.pid
+    ? activeHost
+    : (Array.isArray(bridge.hosts) ? bridge.hosts.find((host) => Number(host?.pid || 0) === process.pid) : null) || {};
   const pending = Array.isArray(bridge.pendingRequests) ? bridge.pendingRequests : [];
   if (!pending.length) {
     return null;
   }
-  const [next, ...rest] = pending;
+  const nextIndex = pending.findIndex((request) => {
+    const targetPid = Number(request?.targetPid || 0);
+    const targetSessionId = String(request?.targetSessionId || "").trim();
+    if (targetPid > 0 && targetPid !== process.pid) {
+      return false;
+    }
+    if (targetSessionId && targetSessionId !== String(currentHost.sessionId || "").trim()) {
+      return false;
+    }
+    if (currentHost.cwd && String(currentHost.cwd) !== String(cwd || "")) {
+      return false;
+    }
+    return true;
+  });
+  if (nextIndex < 0) {
+    return null;
+  }
+  const next = pending[nextIndex];
+  const rest = pending.filter((_, index) => index !== nextIndex);
   bridge.pendingRequests = rest;
-  bridge.activeHost = {
-    ...activeHost,
-    updatedAt: new Date().toISOString()
-  };
-  bridge.hosts = upsertTelegramBridgeHostEntry(bridge.hosts, bridge.activeHost);
+  if (Number(currentHost.pid || 0) === process.pid) {
+    const updatedHost = {
+      ...currentHost,
+      updatedAt: new Date().toISOString()
+    };
+    if (Number(activeHost.pid || 0) === process.pid) {
+      bridge.activeHost = updatedHost;
+    }
+    bridge.hosts = upsertTelegramBridgeHostEntry(bridge.hosts, updatedHost);
+  } else if (Number(activeHost.pid || 0) === process.pid) {
+    bridge.activeHost = {
+      ...activeHost,
+      updatedAt: new Date().toISOString()
+    };
+    bridge.hosts = upsertTelegramBridgeHostEntry(bridge.hosts, bridge.activeHost);
+  }
   await saveGatewayBridge(TELEGRAM_BRIDGE_SERVICE, bridge);
   return next;
 }

package/src/gateway-state.js

@@ -54,6 +54,9 @@ function normalizeBridgeRequest(parsed = {}) {
     sessionId: String(parsed?.sessionId || "").trim(),
     text: String(parsed?.text || "").trim(),
     explicitExecution: parsed?.explicitExecution === true,
+    targetPid: Number.isFinite(Number(parsed?.targetPid)) ? Math.floor(Number(parsed.targetPid)) : 0,
+    targetSessionId: String(parsed?.targetSessionId || "").trim(),
+    targetOwnerId: String(parsed?.targetOwnerId || "").trim(),
     runtimeProfile: String(parsed?.runtimeProfile || "").trim(),
     replyToMessageId: Number.isFinite(Number(parsed?.replyToMessageId)) ? Math.floor(Number(parsed.replyToMessageId)) : 0,
     requestedAt: String(parsed?.requestedAt || "").trim(),

package/src/gateway.js

@@ -473,6 +473,16 @@ function formatBridgeHostLabel(host = {}) {
   return [owner || label, label && label !== owner ? `(${label})` : "", runtime ? `[${runtime}]` : ""].filter(Boolean).join(" ").trim();
 }
 
+function findLiveHostForAgent(hosts = [], agent = {}) {
+  const ownerId = String(agent?.ownerId || "").trim();
+  const sessionId = String(agent?.sessionId || "").trim();
+  return (Array.isArray(hosts) ? hosts : []).find((host) => {
+    const hostOwnerId = String(host?.ownerId || "").trim();
+    const hostSessionId = String(host?.sessionId || "").trim();
+    return (ownerId && hostOwnerId === ownerId) || (sessionId && hostSessionId === sessionId);
+  }) || null;
+}
+
 function getLatestBlockingReviewPolicy(project) {
   const events = Array.isArray(project?.recentEvents) ? [...project.recentEvents] : [];
   const ordered = events
@@ -2631,7 +2641,7 @@ class TelegramGateway {
   }
 
   async runPromptViaBridge(message, sessionId, promptText, options = {}) {
-    const host = await this.getLiveBridgeHost();
+    const host = options.targetHost || await this.getLiveBridgeHost();
     if (!host) {
       return null;
     }
@@ -2650,6 +2660,9 @@ class TelegramGateway {
       sessionId: String(sessionId || "").trim(),
       text: String(promptText || "").trim(),
       explicitExecution: options.explicitExecution === true,
+      targetPid: Number(host?.pid || 0),
+      targetSessionId: String(host?.sessionId || "").trim(),
+      targetOwnerId: String(host?.ownerId || "").trim(),
       runtimeProfile: String(project?.runtimeProfile || "").trim(),
       replyToMessageId: message.message_id,
       requestedAt: new Date().toISOString(),
@@ -2678,7 +2691,11 @@ class TelegramGateway {
       }
 
       const activeHost = nextBridge.activeHost || {};
-      if (Number(activeHost.pid || 0) <= 0) {
+      const knownHosts = Array.isArray(nextBridge.hosts) ? nextBridge.hosts : [];
+      if (Number(host?.pid || 0) > 0 && !knownHosts.some((item) => Number(item?.pid || 0) === Number(host.pid || 0))) {
+        break;
+      }
+      if (Number(activeHost.pid || 0) <= 0 && !(Number(host?.pid || 0) > 0)) {
         break;
       }
     }
@@ -3819,6 +3836,7 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
         });
         return;
       }
+      const liveHosts = await this.getLiveBridgeHosts({ cwd: operatorGate.session?.cwd || this.cwd });
       const host = await this.getLiveBridgeHost();
       const activeExecutor = {
         surface: host?.surface || (host ? "live-tui" : "telegram-fallback"),
@@ -3831,10 +3849,12 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
         label: host?.label || ""
       };
       const selectedExecutor = chooseExecutorAgent(operatorGate.project, activeExecutor);
+      const selectedLiveHost = selectedExecutor ? findLiveHostForAgent(liveHosts, selectedExecutor) : null;
       if (
         selectedExecutor?.ownerId
         && activeExecutor.ownerId
         && String(selectedExecutor.ownerId).trim() !== String(activeExecutor.ownerId).trim()
+        && !selectedLiveHost
       ) {
         const selectedName = String(selectedExecutor.ownerName || selectedExecutor.label || selectedExecutor.ownerId || "selected executor").trim();
         const currentName = String(activeExecutor.ownerName || activeExecutor.label || activeExecutor.ownerId || "current terminal").trim();
@@ -3871,7 +3891,10 @@ 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, { explicitExecution: shouldExecutePrompt }))
+      const content = (await this.runPromptViaBridge(message, sessionId, promptText, {
+        explicitExecution: shouldExecutePrompt,
+        targetHost: selectedLiveHost || host || null
+      }))
         ?? (await this.runPromptFallback(sessionId, promptText));
       await this.deliverPromptResult(message.chat.id, message.message_id, previewMessage, content);
       await this.rememberContinuation(message, content);