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

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

@@ -0,0 +1,133 @@
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { afterEach, describe, expect, test } from "vitest";
+import {
+  resolveAndroidNdkHostDir,
+  resolveDefaultAndroidAssetsDir,
+  resolveHomebrewFormulaIncludeDirs,
+} from "./compile-libllama-paths.mjs";
+
+const tmpDirs = [];
+
+function makeTmpDir() {
+  const dir = fs.mkdtempSync(path.join(os.tmpdir(), "compile-libllama-test-"));
+  tmpDirs.push(dir);
+  return dir;
+}
+
+afterEach(() => {
+  while (tmpDirs.length > 0) {
+    fs.rmSync(tmpDirs.pop(), { recursive: true, force: true });
+  }
+});
+
+describe("compile-libllama Android Vulkan host resolution", () => {
+  test("uses the current OS host prebuilt instead of hardcoded linux", () => {
+    const prebuiltRoot = makeTmpDir();
+    fs.mkdirSync(path.join(prebuiltRoot, "darwin-x86_64"));
+    fs.mkdirSync(path.join(prebuiltRoot, "linux-x86_64"));
+
+    expect(
+      resolveAndroidNdkHostDir(prebuiltRoot, {
+        platform: "darwin",
+        arch: "arm64",
+      }),
+    ).toBe("darwin-x86_64");
+  });
+
+  test("does not select a prebuilt for the wrong host OS", () => {
+    const prebuiltRoot = makeTmpDir();
+    fs.mkdirSync(path.join(prebuiltRoot, "linux-x86_64"));
+
+    expect(
+      resolveAndroidNdkHostDir(prebuiltRoot, {
+        platform: "darwin",
+        arch: "arm64",
+      }),
+    ).toBeNull();
+  });
+
+  test("expands Homebrew opt and versioned Cellar include roots", () => {
+    const prefix = makeTmpDir();
+    fs.mkdirSync(path.join(prefix, "Cellar", "vulkan-headers", "1.3.290"), {
+      recursive: true,
+    });
+
+    expect(
+      resolveHomebrewFormulaIncludeDirs("vulkan-headers", [prefix]),
+    ).toEqual([
+      path.join(prefix, "opt", "vulkan-headers", "include"),
+      path.join(prefix, "Cellar", "vulkan-headers", "1.3.290", "include"),
+    ]);
+  });
+});
+
+describe("compile-libllama Android assets dir resolution", () => {
+  test("prefers the flat elizaOS packages/app shell when present", () => {
+    const root = makeTmpDir();
+    fs.mkdirSync(path.join(root, "packages", "app", "android"), {
+      recursive: true,
+    });
+    fs.mkdirSync(path.join(root, "apps", "app", "android"), {
+      recursive: true,
+    });
+
+    expect(resolveDefaultAndroidAssetsDir({ root })).toBe(
+      path.join(
+        root,
+        "packages",
+        "app",
+        "android",
+        "app",
+        "src",
+        "main",
+        "assets",
+        "agent",
+      ),
+    );
+  });
+
+  test("uses host apps/app shell when packages/app is absent", () => {
+    const root = makeTmpDir();
+    fs.mkdirSync(path.join(root, "apps", "app", "android"), {
+      recursive: true,
+    });
+
+    expect(resolveDefaultAndroidAssetsDir({ root })).toBe(
+      path.join(
+        root,
+        "apps",
+        "app",
+        "android",
+        "app",
+        "src",
+        "main",
+        "assets",
+        "agent",
+      ),
+    );
+  });
+
+  test("falls back to nested eliza/packages/app shell", () => {
+    const root = makeTmpDir();
+    fs.mkdirSync(path.join(root, "eliza", "packages", "app", "android"), {
+      recursive: true,
+    });
+
+    expect(resolveDefaultAndroidAssetsDir({ root })).toBe(
+      path.join(
+        root,
+        "eliza",
+        "packages",
+        "app",
+        "android",
+        "app",
+        "src",
+        "main",
+        "assets",
+        "agent",
+      ),
+    );
+  });
+});

package/scripts/aosp/compile-shim.mjs

@@ -62,7 +62,11 @@ import os from "node:os";
 import path from "node:path";
 import process from "node:process";
 import { fileURLToPath } from "node:url";
-import { ensureZigDrivers, probeZig } from "./compile-libllama.mjs";
+import {
+  assertZigPinForTargets,
+  ensureZigDrivers,
+  probeZig,
+} from "./compile-libllama.mjs";
 
 const here = path.dirname(fileURLToPath(import.meta.url));
 
@@ -329,6 +333,22 @@ export async function main(argv = process.argv.slice(2)) {
   const args = parseArgs(argv);
   const zigVersion = probeZig();
   console.log(`[compile-shim] Found zig ${zigVersion}`);
+  // Same aarch64/x86_64 `*-linux-musl` lld link as compile-libllama — pin the
+  // zig 0.13.x series so a 0.16 toolchain's lld doesn't SIGSEGV the link.
+  assertZigPinForTargets({
+    version: zigVersion,
+    zigTriples: args.abis.map((abi) => {
+      const target = SHIM_ABI_TARGETS.find((t) => t.androidAbi === abi);
+      if (!target) {
+        throw new Error(
+          `[compile-shim] unknown ABI ${abi}; expected one of ${SHIM_ABI_TARGETS.map(
+            (t) => t.androidAbi,
+          ).join(", ")}.`,
+        );
+      }
+      return target.zigTarget;
+    }),
+  });
 
   for (const abi of args.abis) {
     if (args.skipIfPresent) {

package/scripts/aosp/deploy-pixel.mjs

@@ -326,7 +326,7 @@ async function main(argv = process.argv.slice(2)) {
     if (args.voice) {
       console.log(
         "[deploy-pixel] (dry-run) would run the on-device voice round-trip check " +
-          "(mic→VAD→Qwen3-ASR→MTP text→OmniVoice TTS) via the local-inference voice endpoint, " +
+          "(mic→VAD→local ASR→MTP text→OmniVoice TTS) via the local-inference voice endpoint, " +
           "reporting TTFT-from-utterance-end.",
       );
     }

package/scripts/aosp/stage-default-models.mjs

@@ -12,8 +12,8 @@
 //   once at APK build time, then every install is offline-capable.
 //
 // Output (per ABI is unnecessary — GGUF files are arch-independent):
-//   apps/app/android/app/src/main/assets/agent/models/<file>.gguf
-//   apps/app/android/app/src/main/assets/agent/models/manifest.json
+//   packages/app-core/platforms/android/app/src/main/assets/agent/models/<file>.gguf
+//   packages/app-core/platforms/android/app/src/main/assets/agent/models/manifest.json
 //
 // On-device: ElizaAgentService (or any white-label fork's equivalent)
 // extracts assets/agent/models/* into the per-user state dir's
@@ -25,9 +25,9 @@
 //
 // APK size impact (Q4_K_M quants):
 //   eliza-1-2B                   ~1.2 GB
-//   eliza-1-0.8B                   ~0.5 GB
+//   kokoro voice + preset        ~0.2 GB
 //   --------------------------------------
-//   total                          ~1.7 GB
+//   total                          ~1.4 GB
 //
 // Opt out for builders who want to download at runtime instead:
 //   --skip-bundled-models       (passed by build-aosp.mjs)
@@ -56,8 +56,8 @@ const repoRoot = resolveRepoRootFromImportMeta(import.meta.url);
  * eliza/packages/app-core/src/services/local-inference/catalog.ts so the
  * runtime registry treats them as known catalog models, not orphans.
  *
- * The Android image bundles the two mobile-friendly chat tiers so first boot
- * can pick 2B on modern devices and fall back to 0.8B on tight RAM.
+ * The Android image bundles the 2B chat tier — the smallest/entry tier and the
+ * small-phone floor — so first boot has a local chat model on tight RAM.
  *
  * Sizes are sanity-checked at download time. If HuggingFace serves
  * a smaller file (e.g. partial download, repo deleted, replaced) the
@@ -74,17 +74,6 @@ const CHAT_MODEL_ELIZA_1_MOBILE = {
   role: "chat",
 };
 
-const CHAT_MODEL_ELIZA_1_LITE = {
-  id: "eliza-1-0_8b",
-  displayName: "eliza-1-0.8B",
-  hfRepo: "elizaos/eliza-1",
-  hfPath: "bundles/0_8b/text/eliza-1-0_8b-128k.gguf",
-  ggufFile: "text/eliza-1-0_8b-128k.gguf",
-  expectedMinBytes: 300 * 1024 * 1024,
-  expectedMaxBytes: 800 * 1024 * 1024,
-  role: "chat",
-};
-
 // Kokoro-82M voice — the on-device TTS voice. Without it the bundle has no
 // tts/ model, so the runtime can't synthesize and the app falls back to the
 // platform TextToSpeech (the "android voice"). Kokoro is the small/fast voice
@@ -96,7 +85,7 @@ const VOICE_MODEL_KOKORO = {
   id: "eliza-1-kokoro",
   displayName: "Eliza-1 Voice (Kokoro)",
   hfRepo: "elizaos/eliza-1",
-  hfPath: "bundles/0_8b/tts/kokoro/kokoro-82m-v1_0-Q4_K_M.gguf",
+  hfPath: "bundles/2b/tts/kokoro/kokoro-82m-v1_0-Q4_K_M.gguf",
   ggufFile: "tts/kokoro/kokoro-82m-v1_0-Q4_K_M.gguf",
   expectedMinBytes: 150 * 1024 * 1024,
   expectedMaxBytes: 200 * 1024 * 1024,
@@ -116,23 +105,27 @@ const VOICE_PRESET_KOKORO = {
 
 export const DEFAULT_MODELS = [
   CHAT_MODEL_ELIZA_1_MOBILE,
-  CHAT_MODEL_ELIZA_1_LITE,
   VOICE_MODEL_KOKORO,
   VOICE_PRESET_KOKORO,
 ];
 
-const ASSETS_MODELS_DIR = path.join(
-  repoRoot,
-  "apps",
-  "app",
-  "android",
-  "app",
-  "src",
-  "main",
-  "assets",
-  "agent",
-  "models",
-);
+export function resolveDefaultModelsAssetsDir(root = repoRoot) {
+  return path.join(
+    root,
+    "packages",
+    "app-core",
+    "platforms",
+    "android",
+    "app",
+    "src",
+    "main",
+    "assets",
+    "agent",
+    "models",
+  );
+}
+
+const ASSETS_MODELS_DIR = resolveDefaultModelsAssetsDir(repoRoot);
 
 const MANIFEST_PATH = path.join(ASSETS_MODELS_DIR, "manifest.json");
 

package/scripts/aosp/stage-default-models.test.mjs

@@ -0,0 +1,23 @@
+import { describe, expect, it } from "bun:test";
+import path from "node:path";
+import { resolveDefaultModelsAssetsDir } from "./stage-default-models.mjs";
+
+describe("stage-default-models", () => {
+  it("stages Android assets into the app-core Capacitor project", () => {
+    expect(resolveDefaultModelsAssetsDir("/repo")).toBe(
+      path.join(
+        "/repo",
+        "packages",
+        "app-core",
+        "platforms",
+        "android",
+        "app",
+        "src",
+        "main",
+        "assets",
+        "agent",
+        "models",
+      ),
+    );
+  });
+});

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

@@ -17,8 +17,8 @@ import { afterEach, beforeEach, describe, expect, it } from "vitest";
 
 import {
   assertRequiredBundledPackagesLanded,
-  getWorkspacePackageRuntimeCopyEntries,
   getRuntimeDependencies,
+  getWorkspacePackageRuntimeCopyEntries,
   selectCopyTargetNodeModules,
   shouldCopyPackageEntry,
   shouldCopyWorkspacePublishEntry,
@@ -367,6 +367,27 @@ describe("assertRequiredBundledPackagesLanded", () => {
     ).toBe(path.join(requesterDestDir, "node_modules"));
   });
 
+  it("hoists the S3 client so packaged S3 adapters do not create tar-unsafe nested AWS paths", () => {
+    const rootDestDir = path.join(tmpDir, "dist");
+    const targetNodeModules = path.join(rootDestDir, "node_modules");
+    const requesterDestDir = path.join(
+      targetNodeModules,
+      "@brighter",
+      "storage-adapter-s3",
+    );
+
+    expect(
+      selectCopyTargetNodeModules({
+        name: "@aws-sdk/client-s3",
+        requesterDestDir,
+        rootDestDir,
+        targetNodeModules,
+        topLevelVersions: new Map([["@aws-sdk/client-s3", "3.1069.0"]]),
+        resolvedVersion: "3.1050.0",
+      }),
+    ).toBe(targetNodeModules);
+  });
+
   it("collapses WalletConnect patch drift to avoid duplicate desktop runtime copies", () => {
     const rootDestDir = path.join(tmpDir, "dist");
     const targetNodeModules = path.join(rootDestDir, "node_modules");

package/scripts/build-helpers/verify-fused-symbols.mjs

@@ -53,6 +53,32 @@ const STUB_MARKERS = Object.freeze([
   "unsupported in ABI-only build",
 ]);
 
+// #9508: the presence of this env-var name in libggml-vulkan.so proves the Mali
+// scalar-flash-attn subgroup-race mitigation is compiled in — it is only emitted
+// by source carrying the `VK_VENDOR_ID_ARM` `disable_subgroups` branch (the
+// override knob for it). A Vulkan backend WITHOUT this marker is the stale
+// pre-#9508 prebuilt that SIGABRTs mid-decode on Mali GPUs.
+const MALI_FA_MITIGATION_MARKER = "GGML_VK_FA_ALLOW_SUBGROUPS";
+
+// Mali flash-attn mitigation gate (#9508/#9528), extracted so the fail-closed
+// behavior is unit-testable headless (it is pure fs marker-scanning, no nm/otool).
+// A Vulkan fused build MUST ship a libggml-vulkan.so carrying the ARM
+// subgroup-race mitigation marker, or it SIGABRTs mid-decode on Mali GPUs.
+export function assertVulkanMaliMitigation({ lib, target }) {
+  if (!target.includes("vulkan")) return;
+  const vulkanBackend = path.join(path.dirname(lib), "libggml-vulkan.so");
+  if (!fs.existsSync(vulkanBackend)) {
+    throw new Error(
+      `[omnivoice-verify] symbol-verify: target=${target} is a Vulkan build but libggml-vulkan.so is missing next to ${lib} — the GPU backend did not build, so the fused lib would silently run CPU-only on device.`,
+    );
+  }
+  if (!binaryContainsAnyMarker(vulkanBackend, [MALI_FA_MITIGATION_MARKER])) {
+    throw new Error(
+      `[omnivoice-verify] symbol-verify: ${vulkanBackend} lacks the '${MALI_FA_MITIGATION_MARKER}' Mali flash-attn mitigation marker — this is a stale pre-#9508 GPU backend that SIGABRTs mid-decode on Mali. Build libggml-vulkan.so from source carrying the VK_VENDOR_ID_ARM disable_subgroups branch; never stage a prebuilt artifact into a release.`,
+    );
+  }
+}
+
 function pickToolForPlatform(target) {
   // target is e.g. "darwin-arm64-metal-fused", "linux-x64-vulkan-fused", etc.
   if (target.startsWith("darwin-") || target.startsWith("ios-")) {
@@ -421,6 +447,13 @@ function verifyFusedSymbolsInner({ outDir, target }) {
     );
   }
 
+  // Mali flash-attn mitigation gate (#9508). A Vulkan fused build MUST ship a
+  // libggml-vulkan.so that carries the ARM subgroup-race mitigation, or it
+  // SIGABRTs mid-decode on Mali GPUs (Tensor G-series etc.). Building from
+  // source emits the mitigation; copying a stale prebuilt does not. Fail-closed
+  // so a stale GPU backend can never be baked into a release APK.
+  assertVulkanMaliMitigation({ lib, target });
+
   if (isIos) {
     return {
       ok: true,

package/scripts/build-image.sh

@@ -115,9 +115,7 @@ load_env_file "deploy/deploy.env"
 
 APP_IMAGE="${APP_IMAGE:-eliza/agent}"
 APP_ENTRYPOINT="${APP_ENTRYPOINT:-app.mjs}"
-# F6 (#8812): start under plain `node` — the prebuilt dist is compiled JS with
-# `.ts` specifiers rewritten to `.js`, so the tsx loader only added startup tax.
-APP_CMD_START="${APP_CMD_START:-node ${APP_ENTRYPOINT} start}"
+APP_CMD_START="${APP_CMD_START:-node --import ./node_modules/tsx/dist/loader.mjs ${APP_ENTRYPOINT} start}"
 APP_PORT="${APP_PORT:-2138}"
 APP_API_BIND="${APP_API_BIND:-127.0.0.1}"
 OCI_SOURCE="${OCI_SOURCE:-}"

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

@@ -63,7 +63,13 @@ const DEPLOYMENT_TARGET =
 //    ios-deps tree is the historical fallback. Both carry the eliza kernels.
 const FORK_SRC_CANDIDATES = [
   process.env.ELIZA_MTP_LLAMA_CPP_SRC?.trim(),
-  path.join(repoRoot, "plugins", "plugin-local-inference", "native", "llama.cpp"),
+  path.join(
+    repoRoot,
+    "plugins",
+    "plugin-local-inference",
+    "native",
+    "llama.cpp",
+  ),
   path.join(repoRoot, "packages", "native", "ios-deps", "llama.cpp", "src"),
 ].filter(Boolean);
 
@@ -75,7 +81,7 @@ const SUPPORTED_TARGETS = [
 ];
 
 /** Per-target recipe. The iOS device + simulator slices differ only by SDK.
- *  The `-fused` variants additionally build the OmniVoice TTS + Qwen3-ASR FFI
+ *  The `-fused` variants additionally build the OmniVoice TTS + local ASR FFI
  *  (the eliza_inference_* voice ABI = libelizainference) and libmtmd into the
  *  slice, so the iOS XCFramework carries the real voice runtime instead of the
  *  fail-closed runtime-symbol shim. */
@@ -105,7 +111,7 @@ const REQUIRED_KERNELS = [
   { id: "turbo4", pattern: /turbo4/i },
 ];
 
-// ── Fused-only: the OmniVoice TTS + Qwen3-ASR FFI symbol set that distinguishes
+// ── Fused-only: the OmniVoice TTS + local ASR FFI symbol set that distinguishes
 //    a real libelizainference (ABI v4) from the fail-closed runtime shim. These
 //    mirror the eliza_inference_* half of ios-xcframework/build-xcframework.mjs
 //    REQUIRED_IOS_KERNEL_SYMBOLS plus an mtmd presence probe (the ASR path wraps
@@ -219,7 +225,7 @@ function collectArchives(buildDir, outDir) {
     .map((s) => s.trim())
     .filter(Boolean)
     .filter((p) =>
-      // Fused slices also stage libmtmd*.a (Qwen3-ASR projector),
+      // Fused slices also stage libmtmd*.a (local ASR projector),
       // libkokoro_lib*.a (Kokoro-82M TTS, ABI v10), and libelizainference*.a
       // (the eliza_inference_* voice ABI). NOT libomnivoice*.a —
       // elizainference_static already compiles the omnivoice CORE sources, so
@@ -276,12 +282,7 @@ function buildTarget(target) {
   log(`target=${target} sdk=${t.sdk} fork=${revision}`);
   log(`source: ${srcDir}`);
 
-  const buildDir = path.join(
-    STATE_DIR,
-    "local-inference",
-    "mtp-build",
-    target,
-  );
+  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 });
   }
@@ -319,7 +320,7 @@ function buildTarget(target) {
     "-DLLAMA_BUILD_TESTS=OFF",
     "-DLLAMA_BUILD_SERVER=OFF",
     "-DLLAMA_CURL=OFF",
-    // Fused voice slice: build the standalone libmtmd (the Qwen3-ASR audio
+    // Fused voice slice: build the standalone libmtmd (the local ASR audio
     // projector the eliza_inference ASR path wraps). The omnivoice subtree is
     // already configured (LLAMA_BUILD_OMNIVOICE defaults ON); we only need the
     // elizainference_static + mtmd targets, built by name below.
@@ -341,7 +342,7 @@ function buildTarget(target) {
   // library targets carry the full kernel set and need no signing.
   const buildTargets = ["llama", "ggml", "ggml-base", "ggml-cpu", "ggml-metal"];
   if (t.fused) {
-    // mtmd (Qwen3-ASR projector) + kokoro_lib (Kokoro-82M TTS, ABI v10) + the
+    // mtmd (local ASR projector) + kokoro_lib (Kokoro-82M TTS, ABI v10) + the
     // STATIC eliza_inference_* FFI archive. kokoro_lib must build before
     // elizainference_static links so the `if(TARGET kokoro_lib)` fold resolves.
     // NOT omnivoice-tts / omnivoice-codec: those CLIs include audio-io.h
@@ -352,7 +353,7 @@ function buildTarget(target) {
   }
   log(
     `cmake build (static libraries only) — compiles the Metal kernel set${
-      t.fused ? " + OmniVoice/Qwen3-ASR voice FFI" : ""
+      t.fused ? " + OmniVoice/local-ASR voice FFI" : ""
     }`,
   );
   run("cmake", [
@@ -381,7 +382,7 @@ function buildTarget(target) {
     );
   }
 
-  // Fused-only: prove the REAL OmniVoice TTS + Qwen3-ASR FFI (the eliza_inference_*
+  // Fused-only: prove the REAL OmniVoice TTS + local ASR FFI (the eliza_inference_*
   // voice ABI v4) and the mtmd projector are present in the staged archives, so
   // the xcframework assembler's real-vs-fail-closed-shim decision (keyed off
   // CAPABILITIES.omnivoice != null) is backed by actual symbols. The fork at
@@ -414,7 +415,7 @@ function buildTarget(target) {
     archives: archives.map((a) => path.basename(a)),
     // The xcframework assembler reads `omnivoice == null` as "use the
     // fail-closed runtime symbol shim". Fused slices carry the real
-    // libelizainference (OmniVoice TTS + Qwen3-ASR FFI), so they advertise a
+    // libelizainference (OmniVoice TTS + local ASR FFI), so they advertise a
     // non-null capability object → the assembler compiles the shim with
     // -DELIZA_IOS_REAL_ELIZAINFERENCE=1 (dropping the stub voice bodies) and the
     // real symbols resolve from the staged archive.
@@ -434,7 +435,7 @@ function buildTarget(target) {
               : 4,
           library: "libelizainference",
           tts: "omnivoice",
-          asr: "qwen3-asr",
+          asr: "local-asr",
           vad: "silero",
           kokoro: /(?:^|\s)_?eliza_inference_kokoro_synthesize\b/m.test(
             symbolsText,

package/scripts/check-i18n.mjs

@@ -17,7 +17,6 @@ const LOCALE_DIR = path.join(repoRoot, "packages/ui/src/i18n/locales");
 const SCAN_DIRS = [
   path.join(repoRoot, "packages/app-core/src"),
   path.join(repoRoot, "packages/ui/src"),
-  path.join(repoRoot, "packages/cloud-frontend/src"),
 ];
 const ALLOWLIST_PATH = path.join(__dirname, "i18n-dynamic-keys.json");
 const SOURCE_LOCALE = "en";