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

package/dist/index.cjs

@@ -53,7 +53,7 @@ let json_diff = require("json-diff");
 * it terse and parseable.
 */
 function getVersion() {
-	return "0.1.5-alpha.6";
+	return "0.1.5-alpha.8";
 }
 //#endregion
 //#region src/rule-engine/base.ts
@@ -781,12 +781,10 @@ FeishuChannelRule = __decorate([Rule({
 //#endregion
 //#region src/rules/feishu-default-account.ts
 /**
-* Owns the multi-agent feishu-channel migration: turns legacy v1/v2
+* Owner of the multi-agent feishu channel shape: migrates legacy v1/v2
 * (top-level appId + defaultAccount/default) into v3 (`bot-<appId>` account),
-* preserving the user's top-level `appId` / `appSecret` verbatim. Once on
-* v3 this rule does not touch account values — the user owns them.
-* Single-agent configs (no `accounts`) are out of scope — handled by
-* `feishu_channel`.
+* detects + fixes drift on the main bot's appId/appSecret. Single-agent
+* configs (no `accounts`) are out of scope — handled by `feishu_channel`.
 */
 /** Top-level `channels.feishu.*` account-policy fields migrated into the main bot. */
 const TOP_FIELDS_TO_MIGRATE = [
@@ -799,11 +797,25 @@ let FeishuDefaultAccountRule = class FeishuDefaultAccountRule extends DiagnoseRu
 	validate(ctx) {
 		const feishu = getNestedMap(ctx.config, "channels", "feishu");
 		if (!feishu) return { pass: true };
-		if (!asRecord(feishu.accounts)) return { pass: true };
-		if (hasLegacyTopLevel(feishu)) return {
+		const accounts = asRecord(feishu.accounts);
+		if (!accounts) return { pass: true };
+		const topAppId = feishu.appId;
+		if (typeof topAppId === "string" && topAppId !== "") return {
 			pass: false,
 			message: "channels.feishu has legacy shape; needs migration to accounts.bot-<appId>"
 		};
+		const mainBot = findMainBotAccount(ctx.config, accounts);
+		if (mainBot) {
+			const expectedAppId = ctx.vars?.feishuAppID;
+			if (typeof expectedAppId === "string" && expectedAppId !== "" && mainBot.acc.appId !== expectedAppId) return {
+				pass: false,
+				message: `accounts.${mainBot.accountId}.appId mismatch: got ${mainBot.acc.appId}, expected ${expectedAppId}`
+			};
+			if (!secretMatchesCanonical(mainBot.acc.appSecret)) return {
+				pass: false,
+				message: `accounts.${mainBot.accountId}.appSecret drift`
+			};
+		}
 		return { pass: true };
 	}
 	repair(ctx) {
@@ -811,10 +823,16 @@ let FeishuDefaultAccountRule = class FeishuDefaultAccountRule extends DiagnoseRu
 		if (!feishu) return;
 		const accounts = asRecord(feishu.accounts);
 		if (!accounts) return;
-		if (hasLegacyTopLevel(feishu)) this.migrate(ctx, feishu, accounts, feishu.appId, feishu.appSecret);
+		const topAppId = feishu.appId;
+		if (typeof topAppId === "string" && topAppId !== "") {
+			this.migrate(ctx, feishu, accounts, topAppId);
+			return;
+		}
+		this.enforceMainBotValues(ctx, accounts);
 	}
-	migrate(ctx, feishu, accounts, topAppId, topAppSecret) {
-		const expectedKey = `bot-${topAppId}`;
+	migrate(ctx, feishu, accounts, topAppId) {
+		const effectiveAppId = nonEmpty(ctx.vars?.feishuAppID) ?? topAppId;
+		const expectedKey = `bot-${effectiveAppId}`;
 		const existingBot = asRecord(accounts[expectedKey]) ?? {};
 		const defaultAccount = asRecord(accounts.defaultAccount) ?? {};
 		const defaultAcc = asRecord(accounts.default) ?? {};
@@ -831,8 +849,8 @@ let FeishuDefaultAccountRule = class FeishuDefaultAccountRule extends DiagnoseRu
 			...topGroups
 		};
 		if (Object.keys(fusedGroups).length > 0) merged.groups = fusedGroups;
-		merged.appId = topAppId;
-		merged.appSecret = topAppSecret;
+		merged.appId = effectiveAppId;
+		merged.appSecret = DEFAULT_FEISHU_APP_SECRET;
 		const chatID = ctx.vars?.teamChatID;
 		if (typeof chatID === "string" && chatID !== "") {
 			const existingGroups = asRecord(merged.groups) ?? {};
@@ -849,6 +867,14 @@ let FeishuDefaultAccountRule = class FeishuDefaultAccountRule extends DiagnoseRu
 		for (const k of TOP_FIELDS_TO_MIGRATE) delete feishu[k];
 		this.rewireBindings(ctx.config, expectedKey);
 	}
+	enforceMainBotValues(ctx, accounts) {
+		const mainBot = findMainBotAccount(ctx.config, accounts);
+		if (!mainBot) return;
+		const acc = accounts[mainBot.accountId];
+		const expectedAppId = nonEmpty(ctx.vars?.feishuAppID);
+		if (expectedAppId !== void 0 && acc.appId !== expectedAppId) acc.appId = expectedAppId;
+		if (!secretMatchesCanonical(acc.appSecret)) acc.appSecret = DEFAULT_FEISHU_APP_SECRET;
+	}
 	rewireBindings(config, expectedKey) {
 		if (!Array.isArray(config.bindings)) return;
 		const bindings = config.bindings;
@@ -894,18 +920,32 @@ FeishuDefaultAccountRule = __decorate([Rule({
 	repairMode: "standard",
 	usesVars: ["feishuAppID", "teamChatID"]
 })], FeishuDefaultAccountRule);
-/**
-* Legacy top-level shape only counts as "needs migration" when BOTH appId and
-* appSecret are present. Either one alone is treated as a partial config the
-* user owns; doctor leaves it untouched and won't synthesize the missing half
-* from defaults. `appId` must be a non-empty string (used as bot key);
-* `appSecret` may be a string OR a provider-ref object, so we only require
-* `!== undefined`.
-*/
-function hasLegacyTopLevel(feishu) {
-	const appId = feishu.appId;
-	if (typeof appId !== "string" || appId === "") return false;
-	return feishu.appSecret !== void 0;
+function nonEmpty(v) {
+	return typeof v === "string" && v !== "" ? v : void 0;
+}
+function findMainBotAccount(config, accounts) {
+	const mainId = findMainAgent(config)?.id;
+	if (typeof mainId !== "string" || mainId === "") return void 0;
+	const bindings = Array.isArray(config.bindings) ? config.bindings : [];
+	for (const b of bindings) {
+		const rec = asRecord(b);
+		const match = asRecord(rec?.match);
+		if (rec && match && rec.agentId === mainId && match.channel === "feishu") {
+			const accountId = match.accountId;
+			if (typeof accountId === "string") {
+				const acc = asRecord(accounts[accountId]);
+				if (acc) return {
+					accountId,
+					acc
+				};
+			}
+		}
+	}
+}
+/** Bot accounts must carry the canonical provider-ref `appSecret`. */
+function secretMatchesCanonical(secret) {
+	if (typeof secret !== "object" || secret === null || Array.isArray(secret)) return false;
+	return matchMap(secret, DEFAULT_FEISHU_APP_SECRET);
 }
 //#endregion
 //#region src/rules/gateway.ts
@@ -1907,6 +1947,10 @@ function findEntry(pluginVersion) {
 const PLUGIN_NAME = "openclaw-lark";
 const LEGACY_SHORT_NAMES = ["feishu-openclaw-plugin"];
 const FORK_SCOPES = ["@lark-apaas"];
+/** 特化 fork 版全名：虽免于 VERSION_COMPAT_MAP 检查，仍需 openclaw ≥ 此版本 */
+const FORK_LARK_PLUGIN_FULL_NAME = "@lark-apaas/openclaw-lark";
+/** 来自 VERSION_COMPAT_MAP openclawLarkVersion=2026.4.1 对应的 minOpenclawVersion */
+const FORK_LARK_PLUGIN_MIN_OC_VERSION = "2026.3.28";
 /**
 * 飞书插件 ↔ openclaw 版本兼容检测。
 *
@@ -1931,7 +1975,7 @@ let FeishuPluginVersionCompatRule = class FeishuPluginVersionCompatRule extends
 		if (!ocCur) return { pass: true };
 		const installed = detectInstalledPlugin(ctx);
 		if (installed == null) return { pass: true };
-		if (isForkPlugin(installed)) return { pass: true };
+		if (isForkPlugin(installed)) return validateForkPlugin(installed, ocCur, recommendedOc);
 		const isLegacy = isLegacyPlugin(installed);
 		if (!isLegacy && isVersionCompatible(installed, ocCur)) return { pass: true };
 		return decideUpgrade({
@@ -1975,6 +2019,19 @@ function decideUpgrade(args) {
 		message: `${prefix}；当前 openclaw@${ocCur} 已达推荐版本，可直接升级飞书插件`
 	};
 }
+/**
+* @lark-apaas/openclaw-lark 豁免 VERSION_COMPAT_MAP，但仍要求 openclaw ≥ FORK_LARK_PLUGIN_MIN_OC_VERSION。
+* 其他 @lark-apaas scope 的 fork 插件继续无条件 pass。
+*/
+function validateForkPlugin(installed, ocCur, recommendedOc) {
+	if (installed.fullName !== FORK_LARK_PLUGIN_FULL_NAME) return { pass: true };
+	if (compareCalVer(ocCur, FORK_LARK_PLUGIN_MIN_OC_VERSION) >= 0) return { pass: true };
+	return {
+		pass: false,
+		action: "upgrade_openclaw",
+		message: `安装了 ${describePlugin(installed)}（fork 版），当前 openclaw@${ocCur} 低于最低要求 ${FORK_LARK_PLUGIN_MIN_OC_VERSION}；将 openclaw 升级到 ${recommendedOc} 即可满足`
+	};
+}
 function describePlugin(p) {
 	return (p.fullName ?? p.allowName) + (p.version ? `@${p.version}` : "");
 }
@@ -4257,7 +4314,7 @@ async function reportCliRun(opts) {
 //#region src/help.ts
 const BIN = "mclaw-diagnose";
 function versionBanner() {
-	return `v0.1.5-alpha.6`;
+	return `v0.1.5-alpha.8`;
 }
 const COMMANDS = [
 	{

package/package.json

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