fix(telegram): preserve implicit default account (#82794)

giodl73-repo · web-flow · commit c4f20b656eac · 2026-05-16T19:30:52.000-07:00
Keep the top-level Telegram default account in the account list when named accounts or bindings are added alongside top-level credentials. This preserves default polling while still allowing named-only configs to resolve to their single configured account.
diff --git a/extensions/telegram/src/account-selection.ts b/extensions/telegram/src/account-selection.ts
@@ -37,6 +37,21 @@ function listConfiguredAccountIds(cfg: OpenClawConfig): string[] {
   return [...ids];
 }
 
+function hasConfiguredDefaultAccountSource(cfg: OpenClawConfig): boolean {
+  const telegram = cfg.channels?.telegram;
+  if (!telegram) {
+    return false;
+  }
+  const botToken = telegram.botToken;
+  if (typeof botToken === "string") {
+    return botToken.trim().length > 0;
+  }
+  if (botToken && typeof botToken === "object") {
+    return true;
+  }
+  return typeof telegram.tokenFile === "string" && telegram.tokenFile.trim().length > 0;
+}
+
 function resolveBindingAccount(params: {
   binding: unknown;
   channelId: string;
@@ -114,7 +129,10 @@ function resolveListedDefaultAccountId(params: {
 export function listTelegramAccountIds(cfg: OpenClawConfig): string[] {
   return combineAccountIds({
     configuredAccountIds: listConfiguredAccountIds(cfg),
-    additionalAccountIds: listBoundAccountIds(cfg, "telegram"),
+    additionalAccountIds: [
+      ...listBoundAccountIds(cfg, "telegram"),
+      ...(hasConfiguredDefaultAccountSource(cfg) ? [DEFAULT_ACCOUNT_ID] : []),
+    ],
   });
 }
 
diff --git a/extensions/telegram/src/accounts.test.ts b/extensions/telegram/src/accounts.test.ts
@@ -145,6 +145,33 @@ describe("resolveTelegramAccount", () => {
     expect(accounts.map((account) => account.accountId)).toEqual(["work"]);
     expect(accounts[0]?.token).toBe("tok-work");
   });
+
+  it("keeps the implicit default account when named accounts are added to top-level credentials (#82780)", () => {
+    const cfg = {
+      channels: {
+        telegram: {
+          botToken: "tok-default",
+          accounts: {
+            fusion: {
+              enabled: false,
+              name: "Fusion",
+              botToken: "tok-fusion",
+            },
+          },
+        },
+      },
+      bindings: [{ agentId: "fusion", match: { channel: "telegram", accountId: "fusion" } }],
+    } as unknown as OpenClawConfig;
+
+    expect(listTelegramAccountIds(cfg)).toEqual(["default", "fusion"]);
+    expect(resolveDefaultTelegramAccountId(cfg)).toBe("default");
+    expectNoMissingDefaultWarning();
+
+    const accounts = listEnabledTelegramAccounts(cfg);
+    expect(accounts.map((account) => account.accountId)).toEqual(["default"]);
+    expect(accounts[0]?.token).toBe("tok-default");
+    expect(accounts[0]?.tokenSource).toBe("config");
+  });
 });
 
 describe("resolveDefaultTelegramAccountId", () => {
