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

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.12";
 }
 //#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 };
@@ -10693,7 +10692,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.12`;
 }
 const COMMANDS = [
 	{
@@ -11289,14 +11288,15 @@ 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）
+* - result：执行结果一行摘要（派生字段，见 buildUpgradeLarkResultSummary）
+* - log_file：日志文件绝对路径（对应 UpgradeLarkResult.logFile）
 *
 * ## extraMetrics（数值指标，单位毫秒）
 * 未执行的阶段上报 -1 作为哨兵值，便于与"运行了 0ms"区分。
@@ -11309,21 +11309,22 @@ 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 ?? "",
 			result: opts.resultSummary,
 			log_file: opts.logFile
 		},
@@ -11341,18 +11342,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
@@ -11550,8 +11551,7 @@ function runUpgradeLark(opts) {
 		log("upgrade-lark skipped (pre-check gate)");
 		log(`${"=".repeat(60)}`);
 		return {
-			ok: true,
-			skipped: true,
+			status: "skipped",
 			skipReason: reason,
 			upgradeNeeded: false,
 			timing,
@@ -11565,8 +11565,7 @@ function runUpgradeLark(opts) {
 		log("upgrade-lark skipped (pre-check gate)");
 		log(`${"=".repeat(60)}`);
 		return {
-			ok: true,
-			skipped: true,
+			status: "skipped",
 			skipReason: reason,
 			upgradeNeeded: false,
 			timing,
@@ -11580,8 +11579,7 @@ function runUpgradeLark(opts) {
 		log("upgrade-lark check complete");
 		log(`${"=".repeat(60)}`);
 		return {
-			ok: true,
-			skipped: true,
+			status: "skipped",
 			skipReason: "check",
 			upgradeNeeded: true,
 			timing,
@@ -11597,7 +11595,7 @@ function runUpgradeLark(opts) {
 	if (!backup.ok) {
 		log(`ERROR: ${backup.error}`);
 		return {
-			ok: false,
+			status: "failed",
 			error: backup.error,
 			timing,
 			logFile
@@ -11650,7 +11648,7 @@ function runUpgradeLark(opts) {
 		const rollbackOk = restoreFiles(fsOpts);
 		log(`rollback: ${rollbackOk ? "ok" : "FAILED"}`);
 		return {
-			ok: false,
+			status: "failed",
 			error: reason,
 			validationError: reason,
 			stdout: npxStdout,
@@ -11735,7 +11733,7 @@ function runUpgradeLark(opts) {
 	log("upgrade-lark completed successfully");
 	log(`${"=".repeat(60)}`);
 	return {
-		ok: true,
+		status: "success",
 		stdout: npxStdout,
 		stderr: npxStderr,
 		exitCode: npxExitCode,
@@ -12248,20 +12246,11 @@ 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,
@@ -12277,14 +12266,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.12",
   "description": "CLI for OpenClaw config diagnose and repair with JSON5 support",
   "main": "dist/index.cjs",
   "bin": {