@elizaos/app-core 2.0.3-beta.4 → 2.0.3-beta.6

package/scripts/lib/agent-source-watcher.test.mjs

@@ -1,4 +1,5 @@
-import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { execFileSync } from "node:child_process";
+import { mkdirSync, mkdtempSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { afterEach, describe, expect, it } from "vitest";
@@ -8,6 +9,22 @@ import {
   isReloadableChangePath,
   startAgentSourceWatcher,
 } from "./agent-source-watcher.mjs";
+import { resolveRepoRootFromImportMeta } from "./repo-root.mjs";
+
+const repoRoot = resolveRepoRootFromImportMeta(import.meta.url);
+const cleanupHelperScript = path.join(
+  repoRoot,
+  "packages",
+  "scripts",
+  "rm-path-recursive.mjs",
+);
+
+function removePathRecursive(targetPath) {
+  execFileSync(process.execPath, [cleanupHelperScript, targetPath], {
+    cwd: repoRoot,
+    stdio: "inherit",
+  });
+}
 
 const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
@@ -23,7 +40,7 @@ async function waitUntil(predicate, timeoutMs) {
 describe("collectAgentSourceDirs", () => {
   let root = null;
   afterEach(() => {
-    if (root) rmSync(root, { recursive: true, force: true });
+    if (root) removePathRecursive(root);
     root = null;
   });
 
@@ -117,7 +134,7 @@ describe("startAgentSourceWatcher (integration)", () => {
   afterEach(() => {
     if (handle) handle.close();
     handle = null;
-    if (root) rmSync(root, { recursive: true, force: true });
+    if (root) removePathRecursive(root);
     root = null;
   });
 
@@ -154,7 +171,10 @@ describe("startAgentSourceWatcher (integration)", () => {
     const srcDir = path.join(root, "plugins", "plugin-x", "src");
     mkdirSync(srcDir, { recursive: true });
     for (let i = 0; i < 20; i++) {
-      writeFileSync(path.join(srcDir, `mod-${i}.ts`), `export const v${i}=0;\n`);
+      writeFileSync(
+        path.join(srcDir, `mod-${i}.ts`),
+        `export const v${i}=0;\n`,
+      );
     }
 
     const calls = [];

package/scripts/lib/apple-entitlement-audit.test.mjs

@@ -1,5 +1,6 @@
 import assert from "node:assert/strict";
-import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { execFileSync } from "node:child_process";
+import { mkdirSync, mkdtempSync, writeFileSync } from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { describe, it } from "vitest";
@@ -10,6 +11,22 @@ import {
   scanAppleAppBundleForNativeRuntimeSignals,
   validateEntitlementsAgainstTarget,
 } from "./apple-entitlement-audit.mjs";
+import { resolveRepoRootFromImportMeta } from "./repo-root.mjs";
+
+const repoRoot = resolveRepoRootFromImportMeta(import.meta.url);
+const cleanupHelperScript = path.join(
+  repoRoot,
+  "packages",
+  "scripts",
+  "rm-path-recursive.mjs",
+);
+
+function removePathRecursive(targetPath) {
+  execFileSync(process.execPath, [cleanupHelperScript, targetPath], {
+    cwd: repoRoot,
+    stdio: "inherit",
+  });
+}
 
 describe("apple entitlement audit", () => {
   it("accepts the reviewed App Store entitlement sources", () => {
@@ -121,7 +138,7 @@ describe("apple entitlement audit", () => {
         }),
       );
     } finally {
-      rmSync(tmp, { recursive: true, force: true });
+      removePathRecursive(tmp);
     }
   });
 

package/scripts/lib/artifact-staleness.test.mts

@@ -1,3 +1,4 @@
+import { execFileSync } from "node:child_process";
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
@@ -8,6 +9,22 @@ import {
   fileMtime,
   maxMtimeUnder,
 } from "./artifact-staleness.mjs";
+import { resolveRepoRootFromImportMeta } from "./repo-root.mjs";
+
+const repoRoot = resolveRepoRootFromImportMeta(import.meta.url);
+const cleanupHelperScript = path.join(
+  repoRoot,
+  "packages",
+  "scripts",
+  "rm-path-recursive.mjs",
+);
+
+function removePathRecursive(targetPath: string) {
+  execFileSync(process.execPath, [cleanupHelperScript, targetPath], {
+    cwd: repoRoot,
+    stdio: "inherit",
+  });
+}
 
 let tmp: string;
 
@@ -16,7 +33,7 @@ beforeEach(() => {
 });
 
 afterEach(() => {
-  fs.rmSync(tmp, { recursive: true, force: true });
+  removePathRecursive(tmp);
 });
 
 function touch(file: string, mtimeMs: number) {

package/scripts/lib/patch-bun-exports.mjs

@@ -3,6 +3,8 @@
  * (missing in published tarball). Exported for use by patch-deps.mjs and tests.
  * See docs/plugin-resolution-and-node-path.md "Bun and published package exports".
  */
+
+import { execFileSync } from "node:child_process";
 import {
   cpSync,
   existsSync,
@@ -15,6 +17,7 @@ import {
 } from "node:fs";
 import { dirname, resolve } from "node:path";
 import ts from "typescript";
+import { resolveRepoRootFromImportMeta } from "./repo-root.mjs";
 
 const ELIZA_CORE_RUNTIME_FILES = [
   "dist/index.js",
@@ -22,6 +25,21 @@ const ELIZA_CORE_RUNTIME_FILES = [
   "dist/node/index.node.js",
 ];
 
+const REPO_ROOT = resolveRepoRootFromImportMeta(import.meta.url);
+const CLEANUP_HELPER_SCRIPT = resolve(
+  REPO_ROOT,
+  "packages",
+  "scripts",
+  "rm-path-recursive.mjs",
+);
+
+function removePathRecursive(targetPath) {
+  execFileSync(process.execPath, [CLEANUP_HELPER_SCRIPT, targetPath], {
+    cwd: REPO_ROOT,
+    stdio: "ignore",
+  });
+}
+
 function dedupeRealPaths(paths) {
   const seen = new Set();
   const unique = [];
@@ -113,7 +131,7 @@ export function repairElizaCoreRuntimeDist(targetPkgDir, sourcePkgDir) {
   const sourceDist = resolve(sourcePkgDir, "dist");
   const targetDist = resolve(targetPkgDir, "dist");
 
-  rmSync(targetDist, { recursive: true, force: true });
+  removePathRecursive(targetDist);
   cpSync(sourceDist, targetDist, { recursive: true });
   return true;
 }
@@ -241,7 +259,7 @@ export function pruneNestedElizaPluginCoreCopies(root, log = console.log) {
       // Fall back to the directory path when package.json cannot be read.
     }
 
-    rmSync(nestedCoreDir, { recursive: true, force: true });
+    removePathRecursive(nestedCoreDir);
     patched = true;
     log(
       `[patch-deps] Removed nested @elizaos/core from ${pluginName}; plugin imports now resolve the root core.`,

package/scripts/lib/patch-bun-exports.test.mjs

@@ -1,17 +1,41 @@
+import { execFileSync } from "node:child_process";
 import {
+  existsSync,
   mkdirSync,
   mkdtempSync,
   readFileSync,
-  rmSync,
   writeFileSync,
 } from "node:fs";
 import { tmpdir } from "node:os";
-import { join } from "node:path";
+import { dirname, join } from "node:path";
 import { describe, expect, it } from "vitest";
 import {
   applyEsmDynamicRequireCompat,
   patchGitWorkspaceServiceEsmRequireCompat,
+  pruneNestedElizaPluginCoreCopies,
+  repairElizaCoreRuntimeDist,
 } from "./patch-bun-exports.mjs";
+import { resolveRepoRootFromImportMeta } from "./repo-root.mjs";
+
+const repoRoot = resolveRepoRootFromImportMeta(import.meta.url);
+const cleanupHelperScript = join(
+  repoRoot,
+  "packages",
+  "scripts",
+  "rm-path-recursive.mjs",
+);
+
+function removePathRecursive(targetPath) {
+  execFileSync(process.execPath, [cleanupHelperScript, targetPath], {
+    cwd: repoRoot,
+    stdio: "inherit",
+  });
+}
+
+function writeFixtureFile(filePath, contents = "export {};\n") {
+  mkdirSync(dirname(filePath), { recursive: true });
+  writeFileSync(filePath, contents, "utf8");
+}
 
 describe("patch-bun-exports", () => {
   it("applyEsmDynamicRequireCompat replaces generated require shims", () => {
@@ -40,7 +64,7 @@ describe("patch-bun-exports", () => {
       );
       expect(updated).not.toContain("Dynamic require of");
     } finally {
-      rmSync(tmp, { recursive: true, force: true });
+      removePathRecursive(tmp);
     }
   });
 
@@ -73,7 +97,87 @@ describe("patch-bun-exports", () => {
       expect(logs).toHaveLength(1);
       expect(logs[0]).toContain("git-workspace-service");
     } finally {
-      rmSync(tmp, { recursive: true, force: true });
+      removePathRecursive(tmp);
+    }
+  });
+
+  it("repairElizaCoreRuntimeDist replaces an incomplete runtime dist", () => {
+    const tmp = mkdtempSync(join(tmpdir(), "patch-bun-exports-test-"));
+    try {
+      const sourcePkgDir = join(tmp, "source-core");
+      const targetPkgDir = join(tmp, "target-core");
+      for (const relativePath of [
+        "dist/index.js",
+        "dist/browser/index.browser.js",
+        "dist/node/index.node.js",
+      ]) {
+        writeFixtureFile(
+          join(sourcePkgDir, relativePath),
+          `// healthy ${relativePath}\n`,
+        );
+      }
+      writeFixtureFile(join(targetPkgDir, "dist/testing/index.js"));
+      writeFixtureFile(join(targetPkgDir, "dist/stale.js"), "// stale\n");
+
+      expect(repairElizaCoreRuntimeDist(targetPkgDir, sourcePkgDir)).toBe(true);
+      expect(readFileSync(join(targetPkgDir, "dist/index.js"), "utf8")).toBe(
+        "// healthy dist/index.js\n",
+      );
+      expect(
+        existsSync(join(targetPkgDir, "dist/browser/index.browser.js")),
+      ).toBe(true);
+      expect(existsSync(join(targetPkgDir, "dist/node/index.node.js"))).toBe(
+        true,
+      );
+      expect(existsSync(join(targetPkgDir, "dist/stale.js"))).toBe(false);
+    } finally {
+      removePathRecursive(tmp);
+    }
+  });
+
+  it("pruneNestedElizaPluginCoreCopies removes plugin-local core copies", () => {
+    const tmp = mkdtempSync(join(tmpdir(), "patch-bun-exports-test-"));
+    try {
+      const rootCorePkg = join(
+        tmp,
+        "node_modules",
+        "@elizaos",
+        "core",
+        "package.json",
+      );
+      const pluginPkg = join(
+        tmp,
+        "node_modules",
+        "@elizaos",
+        "plugin-demo",
+        "package.json",
+      );
+      const nestedCoreDir = join(
+        tmp,
+        "node_modules",
+        "@elizaos",
+        "plugin-demo",
+        "node_modules",
+        "@elizaos",
+        "core",
+      );
+
+      writeFixtureFile(rootCorePkg, '{"name":"@elizaos/core"}\n');
+      writeFixtureFile(pluginPkg, '{"name":"@elizaos/plugin-demo"}\n');
+      writeFixtureFile(
+        join(nestedCoreDir, "package.json"),
+        '{"name":"@elizaos/core"}\n',
+      );
+
+      const logs = [];
+      expect(
+        pruneNestedElizaPluginCoreCopies(tmp, (msg) => logs.push(msg)),
+      ).toBe(true);
+      expect(existsSync(nestedCoreDir)).toBe(false);
+      expect(logs).toHaveLength(1);
+      expect(logs[0]).toContain("@elizaos/plugin-demo");
+    } finally {
+      removePathRecursive(tmp);
     }
   });
 });

package/scripts/lib/renderer-build-manifest.test.mts

@@ -1,3 +1,4 @@
+import { execFileSync } from "node:child_process";
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
@@ -13,6 +14,22 @@ import {
   readRendererBuildManifest,
   writeRendererBuildManifest,
 } from "./renderer-build-manifest.mjs";
+import { resolveRepoRootFromImportMeta } from "./repo-root.mjs";
+
+const repoRoot = resolveRepoRootFromImportMeta(import.meta.url);
+const cleanupHelperScript = path.join(
+  repoRoot,
+  "packages",
+  "scripts",
+  "rm-path-recursive.mjs",
+);
+
+function removePathRecursive(targetPath: string) {
+  execFileSync(process.execPath, [cleanupHelperScript, targetPath], {
+    cwd: repoRoot,
+    stdio: "inherit",
+  });
+}
 
 let tmp: string;
 
@@ -21,7 +38,7 @@ beforeEach(() => {
 });
 
 afterEach(() => {
-  fs.rmSync(tmp, { recursive: true, force: true });
+  removePathRecursive(tmp);
 });
 
 /**

package/scripts/lib/stage-android-agent.mjs

@@ -39,7 +39,7 @@
  * The ABI-independent `launch.sh` is the packaged production launcher;
  * `agent-bundle.js` is produced by `bun run --cwd packages/agent build:mobile`.
  */
-import { spawn } from "node:child_process";
+import { execFileSync, spawn } from "node:child_process";
 import crypto from "node:crypto";
 import fs from "node:fs";
 import os from "node:os";
@@ -49,6 +49,12 @@ import { fileURLToPath } from "node:url";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const APP_CORE_ROOT = path.resolve(__dirname, "..", "..");
 const ELIZA_REPO_ROOT = path.resolve(APP_CORE_ROOT, "..", "..");
+const CLEANUP_HELPER_SCRIPT = path.join(
+  ELIZA_REPO_ROOT,
+  "packages",
+  "scripts",
+  "rm-path-recursive.mjs",
+);
 
 const BUN_VERSION = "1.3.14";
 // Bun 1.3.13 had a segfault during inference on Cuttlefish at peak
@@ -304,6 +310,13 @@ function run(command, args, { cwd } = {}) {
   });
 }
 
+function removePathRecursiveSync(targetPath) {
+  execFileSync(process.execPath, [CLEANUP_HELPER_SCRIPT, targetPath], {
+    cwd: ELIZA_REPO_ROOT,
+    stdio: "ignore",
+  });
+}
+
 async function downloadFile(url, targetPath) {
   const response = await fetch(url);
   if (!response.ok) {
@@ -589,7 +602,7 @@ async function ensureBunBinary({ cacheDir, bunArch, bunChannel, log }) {
   }
   if (fs.existsSync(bunPath)) fs.unlinkSync(bunPath);
   fs.renameSync(extractedBun, bunPath);
-  fs.rmSync(extractedDir, { recursive: true, force: true });
+  removePathRecursiveSync(extractedDir);
   fs.rmSync(zipPath, { force: true });
   fs.chmodSync(bunPath, 0o755);
   if (expectedRiscv64Sha256) {
@@ -645,7 +658,7 @@ async function ensureAlpineApkExtracted({ cacheDir, alpineArch, log }) {
     return extractDir;
   }
   fs.mkdirSync(archCache, { recursive: true });
-  fs.rmSync(extractDir, { recursive: true, force: true });
+  removePathRecursiveSync(extractDir);
   fs.mkdirSync(extractDir, { recursive: true });
   for (const { pkg, file } of APK_PACKAGES) {
     const apkPath = path.join(archCache, file);

package/scripts/lib/verify-ondevice-artifact.test.mts

@@ -1,11 +1,28 @@
+import { execFileSync } from "node:child_process";
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
 
 import { writeRendererBuildManifest } from "./renderer-build-manifest.mjs";
+import { resolveRepoRootFromImportMeta } from "./repo-root.mjs";
 import { verifyStagedArtifact } from "./verify-ondevice-artifact.mjs";
 
+const repoRoot = resolveRepoRootFromImportMeta(import.meta.url);
+const cleanupHelperScript = path.join(
+  repoRoot,
+  "packages",
+  "scripts",
+  "rm-path-recursive.mjs",
+);
+
+function removePathRecursive(targetPath: string) {
+  execFileSync(process.execPath, [cleanupHelperScript, targetPath], {
+    cwd: repoRoot,
+    stdio: "inherit",
+  });
+}
+
 let tmp: string;
 
 beforeEach(() => {
@@ -13,7 +30,7 @@ beforeEach(() => {
 });
 
 afterEach(() => {
-  fs.rmSync(tmp, { recursive: true, force: true });
+  removePathRecursive(tmp);
 });
 
 function makeDist(dir: string, asset = "index-abc.js") {

package/scripts/link-docker-local-app-packages.mjs

@@ -1,11 +1,16 @@
 #!/usr/bin/env node
 
+import { execFileSync } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
 import { resolveRepoRootFromImportMeta } from "./lib/repo-root.mjs";
 import { collectWorkspaceMaps } from "./lib/workspace-discovery.mjs";
 
 const repoRoot = resolveRepoRootFromImportMeta(import.meta.url);
+const recursiveCleanupScript = path.join(
+  repoRoot,
+  "packages/scripts/rm-path-recursive.mjs",
+);
 const rootPkg = JSON.parse(
   fs.readFileSync(path.join(repoRoot, "package.json"), "utf8"),
 );
@@ -202,6 +207,22 @@ function pathExists(filePath) {
   }
 }
 
+function removeDirectoryRecursive(filePath) {
+  try {
+    execFileSync("node", [recursiveCleanupScript, filePath], {
+      cwd: repoRoot,
+      encoding: "utf8",
+      stdio: "pipe",
+    });
+  } catch (error) {
+    const detail = [error?.stdout, error?.stderr].filter(Boolean).join("\n");
+    throw new Error(
+      `Failed to remove directory ${filePath}${detail ? `: ${detail}` : ""}`,
+      { cause: error },
+    );
+  }
+}
+
 function removePath(filePath) {
   try {
     const stat = fs.lstatSync(filePath);
@@ -209,7 +230,11 @@ function removePath(filePath) {
       fs.unlinkSync(filePath);
       return;
     }
-    fs.rmSync(filePath, { force: true, recursive: stat.isDirectory() });
+    if (stat.isDirectory()) {
+      removeDirectoryRecursive(filePath);
+      return;
+    }
+    fs.rmSync(filePath, { force: true });
   } catch (error) {
     if (error?.code === "ENOENT") {
       return;

package/scripts/mas-smoke.test.mjs

@@ -14,11 +14,12 @@
  */
 
 import assert from "node:assert/strict";
-import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { execFileSync } from "node:child_process";
+import { mkdirSync, mkdtempSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import test from "node:test";
-
+import { resolveRepoRootFromImportMeta } from "./lib/repo-root.mjs";
 import {
   findMachOFiles,
   isMachO,
@@ -26,6 +27,21 @@ import {
   walkBundleFiles,
 } from "./mas-smoke.mjs";
 
+const repoRoot = resolveRepoRootFromImportMeta(import.meta.url);
+const cleanupHelperScript = path.join(
+  repoRoot,
+  "packages",
+  "scripts",
+  "rm-path-recursive.mjs",
+);
+
+function removePathRecursive(targetPath) {
+  execFileSync(process.execPath, [cleanupHelperScript, targetPath], {
+    cwd: repoRoot,
+    stdio: "inherit",
+  });
+}
+
 const SAMPLE_PLIST = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -106,7 +122,7 @@ test("isMachO detects 64-bit Mach-O magic", () => {
     writeFileSync(machoPath, MACHO_HEADER_64);
     assert.equal(isMachO(machoPath), true);
   } finally {
-    rmSync(dir, { recursive: true, force: true });
+    removePathRecursive(dir);
   }
 });
 
@@ -117,7 +133,7 @@ test("isMachO detects fat (universal) Mach-O magic", () => {
     writeFileSync(machoPath, MACHO_HEADER_FAT);
     assert.equal(isMachO(machoPath), true);
   } finally {
-    rmSync(dir, { recursive: true, force: true });
+    removePathRecursive(dir);
   }
 });
 
@@ -128,7 +144,7 @@ test("isMachO returns false on non-Mach-O files", () => {
     writeFileSync(textPath, NOT_MACHO);
     assert.equal(isMachO(textPath), false);
   } finally {
-    rmSync(dir, { recursive: true, force: true });
+    removePathRecursive(dir);
   }
 });
 
@@ -139,7 +155,7 @@ test("isMachO returns false on tiny files (too small for magic)", () => {
     writeFileSync(tinyPath, Buffer.from([0xfe, 0xed])); // only 2 bytes
     assert.equal(isMachO(tinyPath), false);
   } finally {
-    rmSync(dir, { recursive: true, force: true });
+    removePathRecursive(dir);
   }
 });
 
@@ -164,7 +180,7 @@ test("walkBundleFiles enumerates files recursively, skipping directories", () =>
       ],
     );
   } finally {
-    rmSync(dir, { recursive: true, force: true });
+    removePathRecursive(dir);
   }
 });
 
@@ -189,7 +205,7 @@ test("findMachOFiles returns only files matching Mach-O magic", () => {
       .sort();
     assert.deepEqual(machos, ["Contents/MacOS/bun", "Contents/MacOS/launcher"]);
   } finally {
-    rmSync(dir, { recursive: true, force: true });
+    removePathRecursive(dir);
   }
 });
 
@@ -215,6 +231,6 @@ test("findMachOFiles handles deeply nested binaries (e.g. Frameworks)", () => {
       "Contents/Frameworks/Foo.framework/Versions/A/Foo",
     ]);
   } finally {
-    rmSync(dir, { recursive: true, force: true });
+    removePathRecursive(dir);
   }
 });

package/scripts/omnivoice-fuse/prepare.mjs

@@ -17,9 +17,10 @@
  * is no fallback path.
  */
 
-import { spawnSync } from "node:child_process";
+import { execFileSync, spawnSync } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
+import { fileURLToPath } from "node:url";
 
 const OMNIVOICE_REPO =
   process.env.ELIZA_OMNIVOICE_REMOTE ||
@@ -36,6 +37,13 @@ export const OMNIVOICE_GGML_REF =
   process.env.ELIZA_OMNIVOICE_GGML_REF ||
   "0e3980ef205ea3639650f59e54cfeecd7d947700";
 
+const SCRIPT_PATH = fileURLToPath(import.meta.url);
+const SCRIPT_DIR = path.dirname(SCRIPT_PATH);
+const RECURSIVE_CLEANUP_SCRIPT = path.resolve(
+  SCRIPT_DIR,
+  "../../../scripts/rm-path-recursive.mjs",
+);
+
 // Subdirectory inside the llama.cpp checkout where omnivoice sources
 // land. Stable so the CMake graft and the symbol verifier agree.
 export const OMNIVOICE_GRAFT_SUBDIR = "omnivoice";
@@ -72,6 +80,21 @@ function run(cmd, args, opts = {}) {
   return result.stdout?.trim() ?? "";
 }
 
+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(
+      `[omnivoice-fuse] failed to remove directory ${targetPath}${detail ? `: ${detail}` : ""}`,
+      { cause: error },
+    );
+  }
+}
+
 function copyDirRecursive(src, dst) {
   fs.mkdirSync(dst, { recursive: true });
   for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
@@ -101,7 +124,7 @@ function replaceBetween(source, startMarker, endMarker, replacement) {
   return source.slice(0, start) + replacement + source.slice(end);
 }
 
-function writeElizaFfiAdapter({ graftRoot, commit }) {
+function writeElizaFfiAdapter({ graftRoot }) {
   const ffiHeaderSrc = new URL("./ffi.h", import.meta.url).pathname;
   const ffiHeaderDst = path.join(graftRoot, "src", "ffi.h");
   fs.copyFileSync(ffiHeaderSrc, ffiHeaderDst);
@@ -2201,7 +2224,7 @@ static struct ggml_tensor * dac_conv_t1d(struct ggml_context * ctx,
     `#pragma once\n#define OMNIVOICE_VERSION "${commit.slice(0, 12)} (eliza-fused)"\n`,
     "utf8",
   );
-  writeElizaFfiAdapter({ graftRoot, commit });
+  writeElizaFfiAdapter({ graftRoot });
 }
 
 // Ensure a clone of omnivoice.cpp at OMNIVOICE_REF lives under
@@ -2685,7 +2708,7 @@ export function prepareOmnivoiceFusion({
   // If a previous run left an aborted graft behind, blow it away. The
   // git checkout itself remains untouched — we only own the graft
   // subdirectory.
-  fs.rmSync(graftRoot, { recursive: true, force: true });
+  removeDirectoryRecursive(graftRoot);
   fs.mkdirSync(graftRoot, { recursive: true });
 
   for (const subdir of ["src", "tools"]) {