fix: provider startup order and enable flags

This commit is contained in:
Peter Steinberger
2025-12-26 16:54:53 +00:00
parent 17d9ba256b
commit ed2e738ea4
8 changed files with 127 additions and 26 deletions

View File

@@ -42,6 +42,8 @@ export type WebReconnectConfig = {
};
export type WebConfig = {
/** If false, do not start the WhatsApp web provider. Default: true. */
enabled?: boolean;
heartbeatSeconds?: number;
reconnect?: WebReconnectConfig;
};
@@ -126,6 +128,8 @@ export type HooksConfig = {
};
export type TelegramConfig = {
/** If false, do not start the Telegram provider. Default: true. */
enabled?: boolean;
botToken?: string;
requireMention?: boolean;
allowFrom?: Array<string | number>;
@@ -137,6 +141,8 @@ export type TelegramConfig = {
};
export type DiscordConfig = {
/** If false, do not start the Discord provider. Default: true. */
enabled?: boolean;
token?: string;
allowFrom?: Array<string | number>;
guildAllowFrom?: {
@@ -705,6 +711,7 @@ const ClawdisSchema = z.object({
.optional(),
web: z
.object({
enabled: z.boolean().optional(),
heartbeatSeconds: z.number().int().positive().optional(),
reconnect: z
.object({
@@ -719,6 +726,7 @@ const ClawdisSchema = z.object({
.optional(),
telegram: z
.object({
enabled: z.boolean().optional(),
botToken: z.string().optional(),
requireMention: z.boolean().optional(),
allowFrom: z.array(z.union([z.string(), z.number()])).optional(),
@@ -731,6 +739,7 @@ const ClawdisSchema = z.object({
.optional(),
discord: z
.object({
enabled: z.boolean().optional(),
token: z.string().optional(),
allowFrom: z.array(z.union([z.string(), z.number()])).optional(),
guildAllowFrom: z

View File

@@ -1829,6 +1829,17 @@ export async function startGatewayServer(
const startWhatsAppProvider = async () => {
if (whatsappTask) return;
const cfg = loadConfig();
if (cfg.web?.enabled === false) {
whatsappRuntime = {
...whatsappRuntime,
running: false,
connected: false,
lastError: "disabled",
};
logWhatsApp.info("skipping provider start (web.enabled=false)");
return;
}
if (!(await webAuthExists())) {
whatsappRuntime = {
...whatsappRuntime,
@@ -1897,6 +1908,15 @@ export async function startGatewayServer(
const startTelegramProvider = async () => {
if (telegramTask) return;
const cfg = loadConfig();
if (cfg.telegram?.enabled === false) {
telegramRuntime = {
...telegramRuntime,
running: false,
lastError: "disabled",
};
logTelegram.info("skipping provider start (telegram.enabled=false)");
return;
}
const telegramToken =
process.env.TELEGRAM_BOT_TOKEN ?? cfg.telegram?.botToken ?? "";
if (!telegramToken.trim()) {
@@ -1981,6 +2001,15 @@ export async function startGatewayServer(
const startDiscordProvider = async () => {
if (discordTask) return;
const cfg = loadConfig();
if (cfg.discord?.enabled === false) {
discordRuntime = {
...discordRuntime,
running: false,
lastError: "disabled",
};
logDiscord.info("skipping provider start (discord.enabled=false)");
return;
}
const discordToken =
process.env.DISCORD_BOT_TOKEN ?? cfg.discord?.token ?? "";
if (!discordToken.trim()) {
@@ -2057,8 +2086,8 @@ export async function startGatewayServer(
const startProviders = async () => {
await startWhatsAppProvider();
await startTelegramProvider();
await startDiscordProvider();
await startTelegramProvider();
};
const broadcast = (
@@ -6066,14 +6095,20 @@ export async function startGatewayServer(
}
// Start clawd browser control server (unless disabled via config).
void startBrowserControlServerIfEnabled().catch((err) => {
try {
await startBrowserControlServerIfEnabled();
} catch (err) {
logBrowser.error(`server failed to start: ${String(err)}`);
});
}
// Launch configured providers (WhatsApp Web, Telegram) so gateway replies via the
// Launch configured providers (WhatsApp Web, Discord, Telegram) so gateway replies via the
// surface the message came from. Tests can opt out via CLAWDIS_SKIP_PROVIDERS.
if (process.env.CLAWDIS_SKIP_PROVIDERS !== "1") {
void startProviders();
try {
await startProviders();
} catch (err) {
logProviders.error(`provider startup failed: ${String(err)}`);
}
} else {
logProviders.info("skipping provider start (CLAWDIS_SKIP_PROVIDERS=1)");
}

View File

@@ -13,25 +13,35 @@ export async function buildProviderSummary(
const effective = cfg ?? loadConfig();
const lines: string[] = [];
const webLinked = await webAuthExists();
const authAgeMs = getWebAuthAgeMs();
const authAge = authAgeMs === null ? "unknown" : formatAge(authAgeMs);
const { e164 } = readWebSelfId();
lines.push(
webLinked
? chalk.green(
`WhatsApp: linked${e164 ? ` as ${e164}` : ""} (auth ${authAge})`,
)
: chalk.red("WhatsApp: not linked"),
);
const webEnabled = effective.web?.enabled !== false;
if (!webEnabled) {
lines.push(chalk.cyan("WhatsApp: disabled"));
} else {
const webLinked = await webAuthExists();
const authAgeMs = getWebAuthAgeMs();
const authAge = authAgeMs === null ? "unknown" : formatAge(authAgeMs);
const { e164 } = readWebSelfId();
lines.push(
webLinked
? chalk.green(
`WhatsApp: linked${e164 ? ` as ${e164}` : ""} (auth ${authAge})`,
)
: chalk.red("WhatsApp: not linked"),
);
}
const telegramToken =
process.env.TELEGRAM_BOT_TOKEN ?? effective.telegram?.botToken;
lines.push(
telegramToken
? chalk.green("Telegram: configured")
: chalk.cyan("Telegram: not configured"),
);
const telegramEnabled = effective.telegram?.enabled !== false;
if (!telegramEnabled) {
lines.push(chalk.cyan("Telegram: disabled"));
} else {
const telegramToken =
process.env.TELEGRAM_BOT_TOKEN ?? effective.telegram?.botToken;
lines.push(
telegramToken
? chalk.green("Telegram: configured")
: chalk.cyan("Telegram: not configured"),
);
}
const allowFrom = effective.routing?.allowFrom?.length
? effective.routing.allowFrom.map(normalizeE164).filter(Boolean)