Move provider to a plugin-architecture (#661)
* refactor: introduce provider plugin registry * refactor: move provider CLI to plugins * docs: add provider plugin implementation notes * refactor: shift provider runtime logic into plugins * refactor: add plugin defaults and summaries * docs: update provider plugin notes * feat(commands): add /commands slash list * Auto-reply: tidy help message * Auto-reply: fix status command lint * Tests: align google shared expectations * Auto-reply: tidy help message * Auto-reply: fix status command lint * refactor: move provider routing into plugins * test: align agent routing expectations * docs: update provider plugin notes * refactor: route replies via provider plugins * docs: note route-reply plugin hooks * refactor: extend provider plugin contract * refactor: derive provider status from plugins * refactor: unify gateway provider control * refactor: use plugin metadata in auto-reply * fix: parenthesize cron target selection * refactor: derive gateway methods from plugins * refactor: generalize provider logout * refactor: route provider logout through plugins * refactor: move WhatsApp web login methods into plugin * refactor: generalize provider log prefixes * refactor: centralize default chat provider * refactor: derive provider lists from registry * refactor: move provider reload noops into plugins * refactor: resolve web login provider via alias * refactor: derive CLI provider options from plugins * refactor: derive prompt provider list from plugins * style: apply biome lint fixes * fix: resolve provider routing edge cases * docs: update provider plugin refactor notes * fix(gateway): harden agent provider routing * refactor: move provider routing into plugins * refactor: move provider CLI to plugins * refactor: derive provider lists from registry * fix: restore slash command parsing * refactor: align provider ids for schema * refactor: unify outbound target resolution * fix: keep outbound labels stable * feat: add msteams to cron surfaces * fix: clean up lint build issues * refactor: localize chat provider alias normalization * refactor: drive gateway provider lists from plugins * docs: update provider plugin notes * style: format message-provider * fix: avoid provider registry init cycles * style: sort message-provider imports * fix: relax provider alias map typing * refactor: move provider routing into plugins * refactor: add plugin pairing/config adapters * refactor: route pairing and provider removal via plugins * refactor: align auto-reply provider typing * test: stabilize telegram media mocks * docs: update provider plugin refactor notes * refactor: pluginize outbound targets * refactor: pluginize provider selection * refactor: generalize text chunk limits * docs: update provider plugin notes * refactor: generalize group session/config * fix: normalize provider id for room detection * fix: avoid provider init in system prompt * style: formatting cleanup * refactor: normalize agent delivery targets * test: update outbound delivery labels * chore: fix lint regressions * refactor: extend provider plugin adapters * refactor: move elevated/block streaming defaults to plugins * refactor: defer outbound send deps to plugins * docs: note plugin-driven streaming/elevated defaults * refactor: centralize webchat provider constant * refactor: add provider setup adapters * refactor: delegate provider add config to plugins * docs: document plugin-driven provider add * refactor: add plugin state/binding metadata * refactor: build agent provider status from plugins * docs: note plugin-driven agent bindings * refactor: centralize internal provider constant usage * fix: normalize WhatsApp targets for groups and E.164 (#631) (thanks @imfing) * refactor: centralize default chat provider * refactor: centralize WhatsApp target normalization * refactor: move provider routing into plugins * refactor: normalize agent delivery targets * chore: fix lint regressions * fix: normalize WhatsApp targets for groups and E.164 (#631) (thanks @imfing) * feat: expand provider plugin adapters * refactor: route auto-reply via provider plugins * fix: align WhatsApp target normalization * fix: normalize WhatsApp targets for groups and E.164 (#631) (thanks @imfing) * refactor: centralize WhatsApp target normalization * feat: add /config chat config updates * docs: add /config get alias * feat(commands): add /commands slash list * refactor: centralize default chat provider * style: apply biome lint fixes * chore: fix lint regressions * fix: clean up whatsapp allowlist typing * style: format config command helpers * refactor: pluginize tool threading context * refactor: normalize session announce targets * docs: note new plugin threading and announce hooks * refactor: pluginize message actions * docs: update provider plugin actions notes * fix: align provider action adapters * refactor: centralize webchat checks * style: format message provider helpers * refactor: move provider onboarding into adapters * docs: note onboarding provider adapters * feat: add msteams onboarding adapter * style: organize onboarding imports * fix: normalize msteams allowFrom types * feat: add plugin text chunk limits * refactor: use plugin chunk limit fallbacks * feat: add provider mention stripping hooks * style: organize provider plugin type imports * refactor: generalize health snapshots * refactor: update macOS health snapshot handling * docs: refresh health snapshot notes * style: format health snapshot updates * refactor: drive security warnings via plugins * docs: note provider security adapter * style: format provider security adapters * refactor: centralize provider account defaults * refactor: type gateway client identity constants * chore: regen gateway protocol swift * fix: degrade health on failed provider probe * refactor: centralize pairing approve hint * docs: add plugin CLI command references * refactor: route auth and tool sends through plugins * docs: expand provider plugin hooks * refactor: document provider docking touchpoints * refactor: normalize internal provider defaults * refactor: streamline outbound delivery wiring * refactor: make provider onboarding plugin-owned * refactor: support provider-owned agent tools * refactor: move telegram draft chunking into telegram module * refactor: infer provider tool sends via extractToolSend * fix: repair plugin onboarding imports * refactor: de-dup outbound target normalization * style: tidy plugin and agent imports * refactor: data-drive provider selection line * fix: satisfy lint after provider plugin rebase * test: deflake gateway-cli coverage * style: format gateway-cli coverage test * refactor(provider-plugins): simplify provider ids * test(pairing-cli): avoid provider-specific ternary * style(macos): swiftformat HealthStore * refactor(sandbox): derive provider tool denylist * fix(sandbox): avoid plugin init in defaults * refactor(provider-plugins): centralize provider aliases * style(test): satisfy biome * refactor(protocol): v3 providers.status maps * refactor(ui): adapt to protocol v3 * refactor(macos): adapt to protocol v3 * test: update providers.status v3 fixtures * refactor(gateway): map provider runtime snapshot * test(gateway): update reload runtime snapshot * refactor(whatsapp): normalize heartbeat provider id * docs(refactor): update provider plugin notes * style: satisfy biome after rebase * fix: describe sandboxed elevated in prompt * feat(gateway): add agent image attachments + live probe * refactor: derive CLI provider options from plugins * fix(gateway): harden agent provider routing * fix(gateway): harden agent provider routing * refactor: align provider ids for schema * fix(protocol): keep agent provider string * fix(gateway): harden agent provider routing * fix(protocol): keep agent provider string * refactor: normalize agent delivery targets * refactor: support provider-owned agent tools * refactor(config): provider-keyed elevated allowFrom * style: satisfy biome * fix(gateway): appease provider narrowing * style: satisfy biome * refactor(reply): move group intro hints into plugin * fix(reply): avoid plugin registry init cycle * refactor(providers): add lightweight provider dock * refactor(gateway): use typed client id in connect * refactor(providers): document docks and avoid init cycles * refactor(providers): make media limit helper generic * fix(providers): break plugin registry import cycles * style: satisfy biome * refactor(status-all): build providers table from plugins * refactor(gateway): delegate web login to provider plugin * refactor(provider): drop web alias * refactor(provider): lazy-load monitors * style: satisfy lint/format * style: format status-all providers table * style: swiftformat gateway discovery model * test: make reload plan plugin-driven * fix: avoid token stringification in status-all * refactor: make provider IDs explicit in status * feat: warn on signal/imessage provider runtime errors * test: cover gateway provider runtime warnings in status * fix: add runtime kind to provider status issues * test: cover health degradation on probe failure * fix: keep routeReply lightweight * style: organize routeReply imports * refactor(web): extract auth-store helpers * refactor(whatsapp): lazy login imports * refactor(outbound): route replies via plugin outbound * docs: update provider plugin notes * style: format provider status issues * fix: make sandbox scope warning wrap-safe * refactor: load outbound adapters from provider plugins * docs: update provider plugin outbound notes * style(macos): fix swiftformat lint * docs: changelog for provider plugins * fix(macos): satisfy swiftformat * fix(macos): open settings via menu action * style: format after rebase * fix(macos): open Settings via menu action --------- Co-authored-by: LK <luke@kyohere.com> Co-authored-by: Luke K (pr-0f3t) <2609441+lc0rp@users.noreply.github.com> Co-authored-by: Xin <xin@imfing.com>
This commit is contained in:
Peter Steinberger
committed by
GitHub
GitHub
parent
23eec7d841
commit
7acd26a2fc
@@ -15,15 +15,18 @@ import {
|
||||
resolveAgentIdFromSessionKey,
|
||||
resolveMainSessionKey,
|
||||
resolveStorePath,
|
||||
type SessionEntry,
|
||||
saveSessionStore,
|
||||
} from "../config/sessions.js";
|
||||
import { formatErrorMessage } from "../infra/errors.js";
|
||||
import { createSubsystemLogger } from "../logging.js";
|
||||
import { getQueueSize } from "../process/command-queue.js";
|
||||
import { webAuthExists } from "../providers/web/index.js";
|
||||
import {
|
||||
getProviderPlugin,
|
||||
normalizeProviderId,
|
||||
} from "../providers/plugins/index.js";
|
||||
import type { ProviderHeartbeatDeps } from "../providers/plugins/types.js";
|
||||
import { defaultRuntime, type RuntimeEnv } from "../runtime.js";
|
||||
import { getActiveWebListener } from "../web/active-listener.js";
|
||||
import { INTERNAL_MESSAGE_PROVIDER } from "../utils/message-provider.js";
|
||||
import { emitHeartbeatEvent } from "./heartbeat-events.js";
|
||||
import {
|
||||
type HeartbeatRunResult,
|
||||
@@ -34,13 +37,12 @@ import type { OutboundSendDeps } from "./outbound/deliver.js";
|
||||
import { deliverOutboundPayloads } from "./outbound/deliver.js";
|
||||
import { resolveHeartbeatDeliveryTarget } from "./outbound/targets.js";
|
||||
|
||||
type HeartbeatDeps = OutboundSendDeps & {
|
||||
runtime?: RuntimeEnv;
|
||||
getQueueSize?: (lane?: string) => number;
|
||||
nowMs?: () => number;
|
||||
webAuthExists?: () => Promise<boolean>;
|
||||
hasActiveWebListener?: () => boolean;
|
||||
};
|
||||
type HeartbeatDeps = OutboundSendDeps &
|
||||
ProviderHeartbeatDeps & {
|
||||
runtime?: RuntimeEnv;
|
||||
getQueueSize?: (lane?: string) => number;
|
||||
nowMs?: () => number;
|
||||
};
|
||||
|
||||
const log = createSubsystemLogger("gateway/heartbeat");
|
||||
let heartbeatsEnabled = true;
|
||||
@@ -129,13 +131,12 @@ function resolveHeartbeatReasoningPayloads(
|
||||
function resolveHeartbeatSender(params: {
|
||||
allowFrom: Array<string | number>;
|
||||
lastTo?: string;
|
||||
lastProvider?: SessionEntry["lastProvider"];
|
||||
provider?: string | null;
|
||||
}) {
|
||||
const { allowFrom, lastTo, lastProvider } = params;
|
||||
const { allowFrom, lastTo, provider } = params;
|
||||
const candidates = [
|
||||
lastTo?.trim(),
|
||||
lastProvider === "telegram" && lastTo ? `telegram:${lastTo}` : undefined,
|
||||
lastProvider === "whatsapp" && lastTo ? `whatsapp:${lastTo}` : undefined,
|
||||
provider && lastTo ? `${provider}:${lastTo}` : undefined,
|
||||
].filter((val): val is string => Boolean(val?.trim()));
|
||||
|
||||
const allowList = allowFrom
|
||||
@@ -157,26 +158,6 @@ function resolveHeartbeatSender(params: {
|
||||
return candidates[0] ?? "heartbeat";
|
||||
}
|
||||
|
||||
async function resolveWhatsAppReadiness(
|
||||
cfg: ClawdbotConfig,
|
||||
deps?: HeartbeatDeps,
|
||||
): Promise<{ ok: boolean; reason: string }> {
|
||||
if (cfg.web?.enabled === false) {
|
||||
return { ok: false, reason: "whatsapp-disabled" };
|
||||
}
|
||||
const authExists = await (deps?.webAuthExists ?? webAuthExists)();
|
||||
if (!authExists) {
|
||||
return { ok: false, reason: "whatsapp-not-linked" };
|
||||
}
|
||||
const listenerActive = deps?.hasActiveWebListener
|
||||
? deps.hasActiveWebListener()
|
||||
: Boolean(getActiveWebListener());
|
||||
if (!listenerActive) {
|
||||
return { ok: false, reason: "whatsapp-not-running" };
|
||||
}
|
||||
return { ok: true, reason: "ok" };
|
||||
}
|
||||
|
||||
async function restoreHeartbeatUpdatedAt(params: {
|
||||
storePath: string;
|
||||
sessionKey: string;
|
||||
@@ -239,11 +220,24 @@ export async function runHeartbeatOnce(opts: {
|
||||
const startedAt = opts.deps?.nowMs?.() ?? Date.now();
|
||||
const { entry, sessionKey, storePath } = resolveHeartbeatSession(cfg);
|
||||
const previousUpdatedAt = entry?.updatedAt;
|
||||
const allowFrom = cfg.whatsapp?.allowFrom ?? [];
|
||||
const delivery = resolveHeartbeatDeliveryTarget({ cfg, entry });
|
||||
const lastProvider =
|
||||
entry?.lastProvider && entry.lastProvider !== INTERNAL_MESSAGE_PROVIDER
|
||||
? normalizeProviderId(entry.lastProvider)
|
||||
: undefined;
|
||||
const senderProvider =
|
||||
delivery.provider !== "none" ? delivery.provider : lastProvider;
|
||||
const senderAllowFrom = senderProvider
|
||||
? (getProviderPlugin(senderProvider)?.config.resolveAllowFrom?.({
|
||||
cfg,
|
||||
accountId:
|
||||
senderProvider === lastProvider ? entry?.lastAccountId : undefined,
|
||||
}) ?? [])
|
||||
: [];
|
||||
const sender = resolveHeartbeatSender({
|
||||
allowFrom,
|
||||
allowFrom: senderAllowFrom,
|
||||
lastTo: entry?.lastTo,
|
||||
lastProvider: entry?.lastProvider,
|
||||
provider: senderProvider,
|
||||
});
|
||||
const prompt = resolveHeartbeatPrompt(cfg);
|
||||
const ctx = {
|
||||
@@ -311,7 +305,6 @@ export async function runHeartbeatOnce(opts: {
|
||||
return { status: "ran", durationMs: Date.now() - startedAt };
|
||||
}
|
||||
|
||||
const delivery = resolveHeartbeatDeliveryTarget({ cfg, entry });
|
||||
const mediaUrls =
|
||||
replyPayload.mediaUrls ??
|
||||
(replyPayload.mediaUrl ? [replyPayload.mediaUrl] : []);
|
||||
@@ -334,8 +327,15 @@ export async function runHeartbeatOnce(opts: {
|
||||
return { status: "ran", durationMs: Date.now() - startedAt };
|
||||
}
|
||||
|
||||
if (delivery.provider === "whatsapp") {
|
||||
const readiness = await resolveWhatsAppReadiness(cfg, opts.deps);
|
||||
const deliveryAccountId =
|
||||
delivery.provider === lastProvider ? entry?.lastAccountId : undefined;
|
||||
const heartbeatPlugin = getProviderPlugin(delivery.provider);
|
||||
if (heartbeatPlugin?.heartbeat?.checkReady) {
|
||||
const readiness = await heartbeatPlugin.heartbeat.checkReady({
|
||||
cfg,
|
||||
accountId: deliveryAccountId,
|
||||
deps: opts.deps,
|
||||
});
|
||||
if (!readiness.ok) {
|
||||
emitHeartbeatEvent({
|
||||
status: "skipped",
|
||||
@@ -344,7 +344,8 @@ export async function runHeartbeatOnce(opts: {
|
||||
durationMs: Date.now() - startedAt,
|
||||
hasMedia: mediaUrls.length > 0,
|
||||
});
|
||||
log.info("heartbeat: whatsapp not ready", {
|
||||
log.info("heartbeat: provider not ready", {
|
||||
provider: delivery.provider,
|
||||
reason: readiness.reason,
|
||||
});
|
||||
return { status: "skipped", reason: readiness.reason };
|
||||
@@ -355,6 +356,7 @@ export async function runHeartbeatOnce(opts: {
|
||||
cfg,
|
||||
provider: delivery.provider,
|
||||
to: delivery.to,
|
||||
accountId: deliveryAccountId,
|
||||
payloads: [
|
||||
...reasoningPayloads,
|
||||
...(shouldSkipMain
|
||||
|
||||
@@ -1,24 +1,18 @@
|
||||
import {
|
||||
chunkMarkdownText,
|
||||
chunkText,
|
||||
resolveTextChunkLimit,
|
||||
} from "../../auto-reply/chunk.js";
|
||||
import { resolveTextChunkLimit } from "../../auto-reply/chunk.js";
|
||||
import type { ReplyPayload } from "../../auto-reply/types.js";
|
||||
import type { ClawdbotConfig } from "../../config/config.js";
|
||||
import { sendMessageDiscord } from "../../discord/send.js";
|
||||
import { sendMessageIMessage } from "../../imessage/send.js";
|
||||
import { sendMessageMSTeams } from "../../msteams/send.js";
|
||||
import { normalizeAccountId } from "../../routing/session-key.js";
|
||||
import { sendMessageSignal } from "../../signal/send.js";
|
||||
import { sendMessageSlack } from "../../slack/send.js";
|
||||
import { sendMessageTelegram } from "../../telegram/send.js";
|
||||
import { sendMessageWhatsApp } from "../../web/outbound.js";
|
||||
import type { sendMessageDiscord } from "../../discord/send.js";
|
||||
import type { sendMessageIMessage } from "../../imessage/send.js";
|
||||
import { loadProviderOutboundAdapter } from "../../providers/plugins/outbound/load.js";
|
||||
import type { ProviderOutboundAdapter } from "../../providers/plugins/types.js";
|
||||
import type { sendMessageSignal } from "../../signal/send.js";
|
||||
import type { sendMessageSlack } from "../../slack/send.js";
|
||||
import type { sendMessageTelegram } from "../../telegram/send.js";
|
||||
import type { sendMessageWhatsApp } from "../../web/outbound.js";
|
||||
import type { NormalizedOutboundPayload } from "./payloads.js";
|
||||
import { normalizeOutboundPayloads } from "./payloads.js";
|
||||
import type { OutboundProvider } from "./targets.js";
|
||||
|
||||
const MB = 1024 * 1024;
|
||||
|
||||
export type { NormalizedOutboundPayload } from "./payloads.js";
|
||||
export { normalizeOutboundPayloads } from "./payloads.js";
|
||||
|
||||
@@ -36,32 +30,24 @@ export type OutboundSendDeps = {
|
||||
) => Promise<{ messageId: string; conversationId: string }>;
|
||||
};
|
||||
|
||||
export type OutboundDeliveryResult =
|
||||
| { provider: "whatsapp"; messageId: string; toJid: string }
|
||||
| { provider: "telegram"; messageId: string; chatId: string }
|
||||
| { provider: "discord"; messageId: string; channelId: string }
|
||||
| { provider: "slack"; messageId: string; channelId: string }
|
||||
| { provider: "signal"; messageId: string; timestamp?: number }
|
||||
| { provider: "imessage"; messageId: string }
|
||||
| { provider: "msteams"; messageId: string; conversationId: string };
|
||||
export type OutboundDeliveryResult = {
|
||||
provider: Exclude<OutboundProvider, "none">;
|
||||
messageId: string;
|
||||
chatId?: string;
|
||||
channelId?: string;
|
||||
conversationId?: string;
|
||||
timestamp?: number;
|
||||
toJid?: string;
|
||||
pollId?: string;
|
||||
// Provider docking: stash provider-specific fields here to avoid core type churn.
|
||||
meta?: Record<string, unknown>;
|
||||
};
|
||||
|
||||
type Chunker = (text: string, limit: number) => string[];
|
||||
|
||||
const providerCaps: Record<
|
||||
Exclude<OutboundProvider, "none">,
|
||||
{ chunker: Chunker | null }
|
||||
> = {
|
||||
whatsapp: { chunker: chunkText },
|
||||
telegram: { chunker: chunkMarkdownText },
|
||||
discord: { chunker: null },
|
||||
slack: { chunker: null },
|
||||
signal: { chunker: chunkText },
|
||||
imessage: { chunker: chunkText },
|
||||
msteams: { chunker: chunkMarkdownText },
|
||||
};
|
||||
|
||||
type ProviderHandler = {
|
||||
chunker: Chunker | null;
|
||||
textChunkLimit?: number;
|
||||
sendText: (text: string) => Promise<OutboundDeliveryResult>;
|
||||
sendMedia: (
|
||||
caption: string,
|
||||
@@ -69,165 +55,87 @@ type ProviderHandler = {
|
||||
) => Promise<OutboundDeliveryResult>;
|
||||
};
|
||||
|
||||
function resolveMediaMaxBytes(
|
||||
cfg: ClawdbotConfig,
|
||||
provider: "signal" | "imessage",
|
||||
accountId?: string | null,
|
||||
): number | undefined {
|
||||
const normalizedAccountId = normalizeAccountId(accountId);
|
||||
const providerLimit =
|
||||
provider === "signal"
|
||||
? (cfg.signal?.accounts?.[normalizedAccountId]?.mediaMaxMb ??
|
||||
cfg.signal?.mediaMaxMb)
|
||||
: (cfg.imessage?.accounts?.[normalizedAccountId]?.mediaMaxMb ??
|
||||
cfg.imessage?.mediaMaxMb);
|
||||
if (providerLimit) return providerLimit * MB;
|
||||
if (cfg.agents?.defaults?.mediaMaxMb) {
|
||||
return cfg.agents.defaults.mediaMaxMb * MB;
|
||||
function throwIfAborted(abortSignal?: AbortSignal): void {
|
||||
if (abortSignal?.aborted) {
|
||||
throw new Error("Outbound delivery aborted");
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
|
||||
function createProviderHandler(params: {
|
||||
// Provider docking: outbound delivery delegates to plugin.outbound adapters.
|
||||
async function createProviderHandler(params: {
|
||||
cfg: ClawdbotConfig;
|
||||
provider: Exclude<OutboundProvider, "none">;
|
||||
to: string;
|
||||
accountId?: string;
|
||||
deps: Required<OutboundSendDeps>;
|
||||
}): ProviderHandler {
|
||||
const { cfg, to, deps } = params;
|
||||
const rawAccountId = params.accountId;
|
||||
const accountId = normalizeAccountId(rawAccountId);
|
||||
const signalMaxBytes =
|
||||
params.provider === "signal"
|
||||
? resolveMediaMaxBytes(cfg, "signal", accountId)
|
||||
: undefined;
|
||||
const imessageMaxBytes =
|
||||
params.provider === "imessage"
|
||||
? resolveMediaMaxBytes(cfg, "imessage", accountId)
|
||||
: undefined;
|
||||
replyToId?: string | null;
|
||||
threadId?: number | null;
|
||||
deps?: OutboundSendDeps;
|
||||
gifPlayback?: boolean;
|
||||
}): Promise<ProviderHandler> {
|
||||
const outbound = await loadProviderOutboundAdapter(params.provider);
|
||||
if (!outbound?.sendText || !outbound?.sendMedia) {
|
||||
throw new Error(`Outbound not configured for provider: ${params.provider}`);
|
||||
}
|
||||
const handler = createPluginHandler({
|
||||
outbound,
|
||||
cfg: params.cfg,
|
||||
provider: params.provider,
|
||||
to: params.to,
|
||||
accountId: params.accountId,
|
||||
replyToId: params.replyToId,
|
||||
threadId: params.threadId,
|
||||
deps: params.deps,
|
||||
gifPlayback: params.gifPlayback,
|
||||
});
|
||||
if (!handler) {
|
||||
throw new Error(`Outbound not configured for provider: ${params.provider}`);
|
||||
}
|
||||
return handler;
|
||||
}
|
||||
|
||||
const handlers: Record<Exclude<OutboundProvider, "none">, ProviderHandler> = {
|
||||
whatsapp: {
|
||||
chunker: providerCaps.whatsapp.chunker,
|
||||
sendText: async (text) => ({
|
||||
provider: "whatsapp",
|
||||
...(await deps.sendWhatsApp(to, text, {
|
||||
verbose: false,
|
||||
accountId: rawAccountId,
|
||||
})),
|
||||
function createPluginHandler(params: {
|
||||
outbound?: ProviderOutboundAdapter;
|
||||
cfg: ClawdbotConfig;
|
||||
provider: Exclude<OutboundProvider, "none">;
|
||||
to: string;
|
||||
accountId?: string;
|
||||
replyToId?: string | null;
|
||||
threadId?: number | null;
|
||||
deps?: OutboundSendDeps;
|
||||
gifPlayback?: boolean;
|
||||
}): ProviderHandler | null {
|
||||
const outbound = params.outbound;
|
||||
if (!outbound?.sendText || !outbound?.sendMedia) return null;
|
||||
const sendText = outbound.sendText;
|
||||
const sendMedia = outbound.sendMedia;
|
||||
const chunker = outbound.chunker ?? null;
|
||||
return {
|
||||
chunker,
|
||||
textChunkLimit: outbound.textChunkLimit,
|
||||
sendText: async (text) =>
|
||||
sendText({
|
||||
cfg: params.cfg,
|
||||
to: params.to,
|
||||
text,
|
||||
accountId: params.accountId,
|
||||
replyToId: params.replyToId,
|
||||
threadId: params.threadId,
|
||||
gifPlayback: params.gifPlayback,
|
||||
deps: params.deps,
|
||||
}),
|
||||
sendMedia: async (caption, mediaUrl) => ({
|
||||
provider: "whatsapp",
|
||||
...(await deps.sendWhatsApp(to, caption, {
|
||||
verbose: false,
|
||||
mediaUrl,
|
||||
accountId: rawAccountId,
|
||||
})),
|
||||
sendMedia: async (caption, mediaUrl) =>
|
||||
sendMedia({
|
||||
cfg: params.cfg,
|
||||
to: params.to,
|
||||
text: caption,
|
||||
mediaUrl,
|
||||
accountId: params.accountId,
|
||||
replyToId: params.replyToId,
|
||||
threadId: params.threadId,
|
||||
gifPlayback: params.gifPlayback,
|
||||
deps: params.deps,
|
||||
}),
|
||||
},
|
||||
telegram: {
|
||||
chunker: providerCaps.telegram.chunker,
|
||||
sendText: async (text) => ({
|
||||
provider: "telegram",
|
||||
...(await deps.sendTelegram(to, text, {
|
||||
verbose: false,
|
||||
accountId: rawAccountId,
|
||||
})),
|
||||
}),
|
||||
sendMedia: async (caption, mediaUrl) => ({
|
||||
provider: "telegram",
|
||||
...(await deps.sendTelegram(to, caption, {
|
||||
verbose: false,
|
||||
mediaUrl,
|
||||
accountId: rawAccountId,
|
||||
})),
|
||||
}),
|
||||
},
|
||||
discord: {
|
||||
chunker: providerCaps.discord.chunker,
|
||||
sendText: async (text) => ({
|
||||
provider: "discord",
|
||||
...(await deps.sendDiscord(to, text, {
|
||||
verbose: false,
|
||||
accountId: rawAccountId,
|
||||
})),
|
||||
}),
|
||||
sendMedia: async (caption, mediaUrl) => ({
|
||||
provider: "discord",
|
||||
...(await deps.sendDiscord(to, caption, {
|
||||
verbose: false,
|
||||
mediaUrl,
|
||||
accountId: rawAccountId,
|
||||
})),
|
||||
}),
|
||||
},
|
||||
slack: {
|
||||
chunker: providerCaps.slack.chunker,
|
||||
sendText: async (text) => ({
|
||||
provider: "slack",
|
||||
...(await deps.sendSlack(to, text, {
|
||||
accountId: rawAccountId,
|
||||
})),
|
||||
}),
|
||||
sendMedia: async (caption, mediaUrl) => ({
|
||||
provider: "slack",
|
||||
...(await deps.sendSlack(to, caption, {
|
||||
mediaUrl,
|
||||
accountId: rawAccountId,
|
||||
})),
|
||||
}),
|
||||
},
|
||||
signal: {
|
||||
chunker: providerCaps.signal.chunker,
|
||||
sendText: async (text) => ({
|
||||
provider: "signal",
|
||||
...(await deps.sendSignal(to, text, {
|
||||
maxBytes: signalMaxBytes,
|
||||
accountId: rawAccountId,
|
||||
})),
|
||||
}),
|
||||
sendMedia: async (caption, mediaUrl) => ({
|
||||
provider: "signal",
|
||||
...(await deps.sendSignal(to, caption, {
|
||||
mediaUrl,
|
||||
maxBytes: signalMaxBytes,
|
||||
accountId: rawAccountId,
|
||||
})),
|
||||
}),
|
||||
},
|
||||
imessage: {
|
||||
chunker: providerCaps.imessage.chunker,
|
||||
sendText: async (text) => ({
|
||||
provider: "imessage",
|
||||
...(await deps.sendIMessage(to, text, {
|
||||
maxBytes: imessageMaxBytes,
|
||||
accountId: rawAccountId,
|
||||
})),
|
||||
}),
|
||||
sendMedia: async (caption, mediaUrl) => ({
|
||||
provider: "imessage",
|
||||
...(await deps.sendIMessage(to, caption, {
|
||||
mediaUrl,
|
||||
maxBytes: imessageMaxBytes,
|
||||
accountId: rawAccountId,
|
||||
})),
|
||||
}),
|
||||
},
|
||||
msteams: {
|
||||
chunker: providerCaps.msteams.chunker,
|
||||
sendText: async (text) => ({
|
||||
provider: "msteams",
|
||||
...(await deps.sendMSTeams(to, text)),
|
||||
}),
|
||||
sendMedia: async (caption, mediaUrl) => ({
|
||||
provider: "msteams",
|
||||
...(await deps.sendMSTeams(to, caption, { mediaUrl })),
|
||||
}),
|
||||
},
|
||||
};
|
||||
|
||||
return handlers[params.provider];
|
||||
}
|
||||
|
||||
export async function deliverOutboundPayloads(params: {
|
||||
@@ -236,45 +144,44 @@ export async function deliverOutboundPayloads(params: {
|
||||
to: string;
|
||||
accountId?: string;
|
||||
payloads: ReplyPayload[];
|
||||
replyToId?: string | null;
|
||||
threadId?: number | null;
|
||||
deps?: OutboundSendDeps;
|
||||
gifPlayback?: boolean;
|
||||
abortSignal?: AbortSignal;
|
||||
bestEffort?: boolean;
|
||||
onError?: (err: unknown, payload: NormalizedOutboundPayload) => void;
|
||||
onPayload?: (payload: NormalizedOutboundPayload) => void;
|
||||
}): Promise<OutboundDeliveryResult[]> {
|
||||
const { cfg, provider, to, payloads } = params;
|
||||
const accountId = params.accountId;
|
||||
const defaultSendMSTeams = async (
|
||||
to: string,
|
||||
text: string,
|
||||
opts?: { mediaUrl?: string },
|
||||
) => sendMessageMSTeams({ cfg, to, text, mediaUrl: opts?.mediaUrl });
|
||||
const deps = {
|
||||
sendWhatsApp: params.deps?.sendWhatsApp ?? sendMessageWhatsApp,
|
||||
sendTelegram: params.deps?.sendTelegram ?? sendMessageTelegram,
|
||||
sendDiscord: params.deps?.sendDiscord ?? sendMessageDiscord,
|
||||
sendSlack: params.deps?.sendSlack ?? sendMessageSlack,
|
||||
sendSignal: params.deps?.sendSignal ?? sendMessageSignal,
|
||||
sendIMessage: params.deps?.sendIMessage ?? sendMessageIMessage,
|
||||
sendMSTeams: params.deps?.sendMSTeams ?? defaultSendMSTeams,
|
||||
};
|
||||
const deps = params.deps;
|
||||
const abortSignal = params.abortSignal;
|
||||
const results: OutboundDeliveryResult[] = [];
|
||||
const handler = createProviderHandler({
|
||||
const handler = await createProviderHandler({
|
||||
cfg,
|
||||
provider,
|
||||
to,
|
||||
deps,
|
||||
accountId,
|
||||
replyToId: params.replyToId,
|
||||
threadId: params.threadId,
|
||||
gifPlayback: params.gifPlayback,
|
||||
});
|
||||
const textLimit = handler.chunker
|
||||
? resolveTextChunkLimit(cfg, provider, accountId)
|
||||
? resolveTextChunkLimit(cfg, provider, accountId, {
|
||||
fallbackLimit: handler.textChunkLimit,
|
||||
})
|
||||
: undefined;
|
||||
|
||||
const sendTextChunks = async (text: string) => {
|
||||
throwIfAborted(abortSignal);
|
||||
if (!handler.chunker || textLimit === undefined) {
|
||||
results.push(await handler.sendText(text));
|
||||
return;
|
||||
}
|
||||
for (const chunk of handler.chunker(text, textLimit)) {
|
||||
throwIfAborted(abortSignal);
|
||||
results.push(await handler.sendText(chunk));
|
||||
}
|
||||
};
|
||||
@@ -282,6 +189,7 @@ export async function deliverOutboundPayloads(params: {
|
||||
const normalizedPayloads = normalizeOutboundPayloads(payloads);
|
||||
for (const payload of normalizedPayloads) {
|
||||
try {
|
||||
throwIfAborted(abortSignal);
|
||||
params.onPayload?.(payload);
|
||||
if (payload.mediaUrls.length === 0) {
|
||||
await sendTextChunks(payload.text);
|
||||
@@ -290,6 +198,7 @@ export async function deliverOutboundPayloads(params: {
|
||||
|
||||
let first = true;
|
||||
for (const url of payload.mediaUrls) {
|
||||
throwIfAborted(abortSignal);
|
||||
const caption = first ? payload.text : "";
|
||||
first = false;
|
||||
results.push(await handler.sendMedia(caption, url));
|
||||
|
||||
@@ -9,7 +9,7 @@ import {
|
||||
describe("formatOutboundDeliverySummary", () => {
|
||||
it("falls back when result is missing", () => {
|
||||
expect(formatOutboundDeliverySummary("telegram")).toBe(
|
||||
"✅ Sent via telegram. Message ID: unknown",
|
||||
"✅ Sent via Telegram. Message ID: unknown",
|
||||
);
|
||||
expect(formatOutboundDeliverySummary("imessage")).toBe(
|
||||
"✅ Sent via iMessage. Message ID: unknown",
|
||||
@@ -23,7 +23,7 @@ describe("formatOutboundDeliverySummary", () => {
|
||||
messageId: "m1",
|
||||
chatId: "c1",
|
||||
}),
|
||||
).toBe("✅ Sent via telegram. Message ID: m1 (chat c1)");
|
||||
).toBe("✅ Sent via Telegram. Message ID: m1 (chat c1)");
|
||||
|
||||
expect(
|
||||
formatOutboundDeliverySummary("discord", {
|
||||
@@ -31,7 +31,7 @@ describe("formatOutboundDeliverySummary", () => {
|
||||
messageId: "d1",
|
||||
channelId: "chan",
|
||||
}),
|
||||
).toBe("✅ Sent via discord. Message ID: d1 (channel chan)");
|
||||
).toBe("✅ Sent via Discord. Message ID: d1 (channel chan)");
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import { getProviderPlugin } from "../../providers/plugins/index.js";
|
||||
import type { ProviderId } from "../../providers/plugins/types.js";
|
||||
import type { OutboundDeliveryResult } from "./deliver.js";
|
||||
|
||||
export type OutboundDeliveryJson = {
|
||||
@@ -11,6 +13,7 @@ export type OutboundDeliveryJson = {
|
||||
conversationId?: string;
|
||||
timestamp?: number;
|
||||
toJid?: string;
|
||||
meta?: Record<string, unknown>;
|
||||
};
|
||||
|
||||
type OutboundDeliveryMeta = {
|
||||
@@ -20,10 +23,11 @@ type OutboundDeliveryMeta = {
|
||||
conversationId?: string;
|
||||
timestamp?: number;
|
||||
toJid?: string;
|
||||
meta?: Record<string, unknown>;
|
||||
};
|
||||
|
||||
const resolveProviderLabel = (provider: string) =>
|
||||
provider === "imessage" ? "iMessage" : provider;
|
||||
getProviderPlugin(provider as ProviderId)?.meta.label ?? provider;
|
||||
|
||||
export function formatOutboundDeliverySummary(
|
||||
provider: string,
|
||||
@@ -79,6 +83,9 @@ export function buildOutboundDeliveryJson(params: {
|
||||
if (result && "toJid" in result && result.toJid !== undefined) {
|
||||
payload.toJid = result.toJid;
|
||||
}
|
||||
if (result && "meta" in result && result.meta !== undefined) {
|
||||
payload.meta = result.meta;
|
||||
}
|
||||
|
||||
return payload;
|
||||
}
|
||||
|
||||
@@ -3,22 +3,33 @@ import { loadConfig } from "../../config/config.js";
|
||||
import { callGateway, randomIdempotencyKey } from "../../gateway/call.js";
|
||||
import type { PollInput } from "../../polls.js";
|
||||
import { normalizePollInput } from "../../polls.js";
|
||||
import { normalizeMessageProvider } from "../../utils/message-provider.js";
|
||||
import {
|
||||
getProviderPlugin,
|
||||
normalizeProviderId,
|
||||
} from "../../providers/plugins/index.js";
|
||||
import type { ProviderId } from "../../providers/plugins/types.js";
|
||||
import {
|
||||
GATEWAY_CLIENT_MODES,
|
||||
GATEWAY_CLIENT_NAMES,
|
||||
type GatewayClientMode,
|
||||
type GatewayClientName,
|
||||
} from "../../utils/message-provider.js";
|
||||
import {
|
||||
deliverOutboundPayloads,
|
||||
type OutboundDeliveryResult,
|
||||
type OutboundSendDeps,
|
||||
} from "./deliver.js";
|
||||
import { resolveMessageProviderSelection } from "./provider-selection.js";
|
||||
import type { OutboundProvider } from "./targets.js";
|
||||
import { resolveOutboundTarget } from "./targets.js";
|
||||
|
||||
type GatewayCallMode = "cli" | "agent";
|
||||
|
||||
export type MessageGatewayOptions = {
|
||||
url?: string;
|
||||
token?: string;
|
||||
timeoutMs?: number;
|
||||
clientName?: GatewayCallMode;
|
||||
mode?: GatewayCallMode;
|
||||
clientName?: GatewayClientName;
|
||||
clientDisplayName?: string;
|
||||
mode?: GatewayClientMode;
|
||||
};
|
||||
|
||||
type MessageSendParams = {
|
||||
@@ -84,47 +95,56 @@ function resolveGatewayOptions(opts?: MessageGatewayOptions) {
|
||||
typeof opts?.timeoutMs === "number" && Number.isFinite(opts.timeoutMs)
|
||||
? Math.max(1, Math.floor(opts.timeoutMs))
|
||||
: 10_000,
|
||||
clientName: opts?.clientName ?? "cli",
|
||||
mode: opts?.mode ?? "cli",
|
||||
clientName: opts?.clientName ?? GATEWAY_CLIENT_NAMES.CLI,
|
||||
clientDisplayName: opts?.clientDisplayName,
|
||||
mode: opts?.mode ?? GATEWAY_CLIENT_MODES.CLI,
|
||||
};
|
||||
}
|
||||
|
||||
export async function sendMessage(
|
||||
params: MessageSendParams,
|
||||
): Promise<MessageSendResult> {
|
||||
const provider = normalizeMessageProvider(params.provider) ?? "whatsapp";
|
||||
const cfg = params.cfg ?? loadConfig();
|
||||
const provider = params.provider?.trim()
|
||||
? normalizeProviderId(params.provider)
|
||||
: (await resolveMessageProviderSelection({ cfg })).provider;
|
||||
if (!provider) {
|
||||
throw new Error(`Unknown provider: ${params.provider}`);
|
||||
}
|
||||
const plugin = getProviderPlugin(provider as ProviderId);
|
||||
if (!plugin) {
|
||||
throw new Error(`Unknown provider: ${provider}`);
|
||||
}
|
||||
const deliveryMode = plugin.outbound?.deliveryMode ?? "direct";
|
||||
|
||||
if (params.dryRun) {
|
||||
return {
|
||||
provider,
|
||||
to: params.to,
|
||||
via: provider === "whatsapp" ? "gateway" : "direct",
|
||||
via: deliveryMode === "gateway" ? "gateway" : "direct",
|
||||
mediaUrl: params.mediaUrl ?? null,
|
||||
dryRun: true,
|
||||
};
|
||||
}
|
||||
|
||||
if (
|
||||
provider === "telegram" ||
|
||||
provider === "discord" ||
|
||||
provider === "slack" ||
|
||||
provider === "signal" ||
|
||||
provider === "imessage" ||
|
||||
provider === "msteams"
|
||||
) {
|
||||
if (deliveryMode !== "gateway") {
|
||||
const outboundProvider = provider as Exclude<OutboundProvider, "none">;
|
||||
const resolvedTarget = resolveOutboundTarget({
|
||||
provider,
|
||||
provider: outboundProvider,
|
||||
to: params.to,
|
||||
cfg,
|
||||
accountId: params.accountId,
|
||||
mode: "explicit",
|
||||
});
|
||||
if (!resolvedTarget.ok) throw resolvedTarget.error;
|
||||
|
||||
const results = await deliverOutboundPayloads({
|
||||
cfg,
|
||||
provider,
|
||||
provider: outboundProvider,
|
||||
to: resolvedTarget.to,
|
||||
accountId: params.accountId,
|
||||
payloads: [{ text: params.content, mediaUrl: params.mediaUrl }],
|
||||
gifPlayback: params.gifPlayback,
|
||||
deps: params.deps,
|
||||
bestEffort: params.bestEffort,
|
||||
});
|
||||
@@ -154,6 +174,7 @@ export async function sendMessage(
|
||||
},
|
||||
timeoutMs: gateway.timeoutMs,
|
||||
clientName: gateway.clientName,
|
||||
clientDisplayName: gateway.clientDisplayName,
|
||||
mode: gateway.mode,
|
||||
});
|
||||
|
||||
@@ -169,13 +190,12 @@ export async function sendMessage(
|
||||
export async function sendPoll(
|
||||
params: MessagePollParams,
|
||||
): Promise<MessagePollResult> {
|
||||
const provider = normalizeMessageProvider(params.provider) ?? "whatsapp";
|
||||
if (
|
||||
provider !== "whatsapp" &&
|
||||
provider !== "discord" &&
|
||||
provider !== "msteams"
|
||||
) {
|
||||
throw new Error(`Unsupported poll provider: ${provider}`);
|
||||
const cfg = params.cfg ?? loadConfig();
|
||||
const provider = params.provider?.trim()
|
||||
? normalizeProviderId(params.provider)
|
||||
: (await resolveMessageProviderSelection({ cfg })).provider;
|
||||
if (!provider) {
|
||||
throw new Error(`Unknown provider: ${params.provider}`);
|
||||
}
|
||||
|
||||
const pollInput: PollInput = {
|
||||
@@ -184,8 +204,14 @@ export async function sendPoll(
|
||||
maxSelections: params.maxSelections,
|
||||
durationHours: params.durationHours,
|
||||
};
|
||||
const maxOptions = provider === "discord" ? 10 : 12;
|
||||
const normalized = normalizePollInput(pollInput, { maxOptions });
|
||||
const plugin = getProviderPlugin(provider as ProviderId);
|
||||
const outbound = plugin?.outbound;
|
||||
if (!outbound?.sendPoll) {
|
||||
throw new Error(`Unsupported poll provider: ${provider}`);
|
||||
}
|
||||
const normalized = outbound.pollMaxOptions
|
||||
? normalizePollInput(pollInput, { maxOptions: outbound.pollMaxOptions })
|
||||
: normalizePollInput(pollInput);
|
||||
|
||||
if (params.dryRun) {
|
||||
return {
|
||||
@@ -222,6 +248,7 @@ export async function sendPoll(
|
||||
},
|
||||
timeoutMs: gateway.timeoutMs,
|
||||
clientName: gateway.clientName,
|
||||
clientDisplayName: gateway.clientDisplayName,
|
||||
mode: gateway.mode,
|
||||
});
|
||||
|
||||
|
||||
@@ -1,20 +1,11 @@
|
||||
import type { ClawdbotConfig } from "../../config/config.js";
|
||||
import { listEnabledDiscordAccounts } from "../../discord/accounts.js";
|
||||
import { listEnabledIMessageAccounts } from "../../imessage/accounts.js";
|
||||
import { resolveMSTeamsCredentials } from "../../msteams/token.js";
|
||||
import { listEnabledSignalAccounts } from "../../signal/accounts.js";
|
||||
import { listEnabledSlackAccounts } from "../../slack/accounts.js";
|
||||
import { listEnabledTelegramAccounts } from "../../telegram/accounts.js";
|
||||
import { listProviderPlugins } from "../../providers/plugins/index.js";
|
||||
import type { ProviderPlugin } from "../../providers/plugins/types.js";
|
||||
import {
|
||||
DELIVERABLE_MESSAGE_PROVIDERS,
|
||||
type DeliverableMessageProvider,
|
||||
normalizeMessageProvider,
|
||||
} from "../../utils/message-provider.js";
|
||||
import {
|
||||
listEnabledWhatsAppAccounts,
|
||||
resolveWhatsAppAccount,
|
||||
} from "../../web/accounts.js";
|
||||
import { webAuthExists } from "../../web/session.js";
|
||||
|
||||
export type MessageProviderId = DeliverableMessageProvider;
|
||||
|
||||
@@ -24,60 +15,43 @@ function isKnownProvider(value: string): value is MessageProviderId {
|
||||
return (MESSAGE_PROVIDERS as readonly string[]).includes(value);
|
||||
}
|
||||
|
||||
async function isWhatsAppConfigured(cfg: ClawdbotConfig): Promise<boolean> {
|
||||
const accounts = listEnabledWhatsAppAccounts(cfg);
|
||||
if (accounts.length === 0) {
|
||||
const fallback = resolveWhatsAppAccount({ cfg });
|
||||
return await webAuthExists(fallback.authDir);
|
||||
}
|
||||
for (const account of accounts) {
|
||||
if (await webAuthExists(account.authDir)) return true;
|
||||
function isAccountEnabled(account: unknown): boolean {
|
||||
if (!account || typeof account !== "object") return true;
|
||||
const enabled = (account as { enabled?: boolean }).enabled;
|
||||
return enabled !== false;
|
||||
}
|
||||
|
||||
async function isPluginConfigured(
|
||||
plugin: ProviderPlugin,
|
||||
cfg: ClawdbotConfig,
|
||||
): Promise<boolean> {
|
||||
const accountIds = plugin.config.listAccountIds(cfg);
|
||||
if (accountIds.length === 0) return false;
|
||||
|
||||
for (const accountId of accountIds) {
|
||||
const account = plugin.config.resolveAccount(cfg, accountId);
|
||||
const enabled = plugin.config.isEnabled
|
||||
? plugin.config.isEnabled(account, cfg)
|
||||
: isAccountEnabled(account);
|
||||
if (!enabled) continue;
|
||||
if (!plugin.config.isConfigured) return true;
|
||||
const configured = await plugin.config.isConfigured(account, cfg);
|
||||
if (configured) return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
function isTelegramConfigured(cfg: ClawdbotConfig): boolean {
|
||||
return listEnabledTelegramAccounts(cfg).some(
|
||||
(account) => account.token.trim().length > 0,
|
||||
);
|
||||
}
|
||||
|
||||
function isDiscordConfigured(cfg: ClawdbotConfig): boolean {
|
||||
return listEnabledDiscordAccounts(cfg).some(
|
||||
(account) => account.token.trim().length > 0,
|
||||
);
|
||||
}
|
||||
|
||||
function isSlackConfigured(cfg: ClawdbotConfig): boolean {
|
||||
return listEnabledSlackAccounts(cfg).some(
|
||||
(account) => (account.botToken ?? "").trim().length > 0,
|
||||
);
|
||||
}
|
||||
|
||||
function isSignalConfigured(cfg: ClawdbotConfig): boolean {
|
||||
return listEnabledSignalAccounts(cfg).some((account) => account.configured);
|
||||
}
|
||||
|
||||
function isIMessageConfigured(cfg: ClawdbotConfig): boolean {
|
||||
return listEnabledIMessageAccounts(cfg).some((account) => account.configured);
|
||||
}
|
||||
|
||||
function isMSTeamsConfigured(cfg: ClawdbotConfig): boolean {
|
||||
if (!cfg.msteams || cfg.msteams.enabled === false) return false;
|
||||
return Boolean(resolveMSTeamsCredentials(cfg.msteams));
|
||||
}
|
||||
|
||||
export async function listConfiguredMessageProviders(
|
||||
cfg: ClawdbotConfig,
|
||||
): Promise<MessageProviderId[]> {
|
||||
const providers: MessageProviderId[] = [];
|
||||
if (await isWhatsAppConfigured(cfg)) providers.push("whatsapp");
|
||||
if (isTelegramConfigured(cfg)) providers.push("telegram");
|
||||
if (isDiscordConfigured(cfg)) providers.push("discord");
|
||||
if (isSlackConfigured(cfg)) providers.push("slack");
|
||||
if (isSignalConfigured(cfg)) providers.push("signal");
|
||||
if (isIMessageConfigured(cfg)) providers.push("imessage");
|
||||
if (isMSTeamsConfigured(cfg)) providers.push("msteams");
|
||||
for (const plugin of listProviderPlugins()) {
|
||||
if (!isKnownProvider(plugin.id)) continue;
|
||||
if (await isPluginConfigured(plugin, cfg)) {
|
||||
providers.push(plugin.id);
|
||||
}
|
||||
}
|
||||
return providers;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,20 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import type { ClawdbotConfig } from "../../config/config.js";
|
||||
|
||||
import { resolveOutboundTarget } from "./targets.js";
|
||||
|
||||
describe("resolveOutboundTarget", () => {
|
||||
it("falls back to whatsapp allowFrom via config", () => {
|
||||
const cfg: ClawdbotConfig = { whatsapp: { allowFrom: ["+1555"] } };
|
||||
const res = resolveOutboundTarget({
|
||||
provider: "whatsapp",
|
||||
to: "",
|
||||
cfg,
|
||||
mode: "explicit",
|
||||
});
|
||||
expect(res).toEqual({ ok: true, to: "+1555" });
|
||||
});
|
||||
|
||||
it.each([
|
||||
{
|
||||
name: "normalizes whatsapp target when provided",
|
||||
|
||||
@@ -1,14 +1,18 @@
|
||||
import type { ClawdbotConfig } from "../../config/config.js";
|
||||
import type { SessionEntry } from "../../config/sessions.js";
|
||||
import {
|
||||
getProviderPlugin,
|
||||
normalizeProviderId,
|
||||
} from "../../providers/plugins/index.js";
|
||||
import type {
|
||||
ProviderId,
|
||||
ProviderOutboundTargetMode,
|
||||
} from "../../providers/plugins/types.js";
|
||||
import type {
|
||||
DeliverableMessageProvider,
|
||||
GatewayMessageProvider,
|
||||
} from "../../utils/message-provider.js";
|
||||
import { normalizeE164 } from "../../utils.js";
|
||||
import {
|
||||
isWhatsAppGroupJid,
|
||||
normalizeWhatsAppTarget,
|
||||
} from "../../whatsapp/normalize.js";
|
||||
import { INTERNAL_MESSAGE_PROVIDER } from "../../utils/message-provider.js";
|
||||
|
||||
export type OutboundProvider = DeliverableMessageProvider | "none";
|
||||
|
||||
@@ -24,117 +28,60 @@ export type OutboundTargetResolution =
|
||||
| { ok: true; to: string }
|
||||
| { ok: false; error: Error };
|
||||
|
||||
export function normalizeOutboundTarget(params: {
|
||||
provider: GatewayMessageProvider;
|
||||
to?: string;
|
||||
allowFrom?: string[];
|
||||
}): OutboundTargetResolution {
|
||||
const trimmed = params.to?.trim() || "";
|
||||
if (params.provider === "whatsapp") {
|
||||
if (trimmed) {
|
||||
const normalized = normalizeWhatsAppTarget(trimmed);
|
||||
if (!normalized) {
|
||||
return {
|
||||
ok: false,
|
||||
error: new Error(
|
||||
"Delivering to WhatsApp requires --to <E.164|group JID> or whatsapp.allowFrom[0]",
|
||||
),
|
||||
};
|
||||
}
|
||||
return { ok: true, to: normalized };
|
||||
}
|
||||
const fallback = params.allowFrom?.[0]?.trim();
|
||||
if (fallback) {
|
||||
const normalized = normalizeWhatsAppTarget(fallback);
|
||||
if (normalized) {
|
||||
return { ok: true, to: normalized };
|
||||
}
|
||||
}
|
||||
return {
|
||||
ok: false,
|
||||
error: new Error(
|
||||
"Delivering to WhatsApp requires --to <E.164|group JID> or whatsapp.allowFrom[0]",
|
||||
),
|
||||
};
|
||||
}
|
||||
if (params.provider === "telegram") {
|
||||
if (!trimmed) {
|
||||
return {
|
||||
ok: false,
|
||||
error: new Error("Delivering to Telegram requires --to <chatId>"),
|
||||
};
|
||||
}
|
||||
return { ok: true, to: trimmed };
|
||||
}
|
||||
if (params.provider === "discord") {
|
||||
if (!trimmed) {
|
||||
return {
|
||||
ok: false,
|
||||
error: new Error(
|
||||
"Delivering to Discord requires --to <channelId|user:ID|channel:ID>",
|
||||
),
|
||||
};
|
||||
}
|
||||
return { ok: true, to: trimmed };
|
||||
}
|
||||
if (params.provider === "slack") {
|
||||
if (!trimmed) {
|
||||
return {
|
||||
ok: false,
|
||||
error: new Error(
|
||||
"Delivering to Slack requires --to <channelId|user:ID|channel:ID>",
|
||||
),
|
||||
};
|
||||
}
|
||||
return { ok: true, to: trimmed };
|
||||
}
|
||||
if (params.provider === "signal") {
|
||||
if (!trimmed) {
|
||||
return {
|
||||
ok: false,
|
||||
error: new Error(
|
||||
"Delivering to Signal requires --to <E.164|group:ID|signal:group:ID|signal:+E.164>",
|
||||
),
|
||||
};
|
||||
}
|
||||
return { ok: true, to: trimmed };
|
||||
}
|
||||
if (params.provider === "imessage") {
|
||||
if (!trimmed) {
|
||||
return {
|
||||
ok: false,
|
||||
error: new Error(
|
||||
"Delivering to iMessage requires --to <handle|chat_id:ID>",
|
||||
),
|
||||
};
|
||||
}
|
||||
return { ok: true, to: trimmed };
|
||||
}
|
||||
if (params.provider === "msteams") {
|
||||
if (!trimmed) {
|
||||
return {
|
||||
ok: false,
|
||||
error: new Error(
|
||||
"Delivering to MS Teams requires --to <conversationId|user:ID|conversation:ID>",
|
||||
),
|
||||
};
|
||||
}
|
||||
return { ok: true, to: trimmed };
|
||||
}
|
||||
return {
|
||||
ok: false,
|
||||
error: new Error(
|
||||
"Delivering to WebChat is not supported via `clawdbot agent`; use WhatsApp/Telegram or run with --deliver=false.",
|
||||
),
|
||||
};
|
||||
}
|
||||
|
||||
// Provider docking: prefer plugin.outbound.resolveTarget + allowFrom to normalize destinations.
|
||||
export function resolveOutboundTarget(params: {
|
||||
provider: GatewayMessageProvider;
|
||||
to?: string;
|
||||
allowFrom?: string[];
|
||||
cfg?: ClawdbotConfig;
|
||||
accountId?: string | null;
|
||||
mode?: ProviderOutboundTargetMode;
|
||||
}): OutboundTargetResolution {
|
||||
return normalizeOutboundTarget(params);
|
||||
if (params.provider === INTERNAL_MESSAGE_PROVIDER) {
|
||||
return {
|
||||
ok: false,
|
||||
error: new Error(
|
||||
"Delivering to WebChat is not supported via `clawdbot agent`; use WhatsApp/Telegram or run with --deliver=false.",
|
||||
),
|
||||
};
|
||||
}
|
||||
|
||||
const plugin = getProviderPlugin(params.provider as ProviderId);
|
||||
if (!plugin) {
|
||||
return {
|
||||
ok: false,
|
||||
error: new Error(`Unsupported provider: ${params.provider}`),
|
||||
};
|
||||
}
|
||||
|
||||
const allowFrom =
|
||||
params.allowFrom ??
|
||||
(params.cfg && plugin.config.resolveAllowFrom
|
||||
? plugin.config.resolveAllowFrom({
|
||||
cfg: params.cfg,
|
||||
accountId: params.accountId ?? undefined,
|
||||
})
|
||||
: undefined);
|
||||
|
||||
const resolveTarget = plugin.outbound?.resolveTarget;
|
||||
if (resolveTarget) {
|
||||
return resolveTarget({
|
||||
cfg: params.cfg,
|
||||
to: params.to,
|
||||
allowFrom,
|
||||
accountId: params.accountId ?? undefined,
|
||||
mode: params.mode ?? "explicit",
|
||||
});
|
||||
}
|
||||
|
||||
const trimmed = params.to?.trim();
|
||||
if (trimmed) {
|
||||
return { ok: true, to: trimmed };
|
||||
}
|
||||
return {
|
||||
ok: false,
|
||||
error: new Error(`Delivering to ${plugin.meta.label} requires --to`),
|
||||
};
|
||||
}
|
||||
|
||||
export function resolveHeartbeatDeliveryTarget(params: {
|
||||
@@ -143,18 +90,14 @@ export function resolveHeartbeatDeliveryTarget(params: {
|
||||
}): OutboundTarget {
|
||||
const { cfg, entry } = params;
|
||||
const rawTarget = cfg.agents?.defaults?.heartbeat?.target;
|
||||
const target: HeartbeatTarget =
|
||||
rawTarget === "whatsapp" ||
|
||||
rawTarget === "telegram" ||
|
||||
rawTarget === "discord" ||
|
||||
rawTarget === "slack" ||
|
||||
rawTarget === "signal" ||
|
||||
rawTarget === "imessage" ||
|
||||
rawTarget === "msteams" ||
|
||||
rawTarget === "none" ||
|
||||
rawTarget === "last"
|
||||
? rawTarget
|
||||
: "last";
|
||||
let target: HeartbeatTarget = "last";
|
||||
if (rawTarget === "none" || rawTarget === "last") {
|
||||
target = rawTarget;
|
||||
} else if (typeof rawTarget === "string") {
|
||||
const normalized = normalizeProviderId(rawTarget);
|
||||
if (normalized) target = normalized;
|
||||
}
|
||||
|
||||
if (target === "none") {
|
||||
return { provider: "none", reason: "target-none" };
|
||||
}
|
||||
@@ -166,31 +109,11 @@ export function resolveHeartbeatDeliveryTarget(params: {
|
||||
: undefined;
|
||||
|
||||
const lastProvider =
|
||||
entry?.lastProvider && entry.lastProvider !== "webchat"
|
||||
? entry.lastProvider
|
||||
entry?.lastProvider && entry.lastProvider !== INTERNAL_MESSAGE_PROVIDER
|
||||
? normalizeProviderId(entry.lastProvider)
|
||||
: undefined;
|
||||
const lastTo = typeof entry?.lastTo === "string" ? entry.lastTo.trim() : "";
|
||||
|
||||
const provider:
|
||||
| "whatsapp"
|
||||
| "telegram"
|
||||
| "discord"
|
||||
| "slack"
|
||||
| "signal"
|
||||
| "imessage"
|
||||
| "msteams"
|
||||
| undefined =
|
||||
target === "last"
|
||||
? lastProvider
|
||||
: target === "whatsapp" ||
|
||||
target === "telegram" ||
|
||||
target === "discord" ||
|
||||
target === "slack" ||
|
||||
target === "signal" ||
|
||||
target === "imessage" ||
|
||||
target === "msteams"
|
||||
? target
|
||||
: undefined;
|
||||
const provider = target === "last" ? lastProvider : target;
|
||||
|
||||
const to =
|
||||
explicitTo ||
|
||||
@@ -201,28 +124,35 @@ export function resolveHeartbeatDeliveryTarget(params: {
|
||||
return { provider: "none", reason: "no-target" };
|
||||
}
|
||||
|
||||
if (provider !== "whatsapp") {
|
||||
const resolved = normalizeOutboundTarget({ provider, to });
|
||||
return resolved.ok
|
||||
? { provider, to: resolved.to }
|
||||
: { provider: "none", reason: "no-target" };
|
||||
}
|
||||
|
||||
const rawAllow = cfg.whatsapp?.allowFrom ?? [];
|
||||
const resolved = normalizeOutboundTarget({
|
||||
provider: "whatsapp",
|
||||
const accountId =
|
||||
provider === lastProvider ? entry?.lastAccountId : undefined;
|
||||
const resolved = resolveOutboundTarget({
|
||||
provider,
|
||||
to,
|
||||
allowFrom: rawAllow,
|
||||
cfg,
|
||||
accountId,
|
||||
mode: "heartbeat",
|
||||
});
|
||||
if (!resolved.ok) {
|
||||
return { provider: "none", reason: "no-target" };
|
||||
}
|
||||
if (rawAllow.includes("*")) return { provider, to: resolved.to };
|
||||
if (isWhatsAppGroupJid(resolved.to)) return { provider, to: resolved.to };
|
||||
const allowFrom = rawAllow
|
||||
.map((val) => normalizeE164(val))
|
||||
.filter((val) => val.length > 1);
|
||||
if (allowFrom.length === 0) return { provider, to: resolved.to };
|
||||
if (allowFrom.includes(resolved.to)) return { provider, to: resolved.to };
|
||||
return { provider, to: allowFrom[0], reason: "allowFrom-fallback" };
|
||||
|
||||
let reason: string | undefined;
|
||||
const plugin = getProviderPlugin(provider as ProviderId);
|
||||
if (plugin?.config.resolveAllowFrom) {
|
||||
const explicit = resolveOutboundTarget({
|
||||
provider,
|
||||
to,
|
||||
cfg,
|
||||
accountId,
|
||||
mode: "explicit",
|
||||
});
|
||||
if (explicit.ok && explicit.to !== resolved.to) {
|
||||
reason = "allowFrom-fallback";
|
||||
}
|
||||
}
|
||||
|
||||
return reason
|
||||
? { provider, to: resolved.to, reason }
|
||||
: { provider, to: resolved.to };
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
export type ProviderId = "discord" | "telegram" | "whatsapp";
|
||||
import type { ProviderId } from "../providers/plugins/types.js";
|
||||
export type ProviderDirection = "inbound" | "outbound";
|
||||
|
||||
type ActivityEntry = {
|
||||
|
||||
@@ -1,34 +1,11 @@
|
||||
import { type ClawdbotConfig, loadConfig } from "../config/config.js";
|
||||
import {
|
||||
listDiscordAccountIds,
|
||||
resolveDiscordAccount,
|
||||
} from "../discord/accounts.js";
|
||||
import {
|
||||
listIMessageAccountIds,
|
||||
resolveIMessageAccount,
|
||||
} from "../imessage/accounts.js";
|
||||
import { resolveMSTeamsCredentials } from "../msteams/token.js";
|
||||
import { listProviderPlugins } from "../providers/plugins/index.js";
|
||||
import type {
|
||||
ProviderAccountSnapshot,
|
||||
ProviderPlugin,
|
||||
} from "../providers/plugins/types.js";
|
||||
import { DEFAULT_ACCOUNT_ID } from "../routing/session-key.js";
|
||||
import {
|
||||
listSignalAccountIds,
|
||||
resolveSignalAccount,
|
||||
} from "../signal/accounts.js";
|
||||
import { listSlackAccountIds, resolveSlackAccount } from "../slack/accounts.js";
|
||||
import {
|
||||
listTelegramAccountIds,
|
||||
resolveTelegramAccount,
|
||||
} from "../telegram/accounts.js";
|
||||
import { theme } from "../terminal/theme.js";
|
||||
import { normalizeE164 } from "../utils.js";
|
||||
import {
|
||||
listWhatsAppAccountIds,
|
||||
resolveWhatsAppAccount,
|
||||
} from "../web/accounts.js";
|
||||
import {
|
||||
getWebAuthAgeMs,
|
||||
readWebSelfId,
|
||||
webAuthExists,
|
||||
} from "../web/session.js";
|
||||
|
||||
export type ProviderSummaryOptions = {
|
||||
colorize?: boolean;
|
||||
@@ -40,6 +17,120 @@ const DEFAULT_OPTIONS: Required<ProviderSummaryOptions> = {
|
||||
includeAllowFrom: false,
|
||||
};
|
||||
|
||||
type ProviderAccountEntry = {
|
||||
accountId: string;
|
||||
account: unknown;
|
||||
enabled: boolean;
|
||||
configured: boolean;
|
||||
snapshot: ProviderAccountSnapshot;
|
||||
};
|
||||
|
||||
const formatAccountLabel = (params: { accountId: string; name?: string }) => {
|
||||
const base = params.accountId || DEFAULT_ACCOUNT_ID;
|
||||
if (params.name?.trim()) return `${base} (${params.name.trim()})`;
|
||||
return base;
|
||||
};
|
||||
|
||||
const accountLine = (label: string, details: string[]) =>
|
||||
` - ${label}${details.length ? ` (${details.join(", ")})` : ""}`;
|
||||
|
||||
const resolveAccountEnabled = (
|
||||
plugin: ProviderPlugin,
|
||||
account: unknown,
|
||||
cfg: ClawdbotConfig,
|
||||
): boolean => {
|
||||
if (plugin.config.isEnabled) {
|
||||
return plugin.config.isEnabled(account, cfg);
|
||||
}
|
||||
if (!account || typeof account !== "object") return true;
|
||||
const enabled = (account as { enabled?: boolean }).enabled;
|
||||
return enabled !== false;
|
||||
};
|
||||
|
||||
const resolveAccountConfigured = async (
|
||||
plugin: ProviderPlugin,
|
||||
account: unknown,
|
||||
cfg: ClawdbotConfig,
|
||||
): Promise<boolean> => {
|
||||
if (plugin.config.isConfigured) {
|
||||
return await plugin.config.isConfigured(account, cfg);
|
||||
}
|
||||
return true;
|
||||
};
|
||||
|
||||
const buildAccountSnapshot = (params: {
|
||||
plugin: ProviderPlugin;
|
||||
account: unknown;
|
||||
cfg: ClawdbotConfig;
|
||||
accountId: string;
|
||||
enabled: boolean;
|
||||
configured: boolean;
|
||||
}): ProviderAccountSnapshot => {
|
||||
const described = params.plugin.config.describeAccount
|
||||
? params.plugin.config.describeAccount(params.account, params.cfg)
|
||||
: undefined;
|
||||
return {
|
||||
enabled: params.enabled,
|
||||
configured: params.configured,
|
||||
...described,
|
||||
accountId: params.accountId,
|
||||
};
|
||||
};
|
||||
|
||||
const formatAllowFrom = (params: {
|
||||
plugin: ProviderPlugin;
|
||||
cfg: ClawdbotConfig;
|
||||
accountId?: string | null;
|
||||
allowFrom: Array<string | number>;
|
||||
}) => {
|
||||
if (params.plugin.config.formatAllowFrom) {
|
||||
return params.plugin.config.formatAllowFrom({
|
||||
cfg: params.cfg,
|
||||
accountId: params.accountId,
|
||||
allowFrom: params.allowFrom,
|
||||
});
|
||||
}
|
||||
return params.allowFrom.map((entry) => String(entry).trim()).filter(Boolean);
|
||||
};
|
||||
|
||||
const buildAccountDetails = (params: {
|
||||
entry: ProviderAccountEntry;
|
||||
plugin: ProviderPlugin;
|
||||
cfg: ClawdbotConfig;
|
||||
includeAllowFrom: boolean;
|
||||
}): string[] => {
|
||||
const details: string[] = [];
|
||||
const snapshot = params.entry.snapshot;
|
||||
if (snapshot.enabled === false) details.push("disabled");
|
||||
if (snapshot.dmPolicy) details.push(`dm:${snapshot.dmPolicy}`);
|
||||
if (snapshot.tokenSource && snapshot.tokenSource !== "none") {
|
||||
details.push(`token:${snapshot.tokenSource}`);
|
||||
}
|
||||
if (snapshot.botTokenSource && snapshot.botTokenSource !== "none") {
|
||||
details.push(`bot:${snapshot.botTokenSource}`);
|
||||
}
|
||||
if (snapshot.appTokenSource && snapshot.appTokenSource !== "none") {
|
||||
details.push(`app:${snapshot.appTokenSource}`);
|
||||
}
|
||||
if (snapshot.baseUrl) details.push(snapshot.baseUrl);
|
||||
if (snapshot.port != null) details.push(`port:${snapshot.port}`);
|
||||
if (snapshot.cliPath) details.push(`cli:${snapshot.cliPath}`);
|
||||
if (snapshot.dbPath) details.push(`db:${snapshot.dbPath}`);
|
||||
|
||||
if (params.includeAllowFrom && snapshot.allowFrom?.length) {
|
||||
const formatted = formatAllowFrom({
|
||||
plugin: params.plugin,
|
||||
cfg: params.cfg,
|
||||
accountId: snapshot.accountId,
|
||||
allowFrom: snapshot.allowFrom,
|
||||
}).slice(0, 2);
|
||||
if (formatted.length > 0) {
|
||||
details.push(`allow:${formatted.join(",")}`);
|
||||
}
|
||||
}
|
||||
return details;
|
||||
};
|
||||
|
||||
export async function buildProviderSummary(
|
||||
cfg?: ClawdbotConfig,
|
||||
options?: ProviderSummaryOptions,
|
||||
@@ -49,55 +140,106 @@ export async function buildProviderSummary(
|
||||
const resolved = { ...DEFAULT_OPTIONS, ...options };
|
||||
const tint = (value: string, color?: (input: string) => string) =>
|
||||
resolved.colorize && color ? color(value) : value;
|
||||
const formatAccountLabel = (params: { accountId: string; name?: string }) => {
|
||||
const base = params.accountId || DEFAULT_ACCOUNT_ID;
|
||||
if (params.name?.trim()) return `${base} (${params.name.trim()})`;
|
||||
return base;
|
||||
};
|
||||
const accountLine = (label: string, details: string[]) =>
|
||||
` - ${label}${details.length ? ` (${details.join(", ")})` : ""}`;
|
||||
|
||||
const webEnabled = effective.web?.enabled !== false;
|
||||
if (!webEnabled) {
|
||||
lines.push(tint("WhatsApp: disabled", theme.muted));
|
||||
} else {
|
||||
const webLinked = await webAuthExists();
|
||||
const authAgeMs = getWebAuthAgeMs();
|
||||
const authAge = authAgeMs === null ? "" : ` auth ${formatAge(authAgeMs)}`;
|
||||
const { e164 } = readWebSelfId();
|
||||
lines.push(
|
||||
webLinked
|
||||
? tint(
|
||||
`WhatsApp: linked${e164 ? ` ${e164}` : ""}${authAge}`,
|
||||
theme.success,
|
||||
)
|
||||
: tint("WhatsApp: not linked", theme.error),
|
||||
);
|
||||
if (webLinked) {
|
||||
for (const accountId of listWhatsAppAccountIds(effective)) {
|
||||
const account = resolveWhatsAppAccount({ cfg: effective, accountId });
|
||||
const details: string[] = [];
|
||||
if (!account.enabled) details.push("disabled");
|
||||
if (account.selfChatMode) details.push("self-chat");
|
||||
const dmPolicy =
|
||||
account.dmPolicy ?? effective.whatsapp?.dmPolicy ?? "pairing";
|
||||
details.push(`dm:${dmPolicy}`);
|
||||
const allowFrom = (
|
||||
account.allowFrom ??
|
||||
effective.whatsapp?.allowFrom ??
|
||||
[]
|
||||
)
|
||||
.map(normalizeE164)
|
||||
.filter(Boolean)
|
||||
.slice(0, 2);
|
||||
if (allowFrom.length > 0) {
|
||||
details.push(`allow:${allowFrom.join(",")}`);
|
||||
}
|
||||
for (const plugin of listProviderPlugins()) {
|
||||
const accountIds = plugin.config.listAccountIds(effective);
|
||||
const defaultAccountId =
|
||||
plugin.config.defaultAccountId?.(effective) ??
|
||||
accountIds[0] ??
|
||||
DEFAULT_ACCOUNT_ID;
|
||||
const resolvedAccountIds =
|
||||
accountIds.length > 0 ? accountIds : [defaultAccountId];
|
||||
const entries: ProviderAccountEntry[] = [];
|
||||
|
||||
for (const accountId of resolvedAccountIds) {
|
||||
const account = plugin.config.resolveAccount(effective, accountId);
|
||||
const enabled = resolveAccountEnabled(plugin, account, effective);
|
||||
const configured = await resolveAccountConfigured(
|
||||
plugin,
|
||||
account,
|
||||
effective,
|
||||
);
|
||||
const snapshot = buildAccountSnapshot({
|
||||
plugin,
|
||||
account,
|
||||
cfg: effective,
|
||||
accountId,
|
||||
enabled,
|
||||
configured,
|
||||
});
|
||||
entries.push({ accountId, account, enabled, configured, snapshot });
|
||||
}
|
||||
|
||||
const configuredEntries = entries.filter((entry) => entry.configured);
|
||||
const anyEnabled = entries.some((entry) => entry.enabled);
|
||||
const fallbackEntry =
|
||||
entries.find((entry) => entry.accountId === defaultAccountId) ??
|
||||
entries[0];
|
||||
const summary = plugin.status?.buildProviderSummary
|
||||
? await plugin.status.buildProviderSummary({
|
||||
account: fallbackEntry?.account ?? {},
|
||||
cfg: effective,
|
||||
defaultAccountId,
|
||||
snapshot:
|
||||
fallbackEntry?.snapshot ??
|
||||
({ accountId: defaultAccountId } as ProviderAccountSnapshot),
|
||||
})
|
||||
: undefined;
|
||||
|
||||
const summaryRecord = summary as Record<string, unknown> | undefined;
|
||||
const linked =
|
||||
summaryRecord && typeof summaryRecord.linked === "boolean"
|
||||
? summaryRecord.linked
|
||||
: null;
|
||||
const configured =
|
||||
summaryRecord && typeof summaryRecord.configured === "boolean"
|
||||
? summaryRecord.configured
|
||||
: configuredEntries.length > 0;
|
||||
|
||||
const status = !anyEnabled
|
||||
? "disabled"
|
||||
: linked !== null
|
||||
? linked
|
||||
? "linked"
|
||||
: "not linked"
|
||||
: configured
|
||||
? "configured"
|
||||
: "not configured";
|
||||
|
||||
const statusColor =
|
||||
status === "linked" || status === "configured"
|
||||
? theme.success
|
||||
: status === "not linked"
|
||||
? theme.error
|
||||
: theme.muted;
|
||||
const baseLabel = plugin.meta.label ?? plugin.id;
|
||||
let line = `${baseLabel}: ${status}`;
|
||||
|
||||
const authAgeMs =
|
||||
summaryRecord && typeof summaryRecord.authAgeMs === "number"
|
||||
? summaryRecord.authAgeMs
|
||||
: null;
|
||||
const self = summaryRecord?.self as { e164?: string | null } | undefined;
|
||||
if (self?.e164) line += ` ${self.e164}`;
|
||||
if (authAgeMs != null && authAgeMs >= 0) {
|
||||
line += ` auth ${formatAge(authAgeMs)}`;
|
||||
}
|
||||
|
||||
lines.push(tint(line, statusColor));
|
||||
|
||||
if (configuredEntries.length > 0) {
|
||||
for (const entry of configuredEntries) {
|
||||
const details = buildAccountDetails({
|
||||
entry,
|
||||
plugin,
|
||||
cfg: effective,
|
||||
includeAllowFrom: resolved.includeAllowFrom,
|
||||
});
|
||||
lines.push(
|
||||
accountLine(
|
||||
formatAccountLabel({
|
||||
accountId: account.accountId,
|
||||
name: account.name,
|
||||
accountId: entry.accountId,
|
||||
name: entry.snapshot.name,
|
||||
}),
|
||||
details,
|
||||
),
|
||||
@@ -106,219 +248,6 @@ export async function buildProviderSummary(
|
||||
}
|
||||
}
|
||||
|
||||
const telegramEnabled = effective.telegram?.enabled !== false;
|
||||
if (!telegramEnabled) {
|
||||
lines.push(tint("Telegram: disabled", theme.muted));
|
||||
} else {
|
||||
const accounts = listTelegramAccountIds(effective).map((accountId) =>
|
||||
resolveTelegramAccount({ cfg: effective, accountId }),
|
||||
);
|
||||
const configuredAccounts = accounts.filter((account) =>
|
||||
Boolean(account.token?.trim()),
|
||||
);
|
||||
const telegramConfigured = configuredAccounts.length > 0;
|
||||
lines.push(
|
||||
telegramConfigured
|
||||
? tint("Telegram: configured", theme.success)
|
||||
: tint("Telegram: not configured", theme.muted),
|
||||
);
|
||||
if (telegramConfigured) {
|
||||
for (const account of configuredAccounts) {
|
||||
const details: string[] = [];
|
||||
if (!account.enabled) details.push("disabled");
|
||||
if (account.tokenSource && account.tokenSource !== "none") {
|
||||
details.push(`token:${account.tokenSource}`);
|
||||
}
|
||||
lines.push(
|
||||
accountLine(
|
||||
formatAccountLabel({
|
||||
accountId: account.accountId,
|
||||
name: account.name,
|
||||
}),
|
||||
details,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const discordEnabled = effective.discord?.enabled !== false;
|
||||
if (!discordEnabled) {
|
||||
lines.push(tint("Discord: disabled", theme.muted));
|
||||
} else {
|
||||
const accounts = listDiscordAccountIds(effective).map((accountId) =>
|
||||
resolveDiscordAccount({ cfg: effective, accountId }),
|
||||
);
|
||||
const configuredAccounts = accounts.filter((account) =>
|
||||
Boolean(account.token?.trim()),
|
||||
);
|
||||
const discordConfigured = configuredAccounts.length > 0;
|
||||
lines.push(
|
||||
discordConfigured
|
||||
? tint("Discord: configured", theme.success)
|
||||
: tint("Discord: not configured", theme.muted),
|
||||
);
|
||||
if (discordConfigured) {
|
||||
for (const account of configuredAccounts) {
|
||||
const details: string[] = [];
|
||||
if (!account.enabled) details.push("disabled");
|
||||
if (account.tokenSource && account.tokenSource !== "none") {
|
||||
details.push(`token:${account.tokenSource}`);
|
||||
}
|
||||
lines.push(
|
||||
accountLine(
|
||||
formatAccountLabel({
|
||||
accountId: account.accountId,
|
||||
name: account.name,
|
||||
}),
|
||||
details,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const slackEnabled = effective.slack?.enabled !== false;
|
||||
if (!slackEnabled) {
|
||||
lines.push(tint("Slack: disabled", theme.muted));
|
||||
} else {
|
||||
const accounts = listSlackAccountIds(effective).map((accountId) =>
|
||||
resolveSlackAccount({ cfg: effective, accountId }),
|
||||
);
|
||||
const configuredAccounts = accounts.filter(
|
||||
(account) =>
|
||||
Boolean(account.botToken?.trim()) && Boolean(account.appToken?.trim()),
|
||||
);
|
||||
const slackConfigured = configuredAccounts.length > 0;
|
||||
lines.push(
|
||||
slackConfigured
|
||||
? tint("Slack: configured", theme.success)
|
||||
: tint("Slack: not configured", theme.muted),
|
||||
);
|
||||
if (slackConfigured) {
|
||||
for (const account of configuredAccounts) {
|
||||
const details: string[] = [];
|
||||
if (!account.enabled) details.push("disabled");
|
||||
if (account.botTokenSource && account.botTokenSource !== "none") {
|
||||
details.push(`bot:${account.botTokenSource}`);
|
||||
}
|
||||
if (account.appTokenSource && account.appTokenSource !== "none") {
|
||||
details.push(`app:${account.appTokenSource}`);
|
||||
}
|
||||
lines.push(
|
||||
accountLine(
|
||||
formatAccountLabel({
|
||||
accountId: account.accountId,
|
||||
name: account.name,
|
||||
}),
|
||||
details,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const signalEnabled = effective.signal?.enabled !== false;
|
||||
if (!signalEnabled) {
|
||||
lines.push(tint("Signal: disabled", theme.muted));
|
||||
} else {
|
||||
const accounts = listSignalAccountIds(effective).map((accountId) =>
|
||||
resolveSignalAccount({ cfg: effective, accountId }),
|
||||
);
|
||||
const configuredAccounts = accounts.filter((account) => account.configured);
|
||||
const signalConfigured = configuredAccounts.length > 0;
|
||||
lines.push(
|
||||
signalConfigured
|
||||
? tint("Signal: configured", theme.success)
|
||||
: tint("Signal: not configured", theme.muted),
|
||||
);
|
||||
if (signalConfigured) {
|
||||
for (const account of configuredAccounts) {
|
||||
const details: string[] = [];
|
||||
if (!account.enabled) details.push("disabled");
|
||||
if (account.baseUrl) details.push(account.baseUrl);
|
||||
lines.push(
|
||||
accountLine(
|
||||
formatAccountLabel({
|
||||
accountId: account.accountId,
|
||||
name: account.name,
|
||||
}),
|
||||
details,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const imessageEnabled = effective.imessage?.enabled !== false;
|
||||
if (!imessageEnabled) {
|
||||
lines.push(tint("iMessage: disabled", theme.muted));
|
||||
} else {
|
||||
const accounts = listIMessageAccountIds(effective).map((accountId) =>
|
||||
resolveIMessageAccount({ cfg: effective, accountId }),
|
||||
);
|
||||
const configuredAccounts = accounts.filter((account) =>
|
||||
Boolean(
|
||||
account.config.cliPath ||
|
||||
account.config.dbPath ||
|
||||
account.config.allowFrom ||
|
||||
account.config.service ||
|
||||
account.config.region,
|
||||
),
|
||||
);
|
||||
const imessageConfigured = configuredAccounts.length > 0;
|
||||
lines.push(
|
||||
imessageConfigured
|
||||
? tint("iMessage: configured", theme.success)
|
||||
: tint("iMessage: not configured", theme.muted),
|
||||
);
|
||||
if (imessageConfigured) {
|
||||
for (const account of configuredAccounts) {
|
||||
const details: string[] = [];
|
||||
if (!account.enabled) details.push("disabled");
|
||||
lines.push(
|
||||
accountLine(
|
||||
formatAccountLabel({
|
||||
accountId: account.accountId,
|
||||
name: account.name,
|
||||
}),
|
||||
details,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (resolved.includeAllowFrom) {
|
||||
const allowFrom = effective.whatsapp?.allowFrom?.length
|
||||
? effective.whatsapp.allowFrom.map(normalizeE164).filter(Boolean)
|
||||
: [];
|
||||
if (allowFrom.length) {
|
||||
lines.push(tint(`AllowFrom: ${allowFrom.join(", ")}`, theme.muted));
|
||||
}
|
||||
}
|
||||
|
||||
const msEnabled = effective.msteams?.enabled !== false;
|
||||
if (!msEnabled) {
|
||||
lines.push(tint("MS Teams: disabled", theme.muted));
|
||||
} else {
|
||||
const configured = Boolean(resolveMSTeamsCredentials(effective.msteams));
|
||||
lines.push(
|
||||
configured
|
||||
? tint("MS Teams: configured", theme.success)
|
||||
: tint("MS Teams: not configured", theme.muted),
|
||||
);
|
||||
if (configured && resolved.includeAllowFrom) {
|
||||
const allowFrom = (effective.msteams?.allowFrom ?? [])
|
||||
.map((val) => val.trim())
|
||||
.filter(Boolean)
|
||||
.slice(0, 2);
|
||||
if (allowFrom.length > 0) {
|
||||
lines.push(accountLine("default", [`allow:${allowFrom.join(",")}`]));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return lines;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,456 +1,23 @@
|
||||
export type ProviderStatusIssue = {
|
||||
provider:
|
||||
| "discord"
|
||||
| "telegram"
|
||||
| "whatsapp"
|
||||
| "slack"
|
||||
| "signal"
|
||||
| "imessage";
|
||||
accountId: string;
|
||||
kind: "intent" | "permissions" | "config" | "auth" | "runtime";
|
||||
message: string;
|
||||
fix?: string;
|
||||
};
|
||||
|
||||
type DiscordIntentSummary = {
|
||||
messageContent?: "enabled" | "limited" | "disabled";
|
||||
};
|
||||
|
||||
type DiscordApplicationSummary = {
|
||||
intents?: DiscordIntentSummary;
|
||||
};
|
||||
|
||||
type DiscordAccountStatus = {
|
||||
accountId?: unknown;
|
||||
enabled?: unknown;
|
||||
configured?: unknown;
|
||||
application?: unknown;
|
||||
audit?: unknown;
|
||||
};
|
||||
|
||||
type TelegramAccountStatus = {
|
||||
accountId?: unknown;
|
||||
enabled?: unknown;
|
||||
configured?: unknown;
|
||||
allowUnmentionedGroups?: unknown;
|
||||
audit?: unknown;
|
||||
};
|
||||
|
||||
type WhatsAppAccountStatus = {
|
||||
accountId?: unknown;
|
||||
enabled?: unknown;
|
||||
linked?: unknown;
|
||||
connected?: unknown;
|
||||
running?: unknown;
|
||||
reconnectAttempts?: unknown;
|
||||
lastError?: unknown;
|
||||
};
|
||||
|
||||
type RuntimeAccountStatus = {
|
||||
accountId?: unknown;
|
||||
enabled?: unknown;
|
||||
configured?: unknown;
|
||||
running?: unknown;
|
||||
lastError?: unknown;
|
||||
};
|
||||
|
||||
function asString(value: unknown): string | undefined {
|
||||
return typeof value === "string" && value.trim().length > 0
|
||||
? value.trim()
|
||||
: undefined;
|
||||
}
|
||||
|
||||
function formatValue(value: unknown): string | undefined {
|
||||
const s = asString(value);
|
||||
if (s) return s;
|
||||
if (value == null) return undefined;
|
||||
try {
|
||||
return JSON.stringify(value);
|
||||
} catch {
|
||||
if (typeof value === "bigint") return value.toString();
|
||||
if (typeof value === "number" || typeof value === "boolean") {
|
||||
return value.toString();
|
||||
}
|
||||
if (typeof value === "symbol") return value.toString();
|
||||
return Object.prototype.toString.call(value);
|
||||
}
|
||||
}
|
||||
|
||||
function shorten(message: string, maxLen = 140): string {
|
||||
const cleaned = message.replace(/\s+/g, " ").trim();
|
||||
if (cleaned.length <= maxLen) return cleaned;
|
||||
return `${cleaned.slice(0, Math.max(0, maxLen - 1))}…`;
|
||||
}
|
||||
|
||||
function isRecord(value: unknown): value is Record<string, unknown> {
|
||||
return Boolean(value) && typeof value === "object" && !Array.isArray(value);
|
||||
}
|
||||
|
||||
function readDiscordAccountStatus(value: unknown): DiscordAccountStatus | null {
|
||||
if (!isRecord(value)) return null;
|
||||
return {
|
||||
accountId: value.accountId,
|
||||
enabled: value.enabled,
|
||||
configured: value.configured,
|
||||
application: value.application,
|
||||
audit: value.audit,
|
||||
};
|
||||
}
|
||||
|
||||
function readDiscordApplicationSummary(
|
||||
value: unknown,
|
||||
): DiscordApplicationSummary {
|
||||
if (!isRecord(value)) return {};
|
||||
const intentsRaw = value.intents;
|
||||
if (!isRecord(intentsRaw)) return {};
|
||||
return {
|
||||
intents: {
|
||||
messageContent:
|
||||
intentsRaw.messageContent === "enabled" ||
|
||||
intentsRaw.messageContent === "limited" ||
|
||||
intentsRaw.messageContent === "disabled"
|
||||
? intentsRaw.messageContent
|
||||
: undefined,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
type DiscordPermissionsAuditSummary = {
|
||||
unresolvedChannels?: number;
|
||||
channels?: Array<{
|
||||
channelId: string;
|
||||
ok?: boolean;
|
||||
missing?: string[];
|
||||
error?: string | null;
|
||||
}>;
|
||||
};
|
||||
|
||||
function readDiscordPermissionsAuditSummary(
|
||||
value: unknown,
|
||||
): DiscordPermissionsAuditSummary {
|
||||
if (!isRecord(value)) return {};
|
||||
const unresolvedChannels =
|
||||
typeof value.unresolvedChannels === "number" &&
|
||||
Number.isFinite(value.unresolvedChannels)
|
||||
? value.unresolvedChannels
|
||||
: undefined;
|
||||
const channelsRaw = value.channels;
|
||||
const channels = Array.isArray(channelsRaw)
|
||||
? (channelsRaw
|
||||
.map((entry) => {
|
||||
if (!isRecord(entry)) return null;
|
||||
const channelId = asString(entry.channelId);
|
||||
if (!channelId) return null;
|
||||
const ok = typeof entry.ok === "boolean" ? entry.ok : undefined;
|
||||
const missing = Array.isArray(entry.missing)
|
||||
? entry.missing.map((v) => asString(v)).filter(Boolean)
|
||||
: undefined;
|
||||
const error = asString(entry.error) ?? null;
|
||||
return {
|
||||
channelId,
|
||||
ok,
|
||||
missing: missing?.length ? missing : undefined,
|
||||
error,
|
||||
};
|
||||
})
|
||||
.filter(Boolean) as DiscordPermissionsAuditSummary["channels"])
|
||||
: undefined;
|
||||
return { unresolvedChannels, channels };
|
||||
}
|
||||
|
||||
function readTelegramAccountStatus(
|
||||
value: unknown,
|
||||
): TelegramAccountStatus | null {
|
||||
if (!isRecord(value)) return null;
|
||||
return {
|
||||
accountId: value.accountId,
|
||||
enabled: value.enabled,
|
||||
configured: value.configured,
|
||||
allowUnmentionedGroups: value.allowUnmentionedGroups,
|
||||
audit: value.audit,
|
||||
};
|
||||
}
|
||||
|
||||
type TelegramGroupMembershipAuditSummary = {
|
||||
unresolvedGroups?: number;
|
||||
hasWildcardUnmentionedGroups?: boolean;
|
||||
groups?: Array<{
|
||||
chatId: string;
|
||||
ok?: boolean;
|
||||
status?: string | null;
|
||||
error?: string | null;
|
||||
}>;
|
||||
};
|
||||
|
||||
function readTelegramGroupMembershipAuditSummary(
|
||||
value: unknown,
|
||||
): TelegramGroupMembershipAuditSummary {
|
||||
if (!isRecord(value)) return {};
|
||||
const unresolvedGroups =
|
||||
typeof value.unresolvedGroups === "number" &&
|
||||
Number.isFinite(value.unresolvedGroups)
|
||||
? value.unresolvedGroups
|
||||
: undefined;
|
||||
const hasWildcardUnmentionedGroups =
|
||||
typeof value.hasWildcardUnmentionedGroups === "boolean"
|
||||
? value.hasWildcardUnmentionedGroups
|
||||
: undefined;
|
||||
const groupsRaw = value.groups;
|
||||
const groups = Array.isArray(groupsRaw)
|
||||
? (groupsRaw
|
||||
.map((entry) => {
|
||||
if (!isRecord(entry)) return null;
|
||||
const chatId = asString(entry.chatId);
|
||||
if (!chatId) return null;
|
||||
const ok = typeof entry.ok === "boolean" ? entry.ok : undefined;
|
||||
const status = asString(entry.status) ?? null;
|
||||
const error = asString(entry.error) ?? null;
|
||||
return { chatId, ok, status, error };
|
||||
})
|
||||
.filter(Boolean) as TelegramGroupMembershipAuditSummary["groups"])
|
||||
: undefined;
|
||||
return { unresolvedGroups, hasWildcardUnmentionedGroups, groups };
|
||||
}
|
||||
|
||||
function readWhatsAppAccountStatus(
|
||||
value: unknown,
|
||||
): WhatsAppAccountStatus | null {
|
||||
if (!isRecord(value)) return null;
|
||||
return {
|
||||
accountId: value.accountId,
|
||||
enabled: value.enabled,
|
||||
linked: value.linked,
|
||||
connected: value.connected,
|
||||
running: value.running,
|
||||
reconnectAttempts: value.reconnectAttempts,
|
||||
lastError: value.lastError,
|
||||
};
|
||||
}
|
||||
|
||||
function readRuntimeAccountStatus(value: unknown): RuntimeAccountStatus | null {
|
||||
if (!isRecord(value)) return null;
|
||||
return {
|
||||
accountId: value.accountId,
|
||||
enabled: value.enabled,
|
||||
configured: value.configured,
|
||||
running: value.running,
|
||||
lastError: value.lastError,
|
||||
};
|
||||
}
|
||||
import { listProviderPlugins } from "../providers/plugins/index.js";
|
||||
import type {
|
||||
ProviderAccountSnapshot,
|
||||
ProviderStatusIssue,
|
||||
} from "../providers/plugins/types.js";
|
||||
|
||||
export function collectProvidersStatusIssues(
|
||||
payload: Record<string, unknown>,
|
||||
): ProviderStatusIssue[] {
|
||||
const issues: ProviderStatusIssue[] = [];
|
||||
const accountsByProvider = payload.providerAccounts as
|
||||
| Record<string, unknown>
|
||||
| undefined;
|
||||
for (const plugin of listProviderPlugins()) {
|
||||
const collect = plugin.status?.collectStatusIssues;
|
||||
if (!collect) continue;
|
||||
const raw = accountsByProvider?.[plugin.id];
|
||||
if (!Array.isArray(raw)) continue;
|
||||
|
||||
const discordAccountsRaw = payload.discordAccounts;
|
||||
if (Array.isArray(discordAccountsRaw)) {
|
||||
for (const entry of discordAccountsRaw) {
|
||||
const account = readDiscordAccountStatus(entry);
|
||||
if (!account) continue;
|
||||
const accountId = asString(account.accountId) ?? "default";
|
||||
const enabled = account.enabled !== false;
|
||||
const configured = account.configured === true;
|
||||
if (!enabled || !configured) continue;
|
||||
|
||||
const app = readDiscordApplicationSummary(account.application);
|
||||
const messageContent = app.intents?.messageContent;
|
||||
if (messageContent === "disabled") {
|
||||
issues.push({
|
||||
provider: "discord",
|
||||
accountId,
|
||||
kind: "intent",
|
||||
message:
|
||||
"Message Content Intent is disabled. Bot may not see normal channel messages.",
|
||||
fix: "Enable Message Content Intent in Discord Dev Portal → Bot → Privileged Gateway Intents, or require mention-only operation.",
|
||||
});
|
||||
}
|
||||
|
||||
const audit = readDiscordPermissionsAuditSummary(account.audit);
|
||||
if (audit.unresolvedChannels && audit.unresolvedChannels > 0) {
|
||||
issues.push({
|
||||
provider: "discord",
|
||||
accountId,
|
||||
kind: "config",
|
||||
message: `Some configured guild channels are not numeric IDs (unresolvedChannels=${audit.unresolvedChannels}). Permission audit can only check numeric channel IDs.`,
|
||||
fix: "Use numeric channel IDs as keys in discord.guilds.*.channels (then rerun providers status --probe).",
|
||||
});
|
||||
}
|
||||
for (const channel of audit.channels ?? []) {
|
||||
if (channel.ok === true) continue;
|
||||
const missing = channel.missing?.length
|
||||
? ` missing ${channel.missing.join(", ")}`
|
||||
: "";
|
||||
const error = channel.error ? `: ${channel.error}` : "";
|
||||
issues.push({
|
||||
provider: "discord",
|
||||
accountId,
|
||||
kind: "permissions",
|
||||
message: `Channel ${channel.channelId} permission check failed.${missing}${error}`,
|
||||
fix: "Ensure the bot role can view + send in this channel (and that channel overrides don't deny it).",
|
||||
});
|
||||
}
|
||||
}
|
||||
issues.push(...collect(raw as ProviderAccountSnapshot[]));
|
||||
}
|
||||
|
||||
const telegramAccountsRaw = payload.telegramAccounts;
|
||||
if (Array.isArray(telegramAccountsRaw)) {
|
||||
for (const entry of telegramAccountsRaw) {
|
||||
const account = readTelegramAccountStatus(entry);
|
||||
if (!account) continue;
|
||||
const accountId = asString(account.accountId) ?? "default";
|
||||
const enabled = account.enabled !== false;
|
||||
const configured = account.configured === true;
|
||||
if (!enabled || !configured) continue;
|
||||
|
||||
if (account.allowUnmentionedGroups === true) {
|
||||
issues.push({
|
||||
provider: "telegram",
|
||||
accountId,
|
||||
kind: "config",
|
||||
message:
|
||||
"Config allows unmentioned group messages (requireMention=false). Telegram Bot API privacy mode will block most group messages unless disabled.",
|
||||
fix: "In BotFather run /setprivacy → Disable for this bot (then restart the gateway).",
|
||||
});
|
||||
}
|
||||
|
||||
const audit = readTelegramGroupMembershipAuditSummary(account.audit);
|
||||
if (audit.hasWildcardUnmentionedGroups === true) {
|
||||
issues.push({
|
||||
provider: "telegram",
|
||||
accountId,
|
||||
kind: "config",
|
||||
message:
|
||||
'Telegram groups config uses "*" with requireMention=false; membership probing is not possible without explicit group IDs.',
|
||||
fix: "Add explicit numeric group ids under telegram.groups (or per-account groups) to enable probing.",
|
||||
});
|
||||
}
|
||||
if (audit.unresolvedGroups && audit.unresolvedGroups > 0) {
|
||||
issues.push({
|
||||
provider: "telegram",
|
||||
accountId,
|
||||
kind: "config",
|
||||
message: `Some configured Telegram groups are not numeric IDs (unresolvedGroups=${audit.unresolvedGroups}). Membership probe can only check numeric group IDs.`,
|
||||
fix: "Use numeric chat IDs (e.g. -100...) as keys in telegram.groups for requireMention=false groups.",
|
||||
});
|
||||
}
|
||||
for (const group of audit.groups ?? []) {
|
||||
if (group.ok === true) continue;
|
||||
const status = group.status ? ` status=${group.status}` : "";
|
||||
const err = group.error ? `: ${group.error}` : "";
|
||||
issues.push({
|
||||
provider: "telegram",
|
||||
accountId,
|
||||
kind: "runtime",
|
||||
message: `Group ${group.chatId} not reachable by bot.${status}${err}`,
|
||||
fix: "Invite the bot to the group, then DM the bot once (/start) and restart the gateway.",
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const whatsappAccountsRaw = payload.whatsappAccounts;
|
||||
if (Array.isArray(whatsappAccountsRaw)) {
|
||||
for (const entry of whatsappAccountsRaw) {
|
||||
const account = readWhatsAppAccountStatus(entry);
|
||||
if (!account) continue;
|
||||
const accountId = asString(account.accountId) ?? "default";
|
||||
const enabled = account.enabled !== false;
|
||||
if (!enabled) continue;
|
||||
const linked = account.linked === true;
|
||||
const running = account.running === true;
|
||||
const connected = account.connected === true;
|
||||
const reconnectAttempts =
|
||||
typeof account.reconnectAttempts === "number"
|
||||
? account.reconnectAttempts
|
||||
: null;
|
||||
const lastError = asString(account.lastError);
|
||||
|
||||
if (!linked) {
|
||||
issues.push({
|
||||
provider: "whatsapp",
|
||||
accountId,
|
||||
kind: "auth",
|
||||
message: "Not linked (no WhatsApp Web session).",
|
||||
fix: "Run: clawdbot providers login (scan QR on the gateway host).",
|
||||
});
|
||||
continue;
|
||||
}
|
||||
|
||||
if (running && !connected) {
|
||||
issues.push({
|
||||
provider: "whatsapp",
|
||||
accountId,
|
||||
kind: "runtime",
|
||||
message: `Linked but disconnected${reconnectAttempts != null ? ` (reconnectAttempts=${reconnectAttempts})` : ""}${lastError ? `: ${lastError}` : "."}`,
|
||||
fix: "Run: clawdbot doctor (or restart the gateway). If it persists, relink via providers login and check logs.",
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const slackAccountsRaw = payload.slackAccounts;
|
||||
if (Array.isArray(slackAccountsRaw)) {
|
||||
for (const entry of slackAccountsRaw) {
|
||||
const account = readRuntimeAccountStatus(entry);
|
||||
if (!account) continue;
|
||||
const accountId = asString(account.accountId) ?? "default";
|
||||
const enabled = account.enabled !== false;
|
||||
const configured = account.configured === true;
|
||||
if (!enabled || !configured) continue;
|
||||
const lastError = formatValue(account.lastError);
|
||||
if (!lastError) continue;
|
||||
issues.push({
|
||||
provider: "slack",
|
||||
accountId,
|
||||
kind: "runtime",
|
||||
message: `Provider error: ${shorten(lastError)}`,
|
||||
fix: "Check gateway logs (`clawdbot logs --follow`) and re-auth/restart if needed.",
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
const signalAccountsRaw = payload.signalAccounts;
|
||||
if (Array.isArray(signalAccountsRaw)) {
|
||||
for (const entry of signalAccountsRaw) {
|
||||
const account = readRuntimeAccountStatus(entry);
|
||||
if (!account) continue;
|
||||
const accountId = asString(account.accountId) ?? "default";
|
||||
const enabled = account.enabled !== false;
|
||||
const configured = account.configured === true;
|
||||
if (!enabled || !configured) continue;
|
||||
const lastError = formatValue(account.lastError);
|
||||
if (!lastError) continue;
|
||||
issues.push({
|
||||
provider: "signal",
|
||||
accountId,
|
||||
kind: "runtime",
|
||||
message: `Provider error: ${shorten(lastError)}`,
|
||||
fix: "Check gateway logs (`clawdbot logs --follow`) and verify signal CLI/service setup.",
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
const imessageAccountsRaw = payload.imessageAccounts;
|
||||
if (Array.isArray(imessageAccountsRaw)) {
|
||||
for (const entry of imessageAccountsRaw) {
|
||||
const account = readRuntimeAccountStatus(entry);
|
||||
if (!account) continue;
|
||||
const accountId = asString(account.accountId) ?? "default";
|
||||
const enabled = account.enabled !== false;
|
||||
const configured = account.configured === true;
|
||||
if (!enabled || !configured) continue;
|
||||
const lastError = formatValue(account.lastError);
|
||||
if (!lastError) continue;
|
||||
issues.push({
|
||||
provider: "imessage",
|
||||
accountId,
|
||||
kind: "runtime",
|
||||
message: `Provider error: ${shorten(lastError)}`,
|
||||
fix: "Check macOS permissions/TCC and gateway logs (`clawdbot logs --follow`).",
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
return issues;
|
||||
}
|
||||
|
||||
@@ -13,17 +13,17 @@ describe("system-presence", () => {
|
||||
|
||||
upsertPresence(instanceIdUpper, {
|
||||
host: "clawdbot",
|
||||
mode: "app",
|
||||
mode: "ui",
|
||||
instanceId: instanceIdUpper,
|
||||
reason: "connect",
|
||||
});
|
||||
|
||||
updateSystemPresence({
|
||||
text: "Node: Peter-Mac-Studio (10.0.0.1) · app 2.0.0 · last input 5s ago · mode app · reason beacon",
|
||||
text: "Node: Peter-Mac-Studio (10.0.0.1) · ui 2.0.0 · last input 5s ago · mode ui · reason beacon",
|
||||
instanceId: instanceIdLower,
|
||||
host: "Peter-Mac-Studio",
|
||||
ip: "10.0.0.1",
|
||||
mode: "app",
|
||||
mode: "ui",
|
||||
version: "2.0.0",
|
||||
lastInputSeconds: 5,
|
||||
reason: "beacon",
|
||||
|
||||
Reference in New Issue
Block a user