fix(discord): report unresolved token refs at startup (#8...

Recent Commits to openclaw:main

giodl73-repo · 2026-05-15 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -502,6 +502,22 @@ describe("discordPlugin outbound", () => {`
`502`	`502`	`expect(runtimeMonitorDiscordProvider).not.toHaveBeenCalled();`
`503`	`503`	`});`
`504`	`504`
	`505`	`+it("fails loudly before provider startup when a token SecretRef is configured but unresolved", async () => {`
	`506`	`+const cfg = {`
	`507`	`+channels: {`
	`508`	`+discord: {`
	`509`	`+token: { source: "env", provider: "default", id: "DISCORD_BOT_TOKEN" },`
	`510`	`+},`
	`511`	`+},`
	`512`	`+} as unknown as OpenClawConfig;`
	`513`	`+`
	`514`	`+await expect(startDiscordAccount(cfg)).rejects.toThrow(`
	`515`	`+'Discord bot token configured for account "default" is unavailable',`
	`516`	`+);`
	`517`	`+expect(probeDiscordMock).not.toHaveBeenCalled();`
	`518`	`+expect(monitorDiscordProviderMock).not.toHaveBeenCalled();`
	`519`	`+});`
	`520`	`+`
`505`	`521`	`it("does not block Discord monitor startup on the startup probe", async () => {`
`506`	`522`	`let resolveProbe:`
`507`	`523`	`\| ((value: {`

Original file line number	Diff line number	Diff line change
`@@ -651,6 +651,11 @@ export const discordPlugin: ChannelPlugin<ResolvedDiscordAccount, DiscordProbe>`
`651`	`651`	`gateway: {`
`652`	`652`	`startAccount: async (ctx) => {`
`653`	`653`	`const account = ctx.account;`
	`654`	`+if (account.tokenStatus === "configured_unavailable") {`
	`655`	`+throw new Error(`
	`656`	+`Discord bot token configured for account "${account.accountId}" is unavailable; resolve SecretRefs against the active runtime snapshot before using this account.`,
	`657`	`+);`
	`658`	`+}`
`654`	`659`	`const startupDelayMs = resolveDiscordStartupDelayMs(ctx.cfg, account.accountId);`
`655`	`660`	`if (startupDelayMs > 0) {`
`656`	`661`	`ctx.log?.info(`

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ describe("createDiscordPluginBase", () => {`
`63`	`63`	`expect(plugin.config.isEnabled?.(workAccount, cfg)).toBe(true);`
`64`	`64`	`});`
`65`	`65`
`66`		`-it("describes unresolved SecretRef tokens without marking them startup-configured", () => {`
	`66`	`+it("describes unresolved SecretRef tokens as startup-configured so startup reports the resolver error", () => {`
`67`	`67`	`const plugin = createDiscordPluginBase({ setup: {} as never });`
`68`	`68`	`const cfg = {`
`69`	`69`	`channels: {`
`@@ -79,8 +79,8 @@ describe("createDiscordPluginBase", () => {`
`79`	`79`	`expect(account.token).toBe("");`
`80`	`80`	`expect(account.tokenSource).toBe("config");`
`81`	`81`	`expect(account.tokenStatus).toBe("configured_unavailable");`
`82`		`-expect(plugin.config.isConfigured?.(account, cfg)).toBe(false);`
`83`		`-expect(described?.configured).toBe(false);`
	`82`	`+expect(plugin.config.isConfigured?.(account, cfg)).toBe(true);`
	`83`	`+expect(described?.configured).toBe(true);`
`84`	`84`	`expect(described?.tokenStatus).toBe("configured_unavailable");`
`85`	`85`	`});`
`86`	`86`	`});`

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,11 @@ import {`
`15`	`15`	`resolveDiscordAccountDisabledReason,`
`16`	`16`	`type ResolvedDiscordAccount,`
`17`	`17`	`} from "./accounts.js";`
`18`		`-import { getChatChannelMeta, type ChannelPlugin } from "./channel-api.js";`
	`18`	`+import {`
	`19`	`+getChatChannelMeta,`
	`20`	`+resolveConfiguredFromCredentialStatuses,`
	`21`	`+type ChannelPlugin,`
	`22`	`+} from "./channel-api.js";`
`19`	`23`	`import { DiscordChannelConfigSchema } from "./config-schema.js";`
`20`	`24`	`import { normalizeCompatibilityConfig } from "./doctor-contract.js";`
`21`	`25`	`import { DISCORD_LEGACY_CONFIG_RULES } from "./doctor-shared.js";`
`@@ -149,11 +153,13 @@ export function createDiscordPluginBase(params: {`
`149`	`153`	`typeof env?.DISCORD_BOT_TOKEN === "string" && env.DISCORD_BOT_TOKEN.trim().length > 0,`
`150`	`154`	`isEnabled: (account, cfg) => isDiscordAccountEnabledForRuntime(account, cfg),`
`151`	`155`	`disabledReason: (account, cfg) => resolveDiscordAccountDisabledReason(account, cfg),`
`152`		`-isConfigured: (account) => Boolean(account.token?.trim()),`
	`156`	`+isConfigured: (account) =>`
	`157`	`+resolveConfiguredFromCredentialStatuses(account) ?? Boolean(account.token?.trim()),`
`153`	`158`	`describeAccount: (account) =>`
`154`	`159`	`describeAccountSnapshot({`
`155`	`160`	`account,`
`156`		`-configured: Boolean(account.token?.trim()),`
	`161`	`+configured:`
	`162`	`+resolveConfiguredFromCredentialStatuses(account) ?? Boolean(account.token?.trim()),`
`157`	`163`	`extra: {`
`158`	`164`	`tokenSource: account.tokenSource,`
`159`	`165`	`tokenStatus: account.tokenStatus,`

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,67 @@ import {`
`9`	`9`	`const { prepareSecretsRuntimeSnapshot } = setupSecretsRuntimeSnapshotTestHooks();`
`10`	`10`
`11`	`11`	`describe("secrets runtime snapshot discord surface", () => {`
	`12`	`+it("resolves active Discord token refs for the default account", async () => {`
	`13`	`+const topLevelSnapshot = await prepareSecretsRuntimeSnapshot({`
	`14`	`+config: asConfig({`
	`15`	`+channels: {`
	`16`	`+discord: {`
	`17`	`+token: {`
	`18`	`+source: "env",`
	`19`	`+provider: "default",`
	`20`	`+id: "DISCORD_BOT_TOKEN",`
	`21`	`+},`
	`22`	`+},`
	`23`	`+},`
	`24`	`+}),`
	`25`	`+env: {`
	`26`	`+DISCORD_BOT_TOKEN: "base-token",`
	`27`	`+},`
	`28`	`+agentDirs: ["/tmp/openclaw-agent-main"],`
	`29`	`+loadAuthStore: () => loadAuthStoreWithProfiles({}),`
	`30`	`+});`
	`31`	`+expect(topLevelSnapshot.config.channels?.discord?.token).toBe("base-token");`
	`32`	`+`
	`33`	`+const accountSnapshot = await prepareSecretsRuntimeSnapshot({`
	`34`	`+config: asConfig({`
	`35`	`+channels: {`
	`36`	`+discord: {`
	`37`	`+token: {`
	`38`	`+source: "env",`
	`39`	`+provider: "default",`
	`40`	`+id: "DISCORD_BOT_TOKEN",`
	`41`	`+},`
	`42`	`+accounts: {`
	`43`	`+default: {`
	`44`	`+enabled: true,`
	`45`	`+token: {`
	`46`	`+source: "env",`
	`47`	`+provider: "default",`
	`48`	`+id: "DISCORD_DEFAULT_ACCOUNT_TOKEN",`
	`49`	`+},`
	`50`	`+},`
	`51`	`+},`
	`52`	`+},`
	`53`	`+},`
	`54`	`+}),`
	`55`	`+env: {`
	`56`	`+DISCORD_BOT_TOKEN: "base-token",`
	`57`	`+DISCORD_DEFAULT_ACCOUNT_TOKEN: "default-account-token",`
	`58`	`+},`
	`59`	`+agentDirs: ["/tmp/openclaw-agent-main"],`
	`60`	`+loadAuthStore: () => loadAuthStoreWithProfiles({}),`
	`61`	`+});`
	`62`	`+`
	`63`	`+expect(accountSnapshot.config.channels?.discord?.token).toEqual({`
	`64`	`+source: "env",`
	`65`	`+provider: "default",`
	`66`	`+id: "DISCORD_BOT_TOKEN",`
	`67`	`+});`
	`68`	`+expect(accountSnapshot.config.channels?.discord?.accounts?.default?.token).toBe(`
	`69`	`+"default-account-token",`
	`70`	`+);`
	`71`	`+});`
	`72`	`+`
`12`	`73`	`it("fails when non-default Discord account inherits an unresolved top-level token ref", async () => {`
`13`	`74`	`await expect(`
`14`	`75`	`prepareSecretsRuntimeSnapshot({`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main