@lark-apaas/openclaw-scripts-diagnose-cli 0.1.14-alpha.1 → 0.1.14-alpha.2

package/dist/index.cjs

@@ -52,7 +52,7 @@ node_assert = __toESM(node_assert);
 * it terse and parseable.
 */
 function getVersion() {
-	return "0.1.14-alpha.1";
+	return "0.1.14-alpha.2";
 }
 //#endregion
 //#region src/rule-engine/base.ts
@@ -3513,6 +3513,161 @@ function extractScopedNameFromSpec$1(spec) {
 	const at = spec.indexOf("@", 1);
 	return at === -1 ? spec : spec.slice(0, at);
 }
+/**
+* Returns true if the installed feishu plugin is version-incompatible with
+* the current openclaw (or is a legacy plugin that must be replaced).
+* Used by the upgrade_lark_needed rule and the upgrade-lark pre-check gate.
+*/
+function needsLarkUpgrade(ctx) {
+	const cc = resolveCompatContext(ctx);
+	if (!cc) return false;
+	const { ocCur, recommendedOc, installed, isLegacy } = cc;
+	if (isForkPlugin(installed)) return false;
+	if (recommendedOc) return resolveUpgradeDirection(installed, ocCur, recommendedOc, isLegacy) === "lark";
+	return isLegacy || !isVersionCompatible(installed, ocCur);
+}
+//#endregion
+//#region src/channels-probe.ts
+const CHANNEL_LINE_RE = /^-\s+Feishu\s+([^:]+):\s+(.+)$/;
+/**
+* Port of Python `_account_is_working` from the feishu-channel-success-rate skill.
+*
+* Strips colon-prefixed key:value bits (dm:, bot:, in:, out:, token:, allow:,
+* intents:, groups:, health:) and evaluates the canonical health formula.
+*/
+function accountIsWorking(bits) {
+	const bitTokens = /* @__PURE__ */ new Set();
+	let hasError = false;
+	let hasProbeFailed = false;
+	for (const raw of bits) {
+		const b = raw.trim();
+		if (!b) continue;
+		if (b.startsWith("error:")) {
+			hasError = true;
+			continue;
+		}
+		if (b === "probe failed") {
+			hasProbeFailed = true;
+			continue;
+		}
+		bitTokens.add(b.split(":")[0]);
+	}
+	if (!bitTokens.has("enabled") || !bitTokens.has("configured")) return false;
+	if (bitTokens.has("works")) return true;
+	if (bitTokens.has("running") && !hasError && !hasProbeFailed) return true;
+	return false;
+}
+/**
+* Parse the raw stdout of `openclaw channels status --probe`.
+* Port of Python `extract_channels_probe` from the feishu-channel-success-rate skill.
+*/
+function parseChannelsProbeOutput(text) {
+	const gatewayReachable = text.includes("Gateway reachable");
+	const accounts = [];
+	let anyAccountWorking = false;
+	for (const line of text.split("\n")) {
+		const m = CHANNEL_LINE_RE.exec(line.trim());
+		if (!m) continue;
+		const [, acct, rest] = m;
+		const bits = rest.split(",").map((b) => b.trim());
+		const isWorking = accountIsWorking(bits);
+		if (isWorking) anyAccountWorking = true;
+		accounts.push({
+			id: acct.trim(),
+			bits,
+			isWorking,
+			raw: line.trim()
+		});
+	}
+	return {
+		gatewayReachable,
+		accounts,
+		anyAccountWorking
+	};
+}
+/**
+* Run `openclaw channels status --probe` and return a structured result.
+*
+* The command may exit non-zero when some bot accounts fail their probe — that
+* is still useful output.  We therefore try to parse stdout even when the
+* process exits with a non-zero code, falling back to an unavailable result
+* only when there is genuinely no output to parse.
+*
+* @param timeoutMs  Maximum wait time.  Default is 60 s because v2026.4.x
+*   lacks a per-request HTTP timeout and can block indefinitely.
+*/
+function runChannelsProbe(timeoutMs = 6e4) {
+	let stdout = "";
+	let execError;
+	try {
+		stdout = (0, node_child_process.execSync)("openclaw channels status --probe", {
+			encoding: "utf-8",
+			timeout: timeoutMs,
+			stdio: [
+				"ignore",
+				"pipe",
+				"pipe"
+			]
+		});
+	} catch (e) {
+		const err = e;
+		stdout = err.stdout ?? "";
+		execError = err.message;
+		const stderrRaw = err.stderr;
+		const stderr = (typeof stderrRaw === "string" ? stderrRaw : stderrRaw?.toString("utf-8") ?? "").trim();
+		if (stderr) console.error(`channels-probe: stderr from CLI: ${stderr}`);
+	}
+	if (stdout.trim()) return {
+		available: true,
+		...parseChannelsProbeOutput(stdout)
+	};
+	return {
+		available: false,
+		gatewayReachable: false,
+		accounts: [],
+		anyAccountWorking: false,
+		error: execError ?? "no output from openclaw channels status --probe"
+	};
+}
+//#endregion
+//#region src/rules/upgrade-lark-needed.ts
+/**
+* Detects the condition that warrants running `upgrade-lark`:
+*   - feishu plugin version incompatible with current openclaw, AND
+*   - channels are not working.
+*
+* Both conditions must be true simultaneously. If version is compatible or
+* channels are working, the rule passes (no action needed).
+*
+* profile: experimental — runs only in full sweep mode, not in standard doctor.
+* level: silent — telemetry/sweep-only, does not trigger page-level repair UI.
+*/
+let UpgradeLarkNeededRule = class UpgradeLarkNeededRule extends DiagnoseRule {
+	validate(ctx) {
+		if (!needsLarkUpgrade(ctx)) return { pass: true };
+		let anyAccountWorking = false;
+		try {
+			anyAccountWorking = runChannelsProbe(3e4).anyAccountWorking;
+		} catch {
+			return { pass: true };
+		}
+		if (anyAccountWorking) return { pass: true };
+		return {
+			pass: false,
+			action: "upgrade_lark",
+			message: "飞书插件版本不兼容且 channels 不可用，建议执行 upgrade-lark 命令升级飞书插件"
+		};
+	}
+};
+UpgradeLarkNeededRule = __decorate([Rule({
+	key: "upgrade_lark_needed",
+	description: "检测飞书插件版本不兼容且 channels 不可用，判断是否需要执行 upgrade-lark 升级",
+	dependsOn: ["feishu_plugin_version_compat_lark"],
+	repairMode: "check-only",
+	level: "silent",
+	profile: "experimental",
+	usesVars: ["recommendedOpenclawTag"]
+})], UpgradeLarkNeededRule);
 //#endregion
 //#region src/rules/cleanup-install-backup-dirs.ts
 const DIR_PREFIX = ".openclaw-install-";
@@ -6236,23 +6391,6 @@ function reportError(params) {
 	} catch {}
 }
 //#endregion
-//#region ../../openclaw-slardar/lib/report-log.js
-function reportLog(params) {
-	try {
-		const extra = mergeLogExtra(buildTelemetryFields(params), {
-			event: params.event,
-			phase: params.phase,
-			status: params.status,
-			...params.extra
-		});
-		Slardar.sendLog?.({
-			content: params.message,
-			level: params.level ?? "info",
-			extra
-		});
-	} catch {}
-}
-//#endregion
 //#region src/install-cli.ts
 const LARK_CLI_NAME = "lark-cli";
 const AGENT_SKILLS_NAME = "agent-skills";
@@ -10149,109 +10287,6 @@ function finalize(results, aborted) {
 	};
 }
 //#endregion
-//#region src/channels-probe.ts
-const CHANNEL_LINE_RE = /^-\s+Feishu\s+([^:]+):\s+(.+)$/;
-/**
-* Port of Python `_account_is_working` from the feishu-channel-success-rate skill.
-*
-* Strips colon-prefixed key:value bits (dm:, bot:, in:, out:, token:, allow:,
-* intents:, groups:, health:) and evaluates the canonical health formula.
-*/
-function accountIsWorking(bits) {
-	const bitTokens = /* @__PURE__ */ new Set();
-	let hasError = false;
-	let hasProbeFailed = false;
-	for (const raw of bits) {
-		const b = raw.trim();
-		if (!b) continue;
-		if (b.startsWith("error:")) {
-			hasError = true;
-			continue;
-		}
-		if (b === "probe failed") {
-			hasProbeFailed = true;
-			continue;
-		}
-		bitTokens.add(b.split(":")[0]);
-	}
-	if (!bitTokens.has("enabled") || !bitTokens.has("configured")) return false;
-	if (bitTokens.has("works")) return true;
-	if (bitTokens.has("running") && !hasError && !hasProbeFailed) return true;
-	return false;
-}
-/**
-* Parse the raw stdout of `openclaw channels status --probe`.
-* Port of Python `extract_channels_probe` from the feishu-channel-success-rate skill.
-*/
-function parseChannelsProbeOutput(text) {
-	const gatewayReachable = text.includes("Gateway reachable");
-	const accounts = [];
-	let anyAccountWorking = false;
-	for (const line of text.split("\n")) {
-		const m = CHANNEL_LINE_RE.exec(line.trim());
-		if (!m) continue;
-		const [, acct, rest] = m;
-		const bits = rest.split(",").map((b) => b.trim());
-		const isWorking = accountIsWorking(bits);
-		if (isWorking) anyAccountWorking = true;
-		accounts.push({
-			id: acct.trim(),
-			bits,
-			isWorking,
-			raw: line.trim()
-		});
-	}
-	return {
-		gatewayReachable,
-		accounts,
-		anyAccountWorking
-	};
-}
-/**
-* Run `openclaw channels status --probe` and return a structured result.
-*
-* The command may exit non-zero when some bot accounts fail their probe — that
-* is still useful output.  We therefore try to parse stdout even when the
-* process exits with a non-zero code, falling back to an unavailable result
-* only when there is genuinely no output to parse.
-*
-* @param timeoutMs  Maximum wait time.  Default is 60 s because v2026.4.x
-*   lacks a per-request HTTP timeout and can block indefinitely.
-*/
-function runChannelsProbe(timeoutMs = 6e4) {
-	let stdout = "";
-	let execError;
-	try {
-		stdout = (0, node_child_process.execSync)("openclaw channels status --probe", {
-			encoding: "utf-8",
-			timeout: timeoutMs,
-			stdio: [
-				"ignore",
-				"pipe",
-				"pipe"
-			]
-		});
-	} catch (e) {
-		const err = e;
-		stdout = err.stdout ?? "";
-		execError = err.message;
-		const stderrRaw = err.stderr;
-		const stderr = (typeof stderrRaw === "string" ? stderrRaw : stderrRaw?.toString("utf-8") ?? "").trim();
-		if (stderr) console.error(`channels-probe: stderr from CLI: ${stderr}`);
-	}
-	if (stdout.trim()) return {
-		available: true,
-		...parseChannelsProbeOutput(stdout)
-	};
-	return {
-		available: false,
-		gatewayReachable: false,
-		accounts: [],
-		anyAccountWorking: false,
-		error: execError ?? "no output from openclaw channels status --probe"
-	};
-}
-//#endregion
 //#region src/innerapi/reportCliRun.ts
 /**
 * CLI-side client for studio_server's `openclaw.report_cli_run` inner
@@ -10331,7 +10366,7 @@ async function reportCliRun(opts) {
 //#region src/help.ts
 const BIN = "mclaw-diagnose";
 function versionBanner() {
-	return `v0.1.14-alpha.1`;
+	return `v0.1.14-alpha.2`;
 }
 const COMMANDS = [
 	{
@@ -10912,18 +10947,16 @@ function reportDoctorRunToSlardar(opts) {
 		}
 	});
 }
-/** Read the tail of a file, up to maxBytes. Returns empty string on any error. */
-function readFileTail(filePath, maxBytes = 4e3) {
+function readLogFile(filePath) {
 	try {
-		const content = node_fs.default.readFileSync(filePath, "utf-8");
-		if (content.length <= maxBytes) return content;
-		return `...(truncated — showing last ${maxBytes} chars)...\n` + content.slice(-maxBytes);
+		return node_fs.default.readFileSync(filePath, "utf-8");
 	} catch {
 		return "";
 	}
 }
 function reportUpgradeLarkToSlardar(opts) {
-	console.error(`[slardar] upgrade-lark reportTask scene=${opts.scene ?? ""} success=${opts.success} exitCode=${opts.exitCode ?? ""} rollbackOk=${opts.rollbackOk ?? ""}`);
+	console.error(`[slardar] upgrade_lark_run scene=${opts.scene ?? ""} success=${opts.success} exitCode=${opts.exitCode ?? ""} rollbackOk=${opts.rollbackOk ?? ""}`);
+	const logContent = readLogFile(opts.logFile);
 	reportTask({
 		eventName: "upgrade_lark_run",
 		durationMs: opts.durationMs,
@@ -10932,22 +10965,9 @@ function reportUpgradeLarkToSlardar(opts) {
 			scene: opts.scene ?? "",
 			exit_code: String(opts.exitCode ?? ""),
 			rollback_ok: opts.rollbackOk != null ? String(opts.rollbackOk) : "",
-			validation_error: (opts.validationError ?? "").slice(0, 200),
-			error_msg: (opts.error ?? "").slice(0, 200)
-		}
-	});
-	const logContent = readFileTail(opts.logFile);
-	console.error(`[slardar] upgrade_lark_detail logFile=${opts.logFile} contentLength=${logContent.length} sendLogAvailable=${typeof Slardar.sendLog}`);
-	reportLog({
-		event: "upgrade_lark_detail",
-		message: logContent || "(no log content)",
-		level: opts.success ? "info" : "error",
-		extra: {
-			log_file: opts.logFile,
-			scene: opts.scene ?? "",
-			success: String(opts.success),
-			exit_code: String(opts.exitCode ?? ""),
-			rollback_ok: opts.rollbackOk != null ? String(opts.rollbackOk) : ""
+			validation_error: opts.validationError ?? "",
+			error_msg: opts.error ?? "",
+			log_content: logContent
 		}
 	});
 }
@@ -11117,10 +11137,61 @@ function runUpgradeLark(opts) {
 	log(`  configPath : ${configPath}`);
 	log(`${"=".repeat(60)}`);
 	log("");
-	log("── [1/8] 升级前状态快照 ──────────────────────────────────");
-	log(`before-state: botCount=${countFeishuBots(configPath)}`);
+	log("── [Pre-check A] channels probe（升级前）────────────────");
+	const beforeChannels = probeChannels("before", log, 3e4);
 	log("");
-	log("── [2/8] 文件备份 ────────────────────────────────────────");
+	log("── [Pre-check B] 版本兼容预检 ───────────────────────────");
+	let versionNeedsUpgrade = false;
+	try {
+		const rawConfig = node_fs.default.readFileSync(configPath, "utf-8");
+		versionNeedsUpgrade = needsLarkUpgrade({
+			config: loadJSON5().parse(rawConfig),
+			configPath,
+			vars: {},
+			providerDeps: {
+				usesMiaodaProvider: false,
+				usesMiaodaSecretProvider: false
+			}
+		});
+		log(`  version-compat pre-check: ${versionNeedsUpgrade ? "NEEDS_UPGRADE" : "ok"}`);
+	} catch (e) {
+		log(`  version-compat pre-check error: ${e.message} — treating as needs-upgrade`);
+		versionNeedsUpgrade = true;
+	}
+	log("");
+	log("── [Gate] 升级前置条件检查 ───────────────────────────────");
+	log(`  version needs upgrade  : ${versionNeedsUpgrade}`);
+	log(`  channels working before: ${beforeChannels.anyAccountWorking}`);
+	if (!versionNeedsUpgrade) {
+		const reason = "version already compatible — upgrade not needed";
+		log(`  SKIP: ${reason}`);
+		log(`${"=".repeat(60)}`);
+		log("upgrade-lark skipped (pre-check gate)");
+		log(`${"=".repeat(60)}`);
+		return {
+			ok: true,
+			skipped: true,
+			skipReason: reason,
+			logFile
+		};
+	}
+	if (beforeChannels.anyAccountWorking) {
+		const reason = "channels are working — upgrade not needed (version mismatch but system is functional)";
+		log(`  SKIP: ${reason}`);
+		log(`${"=".repeat(60)}`);
+		log("upgrade-lark skipped (pre-check gate)");
+		log(`${"=".repeat(60)}`);
+		return {
+			ok: true,
+			skipped: true,
+			skipReason: reason,
+			logFile
+		};
+	}
+	log("  PROCEED: version incompatible AND channels not working → running upgrade");
+	log("");
+	log("── [1/6] 文件备份 ────────────────────────────────────────");
+	log(`before-state: botCount=${countFeishuBots(configPath)}`);
 	const backup = backupFiles(fsOpts);
 	if (!backup.ok) {
 		log(`ERROR: ${backup.error}`);
@@ -11133,10 +11204,7 @@ function runUpgradeLark(opts) {
 	log("backup: ok");
 	logVersionSnapshot("before-versions", snapshotVersions(cwd, log), log);
 	log("");
-	log("── [3/8] channels probe（升级前）────────────────────────");
-	const beforeChannels = probeChannels("before", log, 3e4);
-	log("");
-	log("── [4/8] 清理本地 openclaw shim ─────────────────────────");
+	log("── [2/6] 清理本地 openclaw shim ─────────────────────────");
 	const localOpenclawBin = node_path.default.join(cwd, "node_modules", ".bin", "openclaw");
 	if (node_fs.default.existsSync(localOpenclawBin)) try {
 		node_fs.default.rmSync(localOpenclawBin);
@@ -11146,7 +11214,7 @@ function runUpgradeLark(opts) {
 	}
 	else log(`  skipped: ${localOpenclawBin} (not found)`);
 	log("");
-	log("── [5/8] npx install (@larksuite/openclaw-lark-tools update) ──");
+	log("── [3/6] npx install (@larksuite/openclaw-lark-tools update) ──");
 	const npxResult = (0, node_child_process.spawnSync)("npx", [
 		"-y",
 		"@larksuite/openclaw-lark-tools",
@@ -11189,7 +11257,7 @@ function runUpgradeLark(opts) {
 		};
 	};
 	log("");
-	log("── [6/8] 插件安装检查 + 版本兼容校验 ───────────────────");
+	log("── [4/6] 插件安装检查 + 版本兼容校验 ───────────────────");
 	const larkExtDir = node_path.default.join(cwd, "extensions", "openclaw-lark");
 	const larkVersion = readPkgVersion(node_path.default.join(larkExtDir, "package.json"));
 	log(`  extensions/openclaw-lark: ${node_fs.default.existsSync(larkExtDir) ? "exists" : "missing"}, version=${larkVersion ?? "n/a"}`);
@@ -11217,25 +11285,22 @@ function runUpgradeLark(opts) {
 	log("  version compat: ok");
 	logVersionSnapshot("after-versions", snapshotVersions(cwd, log), log);
 	log("");
-	log("── [7/8] channels probe（升级后）────────────────────────");
+	log("── [5/6] channels probe（升级后）────────────────────────");
 	if (!probeChannels("after", log, 3e4).anyAccountWorking) {
-		if (!beforeChannels.anyAccountWorking) {
-			log("  channels: not working before or after install — pre-existing issue, skipping rollback");
-			return {
-				ok: false,
-				error: "channels probe: no working account (pre-existing issue, not caused by install)",
-				validationError: "channels probe: no working account (pre-existing)",
-				stdout: npxStdout,
-				stderr: npxStderr,
-				exitCode: npxExitCode,
-				logFile
-			};
-		}
-		return doRollback("channels probe: no working account after install (was working before)");
+		log("  channels: not working before or after install — pre-existing issue, skipping rollback");
+		return {
+			ok: false,
+			error: "channels probe: no working account (pre-existing issue, not caused by install)",
+			validationError: "channels probe: no working account (pre-existing)",
+			stdout: npxStdout,
+			stderr: npxStderr,
+			exitCode: npxExitCode,
+			logFile
+		};
 	}
-	log("  channels: ok");
+	log("  channels: ok (recovered after install)");
 	log("");
-	log("── [8/8] doctor --fix ────────────────────────────────────");
+	log("── [6/6] doctor --fix ────────────────────────────────────");
 	const fixArgs = ["doctor", "--fix"];
 	if (opts.scene) fixArgs.push(`--scene=${opts.scene}`);
 	const fixResult = (0, node_child_process.spawnSync)(process.execPath, [cliScript, ...fixArgs], {

package/package.json

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