@lark-apaas/openclaw-scripts-diagnose-cli 0.1.15-alpha.2 → 0.1.15-alpha.3

package/dist/index.cjs

@@ -52,7 +52,7 @@ node_assert = __toESM(node_assert);
 * it terse and parseable.
 */
 function getVersion() {
-	return "0.1.15-alpha.2";
+	return "0.1.15-alpha.3";
 }
 //#endregion
 //#region src/rule-engine/base.ts
@@ -2543,9 +2543,13 @@ const PROVIDER_FILE_PATH = "/home/gem/workspace/.force/openclaw/miaoda-provider-
 const SECRETS_FILE_PATH = "/home/gem/workspace/.force/openclaw/miaoda-openclaw-secrets.json";
 /** Absolute path to the openclaw config JSON. */
 const CONFIG_PATH = `${WORKSPACE_DIR}/openclaw.json`;
-/** upgrade-lark 每次运行的日志文件路径，含时间戳便于按时间排序定位。 */
-function upgradeLarkLogFile(runId) {
-	return `${DIAGNOSE_DIR}/upgrade-lark-${(/* @__PURE__ */ new Date()).toISOString().slice(0, 19).replace(/:/g, "-")}-${runId.slice(0, 8)}.log`;
+/**
+* upgrade-lark 每次运行的日志文件路径，含时间戳便于按时间排序定位。
+* checkOnly=true 时文件名含 "-check" 后缀，便于与正式安装日志区分。
+*/
+function upgradeLarkLogFile(runId, checkOnly = false) {
+	const ts = (/* @__PURE__ */ new Date()).toISOString().slice(0, 19).replace(/:/g, "-");
+	return `${DIAGNOSE_DIR}/upgrade-lark${checkOnly ? "-check" : ""}-${ts}-${runId.slice(0, 8)}.log`;
 }
 //#endregion
 //#region src/lark-cli-init.ts
@@ -10490,6 +10494,7 @@ function runChannelsProbe(timeoutMs = 6e4, { ignoreProbeFailed = true } = {}) {
 	}
 	if (stdout.trim()) return {
 		available: true,
+		rawOutput: stdout.trim(),
 		...parseChannelsProbeOutput(stdout, { ignoreProbeFailed })
 	};
 	return {
@@ -10501,6 +10506,22 @@ function runChannelsProbe(timeoutMs = 6e4, { ignoreProbeFailed = true } = {}) {
 		error: execError ?? "no output from openclaw channels status --probe"
 	};
 }
+/**
+* 判断 channels probe 结果是否处于"仅一个 Feishu 默认账号、enabled 但未配置"的状态。
+*
+* 这是插件全新安装后的初始状态：npx 工具创建了一个默认账号占位，但用户尚未
+* 填写 AppID / Secret，因此账号显示为 enabled 但 not configured。
+* 此时 anyAccountWorking=false（configured 缺失），但安装本身是成功的。
+*
+* 用于安装后校验的补充分支：当安装前 channels 不可用，且安装后恰好处于此状态时，
+* 视为安装成功，不触发回滚。
+*/
+function isDefaultOnlyState(result) {
+	if (result.accounts.length !== 1) return false;
+	const acct = result.accounts[0];
+	const bitTokens = new Set(acct.bits.map((b) => b.trim().split(":")[0]));
+	return bitTokens.has("enabled") && !bitTokens.has("configured");
+}
 //#endregion
 //#region src/innerapi/reportCliRun.ts
 /**
@@ -10581,7 +10602,7 @@ async function reportCliRun(opts) {
 //#region src/help.ts
 const BIN = "mclaw-diagnose";
 function versionBanner() {
-	return `v0.1.15-alpha.2`;
+	return `v0.1.15-alpha.3`;
 }
 const COMMANDS = [
 	{
@@ -10875,7 +10896,7 @@ EXIT CODES
 		hidden: false,
 		summary: "Upgrade the Feishu/Lark plugin via @larksuite/openclaw-lark-tools",
 		help: `USAGE
-  ${BIN} upgrade-lark [--check] [--scene=<scene>] [--caller=<n>] [--trace-id=<id>]
+  ${BIN} upgrade-lark [--check] [--skip-restart] [--scene=<scene>] [--caller=<n>] [--trace-id=<id>]
 
 DESCRIPTION
   Upgrades the Feishu/Lark plugin by running:
@@ -10896,6 +10917,10 @@ DESCRIPTION
   If the upgrade command fails, or validation fails, the backed-up files are
   restored to roll back the changes.
 
+  After a successful upgrade, the openclaw service is restarted via
+    /opt/force/bin/openclaw_scripts/restart.sh
+  Pass --skip-restart to skip this step (e.g. when restart is handled externally).
+
   Execution is logged to /tmp/openclaw-diagnose/upgrade-lark-<runId>.log.
 
   Output is a single JSON object on stdout:
@@ -10908,8 +10933,9 @@ DESCRIPTION
     { "ok": true, "skipped": true, "upgradeNeeded": true,  "logFile": "..." }  ← exit 1
 
 OPTIONS
-  --check       Diagnose only: run the pre-check gate and report whether
+  --check            Diagnose only: run the pre-check gate and report whether
                      upgrade is needed without installing. Exit 1 if needed.
+  --skip-restart     Skip the post-install service restart (default: restart).
   --scene=<scene>    Telemetry label forwarded to Slardar only.
                      Known values: PageUpgradeLark, etc. Custom strings accepted.
   --caller=<name>    Optional metadata passed to innerapi.
@@ -11162,18 +11188,19 @@ function reportDoctorRunToSlardar(opts) {
 		}
 	});
 }
+const LOG_PREFIX_RE = /^\[\d{4}-\d{2}-\d{2}T[\d:.]+Z\](?:\s+\[run=[^\]]+\])?\s*/;
 /**
-* 读取日志文件末尾最多 maxBytes 个字节。
-* 日志头部为固定 banner，有价值的内容（错误、探测结果、回滚状态）集中在末尾。
-* 从尾部截取保证 Slardar 字段限制内优先保留关键内容。
+* 读取日志文件末尾最多 maxBytes 字节，过滤噪音后返回纯内容。
+* - 剥除每行的时间戳 + run tag 前缀
+* - 过滤纯分隔符行（全为 '='）
+* 日志头部为固定 banner，有价值的内容集中在末尾，从尾部截取。
 */
 function readLogFileTail(filePath, maxBytes = 4e3) {
 	try {
 		const buf = node_fs.default.readFileSync(filePath);
-		if (buf.length <= maxBytes) return buf.toString("utf-8");
-		let start = buf.length - maxBytes;
+		let start = buf.length > maxBytes ? buf.length - maxBytes : 0;
 		while (start < buf.length && buf[start] !== 10) start++;
-		return buf.subarray(start + 1).toString("utf-8");
+		return buf.subarray(start > 0 ? start + 1 : 0).toString("utf-8").split("\n").map((line) => line.replace(LOG_PREFIX_RE, "")).filter((line) => !/^=+$/.test(line.trim())).join("\n").trim();
 	} catch {
 		return "";
 	}
@@ -11228,6 +11255,7 @@ function backupFiles(opts) {
 			node_fs.default.copyFileSync(configPath, node_path.default.join(backupDir, "openclaw.json"));
 			log(`  backed up: openclaw.json (${stat.size} bytes)`);
 		} else log(`  skipped: openclaw.json (not found)`);
+		node_fs.default.mkdirSync(node_path.default.join(backupDir, "extensions"), { recursive: true });
 		const extSrc = node_path.default.join(workspaceDir, "extensions");
 		for (const pluginDir of FEISHU_PLUGIN_DIRS) {
 			const src = node_path.default.join(extSrc, pluginDir);
@@ -11249,23 +11277,32 @@ function backupFiles(opts) {
 function restoreFiles(opts) {
 	const { workspaceDir, configPath, backupDir, log } = opts;
 	try {
+		if (node_fs.default.existsSync(configPath)) {
+			node_fs.default.rmSync(configPath, { force: true });
+			log(`  deleted: openclaw.json`);
+		}
+		const extDst = node_path.default.join(workspaceDir, "extensions");
+		for (const pluginDir of FEISHU_PLUGIN_DIRS) {
+			const dst = node_path.default.join(extDst, pluginDir);
+			if (node_fs.default.existsSync(dst)) {
+				node_fs.default.rmSync(dst, {
+					recursive: true,
+					force: true
+				});
+				log(`  deleted: extensions/${pluginDir}`);
+			}
+		}
 		const configBackup = node_path.default.join(backupDir, "openclaw.json");
 		if (node_fs.default.existsSync(configBackup)) {
 			node_fs.default.copyFileSync(configBackup, configPath);
 			log(`  restored: openclaw.json`);
-		}
-		const extDst = node_path.default.join(workspaceDir, "extensions");
+		} else log(`  skipped restore: openclaw.json (not in backup — was not present before upgrade)`);
 		for (const pluginDir of FEISHU_PLUGIN_DIRS) {
 			const backupSrc = node_path.default.join(backupDir, "extensions", pluginDir);
 			if (node_fs.default.existsSync(backupSrc)) {
-				const dst = node_path.default.join(extDst, pluginDir);
-				if (node_fs.default.existsSync(dst)) node_fs.default.rmSync(dst, {
-					recursive: true,
-					force: true
-				});
-				node_fs.default.cpSync(backupSrc, dst, { recursive: true });
+				node_fs.default.cpSync(backupSrc, node_path.default.join(extDst, pluginDir), { recursive: true });
 				log(`  restored: extensions/${pluginDir}`);
-			}
+			} else log(`  skipped restore: extensions/${pluginDir} (not in backup — was not present before upgrade)`);
 		}
 		return true;
 	} catch (e) {
@@ -11327,6 +11364,7 @@ function probeChannels(label, log, timeoutMs) {
 		if (r.error) log(`  ${label} error: ${r.error}`);
 		if (r.gatewayReachable != null) log(`  ${label} gatewayReachable: ${r.gatewayReachable}`);
 		for (const acct of r.accounts ?? []) log(`  ${label} account ${acct.id}: isWorking=${acct.isWorking} bits=[${acct.bits.join(",")}]`);
+		if (r.rawOutput) log(`  ${label} raw output:\n${r.rawOutput}`);
 		return r;
 	} catch (e) {
 		log(`  ${label} channels probe threw: ${e.message}`);
@@ -11342,7 +11380,7 @@ function probeChannels(label, log, timeoutMs) {
 function runUpgradeLark(opts) {
 	const cwd = opts.cwd ?? "/home/gem/workspace/agent";
 	const configPath = opts.configPath ?? CONFIG_PATH;
-	const logFile = upgradeLarkLogFile(opts.runId);
+	const logFile = upgradeLarkLogFile(opts.runId, opts.checkOnly);
 	const log = makeLogger(logFile);
 	const fsOpts = {
 		workspaceDir: cwd,
@@ -11532,9 +11570,11 @@ function runUpgradeLark(opts) {
 	timing.postProbeMs = Date.now() - t_postProbeStart;
 	log(`  feishu config invalid after: ${afterChannels.feishuConfigInvalid}`);
 	const stillNeedsUpgrade = (afterVersionIncompatible || afterChannels.feishuConfigInvalid) && !afterChannels.anyAccountWorking;
-	log(`  post-check: stillNeedsUpgrade=${stillNeedsUpgrade} (version=${afterVersionIncompatible}, feishuConfig=${afterChannels.feishuConfigInvalid}, channelsWorking=${afterChannels.anyAccountWorking})`);
-	if (stillNeedsUpgrade) return doRollback(`post-install diagnosis still shows anomaly: versionIncompatible=${afterVersionIncompatible}, feishuConfigInvalid=${afterChannels.feishuConfigInvalid}, anyAccountWorking=${afterChannels.anyAccountWorking}`);
-	log("  post-install diagnosis: ok (upgrade conditions resolved)");
+	const isNewDefaultOnly = !beforeChannels.anyAccountWorking && isDefaultOnlyState(afterChannels);
+	log(`  post-check: stillNeedsUpgrade=${stillNeedsUpgrade} (version=${afterVersionIncompatible}, feishuConfig=${afterChannels.feishuConfigInvalid}, channelsWorking=${afterChannels.anyAccountWorking}) isNewDefaultOnly=${isNewDefaultOnly}`);
+	if (stillNeedsUpgrade && !isNewDefaultOnly) return doRollback(`post-install diagnosis still shows anomaly: versionIncompatible=${afterVersionIncompatible}, feishuConfigInvalid=${afterChannels.feishuConfigInvalid}, anyAccountWorking=${afterChannels.anyAccountWorking}`);
+	if (isNewDefaultOnly) log("  post-install diagnosis: ok (new default account — plugin installed, awaiting configuration)");
+	else log("  post-install diagnosis: ok (upgrade conditions resolved)");
 	log("");
 	log("── [6/6] doctor --fix ────────────────────────────────────");
 	const fixArgs = ["doctor", "--fix"];
@@ -11556,6 +11596,26 @@ 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 服务 ──────────────────────────────");
+	const restartScript = "/opt/force/bin/openclaw_scripts/restart.sh";
+	if (opts.skipRestart) log("  skipped: --skip-restart");
+	else if (node_fs.default.existsSync(restartScript)) {
+		const t_restart = Date.now();
+		const restartResult = (0, node_child_process.spawnSync)("bash", [restartScript], {
+			encoding: "utf-8",
+			stdio: [
+				"ignore",
+				"pipe",
+				"pipe"
+			],
+			timeout: 3e4
+		});
+		const restartMs = Date.now() - t_restart;
+		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}` : ""}`);
+	} else log(`  skipped: ${restartScript} not found`);
+	log("");
 	log(`${"=".repeat(60)}`);
 	log("upgrade-lark completed successfully");
 	log(`${"=".repeat(60)}`);
@@ -12060,10 +12120,12 @@ async function main() {
 		}
 		case "upgrade-lark": {
 			const checkOnly = args.includes("--check");
+			const skipRestart = args.includes("--skip-restart");
 			const result = runUpgradeLark({
 				runId: rc.runId,
 				scene,
-				checkOnly
+				checkOnly,
+				skipRestart
 			});
 			const upgradeDurationMs = Date.now() - t0;
 			console.log(JSON.stringify(result));

package/package.json

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