@lark-apaas/openclaw-scripts-diagnose-cli 0.1.15-alpha.15 → 0.1.15-alpha.17

package/dist/index.cjs

@@ -52,7 +52,7 @@ node_assert = __toESM(node_assert);
 * it terse and parseable.
 */
 function getVersion() {
-	return "0.1.15-alpha.15";
+	return "0.1.15-alpha.17";
 }
 //#endregion
 //#region src/rule-engine/base.ts
@@ -4180,9 +4180,10 @@ let FeishuBotChannelConfigRule = class FeishuBotChannelConfigRule extends Diagno
 		};
 	}
 	/** Check a single bot entry (either an account object or the feishu channel itself).
-	*  appSecret is validated based on its current type:
 	*  - object → must match canonical provider-ref
 	*  - string → must match larkApps plaintext
+	*  - undefined/null → missing
+	*  - other → unexpected type
 	*/
 	checkBot(label, bot, larkApp, issues) {
 		const creatorOpenID = larkApp.creatorOpenID;
@@ -4195,7 +4196,8 @@ let FeishuBotChannelConfigRule = class FeishuBotChannelConfigRule extends Diagno
 			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 ${typeof secret}`);
+		} else if (secret === void 0 || secret === null) issues.push(`${label} appSecret is missing`);
+		else issues.push(`${label} appSecret has unexpected type ${typeof secret}`);
 	}
 	repair(ctx) {
 		const larkApps = ctx.vars.larkApps;
@@ -4219,9 +4221,8 @@ let FeishuBotChannelConfigRule = class FeishuBotChannelConfigRule extends Diagno
 		}
 	}
 	/** Fix a single bot entry in-place.
-	*  appSecret is repaired based on its current type:
-	*  - object → fix to canonical provider-ref
-	*  - string → fix to larkApps plaintext
+	*  - object (provider-ref) → fix to canonical
+	*  - otherwise → fix to larkApps plaintext
 	*/
 	fixBot(bot, larkApp) {
 		const creatorOpenID = larkApp.creatorOpenID;
@@ -4235,9 +4236,7 @@ let FeishuBotChannelConfigRule = class FeishuBotChannelConfigRule extends Diagno
 		const secret = bot.appSecret;
 		if (typeof secret === "object" && secret !== null && !Array.isArray(secret)) {
 			if (!matchMap(secret, DEFAULT_FEISHU_APP_SECRET)) bot.appSecret = { ...DEFAULT_FEISHU_APP_SECRET };
-		} else if (typeof secret === "string") {
-			if (secret !== larkApp.appSecret) bot.appSecret = larkApp.appSecret;
-		}
+		} else if (secret !== larkApp.appSecret) bot.appSecret = larkApp.appSecret;
 	}
 };
 FeishuBotChannelConfigRule = __decorate([Rule({
@@ -7123,45 +7122,56 @@ function fixBotChannelConfig(configPath, larkApps, log) {
 		return;
 	}
 	const config = loadJSON5().parse(node_fs.default.readFileSync(configPath, "utf-8"));
-	const accounts = asRecord(getNestedMap(config, "channels", "feishu")?.accounts);
-	if (!accounts) {
-		log("no feishu accounts in config, skip bot channel config fix");
+	const feishu = asRecord(getNestedMap(config, "channels", "feishu"));
+	if (!feishu) {
+		log("no feishu channel in config, skip bot channel config fix");
 		return;
 	}
 	let fixCount = 0;
-	for (const [, account] of Object.entries(accounts)) {
+	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;
-				fixCount++;
-			}
-		}
-		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 };
-			fixCount++;
-		}
+		fixCount += 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) fixCount += fixBot(feishu, larkApp);
 	}
 	if (fixCount > 0) {
 		node_fs.default.writeFileSync(configPath, JSON.stringify(config, null, 2), "utf-8");
 		log(`fixed ${fixCount} bot channel config issue(s) (allowFrom/appSecret)`);
 	} else log("bot channel config ok, no fixes needed");
 }
+/** Fix a single bot entry in-place. Returns number of fixes applied. */
+function fixBot(bot, larkApp) {
+	let fixCount = 0;
+	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;
+			fixCount++;
+		}
+	}
+	const secret = bot.appSecret;
+	if (typeof secret === "object" && secret !== null && !Array.isArray(secret)) {
+		if (!matchMap(secret, DEFAULT_FEISHU_APP_SECRET)) {
+			bot.appSecret = { ...DEFAULT_FEISHU_APP_SECRET };
+			fixCount++;
+		}
+	} else if (secret !== larkApp.appSecret) {
+		bot.appSecret = larkApp.appSecret;
+		fixCount++;
+	}
+	return fixCount;
+}
 /**
 * Step 7: Verify startup scripts landed in configDir/scripts/.
 *
@@ -10704,7 +10714,7 @@ async function reportCliRun(opts) {
 //#region src/help.ts
 const BIN = "mclaw-diagnose";
 function versionBanner() {
-	return `v0.1.15-alpha.15`;
+	return `v0.1.15-alpha.17`;
 }
 const COMMANDS = [
 	{
@@ -11893,15 +11903,15 @@ function isPidAlive(pid) {
 	}
 }
 /**
-* 获取安装操作互斥锁。
+* 尝试获取安装操作互斥锁。
 *
 * 利用 open(O_CREAT | O_EXCL) 的 POSIX 原子性确保同一时刻只有一个安装指令运行。
 * 覆盖的安装指令：upgrade-lark / install-openclaw / install-extension / install-cli / reset --worker。
 *
-* 若锁被活跃进程持有，抛出包含持有者信息的 Error。
-* 若锁文件属于已退出进程（crash 遗留），视为过期锁并覆盖。
+* 返回 null 表示成功获取锁；返回错误信息字符串表示锁被其他进程持有。
+* 与抛异常相比，返回值让调用方可以输出符合各自格式的 result，而不依赖 catch handler 统一处理。
 *
-* 成功获取后自动注册 process.on('exit') 释放锁，无需调用方手动清理。
+* 成功获取后自动注册 process.once('exit') 释放锁，无需调用方手动清理。
 */
 function acquireInstallLock(command) {
 	node_fs.default.mkdirSync(DIAGNOSE_DIR, { recursive: true });
@@ -11917,7 +11927,7 @@ function acquireInstallLock(command) {
 		node_fs.default.closeSync(fd);
 		process.once("exit", releaseInstallLock);
 		console.error(`[install-lock] acquired command=${command} pid=${process.pid}`);
-		return;
+		return null;
 	} catch (e) {
 		if (e.code !== "EEXIST") throw e;
 		let existing = null;
@@ -11936,13 +11946,13 @@ function acquireInstallLock(command) {
 			} catch {}
 			continue;
 		}
-		throw new Error(`另一个安装指令正在运行，请等待其完成后重试。\n  占用指令: ${existing.command}\n  进程 PID : ${existing.pid}\n  开始时间: ${existing.startedAt}\n  锁文件  : ${INSTALL_LOCK_FILE}`);
+		return `另一个安装指令正在运行，请等待其完成后重试。\n  占用指令: ${existing.command}\n  进程 PID : ${existing.pid}\n  开始时间: ${existing.startedAt}\n  锁文件  : ${INSTALL_LOCK_FILE}`;
 	}
 }
 /**
 * 释放安装操作互斥锁。
 * 仅删除由本进程创建的锁文件，避免误删其他进程的锁。
-* 通常由 process.on('exit') 自动调用，不需要手动调用。
+* 通常由 process.once('exit') 自动调用，不需要手动调用。
 */
 function releaseInstallLock() {
 	try {
@@ -11956,8 +11966,18 @@ function releaseInstallLock() {
 }
 //#endregion
 //#region src/index.ts
+/** 锁冲突时各 install 命令的统一处理：输出 { ok: false } 并退出 */
+function handleInstallLockConflict(lockErr) {
+	console.log(JSON.stringify({
+		ok: false,
+		error: lockErr
+	}));
+	node_process.default.exit(1);
+}
 const args = node_process.default.argv.slice(2);
 const mode = args.find((a) => !a.startsWith("-"));
+const t0 = Date.now();
+const scene = getFlag(args, "scene");
 /**
 * Pull the first non-flag positional after the mode name.
 * (The mode itself is args[0] in the filtered set, so we skip index 0.)
@@ -12041,13 +12061,11 @@ async function main() {
 	}
 	const caller = getFlag(args, "caller");
 	const traceId = getFlag(args, "trace-id");
-	const scene = getFlag(args, "scene");
 	const profile = getFlag(args, "profile") === "experimental" ? "experimental" : "standard";
 	const rc = setRunContext({
 		caller,
 		traceId
 	});
-	const t0 = Date.now();
 	console.error(`${mode}: begin argv=[${args.join(" ")}] version=${getVersion()} traceId=${traceId ?? "-"} caller=${caller ?? "-"} runIdGenerated=${rc.generated}`);
 	switch (mode) {
 		case "check": {
@@ -12154,8 +12172,18 @@ async function main() {
 					console.error("Error: --task-id=<id> is required for worker");
 					node_process.default.exit(1);
 				}
-				acquireInstallLock("reset");
 				const resultFile = resetResultFile(taskId);
+				const resetLockErr = acquireInstallLock("reset");
+				if (resetLockErr) {
+					try {
+						node_fs.default.writeFileSync(resultFile, JSON.stringify({
+							status: "failed",
+							error: resetLockErr
+						}));
+					} catch {}
+					node_process.default.exitCode = 1;
+					return;
+				}
 				const raw = await fetchCtxViaInnerApi({
 					populate: planCtxPopulate({ command: "reset" }),
 					caller,
@@ -12199,7 +12227,8 @@ async function main() {
 				console.error("Usage: install-openclaw <tag> [--oss_file_map=<base64>]");
 				node_process.default.exit(1);
 			}
-			acquireInstallLock("install-openclaw");
+			const installOcLockErr = acquireInstallLock("install-openclaw");
+			if (installOcLockErr) handleInstallLockConflict(installOcLockErr);
 			const ossFileMapFlag = getFlag(args, "oss_file_map");
 			let installOssFileMap;
 			let rawForTelemetry;
@@ -12242,7 +12271,8 @@ async function main() {
 				console.error("Usage: install-extension <tag> (--all | --extension=<name>...) [--home_base=<dir>] [--config_path=<path>] [--skip-config-update] [--oss_file_map=<base64>]");
 				node_process.default.exit(1);
 			}
-			acquireInstallLock("install-extension");
+			const installExtLockErr = acquireInstallLock("install-extension");
+			if (installExtLockErr) handleInstallLockConflict(installExtLockErr);
 			const all = args.includes("--all");
 			const names = getMultiFlag(args, "extension");
 			const homeBase = getFlag(args, "home_base");
@@ -12306,7 +12336,8 @@ async function main() {
 				console.error("Usage: install-cli <tag> --cli=<name>... [--home_base=<dir>] [--oss_file_map=<base64>]");
 				node_process.default.exit(1);
 			}
-			acquireInstallLock("install-cli");
+			const installCliLockErr = acquireInstallLock("install-cli");
+			if (installCliLockErr) handleInstallLockConflict(installCliLockErr);
 			const homeBase = getFlag(args, "home_base");
 			const ossFileMapFlag = getFlag(args, "oss_file_map");
 			let installOssFileMap;
@@ -12450,7 +12481,31 @@ async function main() {
 		}
 		case "upgrade-lark": {
 			const checkOnly = args.includes("--check");
-			if (!checkOnly) acquireInstallLock("upgrade-lark");
+			if (!checkOnly) {
+				const upgradeLockErr = acquireInstallLock("upgrade-lark");
+				if (upgradeLockErr) {
+					const fixStatus = computeFixStatus(scene, "failed");
+					const failResult = {
+						status: "failed",
+						error: upgradeLockErr,
+						logFile: "",
+						fixStatus
+					};
+					if (fixStatus !== void 0) writeFixStatusEvent(fixStatus, failResult, console.error);
+					console.log(JSON.stringify(failResult));
+					reportUpgradeLarkToSlardar({
+						scene,
+						checkOnly,
+						durationMs: Date.now() - t0,
+						resultStatus: "failed",
+						error: upgradeLockErr,
+						logFile: "",
+						resultSummary: buildUpgradeLarkResultSummary(failResult, checkOnly)
+					});
+					node_process.default.exitCode = 1;
+					return;
+				}
+			}
 			const skipRestart = args.includes("--skip-restart");
 			const result = runUpgradeLark({
 				runId: rc.runId,
@@ -12516,6 +12571,47 @@ main().catch((err) => {
 	const msg = err instanceof Error ? err.message : String(err);
 	console.error(`${mode ?? "<no-mode>"}: error message=${msg}`);
 	node_process.default.stderr.write(`Error: ${msg}\n`);
+	if (mode) {
+		const durationMs = Date.now() - t0;
+		if (mode === "upgrade-lark") {
+			const checkOnly = args.includes("--check");
+			const fixStatus = computeFixStatus(scene, "failed");
+			const failResult = {
+				status: "failed",
+				error: msg,
+				logFile: "",
+				fixStatus
+			};
+			if (fixStatus !== void 0) writeFixStatusEvent(fixStatus, failResult, console.error);
+			console.log(JSON.stringify(failResult));
+			reportUpgradeLarkToSlardar({
+				scene,
+				checkOnly,
+				durationMs,
+				resultStatus: "failed",
+				error: msg,
+				logFile: "",
+				resultSummary: buildUpgradeLarkResultSummary(failResult, checkOnly)
+			});
+		} else if ([
+			"doctor",
+			"check",
+			"repair",
+			"install-openclaw",
+			"install-extension",
+			"install-cli",
+			"download-resource",
+			"reset",
+			"lark-cli-init"
+		].includes(mode)) reportDoctorRunToSlardar({
+			command: mode,
+			scene,
+			profile: getFlag(args, "profile") === "experimental" ? "experimental" : "standard",
+			fix: args.includes("--fix"),
+			durationMs,
+			success: false
+		});
+	}
 	node_process.default.exitCode = 1;
 });
 //#endregion

package/package.json

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