From 3817e0ce2c04fa16187384038c668dfddc218704 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 27 Jan 2026 15:38:31 +0000
Subject: [PATCH] fix: bundle a2ui before tests

---
 .github/workflows/ci.yml |  6 ++---
 scripts/bundle-a2ui.sh   | 56 +++++++++++++++++++++++++++++-----------
 2 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8cc86bd630..ca4fef2b78 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -76,7 +76,7 @@ jobs:
             command: pnpm lint
           - runtime: node
             task: test
-            command: pnpm test
+            command: pnpm canvas:a2ui:bundle && pnpm test
           - runtime: node
             task: build
             command: pnpm build
@@ -88,7 +88,7 @@ jobs:
             command: pnpm format
           - runtime: bun
             task: test
-            command: bunx vitest run
+            command: pnpm canvas:a2ui:bundle && bunx vitest run
           - runtime: bun
             task: build
             command: bunx tsc -p tsconfig.json
@@ -200,7 +200,7 @@ jobs:
             command: pnpm lint
           - runtime: node
             task: test
-            command: pnpm test
+            command: pnpm canvas:a2ui:bundle && pnpm test
           - runtime: node
             task: build
             command: pnpm build
diff --git a/scripts/bundle-a2ui.sh b/scripts/bundle-a2ui.sh
index 3040023246..75844ec6da 100755
--- a/scripts/bundle-a2ui.sh
+++ b/scripts/bundle-a2ui.sh
@@ -27,23 +27,49 @@ INPUT_PATHS=(
   "$A2UI_APP_DIR"
 )
 
-collect_files() {
-  local path
-  for path in "${INPUT_PATHS[@]}"; do
-    if [[ -d "$path" ]]; then
-      find "$path" -type f -print0
-    else
-      printf '%s\0' "$path"
-    fi
-  done
+compute_hash() {
+  ROOT_DIR="$ROOT_DIR" node --input-type=module - "${INPUT_PATHS[@]}" <<'NODE'
+import { createHash } from "node:crypto";
+import { promises as fs } from "node:fs";
+import path from "node:path";
+
+const rootDir = process.env.ROOT_DIR ?? process.cwd();
+const inputs = process.argv.slice(2);
+const files = [];
+
+async function walk(entryPath) {
+  const st = await fs.stat(entryPath);
+  if (st.isDirectory()) {
+    const entries = await fs.readdir(entryPath);
+    for (const entry of entries) {
+      await walk(path.join(entryPath, entry));
+    }
+    return;
+  }
+  files.push(entryPath);
 }
 
-compute_hash() {
-  collect_files \
-    | LC_ALL=C sort -z \
-    | xargs -0 shasum -a 256 \
-    | shasum -a 256 \
-    | awk '{print $1}'
+for (const input of inputs) {
+  await walk(input);
+}
+
+function normalize(p) {
+  return p.split(path.sep).join("/");
+}
+
+files.sort((a, b) => normalize(a).localeCompare(normalize(b)));
+
+const hash = createHash("sha256");
+for (const filePath of files) {
+  const rel = normalize(path.relative(rootDir, filePath));
+  hash.update(rel);
+  hash.update("\0");
+  hash.update(await fs.readFile(filePath));
+  hash.update("\0");
+}
+
+process.stdout.write(hash.digest("hex"));
+NODE
 }
 
 current_hash="$(compute_hash)"