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

Fix upgrade 3.13 (#488)

Browse Source
This commit is contained in:
paisley
2026-03-14 17:18:20 +08:00
committed by GitHub
Unverified
parent 67ffe09dfc
commit 61291ff83f
5 changed files with 208 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
electron/utils/openclaw-auth.ts
View File

@@ -1055,20 +1055,30 @@ export async function sanitizeOpenClawConfig(): Promise<void> {
modified = true;
}
// ── Disable bare 'feishu' when openclaw-lark is present ────────
// The Gateway binary automatically adds bare 'feishu' to plugins
// config because the openclaw-lark plugin registers the 'feishu'
// channel. We can't DELETE it (triggers config-change → restart →
// Gateway re-adds it → loop). Instead, disable it so it doesn't
// conflict with openclaw-lark.
const allowArr = Array.isArray(pluginsObj.allow) ? pluginsObj.allow as string[] : [];
const hasNewFeishu = allowArr.includes(NEW_FEISHU_ID) || !!pEntries?.[NEW_FEISHU_ID];
if (hasNewFeishu && pEntries?.feishu) {
if (pEntries.feishu.enabled !== false) {
pEntries.feishu.enabled = false;
console.log(`[sanitize] Disabled bare plugins.entries.feishu (openclaw-lark is configured)`);
// ── Remove bare 'feishu' when openclaw-lark is present ─────────
// The Gateway binary automatically adds bare 'feishu' to plugins.allow
// because the openclaw-lark plugin registers the 'feishu' channel.
// However, there's no plugin with id='feishu', so Gateway validation
// fails with "plugin not found: feishu". Remove it from allow[] and
// disable the entries.feishu entry to prevent Gateway from re-adding it.
const allowArr2 = Array.isArray(pluginsObj.allow) ? pluginsObj.allow as string[] : [];
const hasNewFeishu = allowArr2.includes(NEW_FEISHU_ID) || !!pEntries?.[NEW_FEISHU_ID];
if (hasNewFeishu) {
// Remove bare 'feishu' from plugins.allow
const bareFeishuIdx = allowArr2.indexOf('feishu');
if (bareFeishuIdx !== -1) {
allowArr2.splice(bareFeishuIdx, 1);
console.log('[sanitize] Removed bare "feishu" from plugins.allow (openclaw-lark is configured)');
modified = true;
}
// Disable bare 'feishu' in plugins.entries so Gateway won't re-add it
if (pEntries?.feishu) {
if (pEntries.feishu.enabled !== false) {
pEntries.feishu.enabled = false;
console.log('[sanitize] Disabled bare plugins.entries.feishu (openclaw-lark is configured)');
modified = true;
}
}
}
}