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

package/dist/index.cjs

@@ -52,7 +52,7 @@ node_assert = __toESM(node_assert);
 * it terse and parseable.
 */
 function getVersion() {
-	return "0.1.15-alpha.11";
+	return "0.1.15-alpha.13";
 }
 //#endregion
 //#region src/rule-engine/base.ts
@@ -1792,7 +1792,6 @@ let ToolsAllowAlsoAllowConflictRule = class ToolsAllowAlsoAllowConflictRule exte
 	validate(ctx) {
 		const conflicts = [];
 		visitAllScopes(ctx.config, (scope, label) => {
-			console.error(`[tools_allow_also_allow_conflict] scope=${label} hasConflict=${hasConflict(scope)} allow=${JSON.stringify(scope.allow)?.slice(0, 40)} alsoAllow=${JSON.stringify(scope.alsoAllow)?.slice(0, 40)}`);
 			if (hasConflict(scope)) conflicts.push(label);
 		});
 		if (conflicts.length === 0) return { pass: true };
@@ -2635,6 +2634,12 @@ const SECRETS_FILE_PATH = "/home/gem/workspace/.force/openclaw/miaoda-openclaw-s
 /** Absolute path to the openclaw config JSON. */
 const CONFIG_PATH = `${WORKSPACE_DIR}/openclaw.json`;
 /**
+* upgrade-lark 场景专属修复状态的信号文件目录。
+* fixStatus 有值时在此目录下创建同名文件（如 /tmp/event/PORT_FIX_READY），
+* 文件内容为完整的 UpgradeLarkResult JSON，供外部进程轮询感知升级结果。
+*/
+const FIX_EVENT_DIR = "/tmp/event";
+/**
 * upgrade-lark 每次运行的日志文件路径，含时间戳便于按时间排序定位。
 * checkOnly=true 时文件名含 "-check" 后缀，便于与正式安装日志区分。
 */
@@ -3314,6 +3319,13 @@ function execCaptureErr(cmd) {
 		throw new Error(stderrStr ? `${base}\nstderr: ${stderrStr}` : base);
 	}
 }
+/**
+* Synchronous sleep using Atomics.wait on a shared buffer.
+* Works on the main thread (unlike setTimeout which requires an event loop tick).
+*/
+function sleepSync(ms) {
+	Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+}
 /** POSIX single-quote shell escape. Paths with embedded quotes are rare but
 *  the token-file path conventions in sandboxes don't guarantee cleanliness. */
 function shellQuote(s) {
@@ -7366,14 +7378,6 @@ function getResetTask(taskId) {
 		progress: "等待中..."
 	};
 }
-/**
-* Synchronous sleep using Atomics.wait on a shared buffer.
-*/
-function sleepSync(ms) {
-	const buf = new SharedArrayBuffer(4);
-	const arr = new Int32Array(buf);
-	Atomics.wait(arr, 0, 0, ms);
-}
 //#endregion
 //#region src/oss/resolveOssFileMap.ts
 /**
@@ -10693,7 +10697,7 @@ async function reportCliRun(opts) {
 //#region src/help.ts
 const BIN = "mclaw-diagnose";
 function versionBanner() {
-	return `v0.1.15-alpha.11`;
+	return `v0.1.15-alpha.13`;
 }
 const COMMANDS = [
 	{
@@ -11289,14 +11293,16 @@ function reportDoctorRunToSlardar(opts) {
 * ## extraCategories（字符串维度）
 * - scene：调用方标识（如 PageUpgradeLark）
 * - check_only：是否为 --check 仅诊断模式
-* - skipped："true" 表示前置门控未触发跳过安装（含 --check 模式），"false" 表示执行了安装
-* - skip_reason：跳过原因描述（skipped=true 时有值，"check" 表示 --check 模式）
-* - exit_code：npx 子进程退出码（跳过安装时为空）
-* - rollback_ok：回滚是否成功（未触发回滚时为空）
-* - validation_error：安装后校验失败的错误信息
-* - error_msg：命令级错误信息
-* - result：执行结果一行摘要（"success: ..."/"failed: ..."/"skipped: ..."/"check: ..."）
-* - log_file：日志文件绝对路径，便于在沙箱中定位完整日志
+* - status：与 UpgradeLarkResult.status 一致（success / skipped / failed）
+* - skip_reason：跳过原因（对应 UpgradeLarkResult.skipReason）
+* - upgrade_needed：仅 --check 模式，是否检测到需要升级（对应 UpgradeLarkResult.upgradeNeeded）
+* - exit_code：npx 子进程退出码（对应 UpgradeLarkResult.exitCode，跳过安装时为空）
+* - rollback_ok：回滚是否成功（对应 UpgradeLarkResult.rollbackOk，未触发回滚时为空）
+* - validation_error：安装后校验失败信息（对应 UpgradeLarkResult.validationError）
+* - error：命令级错误信息（对应 UpgradeLarkResult.error）
+* - port_check_ok：端口存活检测结果（对应 UpgradeLarkResult.portCheckOk，未执行时为空）
+* - result：执行结果一行摘要（派生字段，见 buildUpgradeLarkResultSummary）
+* - log_file：日志文件绝对路径（对应 UpgradeLarkResult.logFile）
 *
 * ## extraMetrics（数值指标，单位毫秒）
 * 未执行的阶段上报 -1 作为哨兵值，便于与"运行了 0ms"区分。
@@ -11309,21 +11315,23 @@ function reportDoctorRunToSlardar(opts) {
 * 注：[7/7] 重启耗时写入日志但未单独上报，包含在 durationMs 总耗时中。
 */
 function reportUpgradeLarkToSlardar(opts) {
-	console.error(`[slardar] upgrade_lark_run scene=${opts.scene ?? ""} checkOnly=${opts.checkOnly} skipped=${opts.skipped ?? false} success=${opts.success} exitCode=${opts.exitCode ?? ""} rollbackOk=${opts.rollbackOk ?? ""}`);
+	console.error(`[slardar] upgrade_lark_run scene=${opts.scene ?? ""} checkOnly=${opts.checkOnly} status=${opts.resultStatus} exitCode=${opts.exitCode ?? ""} rollbackOk=${opts.rollbackOk ?? ""}`);
 	const t = opts.timing ?? {};
 	reportTask({
 		eventName: "upgrade_lark_run",
 		durationMs: opts.durationMs,
-		status: opts.success ? "success" : "failed",
+		status: opts.resultStatus === "failed" || opts.upgradeNeeded ? "failed" : "success",
 		extraCategories: {
 			scene: opts.scene ?? "",
 			check_only: String(opts.checkOnly),
-			skipped: String(opts.skipped ?? false),
+			status: opts.resultStatus,
 			skip_reason: opts.skipReason ?? "",
+			upgrade_needed: String(opts.upgradeNeeded ?? ""),
 			exit_code: String(opts.exitCode ?? ""),
-			rollback_ok: opts.rollbackOk != null ? String(opts.rollbackOk) : "",
+			rollback_ok: String(opts.rollbackOk ?? ""),
 			validation_error: opts.validationError ?? "",
-			error_msg: opts.error ?? "",
+			error: opts.error ?? "",
+			port_check_ok: String(opts.portCheckOk ?? ""),
 			result: opts.resultSummary,
 			log_file: opts.logFile
 		},
@@ -11333,7 +11341,8 @@ function reportUpgradeLarkToSlardar(opts) {
 			backup_ms: t.backupMs ?? -1,
 			npx_install_ms: t.npxInstallMs ?? -1,
 			post_probe_ms: t.postProbeMs ?? -1,
-			doctor_fix_ms: t.doctorFixMs ?? -1
+			doctor_fix_ms: t.doctorFixMs ?? -1,
+			port_check_ms: t.portCheckMs ?? -1
 		}
 	});
 }
@@ -11341,18 +11350,18 @@ function reportUpgradeLarkToSlardar(opts) {
 * 将 upgrade-lark 运行结果归纳为一行摘要字符串，用于 Slardar result 字段。
 *
 * 格式：
-*   "check: upgrade needed"
-*   "check: no upgrade needed"
+*   "check: upgrade needed"  / "check: no upgrade needed"
 *   "skipped: <skipReason>"
 *   "success: upgrade installed"
-*   "success: new default account (plugin installed, awaiting config)"
-*   "failed: <error>"
+*   "failed: <error> (rolled back)" / "failed: <error> (rollback FAILED)"
 */
-function buildUpgradeLarkResultSummary(opts) {
-	if (opts.checkOnly && opts.skipped) return opts.upgradeNeeded ? "check: upgrade needed" : "check: no upgrade needed";
-	if (opts.skipped) return `skipped: ${opts.skipReason ?? "pre-check gate"}`;
-	if (opts.ok) return "success: upgrade installed";
-	return `failed: ${opts.error ?? opts.validationError ?? "unknown error"}${opts.rollbackOk === false ? " (rollback FAILED)" : opts.rollbackOk ? " (rolled back)" : ""}`;
+function buildUpgradeLarkResultSummary(result, checkOnly) {
+	if (result.status === "skipped") {
+		if (checkOnly) return result.upgradeNeeded ? "check: upgrade needed" : "check: no upgrade needed";
+		return `skipped: ${result.skipReason ?? "pre-check gate"}`;
+	}
+	if (result.status === "success") return "success: upgrade installed";
+	return `failed: ${result.error ?? result.validationError ?? "unknown error"}${result.rollbackOk === false ? " (rollback FAILED)" : result.rollbackOk ? " (rolled back)" : ""}`;
 }
 //#endregion
 //#region src/upgrade-lark.ts
@@ -11492,6 +11501,82 @@ function probeChannels(label, log, timeoutMs) {
 		};
 	}
 }
+/**
+* 根据 scene、最终状态和端口检测结果，计算场景专属修复状态。
+* scene 不在已知场景列表时返回 undefined。
+*/
+function computeFixStatus(scene, status, portCheckOk = void 0) {
+	if (scene === "FromPreviewFailed") return status === "success" && portCheckOk !== false ? "PORT_FIX_READY" : "PORT_FIX_FAILED";
+	if (scene === "FromChannelFailed") return status === "success" ? "CHANNEL_FIX_READY" : "CHANNEL_FIX_FAILED";
+}
+/**
+* 轮询端口检测脚本，确认 openclaw-gateway 在重启后监听指定端口。
+*
+* 逻辑：
+*   1. 先等待 initialWaitMs（让服务有时间完成重启）
+*   2. 循环执行 `bash ${BUILTIN_PATH}/tool/port_check.sh <port>`，至多 maxAttempts 次：
+*      - 输出为空 → 服务尚未就绪，等 intervalMs 后重试
+*      - 输出含端口号 → 端口存活，返回 ok=true
+*      - 输出非空但不含端口号 → 端口异常，立即返回 ok=false
+*   3. 超过 maxAttempts 仍无响应 → 返回 ok=false
+*
+* 注意：${BUILTIN_PATH} 是沙箱 shell 环境变量，通过 `bash -c` 让 shell 自行展开，
+* Node 侧不读取、不拼接该路径。
+*/
+function pollPortCheck(opts) {
+	const { port, initialWaitMs, intervalMs, maxAttempts, log } = opts;
+	const portStr = String(port);
+	const cmd = "bash ${BUILTIN_PATH}/tool/port_check.sh " + portStr;
+	log(`  waiting ${initialWaitMs / 1e3}s before first port-check poll...`);
+	if (initialWaitMs > 0) sleepSync(initialWaitMs);
+	for (let i = 1; i <= maxAttempts; i++) {
+		const r = (0, node_child_process.spawnSync)("bash", ["-c", cmd], {
+			encoding: "utf-8",
+			stdio: [
+				"ignore",
+				"pipe",
+				"pipe"
+			],
+			timeout: 1e4
+		});
+		const output = (r.stdout ?? "").trim();
+		const errout = (r.stderr ?? "").trim();
+		log(`  port-check [${i}/${maxAttempts}]: exit=${r.status ?? "null"} output=${JSON.stringify(output)}${errout ? ` stderr=${JSON.stringify(errout)}` : ""}`);
+		if (!output) {
+			sleepSync(intervalMs);
+			continue;
+		}
+		if (output.includes(portStr)) {
+			log(`  port-check: SUCCESS — port ${port} confirmed in output`);
+			return {
+				ok: true,
+				output
+			};
+		}
+		log(`  port-check: FAILED — output non-empty but port ${port} not found`);
+		return {
+			ok: false,
+			output
+		};
+	}
+	log(`  port-check: FAILED — no response after ${maxAttempts} attempts`);
+	return { ok: false };
+}
+/**
+* 将 fixStatus 信号文件写入 /tmp/event/<fixStatus>，内容为完整的 UpgradeLarkResult JSON。
+* 外部进程（如服务端诊断流程）通过轮询此文件感知升级结果。
+* 写入失败只记录日志，不影响主流程返回值。
+*/
+function writeFixStatusEvent(fixStatus, result, log) {
+	const filePath = `${FIX_EVENT_DIR}/${fixStatus}`;
+	try {
+		node_fs.default.mkdirSync(FIX_EVENT_DIR, { recursive: true });
+		node_fs.default.writeFileSync(filePath, JSON.stringify(result, null, 2));
+		log(`[fix-event] written: ${filePath}`);
+	} catch (e) {
+		log(`[fix-event] write failed: ${filePath} — ${e.message}`);
+	}
+}
 function runUpgradeLark(opts) {
 	const cwd = opts.cwd ?? "/home/gem/workspace/agent";
 	const configPath = opts.configPath ?? CONFIG_PATH;
@@ -11511,6 +11596,10 @@ function runUpgradeLark(opts) {
 	log(`  configPath : ${configPath}`);
 	log(`${"=".repeat(60)}`);
 	const timing = {};
+	const finalReturn = (r) => {
+		if (r.fixStatus !== void 0) writeFixStatusEvent(r.fixStatus, r, log);
+		return r;
+	};
 	log("");
 	log("── [Pre-check A] channels probe（升级前）────────────────");
 	const t_preProbeStart = Date.now();
@@ -11549,14 +11638,14 @@ function runUpgradeLark(opts) {
 		log(`${"=".repeat(60)}`);
 		log("upgrade-lark skipped (pre-check gate)");
 		log(`${"=".repeat(60)}`);
-		return {
-			ok: true,
-			skipped: true,
+		return finalReturn({
+			status: "skipped",
 			skipReason: reason,
 			upgradeNeeded: false,
 			timing,
-			logFile
-		};
+			logFile,
+			fixStatus: computeFixStatus(opts.scene, "skipped")
+		});
 	}
 	if (beforeChannels.anyAccountWorking) {
 		const reason = "channels are working — upgrade not needed (issue detected but system is functional)";
@@ -11564,14 +11653,14 @@ function runUpgradeLark(opts) {
 		log(`${"=".repeat(60)}`);
 		log("upgrade-lark skipped (pre-check gate)");
 		log(`${"=".repeat(60)}`);
-		return {
-			ok: true,
-			skipped: true,
+		return finalReturn({
+			status: "skipped",
 			skipReason: reason,
 			upgradeNeeded: false,
 			timing,
-			logFile
-		};
+			logFile,
+			fixStatus: computeFixStatus(opts.scene, "skipped")
+		});
 	}
 	log(`  PROCEED: requiresLarkUpgrade=true (version=${versionIncompatible}, feishuConfig=${feishuConfigInvalid}) AND channels not working → running upgrade`);
 	if (opts.checkOnly) {
@@ -11579,14 +11668,13 @@ function runUpgradeLark(opts) {
 		log(`${"=".repeat(60)}`);
 		log("upgrade-lark check complete");
 		log(`${"=".repeat(60)}`);
-		return {
-			ok: true,
-			skipped: true,
+		return finalReturn({
+			status: "skipped",
 			skipReason: "check",
 			upgradeNeeded: true,
 			timing,
 			logFile
-		};
+		});
 	}
 	log("");
 	log("── [1/6] 文件备份 ────────────────────────────────────────");
@@ -11596,12 +11684,13 @@ function runUpgradeLark(opts) {
 	timing.backupMs = Date.now() - t_backupStart;
 	if (!backup.ok) {
 		log(`ERROR: ${backup.error}`);
-		return {
-			ok: false,
+		return finalReturn({
+			status: "failed",
 			error: backup.error,
 			timing,
-			logFile
-		};
+			logFile,
+			fixStatus: computeFixStatus(opts.scene, "failed")
+		});
 	}
 	log("backup: ok");
 	logVersionSnapshot("before-versions", snapshotVersions(cwd, log), log);
@@ -11642,15 +11731,15 @@ function runUpgradeLark(opts) {
 	if (statusCheckDelayMs > 0) {
 		log("");
 		log(`── 等待 ${statusCheckDelayMs / 1e3}s（让 openclaw 服务完成重启） ─────────────`);
-		Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, statusCheckDelayMs);
+		sleepSync(statusCheckDelayMs);
 		log("wait done");
 	}
 	const doRollback = (reason) => {
 		log(`ERROR: ${reason}`);
 		const rollbackOk = restoreFiles(fsOpts);
 		log(`rollback: ${rollbackOk ? "ok" : "FAILED"}`);
-		return {
-			ok: false,
+		return finalReturn({
+			status: "failed",
 			error: reason,
 			validationError: reason,
 			stdout: npxStdout,
@@ -11658,8 +11747,9 @@ function runUpgradeLark(opts) {
 			exitCode: npxExitCode,
 			rollbackOk,
 			timing,
-			logFile
-		};
+			logFile,
+			fixStatus: computeFixStatus(opts.scene, "failed")
+		});
 	};
 	log("");
 	log("── [4/5] 安装后诊断校验 ─────────────────────────────────");
@@ -11711,8 +11801,9 @@ function runUpgradeLark(opts) {
 	if (fixResult.stderr?.trim()) log(`doctor(fix) stderr:\n${fixResult.stderr.trim()}`);
 	log(`doctor(fix) exit: ${fixResult.status ?? "null"}${fixResult.error ? ` error: ${fixResult.error.message}` : ""}`);
 	log("");
-	log("── [7/7] 重启 openclaw 服务 ──────────────────────────────");
+	log("── [7/8] 重启 openclaw 服务 ──────────────────────────────");
 	const restartScript = "/opt/force/bin/openclaw_scripts/restart.sh";
+	let restartExecuted = false;
 	if (opts.skipRestart) log("  skipped: --skip-restart");
 	else if (node_fs.default.existsSync(restartScript)) {
 		const t_restart = Date.now();
@@ -11729,19 +11820,39 @@ function runUpgradeLark(opts) {
 		if (restartResult.stdout?.trim()) log(`  restart stdout:\n${restartResult.stdout.trim()}`);
 		if (restartResult.stderr?.trim()) log(`  restart stderr:\n${restartResult.stderr.trim()}`);
 		log(`  restart.sh exit: ${restartResult.status ?? "null"} (${restartMs}ms)${restartResult.error ? ` error: ${restartResult.error.message}` : ""}`);
+		restartExecuted = true;
 	} else log(`  skipped: ${restartScript} not found`);
 	log("");
+	log("── [8/8] 端口存活检测 ────────────────────────────────────");
+	let portCheckOk;
+	if (!restartExecuted) log("  skipped: restart was not executed");
+	else {
+		const t_portCheck = Date.now();
+		const pcResult = pollPortCheck({
+			port: 18789,
+			initialWaitMs: opts.portCheckInitialWaitMs ?? 3e3,
+			intervalMs: opts.portCheckIntervalMs ?? 1e3,
+			maxAttempts: opts.portCheckMaxAttempts ?? 30,
+			log
+		});
+		timing.portCheckMs = Date.now() - t_portCheck;
+		portCheckOk = pcResult.ok;
+		log(`  port-check result: ${portCheckOk ? "ok" : "FAILED"} (${timing.portCheckMs}ms)`);
+	}
+	log("");
 	log(`${"=".repeat(60)}`);
 	log("upgrade-lark completed successfully");
 	log(`${"=".repeat(60)}`);
-	return {
-		ok: true,
+	return finalReturn({
+		status: "success",
 		stdout: npxStdout,
 		stderr: npxStderr,
 		exitCode: npxExitCode,
+		portCheckOk,
 		timing,
-		logFile
-	};
+		logFile,
+		fixStatus: computeFixStatus(opts.scene, "success", portCheckOk)
+	});
 }
 //#endregion
 //#region src/index.ts
@@ -12248,24 +12359,16 @@ async function main() {
 				scene,
 				checkOnly,
 				durationMs: upgradeDurationMs,
-				success: result.ok,
-				skipped: result.skipped,
+				resultStatus: result.status,
+				upgradeNeeded: result.upgradeNeeded,
 				skipReason: result.skipReason,
 				logFile: result.logFile,
-				resultSummary: buildUpgradeLarkResultSummary({
-					ok: result.ok,
-					checkOnly,
-					skipped: result.skipped,
-					skipReason: result.skipReason,
-					upgradeNeeded: result.upgradeNeeded,
-					error: result.error,
-					validationError: result.validationError,
-					rollbackOk: result.rollbackOk
-				}),
+				resultSummary: buildUpgradeLarkResultSummary(result, checkOnly),
 				exitCode: result.exitCode,
 				rollbackOk: result.rollbackOk,
 				validationError: result.validationError,
 				error: result.error,
+				portCheckOk: result.portCheckOk,
 				timing: result.timing
 			});
 			try {
@@ -12277,14 +12380,14 @@ async function main() {
 					durationMs: upgradeDurationMs,
 					caller: rc.caller,
 					traceId: rc.traceId,
-					success: result.ok,
+					success: result.status !== "failed",
 					result,
-					error: result.ok ? void 0 : { message: result.error ?? "upgrade-lark failed" }
+					error: result.status === "failed" ? { message: result.error ?? "upgrade-lark failed" } : void 0
 				});
 			} catch (e) {
 				console.error(`[telemetry] reportCliRun failed: ${e.message}`);
 			}
-			if (!result.ok || checkOnly && result.upgradeNeeded) {
+			if (result.status === "failed" || checkOnly && result.upgradeNeeded) {
 				node_process.default.exitCode = 1;
 				return;
 			}

package/package.json

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