@lark-apaas/openclaw-scripts-diagnose-cli 0.1.15-alpha.16 → 0.1.15-alpha.18

package/dist/index.cjs

@@ -52,7 +52,7 @@ node_assert = __toESM(node_assert);
 * it terse and parseable.
 */
 function getVersion() {
-	return "0.1.15-alpha.16";
+	return "0.1.15-alpha.18";
 }
 //#endregion
 //#region src/rule-engine/base.ts
@@ -10714,7 +10714,7 @@ async function reportCliRun(opts) {
 //#region src/help.ts
 const BIN = "mclaw-diagnose";
 function versionBanner() {
-	return `v0.1.15-alpha.16`;
+	return `v0.1.15-alpha.18`;
 }
 const COMMANDS = [
 	{
@@ -11903,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 });
@@ -11927,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;
@@ -11946,13 +11946,15 @@ function acquireInstallLock(command) {
 			} catch {}
 			continue;
 		}
-		throw new Error(`另一个安装指令正在运行，请等待其完成后重试。\n  占用指令: ${existing.command}\n  进程 PID : ${existing.pid}\n  开始时间: ${existing.startedAt}\n  锁文件  : ${INSTALL_LOCK_FILE}`);
+		const conflictMsg = `另一个安装指令正在运行，请等待其完成后重试。\n  占用指令: ${existing.command}\n  进程 PID : ${existing.pid}\n  开始时间: ${existing.startedAt}\n  锁文件  : ${INSTALL_LOCK_FILE}`;
+		console.error(`[install-lock] conflict: command=${command} blocked by pid=${existing.pid} command=${existing.command}`);
+		return conflictMsg;
 	}
 }
 /**
 * 释放安装操作互斥锁。
 * 仅删除由本进程创建的锁文件，避免误删其他进程的锁。
-* 通常由 process.on('exit') 自动调用，不需要手动调用。
+* 通常由 process.once('exit') 自动调用，不需要手动调用。
 */
 function releaseInstallLock() {
 	try {
@@ -11966,6 +11968,14 @@ 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();
@@ -12164,8 +12174,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,
@@ -12209,7 +12229,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;
@@ -12252,7 +12273,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");
@@ -12316,7 +12338,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;
@@ -12460,7 +12483,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,

package/package.json

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