@lark-apaas/openclaw-scripts-diagnose-cli 0.1.1-alpha.6 → 0.1.1-alpha.7

package/dist/index.cjs

@@ -1090,9 +1090,6 @@ const STEPS = [
 const TOTAL_STEPS = STEPS.length;
 const CORE_BACKUP_PATH = "/home/gem/workspace/.force/openclaw/core-backup.json";
 const TMP_RESET_DIR = "/tmp/openclaw-reset";
-/**
-* Atomically write the result file (write .tmp + rename).
-*/
 function writeResultFile(resultFile, result) {
 	const dir = node_path.default.dirname(resultFile);
 	if (!node_fs.default.existsSync(dir)) node_fs.default.mkdirSync(dir, { recursive: true });
@@ -1100,21 +1097,15 @@ function writeResultFile(resultFile, result) {
 	node_fs.default.writeFileSync(tmpPath, JSON.stringify(result), "utf-8");
 	node_fs.default.renameSync(tmpPath, resultFile);
 }
-/**
-* Update progress in the result file.
-*/
-function updateProgress(resultFile, step, progress, startedAt) {
+function updateProgress(resultFile, step, startedAt) {
 	writeResultFile(resultFile, {
 		status: "running",
 		step,
 		totalSteps: TOTAL_STEPS,
-		progress,
+		progress: STEPS[step - 1],
 		startedAt
 	});
 }
-/**
-* Mark the task as done.
-*/
 function markDone(resultFile, startedAt) {
 	writeResultFile(resultFile, {
 		status: "done",
@@ -1125,142 +1116,182 @@ function markDone(resultFile, startedAt) {
 		completedAt: (/* @__PURE__ */ new Date()).toISOString()
 	});
 }
-/**
-* Mark the task as failed.
-*/
-function markFailed(resultFile, step, progress, error, startedAt) {
+function markFailed(resultFile, step, error, startedAt) {
 	writeResultFile(resultFile, {
 		status: "failed",
 		step,
 		totalSteps: TOTAL_STEPS,
-		progress,
+		progress: step > 0 ? STEPS[step - 1] : "初始化",
 		error,
 		startedAt,
 		completedAt: (/* @__PURE__ */ new Date()).toISOString()
 	});
 }
+/** Step 1: Backup current config as openclaw.json.bak.N */
+function backupCurrentConfig(configPath) {
+	if (!fileExists(configPath)) return;
+	const dir = node_path.default.dirname(configPath);
+	let maxN = 0;
+	try {
+		for (const f of node_fs.default.readdirSync(dir)) {
+			const match = f.match(/^openclaw\.json\.bak\.(\d+)$/);
+			if (match) {
+				const n = parseInt(match[1], 10);
+				if (n > maxN) maxN = n;
+			}
+		}
+	} catch {}
+	node_fs.default.copyFileSync(configPath, configPath + ".bak." + (maxN + 1));
+}
+/** Step 2: Download/copy template zip and extract to TMP_RESET_DIR. Returns srcDir. */
+function downloadAndExtractTemplate(zipDownloadURL) {
+	if (!node_fs.default.existsSync(TMP_RESET_DIR)) node_fs.default.mkdirSync(TMP_RESET_DIR, { recursive: true });
+	const zipPath = node_path.default.join(TMP_RESET_DIR, "template.zip");
+	if (zipDownloadURL.startsWith("http://") || zipDownloadURL.startsWith("https://")) shell(`curl -sSL -o '${zipPath}' '${zipDownloadURL}'`, 12e4);
+	else shell(`cp "${zipDownloadURL}" '${zipPath}'`, 1e4);
+	shell(`unzip -o '${zipPath}' -d '${TMP_RESET_DIR}'`, 6e4);
+	return findSrcDir(TMP_RESET_DIR);
+}
+/** Step 3: Replace $$__XXX__ placeholders and write default config. */
+function generateDefaultConfig(srcDir, configPath, templateVars) {
+	const srcConfigPath = node_path.default.join(srcDir, "openclaw.json");
+	if (!fileExists(srcConfigPath)) throw new Error("template openclaw.json not found at " + srcConfigPath);
+	let content = node_fs.default.readFileSync(srcConfigPath, "utf-8");
+	for (const [placeholder, value] of Object.entries(templateVars)) content = content.split(placeholder).join(value);
+	node_fs.default.writeFileSync(configPath, content, "utf-8");
+}
+/** Step 4: Kill all openclaw processes. */
+function killOpenclawProcesses() {
+	try {
+		shell("pkill -f openclaw-gateway || true", 5e3);
+	} catch {}
+	shell("sleep 2", 5e3);
+}
+/** Step 5: Reinstall openclaw to the version specified in template. */
+function reinstallOpenclaw(srcDir) {
+	const version = loadJSON5().parse(node_fs.default.readFileSync(node_path.default.join(srcDir, "openclaw.json"), "utf-8")).meta?.lastTouchedVersion;
+	try {
+		shell("npm uninstall -g openclaw 2>/dev/null || true", 3e4);
+	} catch {}
+	shell(`npm i -g openclaw@${version || "latest"}`, 6e5);
+	shell("openclaw doctor --fix", 12e4);
+}
+/** Step 6: Merge core-backup.json into config + ensure allowedOrigins. */
+function mergeCoreBackupAndOrigins(configPath, vars) {
+	const JSON5 = loadJSON5();
+	if (fileExists(CORE_BACKUP_PATH)) {
+		const backup = JSON.parse(node_fs.default.readFileSync(CORE_BACKUP_PATH, "utf-8"));
+		const config = JSON5.parse(node_fs.default.readFileSync(configPath, "utf-8"));
+		if (backup.agents) config.agents = backup.agents;
+		if (backup.bindings) config.bindings = backup.bindings;
+		const backupAccounts = backup.channels?.feishu;
+		if (backupAccounts?.accounts) {
+			if (!config.channels) config.channels = {};
+			const ch = config.channels;
+			if (!ch.feishu) ch.feishu = {};
+			ch.feishu.accounts = backupAccounts.accounts;
+		}
+		node_fs.default.writeFileSync(configPath, JSON.stringify(config, null, 2), "utf-8");
+	}
+	const expectedOrigins = Array.isArray(vars.expectedOrigins) ? vars.expectedOrigins : [];
+	if (expectedOrigins.length > 0) {
+		const config = JSON5.parse(node_fs.default.readFileSync(configPath, "utf-8"));
+		if (!config.gateway) config.gateway = {};
+		const gw = config.gateway;
+		if (!gw.controlUi) gw.controlUi = {};
+		const cui = gw.controlUi;
+		const current = Array.isArray(cui.allowedOrigins) ? cui.allowedOrigins.filter((o) => typeof o === "string") : [];
+		const seen = new Set(current);
+		const merged = [...current];
+		for (const o of expectedOrigins) if (!seen.has(o)) {
+			merged.push(o);
+			seen.add(o);
+		}
+		cui.allowedOrigins = merged;
+		node_fs.default.writeFileSync(configPath, JSON.stringify(config, null, 2), "utf-8");
+	}
+}
+/** Step 7: Copy startup scripts from template to agent dir. */
+function copyStartupScripts(srcDir, configDir) {
+	const srcScriptsDir = node_path.default.join(srcDir, "scripts");
+	const targetScriptsDir = node_path.default.join(configDir, "scripts");
+	if (!node_fs.default.existsSync(srcScriptsDir)) return;
+	if (!node_fs.default.existsSync(targetScriptsDir)) node_fs.default.mkdirSync(targetScriptsDir, { recursive: true });
+	shell(`cp -r '${srcScriptsDir}'/* '${targetScriptsDir}/'`, 1e4);
+}
+/** Step 8: Reinstall all plugins via openclaw CLI. */
+function reinstallPlugins() {
+	try {
+		shell("openclaw plugins update --all", 3e5);
+	} catch {}
+}
+/** Step 9: Write secrets/provider key files and restart openclaw. */
+function writeSecretsAndRestart(vars, resetData, configDir) {
+	if (resetData.secretsContent && vars.secretsFilePath) writeFile(vars.secretsFilePath, resetData.secretsContent);
+	if (resetData.providerKeyContent && vars.providerFilePath) writeFile(vars.providerFilePath, resetData.providerKeyContent);
+	const restartScript = node_path.default.join(configDir, "scripts", "restart.sh");
+	if (fileExists(restartScript)) shell(`bash '${restartScript}'`, 3e4);
+}
+/** Clean up temporary reset directory. */
+function cleanup() {
+	try {
+		node_fs.default.rmSync(TMP_RESET_DIR, {
+			recursive: true,
+			force: true
+		});
+	} catch {}
+}
 /**
 * Run the 9-step reset process. Called from the worker entry point.
+*
+* Each step is an independent function. The orchestrator handles progress
+* reporting, error handling, and process-level exception guards.
 */
 function runReset(input, taskId, resultFile) {
 	const startedAt = (/* @__PURE__ */ new Date()).toISOString();
-	const { configPath, resetData } = input;
+	const { configPath, vars, resetData } = input;
 	const configDir = node_path.default.dirname(configPath);
 	let currentStep = 0;
 	process.on("uncaughtException", (err) => {
-		const stepName = currentStep > 0 ? STEPS[currentStep - 1] : "初始化";
-		markFailed(resultFile, currentStep, stepName, `uncaught exception: ${err.message}`, startedAt);
+		markFailed(resultFile, currentStep, `uncaught exception: ${err.message}`, startedAt);
 		process.exit(1);
 	});
 	process.on("unhandledRejection", (reason) => {
-		const stepName = currentStep > 0 ? STEPS[currentStep - 1] : "初始化";
-		markFailed(resultFile, currentStep, stepName, `unhandled rejection: ${reason}`, startedAt);
+		markFailed(resultFile, currentStep, `unhandled rejection: ${reason}`, startedAt);
 		process.exit(1);
 	});
+	/** Advance to the next step, updating the progress file. */
+	const step = (n) => {
+		currentStep = n;
+		updateProgress(resultFile, n, startedAt);
+	};
 	try {
-		currentStep = 1;
-		updateProgress(resultFile, currentStep, STEPS[0], startedAt);
-		if (fileExists(configPath)) {
-			let maxN = 0;
-			try {
-				const files = node_fs.default.readdirSync(configDir);
-				const bakPattern = /^openclaw\.json\.bak\.(\d+)$/;
-				for (const f of files) {
-					const match = f.match(bakPattern);
-					if (match) {
-						const n = parseInt(match[1], 10);
-						if (n > maxN) maxN = n;
-					}
-				}
-			} catch {}
-			const bakPath = configPath + ".bak." + (maxN + 1);
-			node_fs.default.copyFileSync(configPath, bakPath);
-		}
-		currentStep = 2;
-		updateProgress(resultFile, currentStep, STEPS[1], startedAt);
-		if (!node_fs.default.existsSync(TMP_RESET_DIR)) node_fs.default.mkdirSync(TMP_RESET_DIR, { recursive: true });
-		const zipPath = node_path.default.join(TMP_RESET_DIR, "template.zip");
-		const zipSource = resetData.zipDownloadURL;
-		if (zipSource.startsWith("http://") || zipSource.startsWith("https://")) shell(`curl -sSL -o '${zipPath}' '${zipSource}'`, 12e4);
-		else shell(`cp "${zipSource}" '${zipPath}'`, 1e4);
-		shell(`unzip -o '${zipPath}' -d '${TMP_RESET_DIR}'`, 6e4);
-		const srcDir = findSrcDir(TMP_RESET_DIR);
-		currentStep = 3;
-		updateProgress(resultFile, currentStep, STEPS[2], startedAt);
-		const srcConfigPath = node_path.default.join(srcDir, "openclaw.json");
-		if (!fileExists(srcConfigPath)) throw new Error("template openclaw.json not found in downloaded zip at " + srcConfigPath);
-		let configContent = node_fs.default.readFileSync(srcConfigPath, "utf-8");
-		for (const [placeholder, value] of Object.entries(resetData.templateVars)) configContent = configContent.split(placeholder).join(value);
-		node_fs.default.writeFileSync(configPath, configContent, "utf-8");
-		currentStep = 4;
-		updateProgress(resultFile, currentStep, STEPS[3], startedAt);
-		try {
-			shell("pkill -f openclaw-gateway || true", 5e3);
-		} catch {}
-		shell("sleep 2", 5e3);
-		currentStep = 5;
-		updateProgress(resultFile, currentStep, STEPS[4], startedAt);
-		const JSON5 = loadJSON5();
-		const version = JSON5.parse(node_fs.default.readFileSync(srcConfigPath, "utf-8")).meta?.lastTouchedVersion;
-		try {
-			shell("npm uninstall -g openclaw 2>/dev/null || true", 3e4);
-		} catch {}
-		if (version) shell(`npm i -g openclaw@${version}`, 6e5);
-		else shell("npm i -g openclaw@latest", 6e5);
-		shell("openclaw doctor --fix", 12e4);
-		currentStep = 6;
-		updateProgress(resultFile, currentStep, STEPS[5], startedAt);
-		if (fileExists(CORE_BACKUP_PATH)) {
-			const backup = JSON.parse(node_fs.default.readFileSync(CORE_BACKUP_PATH, "utf-8"));
-			const mergeConfig = JSON5.parse(node_fs.default.readFileSync(configPath, "utf-8"));
-			if (backup.agents) mergeConfig.agents = backup.agents;
-			if (backup.bindings) mergeConfig.bindings = backup.bindings;
-			const backupFeishu = backup.channels?.feishu;
-			if (backupFeishu?.accounts) {
-				if (!mergeConfig.channels) mergeConfig.channels = {};
-				const ch = mergeConfig.channels;
-				if (!ch.feishu) ch.feishu = {};
-				const feishu = ch.feishu;
-				feishu.accounts = backupFeishu.accounts;
-			}
-			node_fs.default.writeFileSync(configPath, JSON.stringify(mergeConfig, null, 2), "utf-8");
-		}
-		currentStep = 7;
-		updateProgress(resultFile, currentStep, STEPS[6], startedAt);
-		const srcScriptsDir = node_path.default.join(srcDir, "scripts");
-		const targetScriptsDir = node_path.default.join(configDir, "scripts");
-		if (node_fs.default.existsSync(srcScriptsDir)) {
-			if (!node_fs.default.existsSync(targetScriptsDir)) node_fs.default.mkdirSync(targetScriptsDir, { recursive: true });
-			shell(`cp -r '${srcScriptsDir}'/* '${targetScriptsDir}/'`, 1e4);
-		}
-		currentStep = 8;
-		updateProgress(resultFile, currentStep, STEPS[7], startedAt);
-		try {
-			shell("openclaw plugins update --all", 3e5);
-		} catch (e) {}
-		currentStep = 9;
-		updateProgress(resultFile, currentStep, STEPS[8], startedAt);
-		if (resetData.secretsContent && input.vars.secretsFilePath) writeFile(input.vars.secretsFilePath, resetData.secretsContent);
-		if (resetData.providerKeyContent && input.vars.providerFilePath) writeFile(input.vars.providerFilePath, resetData.providerKeyContent);
-		const restartScript = node_path.default.join(configDir, "scripts", "restart.sh");
-		if (fileExists(restartScript)) shell(`bash '${restartScript}'`, 3e4);
-		try {
-			node_fs.default.rmSync(TMP_RESET_DIR, {
-				recursive: true,
-				force: true
-			});
-		} catch {}
+		step(1);
+		backupCurrentConfig(configPath);
+		step(2);
+		const srcDir = downloadAndExtractTemplate(resetData.zipDownloadURL);
+		step(3);
+		generateDefaultConfig(srcDir, configPath, resetData.templateVars);
+		step(4);
+		killOpenclawProcesses();
+		step(5);
+		reinstallOpenclaw(srcDir);
+		step(6);
+		mergeCoreBackupAndOrigins(configPath, vars);
+		step(7);
+		copyStartupScripts(srcDir, configDir);
+		step(8);
+		reinstallPlugins();
+		step(9);
+		writeSecretsAndRestart(vars, resetData, configDir);
+		cleanup();
 		markDone(resultFile, startedAt);
 	} catch (e) {
-		const stepName = currentStep > 0 ? STEPS[currentStep - 1] : "初始化";
-		markFailed(resultFile, currentStep, stepName, e.message, startedAt);
+		markFailed(resultFile, currentStep, e.message, startedAt);
 		process.exit(1);
 	}
 }
-/**
-* Find the source directory within the extracted zip.
-* Looks for openclaw.json in TMP_RESET_DIR or one level deep.
-*/
+/** Find the source directory within the extracted zip (openclaw.json location). */
 function findSrcDir(baseDir) {
 	if (node_fs.default.existsSync(node_path.default.join(baseDir, "openclaw.json"))) return baseDir;
 	const entries = node_fs.default.readdirSync(baseDir, { withFileTypes: true });

package/package.json

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