admin/DeskClaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: re-mirror default account credentials after channel account changes (#513)

Browse Source
This commit is contained in:
paisley
2026-03-16 09:53:54 +08:00
committed by GitHub
Unverified
parent 7f3408559d
commit 9e10c12f67
1 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
electron/utils/channel-config.ts
View File

@@ -464,10 +464,15 @@ export async function saveChannelConfig(
// Most OpenClaw channel plugins read the default account's credentials // Most OpenClaw channel plugins read the default account's credentials
// from the top level of `channels.<type>` (e.g. channels.feishu.appId), // from the top level of `channels.<type>` (e.g. channels.feishu.appId),
// not from `accounts.default`. Mirror them there so plugins can discover // not from `accounts.default`. Mirror them there so plugins can discover
// the credentials correctly. We use the final account entry (not // the credentials correctly.
// transformedConfig) because `enabled` is only added at the account level. // This MUST run unconditionally (not just when saving the default account)
if (resolvedAccountId === DEFAULT_ACCOUNT_ID) { // because migrateLegacyChannelConfigToAccounts() above strips top-level
for (const [key, value] of Object.entries(accounts[resolvedAccountId])) { // credential keys on every invocation. Without this, saving a non-default
// account (e.g. a sub-agent's Feishu bot) leaves the top-level credentials
// missing, breaking plugins that only read from the top level.
const defaultAccountData = accounts[DEFAULT_ACCOUNT_ID];
if (defaultAccountData) {
for (const [key, value] of Object.entries(defaultAccountData)) {
channelSection[key] = value; channelSection[key] = value;
} }
} }
@@ -567,6 +572,15 @@ export async function deleteChannelAccountConfig(channelType: string, accountId:
if (Object.keys(accounts).length === 0) { if (Object.keys(accounts).length === 0) {
delete currentConfig.channels![channelType]; delete currentConfig.channels![channelType];
} else {
// Re-mirror default account credentials to top level after migration
// stripped them (same rationale as saveChannelConfig).
const defaultAccountData = accounts[DEFAULT_ACCOUNT_ID];
if (defaultAccountData) {
for (const [key, value] of Object.entries(defaultAccountData)) {
channelSection[key] = value;
}
}
} }
await writeOpenClawConfig(currentConfig); await writeOpenClawConfig(currentConfig);
@@ -675,6 +689,15 @@ export async function deleteAgentChannelAccounts(agentId: string): Promise<void>
delete accounts[accountId]; delete accounts[accountId];
if (Object.keys(accounts).length === 0) { if (Object.keys(accounts).length === 0) {
delete currentConfig.channels[channelType]; delete currentConfig.channels[channelType];
} else {
// Re-mirror default account credentials to top level after migration
// stripped them (same rationale as saveChannelConfig).
const defaultAccountData = accounts[DEFAULT_ACCOUNT_ID];
if (defaultAccountData) {
for (const [key, value] of Object.entries(defaultAccountData)) {
section[key] = value;
}
}
} }
modified = true; modified = true;
} }