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

package/dist/index.cjs

@@ -52,7 +52,7 @@ node_assert = __toESM(node_assert);
 * it terse and parseable.
 */
 function getVersion() {
-	return "0.1.15-alpha.13";
+	return "0.1.15-alpha.15";
 }
 //#endregion
 //#region src/rule-engine/base.ts
@@ -2640,6 +2640,13 @@ const CONFIG_PATH = `${WORKSPACE_DIR}/openclaw.json`;
 */
 const FIX_EVENT_DIR = "/tmp/event";
 /**
+* 安装指令互斥锁文件路径。
+* upgrade-lark / install-openclaw / install-extension / install-cli / reset --worker
+* 共享此锁，同一时刻只允许一个安装指令运行。
+* 锁文件内容：{ pid, command, startedAt }。
+*/
+const INSTALL_LOCK_FILE = `${DIAGNOSE_DIR}/install.lock`;
+/**
 * upgrade-lark 每次运行的日志文件路径，含时间戳便于按时间排序定位。
 * checkOnly=true 时文件名含 "-check" 后缀，便于与正式安装日志区分。
 */
@@ -10697,7 +10704,7 @@ async function reportCliRun(opts) {
 //#region src/help.ts
 const BIN = "mclaw-diagnose";
 function versionBanner() {
-	return `v0.1.15-alpha.13`;
+	return `v0.1.15-alpha.15`;
 }
 const COMMANDS = [
 	{
@@ -11596,6 +11603,22 @@ function runUpgradeLark(opts) {
 	log(`  configPath : ${configPath}`);
 	log(`${"=".repeat(60)}`);
 	const timing = {};
+	for (const s of [
+		"PORT_FIX_READY",
+		"PORT_FIX_FAILED",
+		"CHANNEL_FIX_READY",
+		"CHANNEL_FIX_FAILED"
+	]) {
+		const f = `${FIX_EVENT_DIR}/${s}`;
+		try {
+			if (node_fs.default.existsSync(f)) {
+				node_fs.default.rmSync(f);
+				log(`[fix-event] cleared stale: ${f}`);
+			}
+		} catch (e) {
+			log(`[fix-event] clear failed: ${f} — ${e.message}`);
+		}
+	}
 	const finalReturn = (r) => {
 		if (r.fixStatus !== void 0) writeFixStatusEvent(r.fixStatus, r, log);
 		return r;
@@ -11855,6 +11878,83 @@ function runUpgradeLark(opts) {
 	});
 }
 //#endregion
+//#region src/install-lock.ts
+/**
+* 检查指定 PID 是否仍在运行（向进程发 signal 0，不影响其运行状态）。
+* 跨平台：Linux/macOS 均支持；Windows 不在目标平台范围内。
+*/
+function isPidAlive(pid) {
+	try {
+		process.kill(pid, 0);
+		return true;
+	} catch (e) {
+		if (e.code === "EPERM") return true;
+		return false;
+	}
+}
+/**
+* 获取安装操作互斥锁。
+*
+* 利用 open(O_CREAT | O_EXCL) 的 POSIX 原子性确保同一时刻只有一个安装指令运行。
+* 覆盖的安装指令：upgrade-lark / install-openclaw / install-extension / install-cli / reset --worker。
+*
+* 若锁被活跃进程持有，抛出包含持有者信息的 Error。
+* 若锁文件属于已退出进程（crash 遗留），视为过期锁并覆盖。
+*
+* 成功获取后自动注册 process.on('exit') 释放锁，无需调用方手动清理。
+*/
+function acquireInstallLock(command) {
+	node_fs.default.mkdirSync(DIAGNOSE_DIR, { recursive: true });
+	const info = {
+		pid: process.pid,
+		command,
+		startedAt: (/* @__PURE__ */ new Date()).toISOString()
+	};
+	const content = JSON.stringify(info);
+	while (true) try {
+		const fd = node_fs.default.openSync(INSTALL_LOCK_FILE, node_fs.default.constants.O_CREAT | node_fs.default.constants.O_EXCL | node_fs.default.constants.O_WRONLY, 420);
+		node_fs.default.writeSync(fd, content);
+		node_fs.default.closeSync(fd);
+		process.once("exit", releaseInstallLock);
+		console.error(`[install-lock] acquired command=${command} pid=${process.pid}`);
+		return;
+	} catch (e) {
+		if (e.code !== "EEXIST") throw e;
+		let existing = null;
+		try {
+			existing = JSON.parse(node_fs.default.readFileSync(INSTALL_LOCK_FILE, "utf-8"));
+		} catch {
+			try {
+				node_fs.default.rmSync(INSTALL_LOCK_FILE, { force: true });
+			} catch {}
+			continue;
+		}
+		if (!isPidAlive(existing.pid)) {
+			console.error(`[install-lock] stale lock detected (pid=${existing.pid} command=${existing.command}), removing`);
+			try {
+				node_fs.default.rmSync(INSTALL_LOCK_FILE, { force: true });
+			} catch {}
+			continue;
+		}
+		throw new Error(`另一个安装指令正在运行，请等待其完成后重试。\n  占用指令: ${existing.command}\n  进程 PID : ${existing.pid}\n  开始时间: ${existing.startedAt}\n  锁文件  : ${INSTALL_LOCK_FILE}`);
+	}
+}
+/**
+* 释放安装操作互斥锁。
+* 仅删除由本进程创建的锁文件，避免误删其他进程的锁。
+* 通常由 process.on('exit') 自动调用，不需要手动调用。
+*/
+function releaseInstallLock() {
+	try {
+		const raw = node_fs.default.readFileSync(INSTALL_LOCK_FILE, "utf-8");
+		const info = JSON.parse(raw);
+		if (info.pid === process.pid) {
+			node_fs.default.rmSync(INSTALL_LOCK_FILE, { force: true });
+			console.error(`[install-lock] released command=${info.command} pid=${process.pid}`);
+		}
+	} catch {}
+}
+//#endregion
 //#region src/index.ts
 const args = node_process.default.argv.slice(2);
 const mode = args.find((a) => !a.startsWith("-"));
@@ -12054,6 +12154,7 @@ 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 raw = await fetchCtxViaInnerApi({
 					populate: planCtxPopulate({ command: "reset" }),
@@ -12098,6 +12199,7 @@ async function main() {
 				console.error("Usage: install-openclaw <tag> [--oss_file_map=<base64>]");
 				node_process.default.exit(1);
 			}
+			acquireInstallLock("install-openclaw");
 			const ossFileMapFlag = getFlag(args, "oss_file_map");
 			let installOssFileMap;
 			let rawForTelemetry;
@@ -12140,6 +12242,7 @@ 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 all = args.includes("--all");
 			const names = getMultiFlag(args, "extension");
 			const homeBase = getFlag(args, "home_base");
@@ -12203,6 +12306,7 @@ 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 homeBase = getFlag(args, "home_base");
 			const ossFileMapFlag = getFlag(args, "oss_file_map");
 			let installOssFileMap;
@@ -12346,6 +12450,7 @@ async function main() {
 		}
 		case "upgrade-lark": {
 			const checkOnly = args.includes("--check");
+			if (!checkOnly) acquireInstallLock("upgrade-lark");
 			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.13",
+  "version": "0.1.15-alpha.15",
   "description": "CLI for OpenClaw config diagnose and repair with JSON5 support",
   "main": "dist/index.cjs",
   "bin": {