@tritard/waterbrother 0.16.125 → 0.16.127

package/package.json

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

package/src/channels.js

@@ -229,7 +229,7 @@ export function buildChannelOnboardingPayload(serviceId) {
         "Enable Message Content Intent before testing DMs or mentions"
       ],
       commands: [
-        "waterbrother config set-json channels '{\"discord\":{\"enabled\":true,\"botToken\":\"{env:DISCORD_BOT_TOKEN}\",\"applicationId\":\"{env:DISCORD_APPLICATION_ID}\",\"pairingMode\":\"manual\",\"allowedUserIds\":[]}}'",
+        "waterbrother config set-json channels '{\"discord\":{\"enabled\":true,\"botToken\":\"YOUR_BOT_TOKEN\",\"applicationId\":\"YOUR_APP_ID\",\"pairingMode\":\"manual\",\"allowedUserIds\":[]}}'",
         "waterbrother channels status",
         "waterbrother discord status",
         "waterbrother discord run"
@@ -237,7 +237,8 @@ export function buildChannelOnboardingPayload(serviceId) {
       notes: [
         "Start with direct messages before any guild or channel workflow.",
         "This first runtime slice handles DMs and mentions, not full Roundtable rooms yet.",
-        "Prefer explicit user allowlists."
+        "Prefer explicit user allowlists.",
+        "The interactive TUI onboarding wizard can store the Discord token and application id directly, just like Telegram."
       ]
     };
   }

package/src/cli.js

@@ -2925,7 +2925,7 @@ function isProcessAlive(pid) {
 
 async function maybeAutostartGateway(runtime, { cwd, io = console } = {}) {
   if (process.env.WATERBROTHER_GATEWAY_CHILD === "1") {
-    return { attempted: false, started: false, reason: "gateway-child" };
+    return { attempted: false, started: false, reason: "gateway-child", handles: [] };
   }
 
   const gateway = runtime?.gateway || {};
@@ -2933,38 +2933,54 @@ async function maybeAutostartGateway(runtime, { cwd, io = console } = {}) {
     ? gateway.startupChannels.map((value) => String(value || "").trim().toLowerCase()).filter(Boolean)
     : [];
 
-  if (!gateway.enabled || !startupChannels.includes("telegram")) {
-    return { attempted: false, started: false, reason: "not-configured", child: null };
+  if (!gateway.enabled || startupChannels.length === 0) {
+    return { attempted: false, started: false, reason: "not-configured", handles: [] };
   }
 
-  const telegram = runtime?.channels?.telegram || {};
-  if (!telegram.enabled || !String(telegram.botToken || "").trim()) {
-    return { attempted: false, started: false, reason: "telegram-not-ready", child: null };
-  }
+  const handles = [];
+  let attempted = false;
+  let started = false;
 
-  const processInfo = await loadGatewayProcessInfo("telegram");
-  if (isProcessAlive(processInfo.pid)) {
-    return { attempted: true, started: false, reason: "already-running", pid: processInfo.pid, child: null };
-  }
+  for (const serviceId of startupChannels) {
+    if (serviceId === "telegram") {
+      const telegram = runtime?.channels?.telegram || {};
+      if (!telegram.enabled || !String(telegram.botToken || "").trim()) continue;
+    } else if (serviceId === "discord") {
+      const discord = runtime?.channels?.discord || {};
+      if (!discord.enabled || !String(discord.botToken || "").trim() || !String(discord.applicationId || "").trim()) continue;
+    } else {
+      continue;
+    }
 
-  const child = spawn(process.execPath, [BIN_PATH, "gateway", "run", "telegram", "--skip-onboarding"], {
-    cwd,
-    stdio: "ignore",
-    env: {
-      ...process.env,
-      WATERBROTHER_GATEWAY_CHILD: "1"
+    attempted = true;
+    const processInfo = await loadGatewayProcessInfo(serviceId);
+    if (isProcessAlive(processInfo.pid)) {
+      handles.push({ service: serviceId, attempted: true, started: false, reason: "already-running", pid: processInfo.pid, child: null });
+      continue;
     }
-  });
-  child.unref();
 
-  await saveGatewayProcessInfo("telegram", {
-    pid: child.pid,
-    startedAt: new Date().toISOString(),
-    command: "gateway run telegram --skip-onboarding"
-  });
+    const child = spawn(process.execPath, [BIN_PATH, serviceId === "telegram" ? "gateway" : "discord", "run", ...(serviceId === "telegram" ? [serviceId] : []), "--skip-onboarding"].filter(Boolean), {
+      cwd,
+      stdio: "ignore",
+      env: {
+        ...process.env,
+        WATERBROTHER_GATEWAY_CHILD: "1"
+      }
+    });
+    child.unref();
+
+    await saveGatewayProcessInfo(serviceId, {
+      pid: child.pid,
+      startedAt: new Date().toISOString(),
+      command: serviceId === "telegram" ? "gateway run telegram --skip-onboarding" : "discord run --skip-onboarding"
+    });
+
+    io.log?.(dim(`${serviceId} gateway autostarted in background (pid ${child.pid})`));
+    handles.push({ service: serviceId, attempted: true, started: true, pid: child.pid, child });
+    started = true;
+  }
 
-  io.log?.(dim(`telegram gateway autostarted in background (pid ${child.pid})`));
-  return { attempted: true, started: true, pid: child.pid, child };
+  return { attempted, started, reason: handles.length ? "" : "not-ready", handles };
 }
 
 async function stopManagedGateway(service, gatewayHandle, { io = console } = {}) {
@@ -2997,8 +3013,8 @@ async function stopManagedGateway(service, gatewayHandle, { io = console } = {})
 
 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]");
+  if (!["telegram", "discord"].includes(normalized)) {
+    throw new Error("Usage: waterbrother gateway stop [telegram|discord]");
   }
   const processInfo = await loadGatewayProcessInfo(normalized);
   const pid = Number(processInfo?.pid || 0);
@@ -3694,6 +3710,87 @@ async function runOnboardingWizard(config, { cwd }) {
       console.log(dim("Skipping Telegram setup for now. You can always run `waterbrother onboarding telegram` later."));
     }
   }
+
+  const configureDiscord = await promptYesNo("Enable Discord DM control now?", {
+    input: process.stdin,
+    output: process.stdout
+  });
+  if (configureDiscord) {
+    const alreadyHaveDiscordSetup = await promptYesNo("Do you already have a Discord bot token and application id?", {
+      input: process.stdin,
+      output: process.stdout
+    });
+    if (!alreadyHaveDiscordSetup) {
+      console.log("Create a Discord application and bot, enable Message Content Intent, then come back here.");
+      console.log(dim(`Guide: ${getDocsUrl("/onboarding/discord")}`));
+      const openGuide = await promptYesNo("Open the Discord setup guide in your browser?", {
+        input: process.stdin,
+        output: process.stdout
+      });
+      if (openGuide) {
+        const opened = await maybeOpenUrl(getDocsUrl("/onboarding/discord"));
+        if (!opened) {
+          console.log(dim(`Could not open browser automatically. Visit ${getDocsUrl("/onboarding/discord")}`));
+        }
+      }
+    }
+
+    const existingDiscord = next.channels?.discord && typeof next.channels.discord === "object" ? next.channels.discord : {};
+    let discordToken = String(existingDiscord.botToken || existingDiscord.token || "").trim();
+    let discordApplicationId = String(existingDiscord.applicationId || "").trim();
+
+    if (discordToken) {
+      const keepExistingDiscordToken = await promptYesNo(`Use saved Discord bot token (${formatApiKeyHint(discordToken)})?`, {
+        input: process.stdin,
+        output: process.stdout
+      });
+      if (!keepExistingDiscordToken) {
+        discordToken = "";
+      }
+    }
+
+    while (!discordToken) {
+      const enteredDiscordToken = (await promptLine("Paste Discord bot token (Enter to skip for now): ")).trim();
+      if (!enteredDiscordToken) break;
+      discordToken = enteredDiscordToken;
+    }
+
+    if (discordApplicationId) {
+      const keepExistingDiscordAppId = await promptYesNo(`Use saved Discord application id (${discordApplicationId})?`, {
+        input: process.stdin,
+        output: process.stdout
+      });
+      if (!keepExistingDiscordAppId) {
+        discordApplicationId = "";
+      }
+    }
+
+    while (!discordApplicationId && discordToken) {
+      const enteredDiscordApplicationId = (await promptLine("Paste Discord application id (Enter to skip for now): ")).trim();
+      if (!enteredDiscordApplicationId) break;
+      discordApplicationId = enteredDiscordApplicationId;
+    }
+
+    if (discordToken && discordApplicationId) {
+      const channels = next.channels && typeof next.channels === "object" ? { ...next.channels } : {};
+      const discord = channels.discord && typeof channels.discord === "object" ? { ...channels.discord } : {};
+      channels.discord = {
+        ...discord,
+        enabled: true,
+        botToken: discordToken,
+        applicationId: discordApplicationId,
+        pairingMode: discord.pairingMode || "manual",
+        allowedUserIds: Array.isArray(discord.allowedUserIds) ? discord.allowedUserIds : []
+      };
+      next.channels = channels;
+
+      console.log(green("Discord configured for DM-first control."));
+      console.log(dim("Run `waterbrother discord run` in a second terminal when you want the Discord gateway live."));
+    } else {
+      console.log(dim("Skipping Discord setup for now. You can always run `waterbrother onboarding discord` later."));
+    }
+  }
+
   if (!next.approvalMode) next.approvalMode = 'on-request';
   if (!next.designModel) next.designModel = getDefaultDesignModelForProvider(next.provider);
   if (next.traceMode === undefined) next.traceMode = 'on';
@@ -7834,18 +7931,22 @@ Be concrete about surfaces — name actual pages/flows. Choose the best stack fo
     if (gatewayCleanupDone) return;
     gatewayCleanupDone = true;
     await clearTelegramBridgeHost();
-    if (gatewayHandle?.started && gatewayHandle?.child) {
-      await stopManagedGateway("telegram", gatewayHandle, { io: console });
+    for (const handle of Array.isArray(gatewayHandle?.handles) ? gatewayHandle.handles : []) {
+      if (handle?.started && handle?.child) {
+        await stopManagedGateway(handle.service, handle, { 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 {}
+    for (const handle of Array.isArray(gatewayHandle?.handles) ? gatewayHandle.handles : []) {
+      const pid = Number(handle?.pid || 0);
+      if (Number.isFinite(pid) && pid > 0 && isProcessAlive(pid)) {
+        try {
+          process.kill(pid, "SIGTERM");
+        } catch {}
+      }
     }
   };
   const handleExitSignal = () => {

package/src/discord.js

@@ -381,8 +381,8 @@ export async function runDiscordGateway(runtime = {}, { log = console.log, signa
             log(`discord: replied in ${msg.channel_id}`);
             return;
           }
-          if (!msg.guild_id) {
-            const bridged = await runPromptViaBridge(runtime, msg, String(msg.content || "").trim());
+          if (shouldReplyToMessage(msg, botUser?.id)) {
+            const bridged = await runPromptViaBridge(runtime, msg, extractMentionContent(String(msg.content || "").trim(), botUser?.id));
             if (bridged?.content) {
               await sendChannelMessage(discord, msg.channel_id, bridged.content);
               log(`discord: bridged reply in ${msg.channel_id}`);