@lark-apaas/openclaw-scripts-diagnose-cli 0.1.1-alpha.18 → 0.1.1-alpha.19

package/dist/index.cjs

@@ -1232,15 +1232,17 @@ function ensureOpenclawBinary(srcDir, log) {
 		return;
 	}
 	if (isOpenclawInstalled()) {
-		const updateCmd = `openclaw update${targetVersion ? " --tag v" + targetVersion : ""}`;
+		const updateCmd = `openclaw update${targetVersion ? " --tag v" + targetVersion : ""} --yes`;
 		log(`openclaw installed but version mismatched, running: ${updateCmd}`);
+		const timeout = 12 * 6e4;
 		const t = Date.now();
 		try {
-			shell(updateCmd, 10 * 6e4);
+			shell(updateCmd, timeout);
 			log(`openclaw update done in ${Date.now() - t}ms`);
 		} catch (e) {
-			log(`openclaw update failed after ${Date.now() - t}ms: ${e.message}, falling back to full reinstall`);
-			fullReinstall(targetVersion, log);
+			const elapsed = Date.now() - t;
+			if (elapsed >= timeout - 1e3) log(`openclaw update timed out after ${elapsed}ms (non-fatal, continuing)`);
+			else throw e;
 		}
 	} else {
 		log("openclaw binary not found, running full reinstall");
@@ -1290,15 +1292,26 @@ function mergeCoreBackupAndOrigins(configPath, vars, resetData, log) {
 			if (!config.agents) config.agents = {};
 			const agents = config.agents;
 			if (!Array.isArray(agents.list)) agents.list = [];
-			agents.list.push(...backup.agents);
+			const configDir = node_path.default.dirname(configPath);
+			for (const agent of backup.agents) {
+				const enriched = {
+					id: agent.id,
+					name: agent.id,
+					workspace: agent.workspace,
+					agentDir: configDir + "/agents/" + agent.id + "/agent"
+				};
+				agents.list.push(enriched);
+			}
 			merged.push(`agents(+${backup.agents.length})`);
 			const list = agents.list;
-			const mainIdx = list.findIndex((a) => a.id === "main");
-			if (mainIdx >= 0) {
-				list[mainIdx].subagents = { allowAgents: ["*"] };
-				list[mainIdx].default = true;
-				merged.push("main-team-mode");
+			let mainIdx = list.findIndex((a) => a.id === "main");
+			if (mainIdx < 0) {
+				list.unshift({ id: "main" });
+				mainIdx = 0;
 			}
+			list[mainIdx].subagents = { allowAgents: ["*"] };
+			list[mainIdx].default = true;
+			merged.push("main-team-mode");
 			const feishu = config.channels?.feishu;
 			if (feishu) {
 				if (!feishu.accounts) feishu.accounts = {};

package/package.json

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