fix(package): keep artifact duplicate diagnostics relative

vincentkoc · vincentkoc · commit 7cda58c10993 · 2026-06-20T19:02:54.000+02:00
diff --git a/scripts/resolve-openclaw-package-candidate.mjs b/scripts/resolve-openclaw-package-candidate.mjs
@@ -421,8 +421,11 @@ async function findSingleTarball(dir) {
       if (entry.isFile() && /\.t(?:ar\.)?gz$/u.test(entry.name)) {
         tarballs.push(absolute);
         if (tarballs.length > 1) {
+          const relativeTarballs = tarballs
+            .map((tarball) => path.relative(root, tarball))
+            .toSorted((a, b) => a.localeCompare(b));
           throw new Error(
-            `source=artifact requires exactly one .tgz under ${dir}; found at least 2: ${tarballs.toSorted((a, b) => a.localeCompare(b)).join(", ")}`,
+            `source=artifact requires exactly one .tgz under ${dir}; found at least 2: ${relativeTarballs.join(", ")}`,
           );
         }
       }
diff --git a/test/scripts/resolve-openclaw-package-candidate.test.ts b/test/scripts/resolve-openclaw-package-candidate.test.ts
@@ -990,9 +990,14 @@ describe("resolve-openclaw-package-candidate", () => {
     await writeFile(path.join(dir, "openclaw-a.tgz"), "a");
     await writeFile(path.join(dir, "nested.tar.gz"), "b");
 
-    await expect(findSingleTarballForTest(dir)).rejects.toThrow(
-      "source=artifact requires exactly one .tgz",
-    );
+    const error = await findSingleTarballForTest(dir).catch((caught: unknown) => caught);
+    expect(error).toBeInstanceOf(Error);
+    const message = (error as Error).message;
+    expect(message).toContain("source=artifact requires exactly one .tgz");
+    expect(message).toContain("nested.tar.gz");
+    expect(message).toContain("openclaw-a.tgz");
+    expect(message).not.toContain(path.join(dir, "nested.tar.gz"));
+    expect(message).not.toContain(path.join(dir, "openclaw-a.tgz"));
   });
 
   it("reads the source SHA from packed npm build metadata", async () => {

Original file line number	Diff line number	Diff line change
`@@ -421,8 +421,11 @@ async function findSingleTarball(dir) {`
`421`	`421`	`if (entry.isFile() && /\.t(?:ar\.)?gz$/u.test(entry.name)) {`
`422`	`422`	`tarballs.push(absolute);`
`423`	`423`	`if (tarballs.length > 1) {`
	`424`	`+ const relativeTarballs = tarballs`
	`425`	`+ .map((tarball) => path.relative(root, tarball))`
	`426`	`+ .toSorted((a, b) => a.localeCompare(b));`
`424`	`427`	`throw new Error(`
`425`		- `source=artifact requires exactly one .tgz under ${dir}; found at least 2: ${tarballs.toSorted((a, b) => a.localeCompare(b)).join(", ")}`,
	`428`	+ `source=artifact requires exactly one .tgz under ${dir}; found at least 2: ${relativeTarballs.join(", ")}`,
`426`	`429`	`);`
`427`	`430`	`}`
`428`	`431`	`}`