@lark-apaas/openclaw-scripts-diagnose-cli 0.1.6-alpha.8 → 0.1.6-alpha.9

package/dist/index.cjs

@@ -23,12 +23,12 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 //#endregion
 let node_process = require("node:process");
 node_process = __toESM(node_process);
+let node_fs = require("node:fs");
+node_fs = __toESM(node_fs);
 let node_path = require("node:path");
 node_path = __toESM(node_path);
 let json5 = require("json5");
 json5 = __toESM(json5);
-let node_fs = require("node:fs");
-node_fs = __toESM(node_fs);
 let node_child_process = require("node:child_process");
 let node_crypto = require("node:crypto");
 node_crypto = __toESM(node_crypto);
@@ -53,7 +53,7 @@ let json_diff = require("json-diff");
 * it terse and parseable.
 */
 function getVersion() {
-	return "0.1.6-alpha.8";
+	return "0.1.6-alpha.9";
 }
 //#endregion
 //#region src/rule-engine/base.ts
@@ -108,6 +108,14 @@ function topoSort(rules) {
 function getExtensionsDir(configPath) {
 	return node_path.default.join(node_path.default.dirname(configPath), "extensions");
 }
+/** 判断 `<extDir>/<name>/package.json` 是否存在，即插件是否已安装到磁盘。 */
+function isPluginInstalledOnDisk(extDir, name) {
+	try {
+		return node_fs.default.existsSync(node_path.default.join(extDir, name, "package.json"));
+	} catch {
+		return false;
+	}
+}
 /**
 * Canonical provider-ref for the feishu app secret. Both
 * `feishu_default_account` (multi-agent path) and `feishu_channel`
@@ -1381,11 +1389,11 @@ OldMiaodaPluginsCleanupRule = __decorate([Rule({
 //#region src/rules/lark-plugin-allow.ts
 const LARK_PLUGIN = "openclaw-lark";
 const LEGACY_LARK_PLUGIN = "feishu-openclaw-plugin";
-const LARK_PLUGIN_NAMES$1 = [LARK_PLUGIN, LEGACY_LARK_PLUGIN];
+const LARK_PLUGIN_NAMES = [LARK_PLUGIN, LEGACY_LARK_PLUGIN];
 let LarkPluginAllowRule = class LarkPluginAllowRule extends DiagnoseRule {
 	validate(ctx) {
-		const allow = getAllow(ctx.config);
-		if (LARK_PLUGIN_NAMES$1.some((name) => allow.includes(name))) return { pass: true };
+		const allow = getAllow$1(ctx.config);
+		if (LARK_PLUGIN_NAMES.some((name) => allow.includes(name))) return { pass: true };
 		const installed = detectInstalledLarkPlugin(getExtensionsDir(ctx.configPath));
 		if (installed == null) return { pass: true };
 		return {
@@ -1404,7 +1412,7 @@ let LarkPluginAllowRule = class LarkPluginAllowRule extends DiagnoseRule {
 		const rawAllow = pluginsMap.allow;
 		const original = Array.isArray(rawAllow) ? rawAllow : [];
 		const stringAllow = original.filter((e) => typeof e === "string");
-		if (LARK_PLUGIN_NAMES$1.some((name) => stringAllow.includes(name))) return;
+		if (LARK_PLUGIN_NAMES.some((name) => stringAllow.includes(name))) return;
 		original.push(installed);
 		pluginsMap.allow = original;
 	}
@@ -1414,7 +1422,7 @@ LarkPluginAllowRule = __decorate([Rule({
 	dependsOn: ["config_syntax_check"],
 	repairMode: "standard"
 })], LarkPluginAllowRule);
-function getAllow(config) {
+function getAllow$1(config) {
 	const plugins = config.plugins;
 	if (plugins == null || typeof plugins !== "object" || Array.isArray(plugins)) return [];
 	const allow = plugins.allow;
@@ -1438,6 +1446,117 @@ function pluginPackageJsonExists(extDir, pluginDir) {
 	}
 }
 //#endregion
+//#region src/rules/miaoda-plugin-allow.ts
+const MIAODA_PLUGIN = "openclaw-extension-miaoda";
+let MiaodaPluginAllowRule = class MiaodaPluginAllowRule extends DiagnoseRule {
+	validate(ctx) {
+		if (!isPluginInstalledOnDisk(getExtensionsDir(ctx.configPath), MIAODA_PLUGIN)) return { pass: true };
+		if (getAllow(ctx.config).includes(MIAODA_PLUGIN)) return { pass: true };
+		return {
+			pass: false,
+			message: `plugins.allow 缺少 ${MIAODA_PLUGIN}（已在 extensions/ 下装但未启用）`
+		};
+	}
+	repair(ctx) {
+		if (!isPluginInstalledOnDisk(getExtensionsDir(ctx.configPath), MIAODA_PLUGIN)) return;
+		const plugins = ctx.config.plugins;
+		if (plugins == null || typeof plugins !== "object" || Array.isArray(plugins)) {
+			ctx.config.plugins = { allow: [MIAODA_PLUGIN] };
+			return;
+		}
+		const pluginsMap = plugins;
+		const rawAllow = pluginsMap.allow;
+		const allow = Array.isArray(rawAllow) ? rawAllow : [];
+		if (allow.includes(MIAODA_PLUGIN)) return;
+		allow.push(MIAODA_PLUGIN);
+		pluginsMap.allow = allow;
+	}
+};
+MiaodaPluginAllowRule = __decorate([Rule({
+	key: "miaoda_plugin_allow",
+	dependsOn: ["config_syntax_check"],
+	repairMode: "standard",
+	profile: "experimental"
+})], MiaodaPluginAllowRule);
+function getAllow(config) {
+	const plugins = config.plugins;
+	if (plugins == null || typeof plugins !== "object" || Array.isArray(plugins)) return [];
+	const allow = plugins.allow;
+	if (!Array.isArray(allow)) return [];
+	return allow.filter((e) => typeof e === "string");
+}
+//#endregion
+//#region src/rules/builtin-plugin-missing.ts
+/**
+* 遍历 plugins.installs 中所有条目（install-extension --all 写入的运行时记录），
+* 若对应插件在 extensions/ 磁盘上不存在，视为内置插件缺失，引导重新安装。
+*/
+function findMissingInstalledPlugins(ctx) {
+	const extDir = getExtensionsDir(ctx.configPath);
+	const installs = getNestedMap(ctx.config, "plugins", "installs");
+	if (!installs) return [];
+	return Object.keys(installs).filter((name) => !isPluginInstalledOnDisk(extDir, name)).sort();
+}
+let BuiltinPluginMissingRule = class BuiltinPluginMissingRule extends DiagnoseRule {
+	validate(ctx) {
+		const missing = findMissingInstalledPlugins(ctx);
+		if (missing.length === 0) return { pass: true };
+		return {
+			pass: false,
+			action: "upgrade_lark",
+			message: `内置插件缺失，请重新安装: ${missing.join(",")}`
+		};
+	}
+};
+BuiltinPluginMissingRule = __decorate([Rule({
+	key: "builtin_plugin_missing",
+	dependsOn: ["config_syntax_check"],
+	repairMode: "user-confirm",
+	profile: "experimental"
+})], BuiltinPluginMissingRule);
+//#endregion
+//#region src/rules/builtin-plugin-installs-cleanup.ts
+/**
+* 前置规则 builtin_plugin_missing 通过后执行。
+* 遍历 plugins.installs 中所有条目，若对应插件在 extensions/ 下不存在，
+* 则将其从 installs 删除并从 allow 中移除。
+*/
+function findOrphanedInstalls(ctx) {
+	const extDir = getExtensionsDir(ctx.configPath);
+	const installs = getNestedMap(ctx.config, "plugins", "installs");
+	if (!installs) return [];
+	return Object.keys(installs).filter((name) => !isPluginInstalledOnDisk(extDir, name)).sort();
+}
+let BuiltinPluginInstallsCleanupRule = class BuiltinPluginInstallsCleanupRule extends DiagnoseRule {
+	validate(ctx) {
+		const orphaned = findOrphanedInstalls(ctx);
+		if (orphaned.length === 0) return { pass: true };
+		return {
+			pass: false,
+			message: `plugins.installs 存在磁盘缺失的插件: ${orphaned.join(",")}`
+		};
+	}
+	repair(ctx) {
+		const orphaned = findOrphanedInstalls(ctx);
+		if (orphaned.length === 0) return;
+		const orphanSet = new Set(orphaned);
+		const plugins = asRecord(ctx.config.plugins);
+		const installs = asRecord(plugins.installs);
+		if (installs) for (const name of orphaned) delete installs[name];
+		const rawAllow = plugins.allow;
+		if (Array.isArray(rawAllow)) for (let i = rawAllow.length - 1; i >= 0; i--) {
+			const v = rawAllow[i];
+			if (typeof v === "string" && orphanSet.has(v)) rawAllow.splice(i, 1);
+		}
+	}
+};
+BuiltinPluginInstallsCleanupRule = __decorate([Rule({
+	key: "builtin_plugin_installs_cleanup",
+	dependsOn: ["builtin_plugin_missing"],
+	repairMode: "standard",
+	profile: "experimental"
+})], BuiltinPluginInstallsCleanupRule);
+//#endregion
 //#region src/fs-utils.ts
 /**
 * Rename src → dst, falling back to `mv` (which handles cross-device copy)
@@ -4210,246 +4329,6 @@ function finalize(results, aborted) {
 	};
 }
 //#endregion
-//#region src/lark-cli-init.ts
-const LARK_PLUGIN_NAMES = ["openclaw-lark", "feishu-openclaw-plugin"];
-const PE_XML_TAG = "lark-cli-pe";
-const PE_PLACEHOLDER = `
-<${PE_XML_TAG}>
-**【强制要求 - 无例外】飞书所有操作必须先读 feishu-lark-cli skill。未读skill不得调用任何飞书工具，违者视为操作失误。**
-</${PE_XML_TAG}>
-`;
-function isLarkPluginInstalled(configPath) {
-	const extDir = getExtensionsDir(configPath);
-	return LARK_PLUGIN_NAMES.some((name) => {
-		try {
-			return node_fs.default.existsSync(node_path.default.join(extDir, name, "package.json"));
-		} catch {
-			return false;
-		}
-	});
-}
-function isLarkCliAvailable() {
-	try {
-		return (0, node_child_process.spawnSync)("lark-cli", ["--version"], {
-			encoding: "utf-8",
-			timeout: 5e3,
-			stdio: [
-				"ignore",
-				"pipe",
-				"ignore"
-			]
-		}).status === 0;
-	} catch {
-		return false;
-	}
-}
-function readConfig(configPath) {
-	try {
-		const raw = node_fs.default.readFileSync(configPath, "utf-8");
-		const parsed = loadJSON5().parse(raw);
-		return parsed != null && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : null;
-	} catch {
-		return null;
-	}
-}
-/**
-* Resolve the feishu app secret for the given appId.
-*
-* Lookup order:
-*   1. channels.feishu.appSecret  (single-agent: feishu.appId === appId)
-*   2. channels.feishu.accounts[key].appSecret  (multi-agent: account.appId === appId)
-*
-* Value interpretation:
-*   - string  → use directly
-*   - object  → secret is managed by a provider; use `feishuAppSecret` param instead
-*
-* Returns null when the secret cannot be determined.
-*/
-function resolveAppSecret(appId, config, feishuAppSecret) {
-	const feishu = getNestedMap(config, "channels", "feishu");
-	if (!feishu) return null;
-	let rawSecret;
-	if (typeof feishu.appId === "string" && feishu.appId === appId) rawSecret = feishu.appSecret;
-	else {
-		const accounts = asRecord(feishu.accounts);
-		if (accounts) for (const [, val] of Object.entries(accounts)) {
-			const account = asRecord(val);
-			if (account?.appId === appId) {
-				rawSecret = account.appSecret ?? feishu.appSecret;
-				break;
-			}
-		}
-	}
-	if (typeof rawSecret === "string" && rawSecret) return rawSecret;
-	if (rawSecret != null && typeof rawSecret === "object") return feishuAppSecret ?? null;
-	return null;
-}
-/**
-* Resolve the agents.md path for the given appId from the openclaw config.
-*
-* Case 1: appId matches channels.feishu.appId (single-agent path)
-*   → WORKSPACE_DIR/AGENTS.md
-*
-* Case 2: appId found in channels.feishu.accounts (multi-agent path)
-*   → find account key where account.appId === appId
-*   → find binding where match.channel=feishu && match.accountId=that key
-*   → if agentId === 'main'  → WORKSPACE_DIR/agents.md
-*   → else find agent in agents.list by id → agent.workspace/agents.md
-*
-* Returns null when the path cannot be determined.
-*/
-function resolveAgentsMdPath(appId, config) {
-	const feishu = getNestedMap(config, "channels", "feishu");
-	if (!feishu) {
-		console.error("resolveAgentsMdPath: channels.feishu not found");
-		return null;
-	}
-	if (typeof feishu.appId === "string" && feishu.appId === appId) {
-		console.error(`resolveAgentsMdPath: case=single-agent feishu.appId=${feishu.appId}`);
-		return node_path.default.join(WORKSPACE_DIR, "workspace", "AGENTS.md");
-	}
-	const accounts = asRecord(feishu.accounts);
-	if (!accounts) {
-		console.error("resolveAgentsMdPath: feishu.accounts not found");
-		return null;
-	}
-	let accountId;
-	for (const [key, val] of Object.entries(accounts)) if (asRecord(val)?.appId === appId) {
-		accountId = key;
-		break;
-	}
-	if (!accountId) {
-		console.error(`resolveAgentsMdPath: no account found with appId=${appId} in feishu.accounts keys=[${Object.keys(accounts).join(",")}]`);
-		return null;
-	}
-	console.error(`resolveAgentsMdPath: found accountId=${accountId}`);
-	const bindings = Array.isArray(config.bindings) ? config.bindings : [];
-	let agentId;
-	for (const b of bindings) {
-		const binding = asRecord(b);
-		if (!binding) continue;
-		const match = asRecord(binding.match);
-		if (match?.channel === "feishu" && match?.accountId === accountId) {
-			if (typeof binding.agentId === "string") {
-				agentId = binding.agentId;
-				break;
-			}
-		}
-	}
-	if (!agentId) {
-		console.error(`resolveAgentsMdPath: no binding found for accountId=${accountId} in bindings(count=${bindings.length})`);
-		return null;
-	}
-	console.error(`resolveAgentsMdPath: found agentId=${agentId}`);
-	if (agentId === "main") {
-		console.error("resolveAgentsMdPath: case=multi-agent-main");
-		return node_path.default.join(WORKSPACE_DIR, "workspace", "AGENTS.md");
-	}
-	const agentsObj = asRecord(config.agents);
-	const list = Array.isArray(agentsObj?.list) ? agentsObj.list : [];
-	for (const a of list) {
-		const agent = asRecord(a);
-		if (agent?.id === agentId) {
-			const ws = typeof agent.workspace === "string" ? agent.workspace : node_path.default.join(WORKSPACE_DIR, "workspace");
-			console.error(`resolveAgentsMdPath: case=multi-agent-custom agentId=${agentId} workspace=${ws}`);
-			return node_path.default.join(ws, "AGENTS.md");
-		}
-	}
-	console.error(`resolveAgentsMdPath: agentId=${agentId} not found in agents.list(count=${list.length})`);
-	return null;
-}
-function appendPeToAgentsMd(agentsMdPath) {
-	const dir = node_path.default.dirname(agentsMdPath);
-	if (!node_fs.default.existsSync(dir)) node_fs.default.mkdirSync(dir, { recursive: true });
-	const existing = node_fs.default.existsSync(agentsMdPath) ? node_fs.default.readFileSync(agentsMdPath, "utf-8") : "";
-	if (existing.includes(`<${PE_XML_TAG}>`)) {
-		console.error(`lark-cli-init: <${PE_XML_TAG}> already present in ${agentsMdPath}, skipping`);
-		return;
-	}
-	const sep = existing.length > 0 && !existing.endsWith("\n") ? "\n" : "";
-	node_fs.default.appendFileSync(agentsMdPath, `${sep}${PE_PLACEHOLDER}`, "utf-8");
-	console.error(`lark-cli-init: appended PE placeholder to ${agentsMdPath}`);
-}
-function runLarkCliInit(opts) {
-	const configPath = opts.configPath ?? CONFIG_PATH;
-	if (!isLarkPluginInstalled(configPath)) {
-		console.error("lark-cli-init: skipping — openclaw-lark plugin not installed");
-		return {
-			ok: true,
-			skipped: true,
-			skipReason: "openclaw-lark plugin not installed"
-		};
-	}
-	if (!isLarkCliAvailable()) {
-		console.error("lark-cli-init: skipping — lark-cli command not found");
-		return {
-			ok: true,
-			skipped: true,
-			skipReason: "lark-cli command not found"
-		};
-	}
-	const config = readConfig(configPath);
-	if (!config) return {
-		ok: false,
-		error: `could not read config at ${configPath}`
-	};
-	const agentsMdPath = resolveAgentsMdPath(opts.appId, config);
-	console.error(`lark-cli-init: resolved agents.md path=${agentsMdPath ?? "(null)"}`);
-	if (!agentsMdPath) return {
-		ok: false,
-		error: `could not resolve agents.md path for appId=${opts.appId}`
-	};
-	const appSecret = resolveAppSecret(opts.appId, config, opts.feishuAppSecret);
-	if (!appSecret) return {
-		ok: false,
-		error: `could not resolve appSecret for appId=${opts.appId}`
-	};
-	console.error(`lark-cli-init: running lark-cli config init --name ${opts.appId} --app-id ${opts.appId} --brand feishu --app-secret-stdin --force-init`);
-	const initRes = (0, node_child_process.spawnSync)("lark-cli", [
-		"config",
-		"init",
-		"--name",
-		opts.appId,
-		"--app-id",
-		opts.appId,
-		"--brand",
-		"feishu",
-		"--app-secret-stdin",
-		"--force-init"
-	], {
-		stdio: [
-			"pipe",
-			"pipe",
-			"pipe"
-		],
-		encoding: "utf-8",
-		input: appSecret
-	});
-	const configInitStdout = initRes.stdout?.trim() || void 0;
-	const configInitStderr = initRes.stderr?.trim() || void 0;
-	if (configInitStdout) console.error(`lark-cli config init stdout: ${configInitStdout}`);
-	if (configInitStderr) console.error(`lark-cli config init stderr: ${configInitStderr}`);
-	if (initRes.error) return {
-		ok: false,
-		configInitStdout,
-		configInitStderr,
-		error: `lark-cli config init spawn error: ${initRes.error.message}`
-	};
-	if (initRes.status !== 0) return {
-		ok: false,
-		configInitExitCode: initRes.status ?? void 0,
-		configInitStdout,
-		configInitStderr,
-		error: `lark-cli config init exited with code ${initRes.status}`
-	};
-	appendPeToAgentsMd(agentsMdPath);
-	return {
-		ok: true,
-		configInitExitCode: 0,
-		agentsMdPath
-	};
-}
-//#endregion
 //#region src/innerapi/reportCliRun.ts
 /**
 * CLI-side client for studio_server's `openclaw.report_cli_run` inner
@@ -4529,7 +4408,7 @@ async function reportCliRun(opts) {
 //#region src/help.ts
 const BIN = "mclaw-diagnose";
 function versionBanner() {
-	return `v0.1.6-alpha.8`;
+	return `v0.1.6-alpha.9`;
 }
 const COMMANDS = [
 	{
@@ -4738,55 +4617,6 @@ OPTIONS
   --skip-config-update Leave plugins.installs in openclaw.json untouched.
   --ctx=<base64>       Opaque ctx; see install-openclaw for semantics.
   --oss_file_map=...   Pre-built OSS URL map (base64 JSON).
-`
-	},
-	{
-		name: "lark-cli-init",
-		hidden: false,
-		summary: "Initialize lark-cli bot config and append PE to agents.md",
-		help: `USAGE
-  ${BIN} lark-cli-init --app-id=<app-id> [--feishu-app-secret=<secret>]
-
-DESCRIPTION
-  Two-step initialization for a Lark (Feishu) bot when prerequisites are met:
-
-    Prerequisites (both must be satisfied, otherwise the command exits 0 with
-    skipped=true and no side effects):
-      1. openclaw-lark plugin installed under extensions/.
-      2. lark-cli command available on PATH.
-
-  The app secret is resolved from config before running lark-cli:
-    - channels.feishu.appSecret (single-agent) or
-      channels.feishu.accounts[key].appSecret (multi-agent, matched by appId)
-    - If the value is a plain string → used directly.
-    - If the value is a provider-ref object → --feishu-app-secret must be supplied.
-
-  Step 1 — lark-cli config init:
-    Pipes the resolved secret via stdin and runs:
-      lark-cli config init \\
-        --name <app-id> \\
-        --app-id <app-id> \\
-        --brand feishu \\
-        --app-secret-stdin
-
-  Step 2 — append PE to agents.md:
-    Resolves the target agents.md from config (see path resolution below)
-    and appends a <lark-pe> placeholder block (idempotent: skipped if already present).
-
-  agents.md path resolution:
-    - channels.feishu.appId === appId  → WORKSPACE/workspace/AGENTS.md  (single-agent)
-    - accounts[key].appId === appId    → look up binding by accountId:
-        agentId === 'main'             → WORKSPACE/workspace/AGENTS.md
-        otherwise                     → agents.list[agentId].workspace/AGENTS.md
-
-ARGUMENTS
-  --app-id=<app-id>              Required. Bot app ID, e.g. cli_a9659e1f0ab89ccd.
-
-OPTIONS
-
-EXIT CODES
-  0    Success or skipped (prerequisites not met).
-  1    Secret/path unresolvable, lark-cli failed, or config unreadable.
 `
 	},
 	{
@@ -5266,29 +5096,6 @@ async function main() {
 			if (error) throw error;
 			break;
 		}
-		case "lark-cli-init": {
-			const appId = getFlag(args, "app-id");
-			if (!appId) {
-				console.error("Usage: lark-cli-init --app-id=<app-id>");
-				node_process.default.exit(1);
-			}
-			const result = runLarkCliInit({
-				appId,
-				feishuAppSecret: normalizeCtx(await fetchCtxViaInnerApi({
-					populate: { app: ["feishuAppSecret"] },
-					caller: rc.caller,
-					traceId: rc.traceId
-				})).app.feishuAppSecret || void 0
-			});
-			console.log(JSON.stringify(result));
-			await reportRun("lark-cli-init", rc, void 0, args.join(" "), Date.now() - t0, {
-				success: result.ok,
-				result,
-				error: result.ok ? void 0 : new Error(result.error ?? "lark-cli-init failed")
-			});
-			if (!result.ok) node_process.default.exit(1);
-			break;
-		}
 		default:
 			node_process.default.stderr.write(`Unknown command: ${mode}\n\n`);
 			node_process.default.stderr.write(formatTopLevelHelp(helpFlags.expert));

package/package.json

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