@elizaos/app-core 2.0.3-beta.3 → 2.0.3-beta.5

package/scripts/aosp/compile-libllama.mjs

@@ -173,7 +173,7 @@
 //   `eliza/` submodule the same algorithm finds the host repo root
 //   (it stops at the first ancestor that has a `package.json`).
 
-import { spawnSync } from "node:child_process";
+import { execFileSync, spawnSync } from "node:child_process";
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
@@ -187,14 +187,32 @@ import {
 import { verifyFusedSymbols } from "../build-helpers/verify-fused-symbols.mjs";
 import { patchVulkanKernels } from "../kernel-patches/vulkan-kernels.mjs";
 import { resolveRepoRootFromImportMeta } from "../lib/repo-root.mjs";
+import {
+  compareSemver,
+  resolveAndroidNdkHostDir,
+  resolveDefaultAndroidAssetsDir as resolveDefaultAndroidAssetsDirForRoot,
+  resolveHomebrewFormulaIncludeDirs,
+} from "./compile-libllama-paths.mjs";
 import { main as compileShimMain } from "./compile-shim.mjs";
 
+export {
+  compareSemver,
+  resolveAndroidNdkHostDir,
+  resolveHomebrewFormulaIncludeDirs,
+};
+
 const here = path.dirname(fileURLToPath(import.meta.url));
 // Walk up from `eliza/packages/app-core/scripts/aosp/` until we hit
 // the host repo root (the directory with a top-level `package.json`).
 // On a parent-host invocation that's `<host-root>`; when running
 // inside the elizaOS source checkout it's the elizaOS repo root.
 const repoRoot = resolveRepoRootFromImportMeta(import.meta.url);
+const RECURSIVE_CLEANUP_SCRIPT = path.join(
+  repoRoot,
+  "packages",
+  "scripts",
+  "rm-path-recursive.mjs",
+);
 
 // elizaOS/llama.cpp @ 33c888a7b. Composes TBQ (apothic) +
 // QJL (W1-A) + Q4_POLAR (W1-B) + Metal sources (W1-D) + MTP spec-decode
@@ -401,53 +419,18 @@ export function parseAndroidTarget(target) {
   return { target, arch, backend, fused, androidAbi };
 }
 
-export function resolveAndroidNdkHostDir(
-  prebuiltRoot,
-  { platform = os.platform(), arch = os.arch(), entries } = {},
-) {
-  const dirs =
-    entries ??
-    (fs.existsSync(prebuiltRoot) ? fs.readdirSync(prebuiltRoot) : []);
-  const hostDirs = dirs
-    .filter((d) => /^(linux|darwin|windows)-(x86_64|aarch64|arm64)$/.test(d))
-    .sort();
-  const hostPrefix =
-    platform === "win32"
-      ? "windows"
-      : platform === "linux" || platform === "darwin"
-        ? platform
-        : null;
-  if (!hostPrefix) return null;
-
-  const preferredArch =
-    arch === "x64" ? "x86_64" : arch === "arm64" ? "arm64" : arch;
-  const archCandidates =
-    preferredArch === "arm64"
-      ? ["arm64", "aarch64", "x86_64"]
-      : [preferredArch, "x86_64"];
-  return (
-    archCandidates
-      .map((candidate) => `${hostPrefix}-${candidate}`)
-      .find((candidate) => hostDirs.includes(candidate)) ??
-    hostDirs.find((candidate) => candidate.startsWith(`${hostPrefix}-`)) ??
-    null
-  );
-}
-
-export function resolveHomebrewFormulaIncludeDirs(
-  formula,
-  prefixes = ["/opt/homebrew", "/usr/local"],
-) {
-  const includeDirs = [];
-  for (const prefix of prefixes) {
-    includeDirs.push(path.join(prefix, "opt", formula, "include"));
-    const cellar = path.join(prefix, "Cellar", formula);
-    if (!fs.existsSync(cellar)) continue;
-    for (const version of fs.readdirSync(cellar).sort(compareSemver)) {
-      includeDirs.push(path.join(cellar, version, "include"));
-    }
+function removeDirectoryRecursive(targetPath) {
+  try {
+    execFileSync("node", [RECURSIVE_CLEANUP_SCRIPT, path.resolve(targetPath)], {
+      encoding: "utf8",
+      stdio: "pipe",
+    });
+  } catch (error) {
+    const detail = [error?.stdout, error?.stderr].filter(Boolean).join("\n");
+    throw new Error(detail || error?.message || String(error), {
+      cause: error,
+    });
   }
-  return includeDirs;
 }
 
 /**
@@ -545,7 +528,7 @@ export function resolveAndroidVulkanCmakeFlags({
     ? path.resolve(stagingDir)
     : path.join(os.tmpdir(), "eliza-vulkan-headers");
   const stagedVulkan = path.join(incRoot, "vulkan");
-  fs.rmSync(stagedVulkan, { recursive: true, force: true });
+  removeDirectoryRecursive(stagedVulkan);
   fs.mkdirSync(incRoot, { recursive: true });
   fs.cpSync(hostVulkanDir, stagedVulkan, { recursive: true });
   // vulkan_core.h `#include <vk_video/...>` the video-codec extension headers,
@@ -554,7 +537,7 @@ export function resolveAndroidVulkanCmakeFlags({
   const hostVkVideoDir = path.join(path.dirname(hostVulkanDir), "vk_video");
   if (fs.existsSync(hostVkVideoDir)) {
     const stagedVkVideo = path.join(incRoot, "vk_video");
-    fs.rmSync(stagedVkVideo, { recursive: true, force: true });
+    removeDirectoryRecursive(stagedVkVideo);
     fs.cpSync(hostVkVideoDir, stagedVkVideo, { recursive: true });
   }
 
@@ -584,7 +567,7 @@ export function resolveAndroidVulkanCmakeFlags({
     );
   }
   const stagedSpirv = path.join(incRoot, "spirv");
-  fs.rmSync(stagedSpirv, { recursive: true, force: true });
+  removeDirectoryRecursive(stagedSpirv);
   fs.cpSync(path.join(hostSpirvRoot, "spirv"), stagedSpirv, {
     recursive: true,
   });
@@ -609,39 +592,7 @@ export function resolveAndroidVulkanCmakeFlags({
 }
 
 export function resolveDefaultAndroidAssetsDir({ root = repoRoot } = {}) {
-  const appRelativeCandidates = [
-    path.join("packages", "app"),
-    path.join("apps", "app"),
-    path.join("eliza", "packages", "app"),
-  ];
-  for (const appRelative of appRelativeCandidates) {
-    const appRoot = path.join(root, appRelative);
-    if (
-      fs.existsSync(path.join(appRoot, "android")) ||
-      fs.existsSync(path.join(appRoot, "package.json"))
-    ) {
-      return path.join(
-        appRoot,
-        "android",
-        "app",
-        "src",
-        "main",
-        "assets",
-        "agent",
-      );
-    }
-  }
-  return path.join(
-    root,
-    "packages",
-    "app",
-    "android",
-    "app",
-    "src",
-    "main",
-    "assets",
-    "agent",
-  );
+  return resolveDefaultAndroidAssetsDirForRoot({ root });
 }
 
 export function parseArgs(argv) {
@@ -774,28 +725,6 @@ export function parseArgs(argv) {
   return args;
 }
 
-/**
- * Compare two semver-ish version strings (zig follows MAJOR.MINOR.PATCH for
- * stable releases; dev builds add `-dev.NNN+sha` which we strip).
- * Returns negative when `a < b`, positive when `a > b`, zero on equal.
- */
-export function compareSemver(a, b) {
-  const norm = (v) =>
-    String(v)
-      .replace(/^v/, "")
-      .split(/[-+]/)[0]
-      .split(".")
-      .map((n) => Number.parseInt(n, 10) || 0);
-  const aa = norm(a);
-  const bb = norm(b);
-  for (let i = 0; i < Math.max(aa.length, bb.length); i += 1) {
-    const x = aa[i] ?? 0;
-    const y = bb[i] ?? 0;
-    if (x !== y) return x - y;
-  }
-  return 0;
-}
-
 /**
  * Probe the build host for a usable zig toolchain. Returns the absolute path
  * to the zig binary on success, or throws an Error with an install hint
@@ -1091,7 +1020,7 @@ export function ensureLlamaCppCheckout({
     log(
       `[compile-libllama] Cloning llama.cpp ${LLAMA_CPP_TAG} into ${cacheDir}`,
     );
-    fs.rmSync(cacheDir, { recursive: true, force: true });
+    removeDirectoryRecursive(cacheDir);
     fs.mkdirSync(cacheDir, { recursive: true });
     spawn(
       "git",

package/scripts/aosp/compile-libllama.test.mjs

@@ -1,13 +1,22 @@
+import { execFileSync } from "node:child_process";
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { afterEach, describe, expect, test } from "vitest";
+import { resolveRepoRootFromImportMeta } from "../lib/repo-root.mjs";
 import {
   resolveAndroidNdkHostDir,
   resolveDefaultAndroidAssetsDir,
   resolveHomebrewFormulaIncludeDirs,
-} from "./compile-libllama.mjs";
+} from "./compile-libllama-paths.mjs";
 
+const repoRoot = resolveRepoRootFromImportMeta(import.meta.url);
+const cleanupHelperScript = path.join(
+  repoRoot,
+  "packages",
+  "scripts",
+  "rm-path-recursive.mjs",
+);
 const tmpDirs = [];
 
 function makeTmpDir() {
@@ -16,9 +25,16 @@ function makeTmpDir() {
   return dir;
 }
 
+function removePathRecursive(targetPath) {
+  execFileSync(process.execPath, [cleanupHelperScript, targetPath], {
+    cwd: repoRoot,
+    stdio: "inherit",
+  });
+}
+
 afterEach(() => {
   while (tmpDirs.length > 0) {
-    fs.rmSync(tmpDirs.pop(), { recursive: true, force: true });
+    removePathRecursive(tmpDirs.pop());
   }
 });
 

package/scripts/assert-required-bundled-packages.test.ts

@@ -11,8 +11,10 @@
  * bundle.
  */
 
-import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { execFileSync } from "node:child_process";
+import { mkdirSync, mkdtempSync, writeFileSync } from "node:fs";
 import path from "node:path";
+import { fileURLToPath } from "node:url";
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
 
 import {
@@ -28,6 +30,26 @@ import {
 let tmpDir: string;
 let nodeModulesDir: string;
 
+const repoRoot = path.resolve(
+  path.dirname(fileURLToPath(import.meta.url)),
+  "..",
+  "..",
+  "..",
+);
+const cleanupHelperScript = path.join(
+  repoRoot,
+  "packages",
+  "scripts",
+  "rm-path-recursive.mjs",
+);
+
+function removePathRecursive(targetPath: string): void {
+  execFileSync(process.execPath, [cleanupHelperScript, targetPath], {
+    cwd: repoRoot,
+    stdio: "inherit",
+  });
+}
+
 function writePackageJson(
   name: string,
   manifest: Record<string, unknown> = {},
@@ -51,7 +73,7 @@ describe("assertRequiredBundledPackagesLanded", () => {
   });
 
   afterEach(() => {
-    rmSync(tmpDir, { recursive: true, force: true });
+    removePathRecursive(tmpDir);
   });
 
   it("passes when every required package has a package.json", () => {

package/scripts/build-bundled-agent-skills-artifact.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
 
+import { spawnSync } from "node:child_process";
 import { existsSync } from "node:fs";
-import { rm } from "node:fs/promises";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { resolveRepoRootFromImportMeta } from "./lib/repo-root.mjs";
@@ -9,21 +9,45 @@ import { resolveRepoRootFromImportMeta } from "./lib/repo-root.mjs";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const repoRoot = resolveRepoRootFromImportMeta(import.meta.url);
-const pluginDir = path.join(
+const pluginDir = path.join(repoRoot, "plugins", "plugin-agent-skills");
+const cleanupHelperScript = path.join(
   repoRoot,
-  "plugins",
-  "plugin-agent-skills",
-  "typescript",
+  "packages",
+  "scripts",
+  "rm-path-recursive.mjs",
 );
 
 const externals = ["node:*", "@elizaos/core", "fflate"];
 
+function removeGeneratedDist() {
+  if (!existsSync("dist")) {
+    return;
+  }
+
+  const result = spawnSync("node", [cleanupHelperScript, "dist"], {
+    cwd: pluginDir,
+    encoding: "utf8",
+    stdio: "pipe",
+  });
+
+  if (result.error) {
+    throw result.error;
+  }
+  if (result.status !== 0) {
+    const output = [result.stdout, result.stderr]
+      .filter(Boolean)
+      .join("\n")
+      .trim();
+    throw new Error(
+      `cleanup helper failed for ${path.join(pluginDir, "dist")}${output ? `:\n${output}` : ""}`,
+    );
+  }
+}
+
 async function main() {
   process.chdir(pluginDir);
 
-  if (existsSync("dist")) {
-    await rm("dist", { recursive: true, force: true });
-  }
+  removeGeneratedDist();
 
   const result = await Bun.build({
     entrypoints: ["./src/index.ts"],

package/scripts/build-bundled-orchestrator-artifact.mjs

@@ -1,18 +1,17 @@
 #!/usr/bin/env bun
 
+import { spawnSync } from "node:child_process";
 import { existsSync } from "node:fs";
-import { rm } from "node:fs/promises";
 import path from "node:path";
-import { fileURLToPath } from "node:url";
+import { resolveRepoRootFromImportMeta } from "./lib/repo-root.mjs";
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-const repoRoot = path.resolve(__dirname, "..");
-const pluginDir = path.join(
+const repoRoot = resolveRepoRootFromImportMeta(import.meta.url);
+const pluginDir = path.join(repoRoot, "plugins", "plugin-agent-orchestrator");
+const cleanupHelperScript = path.join(
   repoRoot,
-  "eliza",
-  "plugins",
-  "plugin-agent-orchestrator",
+  "packages",
+  "scripts",
+  "rm-path-recursive.mjs",
 );
 
 const externals = [
@@ -26,12 +25,35 @@ const externals = [
   "zod",
 ];
 
+function removeGeneratedDist() {
+  if (!existsSync("dist")) {
+    return;
+  }
+
+  const result = spawnSync("node", [cleanupHelperScript, "dist"], {
+    cwd: pluginDir,
+    encoding: "utf8",
+    stdio: "pipe",
+  });
+
+  if (result.error) {
+    throw result.error;
+  }
+  if (result.status !== 0) {
+    const output = [result.stdout, result.stderr]
+      .filter(Boolean)
+      .join("\n")
+      .trim();
+    throw new Error(
+      `cleanup helper failed for ${path.join(pluginDir, "dist")}${output ? `:\n${output}` : ""}`,
+    );
+  }
+}
+
 async function main() {
   process.chdir(pluginDir);
 
-  if (existsSync("dist")) {
-    await rm("dist", { recursive: true, force: true });
-  }
+  removeGeneratedDist();
 
   const result = await Bun.build({
     entrypoints: ["./src/index.ts"],

package/scripts/build-llama-cpp-mtp.mjs

@@ -36,10 +36,13 @@
  *                                   run-mobile-build.mjs mtpTargetOutDir()
  *   ELIZA_MTP_LLAMA_CPP_SRC         override fork source tree
  *   ELIZA_IOS_DEPLOYMENT_TARGET     iOS min version (default 16.0)
+ *   ELIZA_IOS_METAL_STD             Metal language std (default ios-metal2.4);
+ *                                   the iOS min-version flag is appended here
+ *                                   so embedded metallibs run on older devices
  *   ELIZA_MTP_FORCE_REBUILD=1       ignore a cached slice and rebuild
  */
 
-import { spawnSync } from "node:child_process";
+import { execFileSync, spawnSync } from "node:child_process";
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
@@ -49,6 +52,19 @@ import { fileURLToPath } from "node:url";
 const here = path.dirname(fileURLToPath(import.meta.url));
 // packages/app-core/scripts → repo root
 const repoRoot = path.resolve(here, "..", "..", "..");
+const cleanupHelperScript = path.join(
+  repoRoot,
+  "packages",
+  "scripts",
+  "rm-path-recursive.mjs",
+);
+
+function removePathRecursive(targetPath) {
+  execFileSync(process.execPath, [cleanupHelperScript, targetPath], {
+    cwd: repoRoot,
+    stdio: "inherit",
+  });
+}
 
 // ── State dir — MUST mirror run-mobile-build.mjs elizaStateDirForBuild() and
 //    ios-xcframework/build-xcframework.mjs elizaStateDir() EXACTLY, otherwise
@@ -58,6 +74,7 @@ const STATE_DIR =
 
 const DEPLOYMENT_TARGET =
   process.env.ELIZA_IOS_DEPLOYMENT_TARGET?.trim() || "16.0";
+const IOS_METAL_STD = process.env.ELIZA_IOS_METAL_STD?.trim() || "ios-metal2.4";
 
 // ── Fork source. The canonical fork is the in-repo submodule; the vendored
 //    ios-deps tree is the historical fallback. Both carry the eliza kernels.
@@ -203,7 +220,7 @@ function requiredKernelsMissing(symbolsText) {
 
 function copyHeaders(srcDir, outDir) {
   const incOut = path.join(outDir, "include");
-  fs.rmSync(incOut, { recursive: true, force: true });
+  removePathRecursive(incOut);
   fs.mkdirSync(incOut, { recursive: true });
   for (const incDir of [
     path.join(srcDir, "include"),
@@ -281,10 +298,16 @@ function buildTarget(target) {
   const revision = forkRevision(srcDir);
   log(`target=${target} sdk=${t.sdk} fork=${revision}`);
   log(`source: ${srcDir}`);
+  const metalDeploymentFlag = t.isSimulator
+    ? `-mios-simulator-version-min=${DEPLOYMENT_TARGET}`
+    : `-miphoneos-version-min=${DEPLOYMENT_TARGET}`;
+  // ggml appends GGML_METAL_STD after -std=; CMake list expansion lets this
+  // also pass the iOS deployment target into the embedded metallib compile.
+  const metalStdAndDeployment = `${IOS_METAL_STD};${metalDeploymentFlag}`;
 
   const buildDir = path.join(STATE_DIR, "local-inference", "mtp-build", target);
   if (process.env.ELIZA_MTP_FORCE_REBUILD === "1") {
-    fs.rmSync(buildDir, { recursive: true, force: true });
+    removePathRecursive(buildDir);
   }
   fs.mkdirSync(buildDir, { recursive: true });
   fs.mkdirSync(outDir, { recursive: true });
@@ -309,6 +332,7 @@ function buildTarget(target) {
     // (ggml-metal/CMakeLists.txt ELIZA-KERNEL-EMBED-PATCH-V1).
     "-DGGML_METAL=ON",
     "-DGGML_METAL_EMBED_LIBRARY=ON",
+    `-DGGML_METAL_STD=${metalStdAndDeployment}`,
     "-DGGML_METAL_USE_BF16=ON",
     "-DGGML_ACCELERATE=ON",
     "-DGGML_BLAS=OFF",

package/scripts/build-patched-electrobun-cli.mjs

@@ -8,7 +8,6 @@ import {
   existsSync,
   mkdirSync,
   readFileSync,
-  rmSync,
   writeFileSync,
 } from "node:fs";
 import { createRequire } from "node:module";
@@ -16,6 +15,17 @@ import os from "node:os";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
 import { resolveMainAppDir } from "./lib/app-dir.mjs";
+import { resolveRepoRootFromImportMeta } from "./lib/repo-root.mjs";
+
+const repoRoot = resolveRepoRootFromImportMeta(import.meta.url, {
+  fallbackToCwd: true,
+});
+const cleanupHelperScript = path.join(
+  repoRoot,
+  "packages",
+  "scripts",
+  "rm-path-recursive.mjs",
+);
 
 function fail(message, code = 1) {
   console.error(`[build-patched-electrobun-cli] ${message}`);
@@ -47,6 +57,24 @@ function runAllowFailure(command, args, options = {}) {
   return result.status ?? 1;
 }
 
+function removePathRecursive(targetPath) {
+  const result = spawnSync("node", [cleanupHelperScript, targetPath], {
+    cwd: repoRoot,
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "pipe"],
+  });
+  if (result.error) throw result.error;
+  if (result.status !== 0) {
+    const output = [result.stdout, result.stderr]
+      .filter(Boolean)
+      .join("\n")
+      .trim();
+    fail(
+      `cleanup helper failed for ${targetPath}${output ? `:\n${output}` : ""}`,
+    );
+  }
+}
+
 function resolveElectrobunDir() {
   const appDir = resolveMainAppDir(process.cwd(), "app");
   const workspacePackageJson = path.join(appDir, "package.json");
@@ -394,7 +422,7 @@ function main() {
     process.env.RUNNER_TEMP ?? os.tmpdir(),
     `eliza-electrobun-src-${electrobunVersion}`,
   );
-  rmSync(tempRoot, { recursive: true, force: true });
+  removePathRecursive(tempRoot);
 
   run("git", [
     "clone",

package/scripts/bun-riscv64/bun-version.json

@@ -127,7 +127,7 @@
       "0005-tinycc-disable-on-riscv64.patch": "ee3e9b0c64a5ccdb78397309ce2115381c353a3dfce313aba88dd951264dc7d3",
       "0006-build-add-riscv64-cli-validation.patch": "d621bff9ae125af7674bb4ee44dad62848c1ab6e333e61d4b1f6311eb139764c",
       "0007-deps-per-dep-riscv64-checks.patch": "0d1516c4655601174f5ee91a877ad1a0fcb287ed8df42f7e96297b47b03ea5e4",
-      "0008-source-stabilize-riscv64-musl-build.patch": "21a8ca86c77dd49140e29c0fd0a3d47a490b4d19d7617342db83567fa473b108",
+      "0008-source-stabilize-riscv64-musl-build.patch": "58abdc9deff750305be9176da68b7190cdcbbd1a484256100b36f7239de63824",
       "0009-disable-wasm-streaming-hooks-for-c-loop.patch": "c8658536cc46505cec35ab65f9d51daeba8cc5abac741f55496c65712c556731",
       "0010-disable-inspector-profiler-for-riscv64-c-loop.patch": "4433d1077b59c325b19194fecefa4e33b5a586099fec0f4f999c82d053826128",
       "0011-process-arch-add-riscv64.patch": "1a3e4ab498e83603a34016aab7f02d78fc21a0c7f61daa18cd282e8287d1ef1e",

package/scripts/bun-riscv64/validate.sh

@@ -17,11 +17,13 @@
 #   - Exit 0 if every patch validates, non-zero otherwise.
 #
 # Disk + network: needs ~1.5 GB free for the two shallow clones into /tmp.
-# Network: needs HTTPS access to github.com. Tear-down: rm -rf /tmp/bun-riscv64-validate*
+# Network: needs HTTPS access to github.com. Tear-down: helper removes /tmp/bun-riscv64-validate*
 
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+REPO_ROOT="$(cd "$SCRIPT_DIR/../../../.." && pwd)"
+RM_PATH_RECURSIVE=(node "$REPO_ROOT/packages/scripts/rm-path-recursive.mjs")
 DIST_DIR="$SCRIPT_DIR/dist"
 REPORT="$DIST_DIR/validate-report.txt"
 mkdir -p "$DIST_DIR"
@@ -144,10 +146,10 @@ fi
 
 log ""
 
-declare -A RECORDED_PATCH_PATHS=()
+RECORDED_PATCH_PATHS=()
 if command -v bun >/dev/null 2>&1; then
     while IFS= read -r path; do
-        RECORDED_PATCH_PATHS["$path"]=1
+        RECORDED_PATCH_PATHS+=("$path")
     done < <(bun -e "
         const v = JSON.parse(require('fs').readFileSync('$VERSION_FILE','utf8'));
         for (const k of Object.keys(v.patch_series.bun_patches)) console.log('bun-patches/'+k);
@@ -156,7 +158,7 @@ if command -v bun >/dev/null 2>&1; then
     ")
 else
     while IFS= read -r path; do
-        RECORDED_PATCH_PATHS["$path"]=1
+        RECORDED_PATCH_PATHS+=("$path")
     done < <(python3 -c "
 import json
 v = json.load(open('$VERSION_FILE'))
@@ -165,10 +167,21 @@ for k in v['patch_series']['webkit_patches']: print('webkit-patches/'+k)
 for k in v['patch_series']['webkit_recipes']: print('webkit-patches/'+k)
 ")
 fi
+
+is_recorded_patch_path() {
+    local needle="$1" recorded
+    for recorded in "${RECORDED_PATCH_PATHS[@]}"; do
+        if [ "$recorded" = "$needle" ]; then
+            return 0
+        fi
+    done
+    return 1
+}
+
 for actual in "$SCRIPT_DIR"/bun-patches/*.patch "$SCRIPT_DIR"/webkit-patches/*.patch "$SCRIPT_DIR"/webkit-patches/*.recipe; do
     [ -e "$actual" ] || continue
     rel_path="${actual#"$SCRIPT_DIR/"}"
-    if [ -z "${RECORDED_PATCH_PATHS[$rel_path]+x}" ]; then
+    if ! is_recorded_patch_path "$rel_path"; then
         fail "unrecorded patch/recipe on disk: $rel_path"
     fi
 done
@@ -185,7 +198,7 @@ fi
 CLONE_DIR="${VALIDATE_CLONE_DIR:-/tmp/bun-riscv64-validate-bun}"
 if [ ! -d "$CLONE_DIR/.git" ]; then
     log "Cloning oven-sh/bun @ $BUN_TAG into $CLONE_DIR (shallow)…"
-    rm -rf "$CLONE_DIR"
+    "${RM_PATH_RECURSIVE[@]}" "$CLONE_DIR"
     if ! git clone --depth=1 --branch "$BUN_TAG" --no-recurse-submodules \
             https://github.com/oven-sh/bun.git "$CLONE_DIR" >>"$REPORT" 2>&1; then
         fail "git clone of oven-sh/bun @ $BUN_TAG failed — see $REPORT"
@@ -216,12 +229,12 @@ log "── 4. WebKit patches applicability ────────────
 WK_CLONE_DIR="${VALIDATE_WK_CLONE_DIR:-/tmp/bun-riscv64-validate-webkit}"
 if [ -d "$WK_CLONE_DIR/.git" ] && ! git -C "$WK_CLONE_DIR" rev-parse --verify "$WEBKIT_COMMIT^{commit}" >/dev/null 2>&1; then
     log "Discarding incomplete WebKit clone at $WK_CLONE_DIR"
-    rm -rf "$WK_CLONE_DIR"
+    "${RM_PATH_RECURSIVE[@]}" "$WK_CLONE_DIR"
 fi
 
 if [ ! -d "$WK_CLONE_DIR/.git" ]; then
     log "Cloning oven-sh/WebKit @ $WEBKIT_COMMIT into $WK_CLONE_DIR (shallow)…"
-    rm -rf "$WK_CLONE_DIR"
+    "${RM_PATH_RECURSIVE[@]}" "$WK_CLONE_DIR"
     git init --initial-branch=main "$WK_CLONE_DIR" >>"$REPORT" 2>&1
     git -C "$WK_CLONE_DIR" remote add origin https://github.com/oven-sh/WebKit.git
     if ! git -C "$WK_CLONE_DIR" fetch --depth=1 --filter=blob:none origin "$WEBKIT_COMMIT" >>"$REPORT" 2>&1; then