@tritard/waterbrother 0.16.13 → 0.16.14

package/package.json

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

package/src/cli.js

@@ -2731,22 +2731,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 +2761,35 @@ 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 chooseFromInteractiveMenu({ title, options, defaultIndex = 0 }) {
@@ -6534,7 +6561,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) {
@@ -8808,6 +8858,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();