fix(package): reuse bundled artifact for install smoke

scripts/package-openclaw-for-docker.mjs

@@ -133,6 +133,7 @@ export function parseArgs(argv) {
   const options = {
     outputDir: "",
     outputName: "",
+    packJson: "",
     skipBuild: false,
     sourceDir: ROOT_DIR,
   };
@@ -164,6 +165,15 @@ export function parseArgs(argv) {
         "outputName",
         readEqualsOptionValue(arg.slice("--output-name=".length), "--output-name"),
       );
+    } else if (arg === "--pack-json") {
+      setOnce("--pack-json", "packJson", readOptionValue(argv, index, arg));
+      index += 1;
+    } else if (arg?.startsWith("--pack-json=")) {
+      setOnce(
+        "--pack-json",
+        "packJson",
+        readEqualsOptionValue(arg.slice("--pack-json=".length), "--pack-json"),
+      );
     } else if (arg === "--skip-build") {
       setOnce(arg, "skipBuild", true);
     } else if (arg === "--source-dir") {
@@ -373,6 +383,20 @@ async function runCapture(command, args, cwd, options = {}) {
 
 async function newestOpenClawTarball(outputDir, packOutput) {
   let fromOutput = "";
+  try {
+    const parsed = JSON.parse(packOutput);
+    if (Array.isArray(parsed)) {
+      for (const entry of parsed) {
+        if (typeof entry?.filename !== "string") {
+          continue;
+        }
+        const filename = resolvePackedOpenClawFileName(entry.filename);
+        if (filename) {
+          fromOutput = filename;
+        }
+      }
+    }
+  } catch {}
   for (const line of packOutput.split(/\r?\n/u)) {
     const filename = resolvePackedOpenClawFileName(line);
     if (filename) {
@@ -400,6 +424,30 @@ async function newestOpenClawTarball(outputDir, packOutput) {
   return path.join(outputDir, packed);
 }
 
+async function writePackJson(packOutput, tarball, packJsonPath, sourceDir) {
+  if (!packJsonPath) {
+    return;
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(packOutput);
+  } catch (error) {
+    throw new Error("npm pack --json output was not valid JSON", { cause: error });
+  }
+  if (!Array.isArray(parsed)) {
+    throw new Error("npm pack --json output must be an array");
+  }
+  const filename = path.basename(tarball);
+  for (const entry of parsed) {
+    if (entry && typeof entry === "object" && typeof entry.filename === "string") {
+      entry.filename = filename;
+    }
+  }
+  const target = path.resolve(sourceDir, packJsonPath);
+  await fs.mkdir(path.dirname(target), { recursive: true });
+  await fs.writeFile(target, `${JSON.stringify(parsed, null, 2)}\n`);
+}
+
 async function cleanPackedOpenClawTarballs(outputDir) {
   let entries;
   try {
@@ -597,9 +645,17 @@ export async function packOpenClawPackageForDocker(sourceDir, outputDir, options
   try {
     await cleanPackedOpenClawTarballs(outputDir);
     cleanupBundledAiRuntime = await prepareBundledAiRuntime(sourceDir, outputDir, runCaptureImpl);
+    const packArgs = [
+      "pack",
+      ...(options.packJsonPath ? ["--json"] : []),
+      "--silent",
+      "--ignore-scripts",
+      "--pack-destination",
+      outputDir,
+    ];
     packOutput = await runCaptureImpl(
       "npm",
-      ["pack", "--silent", "--ignore-scripts", "--pack-destination", outputDir],
+      packArgs,
       sourceDir,
       {
         deferForwardedSignalExit: true,
@@ -616,7 +672,17 @@ export async function packOpenClawPackageForDocker(sourceDir, outputDir, options
       await restoreChangelog(sourceDir);
     }
   }
-  return await newestOpenClawTarball(outputDir, packOutput);
+  let tarball = await newestOpenClawTarball(outputDir, packOutput);
+  if (options.outputName) {
+    const target = path.join(outputDir, options.outputName);
+    if (target !== tarball) {
+      await fs.rm(target, { force: true });
+      await fs.rename(tarball, target);
+      tarball = target;
+    }
+  }
+  await writePackJson(packOutput, tarball, options.packJsonPath, sourceDir);
+  return tarball;
 }
 
 async function main() {
@@ -651,16 +717,10 @@ async function main() {
     },
   );
 
-  let tarball = await packOpenClawPackageForDocker(sourceDir, outputDir);
-
-  if (options.outputName) {
-    const target = path.join(outputDir, options.outputName);
-    if (target !== tarball) {
-      await fs.rm(target, { force: true });
-      await fs.rename(tarball, target);
-      tarball = target;
-    }
-  }
+  const tarball = await packOpenClawPackageForDocker(sourceDir, outputDir, {
+    outputName: options.outputName,
+    packJsonPath: options.packJson,
+  });
 
   console.error("==> Checking OpenClaw package tarball");
   const checkStartedAt = Date.now();

scripts/test-install-sh-docker.sh

@@ -299,6 +299,8 @@ prepare_update_tarball() {
   local baseline_pack_json
   local pack_json_file
   local baseline_pack_json_file
+  local package_args
+  local package_tgz
   local packed_update_version
   pack_json_file="${UPDATE_DIR}/pack.json"
   baseline_pack_json_file="${UPDATE_DIR}/baseline-pack.json"
@@ -316,13 +318,20 @@ prepare_update_tarball() {
     UPDATE_EXPECT_VERSION="$(
       node -p 'JSON.parse(require("node:fs").readFileSync("package.json", "utf8")).version'
     )"
-    node --import tsx scripts/write-package-dist-inventory.ts
-    node scripts/check-package-dist-imports.mjs "$ROOT_DIR"
-    quiet_npm pack --ignore-scripts --json --pack-destination "$UPDATE_DIR" >"$pack_json_file"
+    package_args=(
+      --output-dir "$UPDATE_DIR"
+      --pack-json "$pack_json_file"
+      --skip-build
+    )
+    package_tgz="$(node scripts/package-openclaw-for-docker.mjs "${package_args[@]}")"
+    UPDATE_TGZ_FILE="$(basename "$package_tgz")"
   fi
-  UPDATE_TGZ_FILE="$(read_pack_tarball_filename "$pack_json_file")"
   if [[ -z "$UPDATE_PACKAGE_SPEC" ]]; then
-    node scripts/check-openclaw-package-tarball.mjs "${UPDATE_DIR}/${UPDATE_TGZ_FILE}"
+    node scripts/check-openclaw-package-tarball.mjs \
+      --require-bundled-workspace-deps \
+      "${UPDATE_DIR}/${UPDATE_TGZ_FILE}"
+  else
+    UPDATE_TGZ_FILE="$(read_pack_tarball_filename "$pack_json_file")"
   fi
   print_pack_audit "update" "$pack_json_file"
   assert_pack_unpacked_size_budget "update" "$pack_json_file"