@lark-apaas/openclaw-scripts-diagnose-cli 0.1.20 → 0.1.21-alpha.0

package/dist/index.cjs

@@ -52,7 +52,7 @@ node_assert = __toESM(node_assert);
 * it terse and parseable.
 */
 function getVersion() {
-	return "0.1.20";
+	return "0.1.21-alpha.0";
 }
 //#endregion
 //#region src/rule-engine/base.ts
@@ -2679,6 +2679,54 @@ const WORKSPACE_AGENT_REL = "workspace/agent";
 /** openclaw.json 默认相对路径。 */
 const DEFAULT_CONFIG_REL = `${WORKSPACE_AGENT_REL}/openclaw.json`;
 //#endregion
+//#region src/plugin-installs-store.ts
+function getExternalInstallsPath(configPath) {
+	return node_path.default.join(node_path.default.dirname(configPath), "plugins", "installs.json");
+}
+function readExternalInstallRecords(filePath) {
+	const raw = node_fs.default.readFileSync(filePath, "utf-8");
+	const records = asRecord(asRecord(JSON.parse(raw))?.installRecords);
+	if (!records) throw new Error(`plugins installs file must contain object installRecords: ${filePath}`);
+	return records;
+}
+function readExternalPayload(filePath) {
+	const raw = node_fs.default.readFileSync(filePath, "utf-8");
+	const payload = JSON.parse(raw);
+	if (!asRecord(payload)) throw new Error(`plugins installs file must be an object: ${filePath}`);
+	return payload;
+}
+function cloneRecords(records) {
+	return JSON.parse(JSON.stringify(records));
+}
+function getPluginInstalls(configPath, config) {
+	const externalPath = getExternalInstallsPath(configPath);
+	if (node_fs.default.existsSync(externalPath)) return {
+		records: readExternalInstallRecords(externalPath),
+		externalPath,
+		hasExternalFile: true
+	};
+	return {
+		records: asRecord(asRecord(config.plugins)?.installs) ?? {},
+		externalPath,
+		hasExternalFile: false
+	};
+}
+function getPluginInstallsMap(configPath, config) {
+	return getPluginInstalls(configPath, config).records;
+}
+function setPluginInstallsMap(configPath, config, records) {
+	const externalPath = getExternalInstallsPath(configPath);
+	const nextRecords = cloneRecords(records);
+	const plugins = ensureRecord(config, "plugins");
+	plugins.installs = cloneRecords(nextRecords);
+	if (!node_fs.default.existsSync(externalPath)) return;
+	const payload = readExternalPayload(externalPath);
+	payload.installRecords = nextRecords;
+	const tmpPath = `${externalPath}.tmp`;
+	node_fs.default.writeFileSync(tmpPath, JSON.stringify(payload, null, 2), "utf-8");
+	node_fs.default.renameSync(tmpPath, externalPath);
+}
+//#endregion
 //#region src/rules/miaoda-official-plugins-install-spec-unlock.ts
 /**
 * Official miaoda-side plugins that must track manifest — version-locked specs
@@ -2695,9 +2743,7 @@ function unlockSpec(spec) {
 	return spec.slice(0, cut);
 }
 /** Yield `[key, lockedSpec]` for every official-plugin install whose `spec` is locked. */
-function* iterLockedOfficialInstalls(config) {
-	const installs = getNestedMap(config, "plugins", "installs");
-	if (!installs) return;
+function* iterLockedOfficialInstalls(installs) {
 	for (const [key, entry] of Object.entries(installs)) {
 		if (!OFFICIAL_EXTENSION_PLUGIN_NAMES.has(key)) continue;
 		const spec = asRecord(entry)?.spec;
@@ -2706,7 +2752,7 @@ function* iterLockedOfficialInstalls(config) {
 }
 let MiaodaOfficialPluginsInstallSpecUnlockRule = class MiaodaOfficialPluginsInstallSpecUnlockRule extends DiagnoseRule {
 	validate(ctx) {
-		const locked = [...iterLockedOfficialInstalls(ctx.config)].map(([k]) => k);
+		const locked = [...iterLockedOfficialInstalls(getPluginInstallsMap(ctx.configPath, ctx.config))].map(([k]) => k);
 		if (locked.length === 0) return { pass: true };
 		return {
 			pass: false,
@@ -2714,12 +2760,16 @@ let MiaodaOfficialPluginsInstallSpecUnlockRule = class MiaodaOfficialPluginsInst
 		};
 	}
 	repair(ctx) {
-		for (const [key, spec] of iterLockedOfficialInstalls(ctx.config)) setNestedValue(ctx.config, [
-			"plugins",
-			"installs",
-			key,
-			"spec"
-		], unlockSpec(spec));
+		const installs = { ...getPluginInstallsMap(ctx.configPath, ctx.config) };
+		for (const [key, spec] of iterLockedOfficialInstalls(installs)) {
+			const entry = asRecord(installs[key]);
+			if (!entry) continue;
+			installs[key] = {
+				...entry,
+				spec: unlockSpec(spec)
+			};
+		}
+		setPluginInstallsMap(ctx.configPath, ctx.config, installs);
 	}
 };
 MiaodaOfficialPluginsInstallSpecUnlockRule = __decorate([Rule({
@@ -2837,11 +2887,11 @@ const OLD_PLUGIN_NAMES = Object.freeze([
 	"feishu-greeting",
 	"miaoda-keepalive"
 ]);
-function getPluginMaps(config) {
+function getPluginMaps(configPath, config) {
 	const rawAllow = asRecord(config.plugins)?.allow;
 	return {
 		entries: getNestedMap(config, "plugins", "entries"),
-		installs: getNestedMap(config, "plugins", "installs"),
+		installs: getPluginInstallsMap(configPath, config),
 		allow: Array.isArray(rawAllow) ? rawAllow : void 0
 	};
 }
@@ -2853,7 +2903,7 @@ function findResiduals({ entries, installs, allow }, extensionsDir) {
 }
 let OldMiaodaPluginsCleanupRule = class OldMiaodaPluginsCleanupRule extends DiagnoseRule {
 	validate(ctx) {
-		const maps = getPluginMaps(ctx.config);
+		const maps = getPluginMaps(ctx.configPath, ctx.config);
 		if (!hasNewMiaoda(maps)) return { pass: true };
 		const residuals = findResiduals(maps, getExtensionsDir(ctx.configPath));
 		if (residuals.length === 0) return { pass: true };
@@ -2863,7 +2913,7 @@ let OldMiaodaPluginsCleanupRule = class OldMiaodaPluginsCleanupRule extends Diag
 		};
 	}
 	repair(ctx) {
-		const maps = getPluginMaps(ctx.config);
+		const maps = getPluginMaps(ctx.configPath, ctx.config);
 		if (!hasNewMiaoda(maps)) return;
 		const extensionsDir = getExtensionsDir(ctx.configPath);
 		const { entries, installs, allow } = maps;
@@ -2887,6 +2937,7 @@ let OldMiaodaPluginsCleanupRule = class OldMiaodaPluginsCleanupRule extends Diag
 				console.error(`[old_miaoda_plugins_cleanup] rmSync ${target} failed: ${e.message}`);
 			}
 		}
+		if (installs) setPluginInstallsMap(ctx.configPath, ctx.config, installs);
 	}
 };
 OldMiaodaPluginsCleanupRule = __decorate([Rule({
@@ -2929,8 +2980,7 @@ BuiltinPluginMissingRule = __decorate([Rule({
 */
 function findOrphanedInstalls(ctx) {
 	const extDir = getExtensionsDir(ctx.configPath);
-	const installs = getNestedMap(ctx.config, "plugins", "installs");
-	if (!installs) return [];
+	const installs = getPluginInstallsMap(ctx.configPath, ctx.config);
 	return Object.keys(installs).filter((name) => !isPluginInstalledOnDisk(extDir, name)).sort();
 }
 let BuiltinPluginInstallsCleanupRule = class BuiltinPluginInstallsCleanupRule extends DiagnoseRule {
@@ -2946,11 +2996,10 @@ let BuiltinPluginInstallsCleanupRule = class BuiltinPluginInstallsCleanupRule ex
 		const orphaned = findOrphanedInstalls(ctx);
 		if (orphaned.length === 0) return;
 		const orphanSet = new Set(orphaned);
-		const plugins = asRecord(ctx.config.plugins);
-		if (!plugins) return;
-		const installs = asRecord(plugins.installs);
-		if (installs) for (const name of orphaned) delete installs[name];
-		const rawAllow = plugins.allow;
+		const installs = { ...getPluginInstallsMap(ctx.configPath, ctx.config) };
+		for (const name of orphaned) delete installs[name];
+		setPluginInstallsMap(ctx.configPath, ctx.config, installs);
+		const rawAllow = asRecord(ctx.config.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);
@@ -3301,7 +3350,7 @@ function findLegacyResiduals(ctx) {
 	if (asRecord(plugins?.entries)?.["feishu-openclaw-plugin"] != null) found.push("entries[legacy]");
 	const allow = plugins?.allow;
 	if (Array.isArray(allow) && allow.includes("feishu-openclaw-plugin")) found.push("allow[legacy]");
-	if (asRecord(plugins?.installs)?.["feishu-openclaw-plugin"] != null) found.push("installs[legacy]");
+	if (asRecord(getPluginInstallsMap(ctx.configPath, ctx.config)["feishu-openclaw-plugin"]) != null) found.push("installs[legacy]");
 	const extDir = getExtensionsDir(ctx.configPath);
 	for (const name of LEGACY_DIRS_TO_REMOVE) if (node_fs.default.existsSync(node_path.default.join(extDir, name))) found.push(`fs/${name}`);
 	return found;
@@ -3324,14 +3373,17 @@ function cleanupLegacyResiduals(ctx) {
 	if (plugins) {
 		const entries = asRecord(plugins.entries);
 		if (entries && "feishu-openclaw-plugin" in entries) delete entries[LEGACY_LARK_PLUGIN_NAME];
-		const installs = asRecord(plugins.installs);
-		if (installs && "feishu-openclaw-plugin" in installs) delete installs[LEGACY_LARK_PLUGIN_NAME];
 		const allow = plugins.allow;
 		if (Array.isArray(allow)) {
 			for (let i = allow.length - 1; i >= 0; i--) if (allow[i] === "feishu-openclaw-plugin") allow.splice(i, 1);
 			if (!allow.includes("openclaw-lark")) allow.push(LARK_PLUGIN_NAME);
 		}
 	}
+	const installs = { ...getPluginInstallsMap(ctx.configPath, ctx.config) };
+	if ("feishu-openclaw-plugin" in installs) {
+		delete installs[LEGACY_LARK_PLUGIN_NAME];
+		setPluginInstallsMap(ctx.configPath, ctx.config, installs);
+	}
 	const extDir = getExtensionsDir(ctx.configPath);
 	for (const name of LEGACY_DIRS_TO_REMOVE) {
 		const target = node_path.default.join(extDir, name);
@@ -3752,13 +3804,13 @@ function detectInstalledLarkPlugin(ctx) {
 	const allowRaw = asRecord(ctx.config.plugins)?.allow;
 	const allow = Array.isArray(allowRaw) ? allowRaw.filter((e) => typeof e === "string") : [];
 	const extDir = getExtensionsDir(ctx.configPath);
-	const installs = getNestedMap(ctx.config, "plugins", "installs");
+	const installs = getPluginInstallsMap(ctx.configPath, ctx.config);
 	for (const name of [LARK_PLUGIN_NAME, ...LEGACY_SHORT_NAMES]) {
 		if (!allow.includes(name)) continue;
 		const pkgPath = node_path.default.join(extDir, name, "package.json");
 		if (!node_fs.default.existsSync(pkgPath)) continue;
 		const pkg = readPluginPackageJson(pkgPath) ?? {};
-		const installEntry = installs && asRecord(installs[name]);
+		const installEntry = asRecord(installs[name]);
 		return {
 			allowName: name,
 			fullName: pkg.name ?? extractScopedNameFromSpec$1(installEntry?.spec),
@@ -4324,8 +4376,7 @@ function readInstalledLarkPlugin(ctx) {
 	} catch {
 		pkg = {};
 	}
-	const installs = getNestedMap(ctx.config, "plugins", "installs");
-	const installEntry = installs ? asRecord(installs[LARK_PLUGIN_NAME]) : void 0;
+	const installEntry = asRecord(getPluginInstallsMap(ctx.configPath, ctx.config)[LARK_PLUGIN_NAME]);
 	return {
 		name: pkg.name ?? extractScopedNameFromSpec(installEntry?.spec),
 		version: pkg.version ?? (typeof installEntry?.version === "string" ? installEntry.version : void 0)
@@ -5599,12 +5650,13 @@ async function installExtension(tag, ossFileMap, opts = {}) {
 }
 const PLUGINS_TO_AUTO_ENABLE = [LARK_PLUGIN_NAME, MIAODA_PLUGIN_NAME];
 /**
-* Merge each installed extension's installMetadata into openclaw.json's
-* plugins.installs[<pkg.name>]. Atomic write via tmp + rename.
+* Merge each installed extension's installMetadata into the plugin installs
+* store. Old sandboxes only have openclaw.json.plugins.installs; newer
+* templates also carry plugins/installs.json and keep openclaw.json as a mirror.
 *
 * - No openclaw.json → log + return (not an error; some install contexts don't have it yet)
 * - Extension without installMetadata in manifest → skip that entry (log)
-* - Existing plugins.installs entries for other extensions left untouched
+* - Existing install entries for other extensions left untouched
 *
 * Special-case for mem0: when openclaw-mem0-plugin is among the installed
 * targets, also append it to plugins.allow (idempotent) and seed
@@ -5613,7 +5665,7 @@ const PLUGINS_TO_AUTO_ENABLE = [LARK_PLUGIN_NAME, MIAODA_PLUGIN_NAME];
 */
 function updatePluginInstalls(configPath, installedPkgs) {
 	if (!node_fs.default.existsSync(configPath)) {
-		console.error(`[install-extension] no config at ${configPath} — skip plugins.installs update`);
+		console.error(`[install-extension] no config at ${configPath} — skip plugin installs update`);
 		return;
 	}
 	const JSON5 = loadJSON5();
@@ -5621,8 +5673,7 @@ function updatePluginInstalls(configPath, installedPkgs) {
 	const config = JSON5.parse(raw);
 	if (!config.plugins || typeof config.plugins !== "object") config.plugins = {};
 	const plugins = config.plugins;
-	if (!plugins.installs || typeof plugins.installs !== "object") plugins.installs = {};
-	const installs = plugins.installs;
+	const installs = { ...getPluginInstallsMap(configPath, config) };
 	let updated = 0;
 	let skipped = 0;
 	for (const pkg of installedPkgs) if (pkg.installMetadata) {
@@ -5650,10 +5701,11 @@ function updatePluginInstalls(configPath, installedPkgs) {
 			enabled: true
 		};
 	}
+	setPluginInstallsMap(configPath, config, installs);
 	const tmpPath = configPath + ".installs-tmp";
 	node_fs.default.writeFileSync(tmpPath, JSON.stringify(config, null, 2), "utf-8");
 	moveSafe(tmpPath, configPath);
-	console.error(`[install-extension] plugins.installs updated: ${updated} entry(ies) in ${configPath}` + (skipped > 0 ? ` (${skipped} package(s) without installMetadata skipped)` : ""));
+	console.error(`[install-extension] plugin installs updated: ${updated} entry(ies) for ${configPath}` + (skipped > 0 ? ` (${skipped} package(s) without installMetadata skipped)` : ""));
 }
 function installOne$1(pkg, tarball, homeBase) {
 	const destDir = node_path.default.join(homeBase, pkg.installPath);
@@ -11253,7 +11305,7 @@ async function reportCliRun(opts) {
 //#region src/help.ts
 const BIN = "mclaw-diagnose";
 function versionBanner() {
-	return `v0.1.20`;
+	return `v0.1.21-alpha.0`;
 }
 const COMMANDS = [
 	{
@@ -11447,7 +11499,7 @@ OPTIONS
 DESCRIPTION
   Downloads + installs one or more openclaw extension tarballs
   (feishu, miaoda, etc.) into <home_base>/workspace/agent/extensions/,
-  then splices installMetadata into openclaw.json's plugins.installs
+  then splices installMetadata into the plugin installs store
   unless --skip-config-update is passed.
 
 ARGUMENTS
@@ -11459,7 +11511,7 @@ OPTIONS
   --extension=<name>   Install a specific extension (repeatable).
   --home_base=<dir>    Override the /home/gem base (tests).
   --config_path=<p>    Override the openclaw.json path (tests).
-  --skip-config-update Leave plugins.installs in openclaw.json untouched.
+  --skip-config-update Leave plugin install records untouched.
   --oss_file_map=...   Pre-built OSS URL map (base64 JSON); skips innerapi.
 `
 	},

package/package.json

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