diff --git a/src/slack/account-inspect.ts b/src/slack/account-inspect.ts index f29d718aa..82978d32d 100644 --- a/src/slack/account-inspect.ts +++ b/src/slack/account-inspect.ts @@ -1,9 +1,12 @@ import type { OpenClawConfig } from "../config/config.js"; import { hasConfiguredSecretInput, normalizeSecretInputString } from "../config/types.secrets.js"; import type { SlackAccountConfig } from "../config/types.slack.js"; -import { resolveAccountEntry } from "../routing/account-lookup.js"; import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "../routing/session-key.js"; -import { resolveDefaultSlackAccountId, type SlackTokenSource } from "./accounts.js"; +import { + mergeSlackAccountConfig, + resolveDefaultSlackAccountId, + type SlackTokenSource, +} from "./accounts.js"; export type SlackCredentialStatus = "available" | "configured_unavailable" | "missing"; @@ -39,21 +42,6 @@ export type InspectedSlackAccount = { channels?: SlackAccountConfig["channels"]; }; -function resolveSlackAccountConfig( - cfg: OpenClawConfig, - accountId: string, -): SlackAccountConfig | undefined { - return resolveAccountEntry(cfg.channels?.slack?.accounts, accountId); -} - -function mergeSlackAccountConfig(cfg: OpenClawConfig, accountId: string): SlackAccountConfig { - const { accounts: _ignored, ...base } = (cfg.channels?.slack ?? {}) as SlackAccountConfig & { - accounts?: unknown; - }; - const account = resolveSlackAccountConfig(cfg, accountId) ?? {}; - return { ...base, ...account }; -} - function inspectSlackToken(value: unknown): { token?: string; source: Exclude; diff --git a/src/slack/accounts.ts b/src/slack/accounts.ts index b997a2ccc..b90ded773 100644 --- a/src/slack/accounts.ts +++ b/src/slack/accounts.ts @@ -43,7 +43,10 @@ function resolveAccountConfig( return resolveAccountEntry(cfg.channels?.slack?.accounts, accountId); } -function mergeSlackAccountConfig(cfg: OpenClawConfig, accountId: string): SlackAccountConfig { +export function mergeSlackAccountConfig( + cfg: OpenClawConfig, + accountId: string, +): SlackAccountConfig { const { accounts: _ignored, ...base } = (cfg.channels?.slack ?? {}) as SlackAccountConfig & { accounts?: unknown; };