@lark-apaas/openclaw-scripts-diagnose-cli 0.1.11-alpha.1 → 0.1.11-alpha.2

package/dist/index.cjs

@@ -52,7 +52,7 @@ node_assert = __toESM(node_assert);
 * it terse and parseable.
 */
 function getVersion() {
-	return "0.1.11-alpha.1";
+	return "0.1.11-alpha.2";
 }
 //#endregion
 //#region src/rule-engine/base.ts
@@ -86,11 +86,16 @@ function getRuleMetas(keys) {
 		description: r.meta.description ?? "(no description)",
 		repairMode: r.meta.repairMode,
 		profile: r.meta.profile ?? "standard",
+		level: getRuleImpactLevel(r.meta),
 		dependsOn: r.meta.dependsOn ?? [],
 		hasSkipWhen: r.meta.skipWhen !== void 0,
 		hasRepair: r.repair !== DiagnoseRule.prototype.repair
 	}));
 }
+/** Default to critical for compatibility with tests/callers that build fake rules. */
+function getRuleImpactLevel(meta) {
+	return meta.level ?? "critical";
+}
 /**
 * 判断规则在当前 profile 下是否应执行。
 * experimental profile 运行所有规则；standard 只运行 standard（或未标注）规则。
@@ -1314,7 +1319,8 @@ let OpenclawRuntimeMissingRule = class OpenclawRuntimeMissingRule extends Diagno
 OpenclawRuntimeMissingRule = __decorate([Rule({
 	key: "openclaw_runtime_missing",
 	description: "检查 openclaw 二进制是否在 PATH 中可用；缺失时提示重新安装",
-	repairMode: "user-confirm"
+	repairMode: "user-confirm",
+	level: "critical"
 })], OpenclawRuntimeMissingRule);
 //#endregion
 //#region src/rules/multi-process-detect.ts
@@ -1338,7 +1344,8 @@ let ProcessStatusRule = class ProcessStatusRule extends DiagnoseRule {
 ProcessStatusRule = __decorate([Rule({
 	key: "multi_process_detect",
 	description: "通过 pgrep 检测是否存在多个并发的 openclaw-gateway 进程；多进程通常表明上次会话未正常退出",
-	repairMode: "standard"
+	repairMode: "standard",
+	level: "critical"
 })], ProcessStatusRule);
 //#endregion
 //#region src/rules/config-file-recover.ts
@@ -1404,7 +1411,8 @@ let ConfigFileBackupRule = class ConfigFileBackupRule extends DiagnoseRule {
 ConfigFileBackupRule = __decorate([Rule({
 	key: "config_file_recover",
 	description: "扫描 .bak* 配置备份，当主配置 openclaw.json 缺失时恢复编号最高的备份",
-	repairMode: "standard"
+	repairMode: "standard",
+	level: "critical"
 })], ConfigFileBackupRule);
 //#endregion
 //#region src/rules/config-file-missing.ts
@@ -1439,7 +1447,8 @@ ConfigFileMissingRule = __decorate([Rule({
 	key: "config_file_missing",
 	description: "在执行恢复后检查 openclaw.json 是否存在；若仍缺失则触发全量重置",
 	dependsOn: ["config_file_recover"],
-	repairMode: "reset"
+	repairMode: "reset",
+	level: "critical"
 })], ConfigFileMissingRule);
 //#endregion
 //#region src/rules/config-syntax.ts
@@ -1462,7 +1471,8 @@ ConfigSyntaxRule = __decorate([Rule({
 	key: "config_syntax_check",
 	description: "验证 openclaw.json 的 JSON5 语法；schema 校验失败或解析错误时需要 AI 辅助修复",
 	dependsOn: ["config_file_recover", "config_file_missing"],
-	repairMode: "ai"
+	repairMode: "ai",
+	level: "critical"
 })], ConfigSyntaxRule);
 //#endregion
 //#region src/rules/template-vars-unreplaced.ts
@@ -1493,6 +1503,7 @@ TemplateVarsUnreplacedRule = __decorate([Rule({
 	description: "检测 openclaw.json 中未替换的 $__XXX__ 占位符，并从注入的环境变量中填充",
 	dependsOn: ["config_syntax_check"],
 	repairMode: "standard",
+	level: "critical",
 	usesVars: ["templateVars"]
 })], TemplateVarsUnreplacedRule);
 function collectPlaceholders(value, found) {
@@ -1648,6 +1659,7 @@ GatewayRule = __decorate([Rule({
 	description: "验证 gateway 必填字段（port、mode、bind、auth、trustedProxies）是否存在且有效；修复缺失或非法值",
 	dependsOn: ["config_syntax_check"],
 	repairMode: "standard",
+	level: "critical",
 	usesVars: ["gatewayToken"]
 })], GatewayRule);
 //#endregion
@@ -1694,6 +1706,7 @@ AllowedOriginsRule = __decorate([Rule({
 	description: "确保所有 expectedOrigins 条目都存在于 gateway.auth.allowedOrigins 中；自动追加缺失的条目",
 	dependsOn: ["config_syntax_check"],
 	repairMode: "standard",
+	level: "critical",
 	usesVars: ["expectedOrigins"]
 })], AllowedOriginsRule);
 function getExpectedOrigins(vars) {
@@ -1753,7 +1766,8 @@ SessionPersistenceRule = __decorate([Rule({
 	key: "session_persistence",
 	description: "补齐 session.resetByChannel 与 session.maintenance 持久化配置",
 	dependsOn: ["config_syntax_check"],
-	repairMode: "standard"
+	repairMode: "standard",
+	level: "silent"
 })], SessionPersistenceRule);
 //#endregion
 //#region src/rules/feishu-default-account.ts
@@ -1870,6 +1884,7 @@ FeishuDefaultAccountRule = __decorate([Rule({
 	description: "将旧版 v1/v2 飞书 channel 配置迁移为规范的 v3 bot-<appId> 账号结构",
 	dependsOn: ["config_syntax_check"],
 	repairMode: "standard",
+	level: "critical",
 	usesVars: ["feishuAppID", "teamChatID"]
 })], FeishuDefaultAccountRule);
 /**
@@ -1948,6 +1963,7 @@ FeishuChannelRule = __decorate([Rule({
 	description: "确保 channels.feishu 已启用，且包含单 agent 所需的 appId 和 appSecret 字段",
 	dependsOn: ["config_syntax_check", "feishu_default_account"],
 	repairMode: "standard",
+	level: "critical",
 	usesVars: ["feishuAppID", "feishuAppSecret"]
 })], FeishuChannelRule);
 //#endregion
@@ -1978,7 +1994,8 @@ FeishuBotIdRule = __decorate([Rule({
 	key: "feishu_bot_id",
 	description: "确保多账号飞书配置中每个 bot-<appId> 账号 key 与 appId 一致",
 	dependsOn: ["config_syntax_check", "feishu_default_account"],
-	repairMode: "standard"
+	repairMode: "standard",
+	level: "critical"
 })], FeishuBotIdRule);
 function getMismatchedAccounts(accounts) {
 	const mismatched = [];
@@ -2062,6 +2079,7 @@ FeishuAccountsConsistencyRule = __decorate([Rule({
 	description: "检测多 agent 配置中 channels.feishu.accounts、agents.list 与 feishu bindings 之间的数量/ID 不一致（实验性）",
 	dependsOn: ["config_syntax_check"],
 	repairMode: "check-only",
+	level: "silent",
 	usesVars: ["feishuAppID"],
 	profile: "experimental"
 })], FeishuAccountsConsistencyRule);
@@ -2183,6 +2201,7 @@ ModelProviderRule = __decorate([Rule({
 	description: "检查妙搭 model provider 配置项（baseUrl、apiKey、必要 headers）是否存在且格式正确；非妙搭沙箱时跳过",
 	dependsOn: ["config_syntax_check"],
 	repairMode: "standard",
+	level: "critical",
 	usesVars: ["innerAPIKey", "baseURL"],
 	skipWhen: ({ hasMiaoda }) => !hasMiaoda
 })], ModelProviderRule);
@@ -2251,6 +2270,7 @@ SecretProviderRule = _SecretProviderRule = __decorate([Rule({
 	description: "验证 miaoda-provider / miaoda-secret-provider 配置块是否存在且完整；未检测到妙搭 provider 时跳过",
 	dependsOn: ["config_syntax_check"],
 	repairMode: "standard",
+	level: "critical",
 	skipWhen: ({ hasMiaoda, deps }) => !hasMiaoda || !deps.usesMiaodaProvider && !deps.usesMiaodaSecretProvider
 })], SecretProviderRule);
 //#endregion
@@ -2313,6 +2333,7 @@ JwtTokenRule = __decorate([Rule({
 	description: "验证 miaoda provider 引用的 JWT token 文件存在且未过期；非妙搭沙箱时跳过",
 	dependsOn: ["config_syntax_check"],
 	repairMode: "standard",
+	level: "critical",
 	usesVars: ["providerFilePath"],
 	skipWhen: ({ hasMiaoda, deps }) => !hasMiaoda || !deps.usesMiaodaProvider
 })], JwtTokenRule);
@@ -2370,6 +2391,7 @@ SecretsFileRule = __decorate([Rule({
 	description: "验证 miaoda secret-provider 引用的 secrets.json 文件存在且可解析；非妙搭或非 secret-provider 沙箱时跳过",
 	dependsOn: ["config_syntax_check"],
 	repairMode: "standard",
+	level: "critical",
 	usesVars: [
 		"secretsFilePath",
 		"feishuAppSecret",
@@ -2408,7 +2430,8 @@ AgentsMdServiceCommandsRule = __decorate([Rule({
 	key: "agents_md_service_commands",
 	description: "检测各智能体 AGENTS.md 中旧版 OpenClaw 服务命令，并替换为 /opt/force/bin/openclaw_scripts 路径",
 	dependsOn: ["config_syntax_check"],
-	repairMode: "standard"
+	repairMode: "standard",
+	level: "silent"
 })], AgentsMdServiceCommandsRule);
 function hasOldServiceCommands(content) {
 	return SERVICE_COMMAND_REPLACEMENTS.some(([oldCmd]) => content.includes(oldCmd));
@@ -2482,10 +2505,14 @@ AgentsMdResourceConstrainedToolsRule = __decorate([Rule({
 	key: "agents_md_resource_constrained_tools",
 	description: "检测各智能体 AGENTS.md 中 resource_constrained_tools 规则块，缺失时追加，存在时替换为当前内容",
 	dependsOn: ["config_syntax_check"],
-	repairMode: "standard"
+	repairMode: "standard",
+	level: "silent"
 })], AgentsMdResourceConstrainedToolsRule);
 function hasCurrentResourceConstrainedToolsBlock(content) {
-	return content.includes(RESOURCE_CONSTRAINED_TOOLS_BLOCK);
+	return normalizeForTemplateMatch(content).includes(normalizeForTemplateMatch(RESOURCE_CONSTRAINED_TOOLS_BLOCK));
+}
+function normalizeForTemplateMatch(content) {
+	return content.replace(/\r\n?/g, "\n").split("\n").map((line) => line.trimEnd()).filter((line) => line.length > 0).join("\n");
 }
 function upsertResourceConstrainedToolsBlock(content) {
 	const tagRe = new RegExp(`<${RESOURCE_CONSTRAINED_TOOLS_TAG}>[\\s\\S]*?</${RESOURCE_CONSTRAINED_TOOLS_TAG}>`);
@@ -2547,7 +2574,8 @@ MiaodaOfficialPluginsInstallSpecUnlockRule = __decorate([Rule({
 	key: "miaoda_official_plugins_install_spec_unlock",
 	description: "移除官方妙搭插件安装条目中的锁版本 npm spec，使其跟随最新 manifest 版本",
 	dependsOn: ["config_syntax_check"],
-	repairMode: "standard"
+	repairMode: "standard",
+	level: "silent"
 })], MiaodaOfficialPluginsInstallSpecUnlockRule);
 //#endregion
 //#region src/rules/miaoda-plugin-allow.ts
@@ -2581,6 +2609,7 @@ MiaodaPluginAllowRule = __decorate([Rule({
 	description: "当 openclaw-extension-miaoda 已在磁盘安装但未在 allow 列表中时，将其添加到 plugins.allow（实验性）",
 	dependsOn: ["config_syntax_check"],
 	repairMode: "standard",
+	level: "critical",
 	profile: "standard"
 })], MiaodaPluginAllowRule);
 function getAllow$1(config) {
@@ -2626,7 +2655,8 @@ LarkPluginAllowRule = __decorate([Rule({
 	key: "lark_plugin_allow",
 	description: "当飞书插件（openclaw-lark 或旧版名）已在磁盘安装但未加入 plugins.allow 时，自动添加",
 	dependsOn: ["config_syntax_check"],
-	repairMode: "standard"
+	repairMode: "standard",
+	level: "critical"
 })], LarkPluginAllowRule);
 function getAllow(config) {
 	const plugins = config.plugins;
@@ -2716,7 +2746,8 @@ OldMiaodaPluginsCleanupRule = __decorate([Rule({
 	key: "old_miaoda_plugins_cleanup",
 	description: "当新版 openclaw-extension-miaoda 已存在时，清理过时插件引用（openclaw-feishu-greeting、openclaw-miaoda-keepalive 等）",
 	dependsOn: ["config_syntax_check"],
-	repairMode: "standard"
+	repairMode: "standard",
+	level: "silent"
 })], OldMiaodaPluginsCleanupRule);
 //#endregion
 //#region src/rules/builtin-plugin-missing.ts
@@ -2751,6 +2782,7 @@ BuiltinPluginMissingRule = __decorate([Rule({
 	description: "检查所有内置扩展插件（openclaw-lark、openclaw-extension-miaoda 等）是否已在磁盘安装；缺失时提示重新安装（实验性）",
 	dependsOn: ["config_syntax_check"],
 	repairMode: "user-confirm",
+	level: "critical",
 	profile: "experimental"
 })], BuiltinPluginMissingRule);
 //#endregion
@@ -2794,6 +2826,7 @@ BuiltinPluginInstallsCleanupRule = __decorate([Rule({
 	description: "在 builtin_plugin_missing 通过后，清除 plugins.installs 中磁盘目录已不存在的条目（实验性）",
 	dependsOn: ["builtin_plugin_missing"],
 	repairMode: "standard",
+	level: "silent",
 	profile: "experimental"
 })], BuiltinPluginInstallsCleanupRule);
 //#endregion
@@ -3076,7 +3109,8 @@ FeishuPluginStateNormalizeRule = __decorate([Rule({
 	key: "feishu_plugin_state_normalize",
 	description: "规范化磁盘上的飞书插件状态：删除旧版插件目录、清理内置 feishu 目录，并将 openclaw.json 条目对齐到 openclaw-lark 插件",
 	dependsOn: ["config_syntax_check"],
-	repairMode: "standard"
+	repairMode: "standard",
+	level: "critical"
 })], FeishuPluginStateNormalizeRule);
 function isPluginInstalled(ctx) {
 	return node_fs.default.existsSync(node_path.default.join(getExtensionsDir(ctx.configPath), PLUGIN_NAME$1));
@@ -3349,6 +3383,7 @@ FeishuPluginOpenclawUpgradeRule = __decorate([Rule({
 	description: "检查飞书插件是否要求更高版本的 openclaw；是则提示升级 openclaw",
 	dependsOn: ["config_syntax_check"],
 	repairMode: "user-confirm",
+	level: "critical",
 	usesVars: ["recommendedOpenclawTag"]
 })], FeishuPluginOpenclawUpgradeRule);
 /**
@@ -3375,6 +3410,7 @@ FeishuPluginLarkUpgradeRule = __decorate([Rule({
 	description: "检查飞书插件版本是否落后于当前 openclaw；是则提示升级飞书插件",
 	dependsOn: ["config_syntax_check", "feishu_plugin_version_compat_openclaw"],
 	repairMode: "user-confirm",
+	level: "critical",
 	usesVars: ["recommendedOpenclawTag"]
 })], FeishuPluginLarkUpgradeRule);
 function isForkPlugin(p) {
@@ -3515,7 +3551,8 @@ let CleanupInstallBackupDirsRule = class CleanupInstallBackupDirsRule extends Di
 CleanupInstallBackupDirsRule = __decorate([Rule({
 	key: "cleanup_install_backup_dirs",
 	description: "清理 extensions/ 目录中升级中断遗留的 .openclaw-install-stage-* 和 .openclaw-install-backups/ 脏目录",
-	repairMode: "standard"
+	repairMode: "standard",
+	level: "critical"
 })], CleanupInstallBackupDirsRule);
 //#endregion
 //#region src/check.ts
@@ -3637,7 +3674,7 @@ function runCheckImpl(input) {
 				action: r.action
 			});
 			failedKeys.add(meta.key);
-			pushFailedRule(result, meta.repairMode, meta.key, r.message || "", r.action);
+			if (getRuleImpactLevel(meta) === "critical") pushFailedRule(result, meta.repairMode, meta.key, r.message || "", r.action);
 		}
 	}
 	console.error(`runCheck: end totalMs=${Date.now() - tStart} failed={standard:${result.failedRules.standard.length},ai:${result.failedRules.ai.length},reset:${result.failedRules.reset.length}}`);
@@ -6561,7 +6598,12 @@ function mergeCoreBackupAndOrigins(configPath, vars, resetData, log) {
 		const config = JSON5.parse(node_fs.default.readFileSync(configPath, "utf-8"));
 		const merged = [];
 		const backupAccounts = backup.channels?.feishu?.accounts;
-		if ((backup.agents?.length ?? 0) > 0 || backupAccounts != null && Object.keys(backupAccounts).length > 0) {
+		const isMultiAgent = (backup.agents?.length ?? 0) > 0 || backupAccounts != null && Object.keys(backupAccounts).length > 0;
+		if (backup.bindings && backup.bindings.length > 0) {
+			config.bindings = backup.bindings;
+			merged.push("bindings");
+		}
+		if (isMultiAgent) {
 			if (backup.agents && backup.agents.length > 0) {
 				if (!config.agents) config.agents = {};
 				const agents = config.agents;
@@ -6584,10 +6626,6 @@ function mergeCoreBackupAndOrigins(configPath, vars, resetData, log) {
 				list[mainIdx].default = true;
 				merged.push("main-team-mode");
 			}
-			if (backup.bindings && backup.bindings.length > 0) {
-				config.bindings = backup.bindings;
-				merged.push("bindings");
-			}
 			if (!config.channels) config.channels = {};
 			const ch = config.channels;
 			if (!ch.feishu) ch.feishu = {};
@@ -10052,7 +10090,7 @@ async function reportCliRun(opts) {
 //#region src/help.ts
 const BIN = "mclaw-diagnose";
 function versionBanner() {
-	return `v0.1.11-alpha.1`;
+	return `v0.1.11-alpha.2`;
 }
 const COMMANDS = [
 	{
@@ -10526,6 +10564,7 @@ function flushDiagnoseSlardar() {
 }
 function reportDoctorRunToSlardar(opts) {
 	const outcomes = opts.ruleOutcomes ?? [];
+	const ruleLevels = new Map(getAllRules().map((rule) => [rule.meta.key, getRuleImpactLevel(rule.meta)]));
 	console.error(`[slardar] reportTask command=${opts.command} scene=${opts.scene ?? ""} profile=${opts.profile} fix=${opts.fix} events=${1 + outcomes.length}`);
 	reportTask({
 		eventName: "diagnose_cli_run",
@@ -10552,6 +10591,7 @@ function reportDoctorRunToSlardar(opts) {
 			fix: String(opts.fix),
 			rule_key: o.rule,
 			rule_status: o.status,
+			rule_level: ruleLevels.get(o.rule) ?? "",
 			rule_message: o.message ?? ""
 		}
 	});

package/package.json

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