CLI: remove relay/heartbeat legacy commands

src/cli/program.ts

@@ -9,23 +9,10 @@ import { loadConfig } from "../config/config.js";
 import { callGateway, randomIdempotencyKey } from "../gateway/call.js";
 import { startGatewayServer } from "../gateway/server.js";
 import { danger, info, setVerbose } from "../globals.js";
-import { acquireRelayLock, RelayLockError } from "../infra/relay-lock.js";
-import { getResolvedLoggerSettings } from "../logging.js";
-import {
-  loginWeb,
-  logoutWeb,
-  monitorWebProvider,
-  resolveHeartbeatRecipients,
-  runWebHeartbeatOnce,
-  type WebMonitorTuning,
-} from "../provider-web.js";
+import { loginWeb, logoutWeb } from "../provider-web.js";
 import { runRpcLoop } from "../rpc/loop.js";
 import { defaultRuntime } from "../runtime.js";
 import { VERSION } from "../version.js";
-import {
-  resolveHeartbeatSeconds,
-  resolveReconnectPolicy,
-} from "../web/reconnect.js";
 import {
   ensureWebChatServerFromConfig,
   startWebChatServer,
@@ -80,20 +67,16 @@ export function buildProgram() {
       "Send via your web session and print JSON result.",
     ],
     [
-      "clawdis relay --verbose",
-      "Auto-reply loop using your linked web session.",
+      "clawdis gateway --port 18789",
+      "Run the WebSocket Gateway locally.",
     ],
     [
-      "clawdis heartbeat --verbose",
-      "Send a heartbeat ping to your active session or first allowFrom contact.",
-    ],
-    [
-      "clawdis status",
-      "Show web session health and recent session recipients.",
+      "clawdis gw:status",
+      "Fetch Gateway status over WS.",
     ],
     [
       'clawdis agent --to +15555550123 --message "Run summary" --deliver',
-      "Talk directly to the agent using the same session handling; optionally send the WhatsApp reply.",
+      "Talk directly to the agent using the Gateway; optionally send the WhatsApp reply.",
     ],
     [
       'clawdis send --provider telegram --to @mychat --message "Hi"',
@@ -246,91 +229,6 @@ Examples:
       await runRpcLoop({ input: process.stdin, output: process.stdout });
       await new Promise<never>(() => {});
     });
-
-  program
-    .command("heartbeat")
-    .description("Trigger a heartbeat or manual send once (web provider only)")
-    .option("--to <number>", "Override target E.164; defaults to allowFrom[0]")
-    .option(
-      "--session-id <id>",
-      "Force a session id for this heartbeat (resumes a specific Pi session)",
-    )
-    .option(
-      "--all",
-      "Send heartbeat to all active sessions (or allowFrom entries when none)",
-      false,
-    )
-    .option(
-      "--message <text>",
-      "Send a custom message instead of the heartbeat probe",
-    )
-    .option("--body <text>", "Alias for --message")
-    .option("--dry-run", "Print the resolved payload without sending", false)
-    .option("--verbose", "Verbose logging", false)
-    .addHelpText(
-      "after",
-      `
-Examples:
-  clawdis heartbeat                 # uses web session + first allowFrom contact
-  clawdis heartbeat --verbose       # prints detailed heartbeat logs
-  clawdis heartbeat --to +1555123   # override destination
-  clawdis heartbeat --session-id <uuid> --to +1555123   # resume a specific session
-  clawdis heartbeat --message "Ping"
-  clawdis heartbeat --all           # send to every active session recipient or allowFrom entry`,
-    )
-    .action(async (opts) => {
-      setVerbose(Boolean(opts.verbose));
-      const cfg = loadConfig();
-      const allowAll = Boolean(opts.all);
-      const resolution = resolveHeartbeatRecipients(cfg, {
-        to: opts.to,
-        all: allowAll,
-      });
-      if (
-        !opts.to &&
-        !allowAll &&
-        resolution.source === "session-ambiguous" &&
-        resolution.recipients.length > 1
-      ) {
-        defaultRuntime.error(
-          danger(
-            `Multiple active sessions found (${resolution.recipients.join(", ")}). Pass --to <E.164> or --all to send to all.`,
-          ),
-        );
-        defaultRuntime.exit(1);
-      }
-      const recipients = resolution.recipients;
-      if (!recipients || recipients.length === 0) {
-        defaultRuntime.error(
-          danger(
-            "No destination found. Add inbound.allowFrom numbers or pass --to <E.164>.",
-          ),
-        );
-        defaultRuntime.exit(1);
-      }
-
-      const overrideBody =
-        (opts.message as string | undefined) ||
-        (opts.body as string | undefined) ||
-        undefined;
-      const dryRun = Boolean(opts.dryRun);
-
-      try {
-        for (const to of recipients) {
-          await runWebHeartbeatOnce({
-            to,
-            verbose: Boolean(opts.verbose),
-            runtime: defaultRuntime,
-            sessionId: opts.sessionId,
-            overrideBody,
-            dryRun,
-          });
-        }
-      } catch {
-        defaultRuntime.exit(1);
-      }
-    });
-
   program
     .command("gateway")
     .description("Run the WebSocket Gateway (replaces relay)")
@@ -505,339 +403,6 @@ Examples:
         }
       }),
   );
-
-  program
-    .command("relay")
-    .description(
-      "Auto-reply to inbound messages across configured providers (web, Telegram)",
-    )
-    .option(
-      "--provider <auto|web|telegram|all>",
-      "Which providers to start: auto (default), web, telegram, or all",
-    )
-    .option(
-      "--web-heartbeat <seconds>",
-      "Heartbeat interval for web relay health logs (seconds)",
-    )
-    .option(
-      "--web-retries <count>",
-      "Max consecutive web reconnect attempts before exit (0 = unlimited)",
-    )
-    .option(
-      "--web-retry-initial <ms>",
-      "Initial reconnect backoff for web relay (ms)",
-    )
-    .option("--web-retry-max <ms>", "Max reconnect backoff for web relay (ms)")
-    .option(
-      "--heartbeat-now",
-      "Run a heartbeat immediately when relay starts",
-      false,
-    )
-    .option(
-      "--webhook",
-      "Run Telegram webhook server instead of long-poll",
-      false,
-    )
-    .option(
-      "--webhook-path <path>",
-      "Telegram webhook path (default /telegram-webhook when webhook enabled)",
-    )
-    .option(
-      "--webhook-secret <secret>",
-      "Secret token to verify Telegram webhook requests",
-    )
-    .option("--port <port>", "Port for Telegram webhook server (default 8787)")
-    .option(
-      "--webhook-url <url>",
-      "Public Telegram webhook URL to register (overrides localhost autodetect)",
-    )
-    .option("--verbose", "Verbose logging", false)
-    .addHelpText(
-      "after",
-      `
-Examples:
-  clawdis relay                     # starts WhatsApp; also Telegram if bot token set
-  clawdis relay --provider web      # force WhatsApp-only
-  clawdis relay --provider telegram # Telegram-only (needs TELEGRAM_BOT_TOKEN)
-  clawdis relay --heartbeat-now     # send immediate agent heartbeat on start (web)
-  clawdis relay --web-heartbeat 60  # override WhatsApp heartbeat interval
-  # Troubleshooting: docs/refactor/web-relay-troubleshooting.md
-`,
-    )
-    .action(async (_opts) => {
-      defaultRuntime.error(
-        danger(
-          "`clawdis relay` is deprecated. Use the WebSocket Gateway (`clawdis gateway`) plus gw:* commands or WebChat/mac app clients.",
-        ),
-      );
-      defaultRuntime.exit(1);
-    });
-
-  // relay is deprecated; gateway is the single entry point.
-
-  program
-    .command("relay-legacy")
-    .description(
-      "(Deprecated) legacy relay for web/telegram; use `gateway` instead",
-    )
-    .option(
-      "--provider <auto|web|telegram|all>",
-      "Which providers to start: auto (default), web, telegram, or all",
-    )
-    .option(
-      "--web-heartbeat <seconds>",
-      "Heartbeat interval for web relay health logs (seconds)",
-    )
-    .option(
-      "--web-retries <count>",
-      "Max consecutive web reconnect attempts before exit (0 = unlimited)",
-    )
-    .option(
-      "--web-retry-initial <ms>",
-      "Initial reconnect backoff for web relay (ms)",
-    )
-    .option("--web-retry-max <ms>", "Max reconnect backoff for web relay (ms)")
-    .option(
-      "--heartbeat-now",
-      "Run a heartbeat immediately when relay starts",
-      false,
-    )
-    .option(
-      "--webhook",
-      "Run Telegram webhook server instead of long-poll",
-      false,
-    )
-    .option(
-      "--webhook-path <path>",
-      "Telegram webhook path (default /telegram-webhook when webhook enabled)",
-    )
-    .option(
-      "--webhook-secret <secret>",
-      "Secret token to verify Telegram webhook requests",
-    )
-    .option("--port <port>", "Port for Telegram webhook server (default 8787)")
-    .option(
-      "--webhook-url <url>",
-      "Public Telegram webhook URL to register (overrides localhost autodetect)",
-    )
-    .option("--verbose", "Verbose logging", false)
-    .addHelpText(
-      "after",
-      `
-This command is legacy and will be removed. Prefer the Gateway.
-`,
-    )
-    .action(async (opts) => {
-      setVerbose(Boolean(opts.verbose));
-      const { file: logFile, level: logLevel } = getResolvedLoggerSettings();
-      defaultRuntime.log(info(`logs: ${logFile} (level ${logLevel})`));
-
-      let releaseRelayLock: (() => Promise<void>) | null = null;
-      try {
-        releaseRelayLock = await acquireRelayLock();
-      } catch (err) {
-        if (err instanceof RelayLockError) {
-          defaultRuntime.error(danger(`Relay already running: ${err.message}`));
-          defaultRuntime.exit(1);
-          return;
-        }
-        throw err;
-      }
-
-      const providerOpt = (opts.provider ?? "auto").toLowerCase();
-      const cfg = loadConfig();
-      const telegramToken =
-        process.env.TELEGRAM_BOT_TOKEN ?? cfg.telegram?.botToken;
-
-      let startWeb = false;
-      let startTelegram = false;
-      switch (providerOpt) {
-        case "web":
-          startWeb = true;
-          break;
-        case "telegram":
-          startTelegram = true;
-          break;
-        case "all":
-          startWeb = true;
-          startTelegram = true;
-          break;
-        default:
-          startWeb = true;
-          startTelegram = Boolean(telegramToken);
-          break;
-      }
-
-      if (startTelegram && !telegramToken) {
-        defaultRuntime.error(
-          danger(
-            "Telegram relay requires TELEGRAM_BOT_TOKEN or telegram.botToken in config",
-          ),
-        );
-        defaultRuntime.exit(1);
-        return;
-      }
-
-      if (!startWeb && !startTelegram) {
-        defaultRuntime.error(
-          danger("No providers selected. Use --provider web|telegram|all."),
-        );
-        defaultRuntime.exit(1);
-        return;
-      }
-
-      const webHeartbeat =
-        opts.webHeartbeat !== undefined
-          ? Number.parseInt(String(opts.webHeartbeat), 10)
-          : undefined;
-      const webRetries =
-        opts.webRetries !== undefined
-          ? Number.parseInt(String(opts.webRetries), 10)
-          : undefined;
-      const webRetryInitial =
-        opts.webRetryInitial !== undefined
-          ? Number.parseInt(String(opts.webRetryInitial), 10)
-          : undefined;
-      const webRetryMax =
-        opts.webRetryMax !== undefined
-          ? Number.parseInt(String(opts.webRetryMax), 10)
-          : undefined;
-      const heartbeatNow = Boolean(opts.heartbeatNow);
-      if (
-        webHeartbeat !== undefined &&
-        (Number.isNaN(webHeartbeat) || webHeartbeat <= 0)
-      ) {
-        defaultRuntime.error("--web-heartbeat must be a positive integer");
-        defaultRuntime.exit(1);
-      }
-      if (
-        webRetries !== undefined &&
-        (Number.isNaN(webRetries) || webRetries < 0)
-      ) {
-        defaultRuntime.error("--web-retries must be >= 0");
-        defaultRuntime.exit(1);
-      }
-      if (
-        webRetryInitial !== undefined &&
-        (Number.isNaN(webRetryInitial) || webRetryInitial <= 0)
-      ) {
-        defaultRuntime.error("--web-retry-initial must be a positive integer");
-        defaultRuntime.exit(1);
-      }
-      if (
-        webRetryMax !== undefined &&
-        (Number.isNaN(webRetryMax) || webRetryMax <= 0)
-      ) {
-        defaultRuntime.error("--web-retry-max must be a positive integer");
-        defaultRuntime.exit(1);
-      }
-      if (
-        webRetryMax !== undefined &&
-        webRetryInitial !== undefined &&
-        webRetryMax < webRetryInitial
-      ) {
-        defaultRuntime.error("--web-retry-max must be >= --web-retry-initial");
-        defaultRuntime.exit(1);
-      }
-
-      const controller = new AbortController();
-      const stopAll = () => controller.abort();
-      process.once("SIGINT", stopAll);
-
-      const runners: Array<Promise<unknown>> = [];
-
-      if (startWeb) {
-        const webTuning: WebMonitorTuning = {};
-        if (webHeartbeat !== undefined)
-          webTuning.heartbeatSeconds = webHeartbeat;
-        if (heartbeatNow) webTuning.replyHeartbeatNow = true;
-        const reconnect: WebMonitorTuning["reconnect"] = {};
-        if (webRetries !== undefined) reconnect.maxAttempts = webRetries;
-        if (webRetryInitial !== undefined)
-          reconnect.initialMs = webRetryInitial;
-        if (webRetryMax !== undefined) reconnect.maxMs = webRetryMax;
-        if (Object.keys(reconnect).length > 0) {
-          webTuning.reconnect = reconnect;
-        }
-        logWebSelfId(defaultRuntime, true);
-        const effectiveHeartbeat = resolveHeartbeatSeconds(
-          cfg,
-          webTuning.heartbeatSeconds,
-        );
-        const effectivePolicy = resolveReconnectPolicy(
-          cfg,
-          webTuning.reconnect,
-        );
-        defaultRuntime.log(
-          info(
-            `Web relay health: heartbeat ${effectiveHeartbeat}s, retries ${effectivePolicy.maxAttempts || "∞"}, backoff ${effectivePolicy.initialMs}→${effectivePolicy.maxMs}ms x${effectivePolicy.factor} (jitter ${Math.round(effectivePolicy.jitter * 100)}%)`,
-          ),
-        );
-
-        const webchatServer = await ensureWebChatServerFromConfig();
-        if (webchatServer) {
-          defaultRuntime.log(
-            info(
-              `webchat listening on http://127.0.0.1:${webchatServer.port}/webchat/`,
-            ),
-          );
-        }
-
-        runners.push(
-          monitorWebProvider(
-            Boolean(opts.verbose),
-            undefined,
-            true,
-            undefined,
-            defaultRuntime,
-            controller.signal,
-            webTuning,
-          ),
-        );
-      }
-
-      if (startTelegram) {
-        const useWebhook = Boolean(opts.webhook);
-        const telegramRunner = (async () => {
-          const { monitorTelegramProvider } = await import(
-            "../telegram/monitor.js"
-          );
-          const sharedOpts = {
-            token: telegramToken,
-            runtime: defaultRuntime,
-            abortSignal: controller.signal,
-          } as const;
-          if (useWebhook) {
-            const port = opts.port
-              ? Number.parseInt(String(opts.port), 10)
-              : 8787;
-            const path = opts.webhookPath ?? "/telegram-webhook";
-            return monitorTelegramProvider({
-              ...sharedOpts,
-              useWebhook: true,
-              webhookPath: path,
-              webhookPort: port,
-              webhookSecret: opts.webhookSecret ?? cfg.telegram?.webhookSecret,
-              webhookUrl: opts.webhookUrl ?? cfg.telegram?.webhookUrl,
-            });
-          }
-          return monitorTelegramProvider(sharedOpts);
-        })();
-        runners.push(telegramRunner);
-      }
-
-      try {
-        await Promise.all(runners);
-      } catch (err) {
-        defaultRuntime.error(danger(`Relay failed: ${String(err)}`));
-        defaultRuntime.exit(1);
-      } finally {
-        if (releaseRelayLock) await releaseRelayLock();
-      }
-    });
-
-  // relay is the single entry point; heartbeat/Telegram helpers removed.
-
   program
     .command("status")
     .description("Show web session health and recent session recipients")