@tritard/waterbrother 0.16.13 → 0.16.15

package/package.json

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

package/src/cli.js

@@ -131,6 +131,7 @@ const INTERACTIVE_COMMANDS = [
   { name: "/gateway pairings", description: "List pending Telegram pairing requests" },
   { name: "/gateway pair <user-id>", description: "Approve a pending Telegram user id" },
   { name: "/gateway unpair <user-id>", description: "Remove a paired Telegram user id" },
+  { name: "/gateway stop", description: "Stop the tracked Telegram gateway process" },
   { name: "/channels", description: "Show messaging channel readiness" },
   { name: "/agent", description: "Show active agent profile" },
   { name: "/agent <profile>", description: "Switch profile: coder|designer|reviewer|planner" },
@@ -242,6 +243,7 @@ Usage:
   waterbrother channels show <service>
   waterbrother gateway status
   waterbrother gateway run telegram
+  waterbrother gateway stop [telegram]
   waterbrother gateway pairings [telegram]
   waterbrother gateway pair [telegram] <user-id>
   waterbrother gateway unpair [telegram] <user-id>
@@ -2731,22 +2733,21 @@ async function maybeAutostartGateway(runtime, { cwd, io = console } = {}) {
     : [];
 
   if (!gateway.enabled || !startupChannels.includes("telegram")) {
-    return { attempted: false, started: false, reason: "not-configured" };
+    return { attempted: false, started: false, reason: "not-configured", child: null };
   }
 
   const telegram = runtime?.channels?.telegram || {};
   if (!telegram.enabled || !String(telegram.botToken || "").trim()) {
-    return { attempted: false, started: false, reason: "telegram-not-ready" };
+    return { attempted: false, started: false, reason: "telegram-not-ready", child: null };
   }
 
   const processInfo = await loadGatewayProcessInfo("telegram");
   if (isProcessAlive(processInfo.pid)) {
-    return { attempted: true, started: false, reason: "already-running", pid: processInfo.pid };
+    return { attempted: true, started: false, reason: "already-running", pid: processInfo.pid, child: null };
   }
 
   const child = spawn(process.execPath, [BIN_PATH, "gateway", "run", "telegram", "--skip-onboarding"], {
     cwd,
-    detached: true,
     stdio: "ignore",
     env: {
       ...process.env,
@@ -2762,7 +2763,50 @@ async function maybeAutostartGateway(runtime, { cwd, io = console } = {}) {
   });
 
   io.log?.(dim(`telegram gateway autostarted in background (pid ${child.pid})`));
-  return { attempted: true, started: true, pid: child.pid };
+  return { attempted: true, started: true, pid: child.pid, child };
+}
+
+async function stopManagedGateway(service, gatewayHandle, { io = console } = {}) {
+  const pid = Number(gatewayHandle?.pid || 0);
+  if (!Number.isFinite(pid) || pid <= 0 || !isProcessAlive(pid)) {
+    return false;
+  }
+  try {
+    process.kill(pid, "SIGTERM");
+  } catch {
+    return false;
+  }
+
+  const deadline = Date.now() + 2500;
+  while (Date.now() < deadline) {
+    if (!isProcessAlive(pid)) {
+      await saveGatewayProcessInfo(service, { pid: 0, startedAt: "", command: "" });
+      return true;
+    }
+    await new Promise((resolve) => setTimeout(resolve, 100));
+  }
+
+  try {
+    process.kill(pid, "SIGKILL");
+  } catch {}
+  await saveGatewayProcessInfo(service, { pid: 0, startedAt: "", command: "" });
+  io.log?.(dim(`${service} gateway forced down on TUI exit`));
+  return true;
+}
+
+async function stopTrackedGateway(service = "telegram", { io = console } = {}) {
+  const normalized = String(service || "telegram").trim().toLowerCase();
+  if (normalized !== "telegram") {
+    throw new Error("Usage: waterbrother gateway stop [telegram]");
+  }
+  const processInfo = await loadGatewayProcessInfo(normalized);
+  const pid = Number(processInfo?.pid || 0);
+  if (!Number.isFinite(pid) || pid <= 0 || !isProcessAlive(pid)) {
+    await saveGatewayProcessInfo(normalized, { pid: 0, startedAt: "", command: "" });
+    return { stopped: false, pid: 0 };
+  }
+  const stopped = await stopManagedGateway(normalized, { pid }, { io });
+  return { stopped, pid };
 }
 
 async function chooseFromInteractiveMenu({ title, options, defaultIndex = 0 }) {
@@ -3533,7 +3577,20 @@ async function runGatewayCommand(positional, runtime, { cwd = process.cwd(), asJ
     return;
   }
 
-  throw new Error("Usage: waterbrother gateway status|run <telegram>|pairings [telegram]|pair [telegram] <user-id>|unpair [telegram] <user-id>");
+  if (sub === "stop") {
+    const service = String(positional[2] || "telegram").trim().toLowerCase();
+    const result = await stopTrackedGateway(service, { io: console });
+    if (asJson) {
+      printData({ ok: true, service, stopped: result.stopped, pid: result.pid }, true);
+    } else if (result.stopped) {
+      console.log(`Stopped ${service} gateway process ${result.pid}`);
+    } else {
+      console.log(`No running ${service} gateway process found`);
+    }
+    return;
+  }
+
+  throw new Error("Usage: waterbrother gateway status|run <telegram>|stop [telegram]|pairings [telegram]|pair [telegram] <user-id>|unpair [telegram] <user-id>");
 }
 
 async function runMcpCommand(positional, runtime, { cwd, asJson = false } = {}) {
@@ -6534,7 +6591,30 @@ Be concrete about surfaces — name actual pages/flows. Choose the best stack fo
     }
   }
 
-  await maybeAutostartGateway(context.runtime, { cwd: context.cwd });
+  const gatewayHandle = await maybeAutostartGateway(context.runtime, { cwd: context.cwd });
+  let gatewayCleanupDone = false;
+  const cleanupManagedGateway = async () => {
+    if (gatewayCleanupDone) return;
+    gatewayCleanupDone = true;
+    if (gatewayHandle?.started && gatewayHandle?.child) {
+      await stopManagedGateway("telegram", gatewayHandle, { io: console });
+    }
+  };
+  const cleanupManagedGatewaySync = () => {
+    if (gatewayCleanupDone) return;
+    gatewayCleanupDone = true;
+    const pid = Number(gatewayHandle?.pid || 0);
+    if (Number.isFinite(pid) && pid > 0 && isProcessAlive(pid)) {
+      try {
+        process.kill(pid, "SIGTERM");
+      } catch {}
+    }
+  };
+  const handleExitSignal = () => {
+    cleanupManagedGatewaySync();
+  };
+  process.once("SIGINT", handleExitSignal);
+  process.once("SIGTERM", handleExitSignal);
   printInteractiveHeader({ runtime: context.runtime, agent, cwd: context.cwd });
   console.log("Interactive mode. Type /exit to quit, /help for commands.");
   if (process.stdout.isTTY) {
@@ -7148,6 +7228,20 @@ Be concrete about surfaces — name actual pages/flows. Choose the best stack fo
       continue;
     }
 
+    if (line === "/gateway stop") {
+      try {
+        const result = await stopTrackedGateway("telegram", { io: console });
+        if (result.stopped) {
+          console.log(`Stopped telegram gateway process ${result.pid}`);
+        } else {
+          console.log("No running telegram gateway process found");
+        }
+      } catch (error) {
+        console.log(`gateway stop failed: ${error instanceof Error ? error.message : String(error)}`);
+      }
+      continue;
+    }
+
     if (line === "/channels") {
       for (const status of getChannelStatuses(context.runtime)) {
         console.log(formatChannelStatusLine(status));
@@ -8808,6 +8902,10 @@ Be concrete about surfaces — name actual pages/flows. Choose the best stack fo
     }
   }
 
+  await cleanupManagedGateway();
+  process.off("SIGINT", handleExitSignal);
+  process.off("SIGTERM", handleExitSignal);
+
   // Kill any running preview server
   killPreview();