mirror of
https://github.com/moltbot/moltbot.git
synced 2026-04-28 00:43:57 +00:00
fix(telegram): warn when accounts.default is missing in multi-account setup
When configuring Telegram multi-account, omitting accounts.default leads to confusing default routing behavior. The system silently falls back to the first configured account alphabetically, which may not be the intended bot identity for sends. Now a log.warn is emitted once when the fallback occurs, guiding users to set channels.telegram.defaultAccount or add an accounts.default entry. Closes #32137 Made-with: Cursor
This commit is contained in:
committed by
Gustavo Madeira Santana
parent
2370ea5d1b
commit
7e96e44cd3
@@ -1,8 +1,9 @@
|
|||||||
import { afterEach, describe, expect, it, vi } from "vitest";
|
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
||||||
import type { OpenClawConfig } from "../config/config.js";
|
import type { OpenClawConfig } from "../config/config.js";
|
||||||
import { withEnv } from "../test-utils/env.js";
|
import { withEnv } from "../test-utils/env.js";
|
||||||
import {
|
import {
|
||||||
listTelegramAccountIds,
|
listTelegramAccountIds,
|
||||||
|
resetMissingDefaultWarnFlag,
|
||||||
resolveDefaultTelegramAccountId,
|
resolveDefaultTelegramAccountId,
|
||||||
resolveTelegramAccount,
|
resolveTelegramAccount,
|
||||||
} from "./accounts.js";
|
} from "./accounts.js";
|
||||||
@@ -24,6 +25,7 @@ vi.mock("../logging/subsystem.js", () => ({
|
|||||||
describe("resolveTelegramAccount", () => {
|
describe("resolveTelegramAccount", () => {
|
||||||
afterEach(() => {
|
afterEach(() => {
|
||||||
warnMock.mockClear();
|
warnMock.mockClear();
|
||||||
|
resetMissingDefaultWarnFlag();
|
||||||
});
|
});
|
||||||
|
|
||||||
it("falls back to the first configured account when accountId is omitted", () => {
|
it("falls back to the first configured account when accountId is omitted", () => {
|
||||||
@@ -105,6 +107,81 @@ describe("resolveTelegramAccount", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
describe("resolveDefaultTelegramAccountId", () => {
|
describe("resolveDefaultTelegramAccountId", () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
resetMissingDefaultWarnFlag();
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
warnMock.mockClear();
|
||||||
|
resetMissingDefaultWarnFlag();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("warns when accounts.default is missing in multi-account setup (#32137)", () => {
|
||||||
|
const cfg: OpenClawConfig = {
|
||||||
|
channels: {
|
||||||
|
telegram: {
|
||||||
|
accounts: { work: { botToken: "tok-work" }, alerts: { botToken: "tok-alerts" } },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
const result = resolveDefaultTelegramAccountId(cfg);
|
||||||
|
expect(result).toBe("alerts");
|
||||||
|
expect(warnMock).toHaveBeenCalledWith(expect.stringContaining("accounts.default is missing"));
|
||||||
|
});
|
||||||
|
|
||||||
|
it("does not warn when accounts.default exists", () => {
|
||||||
|
const cfg: OpenClawConfig = {
|
||||||
|
channels: {
|
||||||
|
telegram: {
|
||||||
|
accounts: { default: { botToken: "tok-default" }, work: { botToken: "tok-work" } },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
resolveDefaultTelegramAccountId(cfg);
|
||||||
|
const warnLines = warnMock.mock.calls.map(([line]: [string]) => line);
|
||||||
|
expect(warnLines.every((line: string) => !line.includes("accounts.default is missing"))).toBe(
|
||||||
|
true,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("does not warn when defaultAccount is explicitly set", () => {
|
||||||
|
const cfg: OpenClawConfig = {
|
||||||
|
channels: {
|
||||||
|
telegram: {
|
||||||
|
defaultAccount: "work",
|
||||||
|
accounts: { work: { botToken: "tok-work" } },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
resolveDefaultTelegramAccountId(cfg);
|
||||||
|
const warnLines = warnMock.mock.calls.map(([line]: [string]) => line);
|
||||||
|
expect(warnLines.every((line: string) => !line.includes("accounts.default is missing"))).toBe(
|
||||||
|
true,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("warns only once per process lifetime", () => {
|
||||||
|
const cfg: OpenClawConfig = {
|
||||||
|
channels: {
|
||||||
|
telegram: {
|
||||||
|
accounts: { work: { botToken: "tok-work" } },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
resolveDefaultTelegramAccountId(cfg);
|
||||||
|
resolveDefaultTelegramAccountId(cfg);
|
||||||
|
resolveDefaultTelegramAccountId(cfg);
|
||||||
|
|
||||||
|
const missingDefaultWarns = warnMock.mock.calls
|
||||||
|
.map(([line]: [string]) => line)
|
||||||
|
.filter((line: string) => line.includes("accounts.default is missing"));
|
||||||
|
expect(missingDefaultWarns).toHaveLength(1);
|
||||||
|
});
|
||||||
|
|
||||||
it("prefers channels.telegram.defaultAccount when it matches a configured account", () => {
|
it("prefers channels.telegram.defaultAccount when it matches a configured account", () => {
|
||||||
const cfg: OpenClawConfig = {
|
const cfg: OpenClawConfig = {
|
||||||
channels: {
|
channels: {
|
||||||
|
|||||||
@@ -63,6 +63,13 @@ export function listTelegramAccountIds(cfg: OpenClawConfig): string[] {
|
|||||||
return ids.toSorted((a, b) => a.localeCompare(b));
|
return ids.toSorted((a, b) => a.localeCompare(b));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let emittedMissingDefaultWarn = false;
|
||||||
|
|
||||||
|
/** @internal Reset the once-per-process warning flag. Exported for tests only. */
|
||||||
|
export function resetMissingDefaultWarnFlag(): void {
|
||||||
|
emittedMissingDefaultWarn = false;
|
||||||
|
}
|
||||||
|
|
||||||
export function resolveDefaultTelegramAccountId(cfg: OpenClawConfig): string {
|
export function resolveDefaultTelegramAccountId(cfg: OpenClawConfig): string {
|
||||||
const boundDefault = resolveDefaultAgentBoundAccountId(cfg, "telegram");
|
const boundDefault = resolveDefaultAgentBoundAccountId(cfg, "telegram");
|
||||||
if (boundDefault) {
|
if (boundDefault) {
|
||||||
@@ -79,6 +86,14 @@ export function resolveDefaultTelegramAccountId(cfg: OpenClawConfig): string {
|
|||||||
if (ids.includes(DEFAULT_ACCOUNT_ID)) {
|
if (ids.includes(DEFAULT_ACCOUNT_ID)) {
|
||||||
return DEFAULT_ACCOUNT_ID;
|
return DEFAULT_ACCOUNT_ID;
|
||||||
}
|
}
|
||||||
|
if (ids.length > 0 && !emittedMissingDefaultWarn) {
|
||||||
|
emittedMissingDefaultWarn = true;
|
||||||
|
log.warn(
|
||||||
|
`channels.telegram: accounts.default is missing; falling back to "${ids[0]}". ` +
|
||||||
|
"Set channels.telegram.defaultAccount or add an accounts.default entry " +
|
||||||
|
"to avoid routing surprises in multi-account setups.",
|
||||||
|
);
|
||||||
|
}
|
||||||
return ids[0] ?? DEFAULT_ACCOUNT_ID;
|
return ids[0] ?? DEFAULT_ACCOUNT_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user