@lark-apaas/openclaw-scripts-diagnose-cli 0.1.1-alpha.29 → 0.1.1-alpha.30

package/dist/index.cjs

@@ -1458,6 +1458,79 @@ function execCaptureErr(cmd) {
 function shellQuote(s) {
 	return `'${s.replace(/'/g, `'\\''`)}'`;
 }
+/**
+* Extract an npm-packed gzipped tarball.
+*
+* ## The problem this works around
+*
+* Some tarballs (openclaw's among them — they're not packed by vanilla
+* `npm pack`) include relative symlinks inside nested .bin/ dirs whose
+* targets contain `..`, e.g.
+*   node_modules/<pkg>/node_modules/.bin/foo -> ../foo/bin/cli.js
+*
+* GNU tar classifies any symlink target with `..` or a leading `/` as
+* "dangerous" and defers its extraction to a post-files pass, while also
+* needing a post-files pass to restore directory permissions/mtimes. The
+* two passes race: the deferred-symlink handling mutates parent-dir inodes,
+* then the directory stat-restore pass does `fstatat()` and the recorded
+* inode doesn't match, firing
+*
+*   tar: <path>: Directory renamed before its status could be extracted
+*
+* from `apply_nonancestor_delayed_set_stat()` in extract.c. This is an
+* `ERROR` (hard-fail, exit 2) — the `--warning=no-rename-directory`
+* keyword controls a different, incremental-archive code path and does
+* NOT silence this. Reference: Paul Eggert, bug-tar 2004-04:
+* https://lists.gnu.org/archive/html/bug-tar/2004-04/msg00021.html
+*
+* ## The fix
+*
+* Pass `--absolute-names` (aka `-P`). Per GNU tar docs, this disables the
+* "normalize dangerous names" logic — including the deferred-symlink pass
+* that's racing us. Also stops stripping leading `/`, but our tarballs
+* only contain relative (`./node_modules/...`) paths so there's nothing
+* to strip. Safe because:
+*   - The tarball is sha512-verified upstream (downloadWithCache)
+*   - All entry paths are relative, no absolute-path escape risk
+*   - All dangerous symlink targets resolve within the extracted tree
+*
+* ## Belt-and-suspenders
+*
+* If some tar variant still emits the error despite -P, we fall through
+* to checking the stderr pattern: if every error line is the benign
+* "Directory renamed …" text (no real failures like ENOSPC/EACCES/gzip
+* CRC/etc.), swallow exit 2. Callers MUST still verify extraction
+* (e.g. `fs.existsSync(path.join(dest, 'package.json'))`) — tar's
+* `skip_this_one = 1` after the error means some dirs missed their
+* mtime/mode restore, but content was written.
+*/
+function extractTarballTolerant(tarball, destDir, opts = {}) {
+	const strip = opts.stripComponents ?? 0;
+	const stripFlag = strip > 0 ? ` --strip-components=${strip}` : "";
+	const cmd = `tar -xzf ${shellQuote(tarball)} -C ${shellQuote(destDir)}${stripFlag} -P`;
+	try {
+		execCaptureErr(cmd);
+		return;
+	} catch (e) {
+		const msg = e?.message ?? "";
+		const hasFalseAlarm = msg.includes("Directory renamed before its status could be extracted");
+		const hasFatal = [
+			/Cannot open/i,
+			/Cannot mkdir/i,
+			/Cannot create/i,
+			/No space left on device/i,
+			/Disk quota exceeded/i,
+			/Permission denied/i,
+			/Read-only file system/i,
+			/unrecognized option/i,
+			/gzip:/i,
+			/Unexpected EOF/i,
+			/Invalid argument/i
+		].some((r) => r.test(msg));
+		if (!hasFalseAlarm || hasFatal) throw e;
+		console.error(`[tar] -P did not suppress "Directory renamed" on ${tarball}; tolerating (content must be verified by caller)`);
+	}
+}
 //#endregion
 //#region src/reset-async.ts
 /**
@@ -1590,7 +1663,7 @@ async function installOpenclaw(openclawTag, ossFileMap, opts = {}) {
 	node_fs.default.mkdirSync(node_path.default.dirname(targetDir), { recursive: true });
 	const tmpStage = node_fs.default.mkdtempSync(node_path.default.join(opts.tmpRoot ?? node_os.default.tmpdir(), "openclaw-install-"));
 	try {
-		execCaptureErr(`tar -xzf '${tarball}' -C '${tmpStage}' --strip-components=1`);
+		extractTarballTolerant(tarball, tmpStage, { stripComponents: 1 });
 		if (!node_fs.default.existsSync(node_path.default.join(tmpStage, "package.json"))) throw new Error("extracted tarball missing package.json");
 		moveSafe(tmpStage, newDir);
 		const hadExisting = node_fs.default.existsSync(targetDir);
@@ -1703,7 +1776,7 @@ function installOne(pkg, tarball, homeBase) {
 	});
 	node_fs.default.mkdirSync(stagingDir);
 	try {
-		execCaptureErr(`tar -xzf '${tarball}' -C '${stagingDir}' --strip-components=1`);
+		extractTarballTolerant(tarball, stagingDir, { stripComponents: 1 });
 		if (!node_fs.default.existsSync(node_path.default.join(stagingDir, "package.json"))) throw new Error(`extension tarball missing package.json: ${pkg.name}`);
 	} catch (e) {
 		try {
@@ -1741,7 +1814,7 @@ async function downloadResource(tag, ossFileMap, opts) {
 	const format = (pkg.format ?? "").toLowerCase();
 	const lower = pkg.ossKey.toLowerCase();
 	if (format === "tgz" || lower.endsWith(".tgz") || lower.endsWith(".tar.gz")) {
-		execCaptureErr(`tar -xzf '${file}' -C '${extractDir}'`);
+		extractTarballTolerant(file, extractDir);
 		console.error(`[download-resource] ${opts.role}/${opts.name}: extracted to ${extractDir}`);
 	} else {
 		const basename = node_path.default.posix.basename(pkg.ossKey);
@@ -2520,7 +2593,7 @@ async function runDoctor(rawCtx, opts) {
 //#region src/help.ts
 const BIN = "mclaw-diagnose";
 function versionBanner() {
-	return `v0.1.1-alpha.29`;
+	return `v0.1.1-alpha.30`;
 }
 const COMMANDS = [
 	{

package/package.json

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