fix(discord): break plugin-sdk account helper cycle

This commit is contained in:
Vincent Koc 2026-03-19 06:13:43 -07:00
parent dd10f290e8
commit 1c1a3b6a75
6 changed files with 25 additions and 20 deletions

View File

@ -1,16 +1,14 @@
import type { DiscordAccountConfig, OpenClawConfig } from "openclaw/plugin-sdk/discord-core";
import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
import {
hasConfiguredSecretInput,
normalizeSecretInputString,
} from "openclaw/plugin-sdk/config-runtime";
import {
mergeDiscordAccountConfig,
resolveDefaultDiscordAccountId,
resolveDiscordAccountConfig,
} from "./accounts.js";
import {
DEFAULT_ACCOUNT_ID,
normalizeAccountId,
hasConfiguredSecretInput,
normalizeSecretInputString,
type OpenClawConfig,
type DiscordAccountConfig,
} from "./runtime-api.js";
export type DiscordCredentialStatus = "available" | "configured_unavailable" | "missing";

View File

@ -1,12 +1,14 @@
import type {
DiscordAccountConfig,
DiscordActionConfig,
OpenClawConfig,
} from "openclaw/plugin-sdk/discord-core";
import {
createAccountActionGate,
createAccountListHelpers,
normalizeAccountId,
resolveAccountEntry,
type OpenClawConfig,
type DiscordAccountConfig,
type DiscordActionConfig,
} from "./runtime-api.js";
} from "openclaw/plugin-sdk/account-helpers";
import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
import { resolveAccountEntry } from "openclaw/plugin-sdk/routing";
import { resolveDiscordToken } from "./token.js";
export type ResolvedDiscordAccount = {

View File

@ -15,6 +15,9 @@ export {
resolvePollMaxSelections,
type ActionGate,
type ChannelPlugin,
type DiscordAccountConfig,
type DiscordActionConfig,
type DiscordConfig,
type OpenClawConfig,
} from "openclaw/plugin-sdk/discord-core";
export { DiscordConfigSchema } from "openclaw/plugin-sdk/discord-core";
@ -42,8 +45,6 @@ export type {
ChannelMessageActionAdapter,
ChannelMessageActionName,
} from "openclaw/plugin-sdk/channel-runtime";
export type { DiscordConfig } from "openclaw/plugin-sdk/discord";
export type { DiscordAccountConfig, DiscordActionConfig } from "openclaw/plugin-sdk/discord";
export {
hasConfiguredSecretInput,
normalizeResolvedSecretInputString,

View File

@ -1,4 +1,3 @@
import type { DiscordPluralKitConfig } from "openclaw/plugin-sdk/discord";
import type {
BlockStreamingChunkConfig,
BlockStreamingCoalesceConfig,
@ -19,6 +18,11 @@ import type { TtsConfig } from "./types.tts.js";
export type DiscordStreamMode = "off" | "partial" | "block" | "progress";
export type DiscordPluralKitConfig = {
enabled?: boolean;
token?: string;
};
export type DiscordDmConfig = {
/** If false, ignore all incoming Discord DMs. Default: true. */
enabled?: boolean;

View File

@ -1,7 +1,8 @@
export type { ChannelPlugin } from "./channel-plugin-common.js";
export type { DiscordActionConfig } from "../config/types.js";
export type { DiscordAccountConfig, DiscordActionConfig } from "../config/types.js";
export { buildChannelConfigSchema, getChatChannelMeta } from "./channel-plugin-common.js";
export type { OpenClawConfig } from "../config/config.js";
export type { DiscordConfig } from "../config/types.discord.js";
export { withNormalizedTimestamp } from "../agents/date-time.js";
export { assertMediaNotDataUrl } from "../agents/sandbox-paths.js";
export {

View File

@ -5,8 +5,7 @@ export type {
} from "../channels/plugins/types.js";
export type { OpenClawConfig } from "../config/config.js";
export type { DiscordAccountConfig, DiscordActionConfig } from "../config/types.js";
export type { DiscordConfig } from "../config/types.discord.js";
export type { DiscordPluralKitConfig } from "../../extensions/discord/api.js";
export type { DiscordConfig, DiscordPluralKitConfig } from "../config/types.discord.js";
export type { InspectedDiscordAccount } from "../../extensions/discord/api.js";
export type { ResolvedDiscordAccount } from "../../extensions/discord/api.js";
export type { DiscordSendComponents, DiscordSendEmbeds } from "../../extensions/discord/api.js";