@lark-apaas/openclaw-scripts-diagnose-cli 0.1.13-alpha.2 → 0.1.13-alpha.4

package/dist/index.cjs

@@ -52,7 +52,7 @@ node_assert = __toESM(node_assert);
 * it terse and parseable.
 */
 function getVersion() {
-	return "0.1.13-alpha.2";
+	return "0.1.13-alpha.4";
 }
 //#endregion
 //#region src/rule-engine/base.ts
@@ -10132,7 +10132,7 @@ async function reportCliRun(opts) {
 //#region src/help.ts
 const BIN = "mclaw-diagnose";
 function versionBanner() {
-	return `v0.1.13-alpha.2`;
+	return `v0.1.13-alpha.4`;
 }
 const COMMANDS = [
 	{
@@ -10834,9 +10834,17 @@ function runUpgradeLark(opts) {
 		log
 	};
 	const cliScript = opts.cliScript ?? process.argv[1];
-	log(`=== upgrade-lark started runId=${opts.runId} cwd=${cwd} configPath=${configPath} ===`);
+	const statusCheckDelayMs = opts.statusCheckDelayMs ?? 5e3;
+	log(`${"=".repeat(60)}`);
+	log(`upgrade-lark started  runId=${opts.runId}`);
+	log(`  cwd        : ${cwd}`);
+	log(`  configPath : ${configPath}`);
+	log(`${"=".repeat(60)}`);
+	log("");
+	log("── [1/6] 升级前状态快照 ──────────────────────────────────");
 	log(`before-state: botCount=${countFeishuBots(configPath)}`);
-	log("--- backup ---");
+	log("");
+	log("── [2/6] 文件备份 ────────────────────────────────────────");
 	const backup = backupFiles(fsOpts);
 	if (!backup.ok) {
 		log(`ERROR: ${backup.error}`);
@@ -10848,7 +10856,8 @@ function runUpgradeLark(opts) {
 	}
 	log("backup: ok");
 	logVersionSnapshot("before-versions", snapshotVersions(cwd), log);
-	log("--- npx @larksuite/openclaw-lark-tools update ---");
+	log("");
+	log("── [3/6] npx install (@larksuite/openclaw-lark-tools update) ──");
 	const npxResult = (0, node_child_process.spawnSync)("npx", [
 		"-y",
 		"@larksuite/openclaw-lark-tools",
@@ -10870,21 +10879,14 @@ function runUpgradeLark(opts) {
 	if (npxStderr) log(`npx stderr:\n${npxStderr}`);
 	log(`npx exit: ${npxExitCode}${npxResult.error ? ` error: ${npxResult.error.message}` : ""}`);
 	logVersionSnapshot("after-versions", snapshotVersions(cwd), log);
-	log("--- openclaw gateway status ---");
-	const gatewayStatusResult = (0, node_child_process.spawnSync)("openclaw", ["gateway", "status"], {
-		cwd,
-		encoding: "utf-8",
-		stdio: [
-			"ignore",
-			"pipe",
-			"pipe"
-		],
-		timeout: 15e3
-	});
-	if (gatewayStatusResult.stdout?.trim()) log(`gateway stdout:\n${gatewayStatusResult.stdout.trim()}`);
-	if (gatewayStatusResult.stderr?.trim()) log(`gateway stderr:\n${gatewayStatusResult.stderr.trim()}`);
-	log(`gateway status exit: ${gatewayStatusResult.status ?? "null"}${gatewayStatusResult.error ? ` error: ${gatewayStatusResult.error.message}` : ""}`);
-	log("--- doctor check ---");
+	if (statusCheckDelayMs > 0) {
+		log("");
+		log(`── 等待 ${statusCheckDelayMs / 1e3}s（让 openclaw 服务完成重启） ─────────────`);
+		Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, statusCheckDelayMs);
+		log("wait done");
+	}
+	log("");
+	log("── [4/6] doctor check ────────────────────────────────────");
 	const doctorArgs = ["doctor"];
 	if (opts.scene) doctorArgs.push(`--scene=${opts.scene}`);
 	const doctorResult = (0, node_child_process.spawnSync)(process.execPath, [cliScript, ...doctorArgs], {
@@ -10901,7 +10903,8 @@ function runUpgradeLark(opts) {
 	if (doctorResult.stdout?.trim()) log(`doctor stdout:\n${doctorResult.stdout.trim()}`);
 	if (doctorResult.stderr?.trim()) log(`doctor stderr:\n${doctorResult.stderr.trim()}`);
 	log(`doctor exit: ${doctorResult.status ?? "null"}${doctorResult.error ? ` error: ${doctorResult.error.message}` : ""}`);
-	log("--- channels probe ---");
+	log("");
+	log("── [5/6] channels probe ──────────────────────────────────");
 	try {
 		const channelsResult = runChannelsProbe(3e4);
 		log(`channels available: ${channelsResult.available}`);
@@ -10912,7 +10915,25 @@ function runUpgradeLark(opts) {
 	} catch (e) {
 		log(`channels probe threw: ${e.message}`);
 	}
-	log("=== upgrade-lark completed (validation disabled) ===");
+	log("");
+	log("── [6/6] openclaw gateway status ────────────────────────");
+	const gatewayStatusResult = (0, node_child_process.spawnSync)("openclaw", ["gateway", "status"], {
+		cwd,
+		encoding: "utf-8",
+		stdio: [
+			"ignore",
+			"pipe",
+			"pipe"
+		],
+		timeout: 15e3
+	});
+	if (gatewayStatusResult.stdout?.trim()) log(`gateway stdout:\n${gatewayStatusResult.stdout.trim()}`);
+	if (gatewayStatusResult.stderr?.trim()) log(`gateway stderr:\n${gatewayStatusResult.stderr.trim()}`);
+	log(`gateway status exit: ${gatewayStatusResult.status ?? "null"}${gatewayStatusResult.error ? ` error: ${gatewayStatusResult.error.message}` : ""}`);
+	log("");
+	log(`${"=".repeat(60)}`);
+	log("upgrade-lark completed (validation disabled)");
+	log(`${"=".repeat(60)}`);
 	return {
 		ok: true,
 		stdout: npxStdout,
@@ -11443,10 +11464,11 @@ async function main() {
 				runId: rc.runId,
 				scene
 			});
+			const upgradeDurationMs = Date.now() - t0;
 			console.log(JSON.stringify(result));
 			reportUpgradeLarkToSlardar({
 				scene,
-				durationMs: Date.now() - t0,
+				durationMs: upgradeDurationMs,
 				success: result.ok,
 				logFile: result.logFile,
 				exitCode: result.exitCode,
@@ -11454,15 +11476,22 @@ async function main() {
 				validationError: result.validationError,
 				error: result.error
 			});
-			await reportRun("upgrade-lark", rc, void 0, args.join(" "), Date.now() - t0, {
-				success: result.ok,
-				result,
-				error: result.ok ? void 0 : new Error(result.error ?? "upgrade-lark failed")
-			}, {
-				scene,
-				profile,
-				fix: false
-			});
+			try {
+				await reportCliRun({
+					command: "upgrade-lark",
+					runId: rc.runId,
+					version: getVersion(),
+					invocation: args.join(" "),
+					durationMs: upgradeDurationMs,
+					caller: rc.caller,
+					traceId: rc.traceId,
+					success: result.ok,
+					result,
+					error: result.ok ? void 0 : { message: result.error ?? "upgrade-lark failed" }
+				});
+			} catch (e) {
+				console.error(`[telemetry] reportCliRun failed: ${e.message}`);
+			}
 			if (!result.ok) {
 				node_process.default.exitCode = 1;
 				return;

package/package.json

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