@lark-apaas/openclaw-scripts-diagnose-cli 0.1.13-alpha.6 → 0.1.13-alpha.8

package/dist/index.cjs

@@ -52,7 +52,7 @@ node_assert = __toESM(node_assert);
 * it terse and parseable.
 */
 function getVersion() {
-	return "0.1.13-alpha.6";
+	return "0.1.13-alpha.8";
 }
 //#endregion
 //#region src/rule-engine/base.ts
@@ -3560,31 +3560,31 @@ CleanupInstallBackupDirsRule = __decorate([Rule({
 * Ensures each bot account's channel config is correct:
 *   1. `allowFrom` contains its own `creatorOpenID` from larkApps
 *   2. `appSecret` is either the canonical provider-ref or matches larkApps plaintext
+*
+* Covers both multi-account (channels.feishu.accounts) and single-account
+* (channels.feishu.appId + allowFrom at top level) layouts.
 */
 let FeishuBotChannelConfigRule = class FeishuBotChannelConfigRule extends DiagnoseRule {
 	validate(ctx) {
 		const larkApps = ctx.vars.larkApps;
 		if (!larkApps || larkApps.length === 0) return { pass: true };
-		const accounts = asRecord(getNestedMap(ctx.config, "channels", "feishu")?.accounts);
-		if (!accounts) return { pass: true };
+		const feishu = asRecord(getNestedMap(ctx.config, "channels", "feishu"));
+		if (!feishu) return { pass: true };
 		const issues = [];
-		for (const [accountId, account] of Object.entries(accounts)) {
+		const accounts = asRecord(feishu.accounts);
+		if (accounts) for (const [accountId, account] of Object.entries(accounts)) {
 			const bot = asRecord(account);
 			if (!bot) continue;
 			const appId = bot.appId;
 			if (typeof appId !== "string" || !appId.startsWith("cli_")) continue;
 			const larkApp = larkApps.find((e) => e.larkAppID === appId);
 			if (!larkApp) continue;
-			const creatorOpenID = larkApp.creatorOpenID;
-			if (typeof creatorOpenID === "string" && creatorOpenID !== "") {
-				if (!(Array.isArray(bot.allowFrom) ? bot.allowFrom : []).includes(creatorOpenID)) issues.push(`${accountId} allowFrom missing creatorOpenID ${creatorOpenID.length > 8 ? creatorOpenID.slice(0, 4) + "***" + creatorOpenID.slice(-4) : "***"}`);
-			}
-			const secret = bot.appSecret;
-			if (typeof secret === "object" && secret !== null && !Array.isArray(secret)) {
-				if (!matchMap(secret, DEFAULT_FEISHU_APP_SECRET)) issues.push(`${accountId} appSecret is a provider-ref but not the canonical one`);
-			} else if (typeof secret === "string") {
-				if (secret !== larkApp.appSecret) issues.push(`${accountId} appSecret plaintext mismatch`);
-			} else issues.push(`${accountId} appSecret has unexpected type`);
+			this.checkBot(accountId, bot, larkApp, issues);
+		}
+		const singleAppId = feishu.appId;
+		if (typeof singleAppId === "string" && singleAppId.startsWith("cli_") && !accounts) {
+			const larkApp = larkApps.find((e) => e.larkAppID === singleAppId);
+			if (larkApp) this.checkBot("feishu", feishu, larkApp, issues);
 		}
 		if (issues.length === 0) return { pass: true };
 		return {
@@ -3592,40 +3592,64 @@ let FeishuBotChannelConfigRule = class FeishuBotChannelConfigRule extends Diagno
 			message: issues.join("; ")
 		};
 	}
+	/** Check a single bot entry (either an account object or the feishu channel itself). */
+	checkBot(label, bot, larkApp, issues) {
+		const creatorOpenID = larkApp.creatorOpenID;
+		const allowFrom = Array.isArray(bot.allowFrom) ? bot.allowFrom : [];
+		if (typeof creatorOpenID === "string" && creatorOpenID !== "") {
+			if (!allowFrom.includes(creatorOpenID)) issues.push(`${label} allowFrom missing creatorOpenID ${creatorOpenID.length > 8 ? creatorOpenID.slice(0, 4) + "***" + creatorOpenID.slice(-4) : "***"}`);
+		} else if (allowFrom.length === 0) issues.push(`${label} allowFrom is empty (creatorOpenID unavailable, cannot auto-fix)`);
+		const secret = bot.appSecret;
+		if (typeof secret === "object" && secret !== null && !Array.isArray(secret)) {
+			if (!matchMap(secret, DEFAULT_FEISHU_APP_SECRET)) issues.push(`${label} appSecret is a provider-ref but not the canonical one`);
+		} else if (typeof secret === "string") {
+			if (secret !== larkApp.appSecret) issues.push(`${label} appSecret plaintext mismatch`);
+		} else issues.push(`${label} appSecret has unexpected type`);
+	}
 	repair(ctx) {
 		const larkApps = ctx.vars.larkApps;
 		if (!larkApps || larkApps.length === 0) return;
-		const accounts = asRecord(getNestedMap(ctx.config, "channels", "feishu")?.accounts);
-		if (!accounts) return;
-		for (const [, account] of Object.entries(accounts)) {
+		const feishu = asRecord(getNestedMap(ctx.config, "channels", "feishu"));
+		if (!feishu) return;
+		const accounts = asRecord(feishu.accounts);
+		if (accounts) for (const [, account] of Object.entries(accounts)) {
 			const bot = asRecord(account);
 			if (!bot) continue;
 			const appId = bot.appId;
 			if (typeof appId !== "string" || !appId.startsWith("cli_")) continue;
 			const larkApp = larkApps.find((e) => e.larkAppID === appId);
 			if (!larkApp) continue;
-			const creatorOpenID = larkApp.creatorOpenID;
-			if (typeof creatorOpenID === "string" && creatorOpenID !== "") {
-				const allowFrom = Array.isArray(bot.allowFrom) ? [...bot.allowFrom] : [];
-				if (!allowFrom.includes(creatorOpenID)) {
-					allowFrom.push(creatorOpenID);
-					bot.allowFrom = allowFrom;
-				}
+			this.fixBot(bot, larkApp);
+		}
+		const singleAppId = feishu.appId;
+		if (typeof singleAppId === "string" && singleAppId.startsWith("cli_") && !accounts) {
+			const larkApp = larkApps.find((e) => e.larkAppID === singleAppId);
+			if (larkApp) this.fixBot(feishu, larkApp);
+		}
+	}
+	/** Fix a single bot entry in-place. */
+	fixBot(bot, larkApp) {
+		const creatorOpenID = larkApp.creatorOpenID;
+		if (typeof creatorOpenID === "string" && creatorOpenID !== "") {
+			const allowFrom = Array.isArray(bot.allowFrom) ? [...bot.allowFrom] : [];
+			if (!allowFrom.includes(creatorOpenID)) {
+				allowFrom.push(creatorOpenID);
+				bot.allowFrom = allowFrom;
 			}
-			const secret = bot.appSecret;
-			let needsFix = false;
-			if (typeof secret === "object" && secret !== null && !Array.isArray(secret)) {
-				if (!matchMap(secret, DEFAULT_FEISHU_APP_SECRET)) needsFix = true;
-			} else if (typeof secret === "string") {
-				if (secret !== larkApp.appSecret) needsFix = true;
-			} else needsFix = true;
-			if (needsFix) bot.appSecret = { ...DEFAULT_FEISHU_APP_SECRET };
 		}
+		const secret = bot.appSecret;
+		let needsFix = false;
+		if (typeof secret === "object" && secret !== null && !Array.isArray(secret)) {
+			if (!matchMap(secret, DEFAULT_FEISHU_APP_SECRET)) needsFix = true;
+		} else if (typeof secret === "string") {
+			if (secret !== larkApp.appSecret) needsFix = true;
+		} else needsFix = true;
+		if (needsFix) bot.appSecret = { ...DEFAULT_FEISHU_APP_SECRET };
 	}
 };
 FeishuBotChannelConfigRule = __decorate([Rule({
 	key: "feishu_bot_channel_config",
-	description: "确保多账号飞书配置中每个 bot 账号的 allowFrom 包含其创建者 openID 且 appSecret 值正确",
+	description: "确保飞书配置中 bot 账号的 allowFrom 包含其创建者 openID 且 appSecret 值正确",
 	dependsOn: [
 		"config_syntax_check",
 		"feishu_default_account",
@@ -10246,7 +10270,7 @@ async function reportCliRun(opts) {
 //#region src/help.ts
 const BIN = "mclaw-diagnose";
 function versionBanner() {
-	return `v0.1.13-alpha.6`;
+	return `v0.1.13-alpha.8`;
 }
 const COMMANDS = [
 	{
@@ -10705,6 +10729,7 @@ function planCtxPopulate(opts) {
 		populate.secrets = true;
 		populate.install = true;
 		populate.reset = true;
+		populate.larkApps = true;
 	}
 	return populate;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/openclaw-scripts-diagnose-cli",
-  "version": "0.1.13-alpha.6",
+  "version": "0.1.13-alpha.8",
   "description": "CLI for OpenClaw config diagnose and repair with JSON5 support",
   "main": "dist/index.cjs",
   "bin": {