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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elizaos/app-core",
-  "version": "2.0.3-beta.3",
+  "version": "2.0.3-beta.4",
   "description": "Shared application core for elizaOS white-label agent apps.",
   "type": "module",
   "license": "MIT",
@@ -155,22 +155,22 @@
     "three": "^0.184.0"
   },
   "optionalDependencies": {
-    "@elizaos/capacitor-appblocker": "2.0.3-beta.3",
-    "@elizaos/capacitor-bun-runtime": "2.0.3-beta.3",
-    "@elizaos/capacitor-camera": "2.0.3-beta.3",
-    "@elizaos/capacitor-canvas": "2.0.3-beta.3",
-    "@elizaos/capacitor-contacts": "2.0.3-beta.3",
-    "@elizaos/capacitor-gateway": "2.0.3-beta.3",
-    "@elizaos/capacitor-location": "2.0.3-beta.3",
-    "@elizaos/capacitor-messages": "2.0.3-beta.3",
-    "@elizaos/capacitor-mobile-agent-bridge": "2.0.3-beta.3",
-    "@elizaos/capacitor-mobile-signals": "2.0.3-beta.3",
-    "@elizaos/capacitor-phone": "2.0.3-beta.3",
-    "@elizaos/capacitor-screencapture": "2.0.3-beta.3",
-    "@elizaos/capacitor-swabble": "2.0.3-beta.3",
-    "@elizaos/capacitor-system": "2.0.3-beta.3",
-    "@elizaos/capacitor-talkmode": "2.0.3-beta.3",
-    "@elizaos/capacitor-websiteblocker": "2.0.3-beta.3",
+    "@elizaos/capacitor-appblocker": "2.0.3-beta.4",
+    "@elizaos/capacitor-bun-runtime": "2.0.3-beta.4",
+    "@elizaos/capacitor-camera": "2.0.3-beta.4",
+    "@elizaos/capacitor-canvas": "2.0.3-beta.4",
+    "@elizaos/capacitor-contacts": "2.0.3-beta.4",
+    "@elizaos/capacitor-gateway": "2.0.3-beta.4",
+    "@elizaos/capacitor-location": "2.0.3-beta.4",
+    "@elizaos/capacitor-messages": "2.0.3-beta.4",
+    "@elizaos/capacitor-mobile-agent-bridge": "2.0.3-beta.4",
+    "@elizaos/capacitor-mobile-signals": "2.0.3-beta.4",
+    "@elizaos/capacitor-phone": "2.0.3-beta.4",
+    "@elizaos/capacitor-screencapture": "2.0.3-beta.4",
+    "@elizaos/capacitor-swabble": "2.0.3-beta.4",
+    "@elizaos/capacitor-system": "2.0.3-beta.4",
+    "@elizaos/capacitor-talkmode": "2.0.3-beta.4",
+    "@elizaos/capacitor-websiteblocker": "2.0.3-beta.4",
     "sharp": "^0.34.5"
   },
   "dependencies": {
@@ -184,24 +184,24 @@
     "@capacitor/preferences": "^8.0.1",
     "@capacitor/push-notifications": "^8.0.0",
     "@clack/prompts": "^1.0.0",
-    "@elizaos/core": "2.0.3-beta.3",
-    "@elizaos/plugin-anthropic": "2.0.3-beta.3",
-    "@elizaos/plugin-browser": "2.0.3-beta.3",
-    "@elizaos/plugin-edge-tts": "2.0.3-beta.3",
-    "@elizaos/plugin-elizacloud": "2.0.3-beta.3",
-    "@elizaos/plugin-groq": "2.0.3-beta.3",
-    "@elizaos/plugin-health": "2.0.3-beta.3",
-    "@elizaos/plugin-local-inference": "2.0.3-beta.3",
-    "@elizaos/plugin-openai": "2.0.3-beta.3",
-    "@elizaos/plugin-registry": "2.0.3-beta.3",
-    "@elizaos/plugin-sql": "2.0.3-beta.3",
-    "@elizaos/plugin-wechat": "2.0.3-beta.3",
-    "@elizaos/plugin-workflow": "2.0.3-beta.3",
-    "@elizaos/registry": "2.0.3-beta.3",
-    "@elizaos/shared": "2.0.3-beta.3",
-    "@elizaos/skills": "2.0.3-beta.3",
-    "@elizaos/ui": "2.0.3-beta.3",
-    "@elizaos/vault": "2.0.3-beta.3",
+    "@elizaos/core": "2.0.3-beta.4",
+    "@elizaos/plugin-anthropic": "2.0.3-beta.4",
+    "@elizaos/plugin-browser": "2.0.3-beta.4",
+    "@elizaos/plugin-edge-tts": "2.0.3-beta.4",
+    "@elizaos/plugin-elizacloud": "2.0.3-beta.4",
+    "@elizaos/plugin-groq": "2.0.3-beta.4",
+    "@elizaos/plugin-health": "2.0.3-beta.4",
+    "@elizaos/plugin-local-inference": "2.0.3-beta.4",
+    "@elizaos/plugin-openai": "2.0.3-beta.4",
+    "@elizaos/plugin-registry": "2.0.3-beta.4",
+    "@elizaos/plugin-sql": "2.0.3-beta.4",
+    "@elizaos/plugin-wechat": "2.0.3-beta.4",
+    "@elizaos/plugin-workflow": "2.0.3-beta.4",
+    "@elizaos/registry": "2.0.3-beta.4",
+    "@elizaos/shared": "2.0.3-beta.4",
+    "@elizaos/skills": "2.0.3-beta.4",
+    "@elizaos/ui": "2.0.3-beta.4",
+    "@elizaos/vault": "2.0.3-beta.4",
     "@node-rs/argon2": "^2.0.2",
     "@upstash/redis": "^1.37.0",
     "chalk": "^5.3.0",
@@ -222,5 +222,5 @@
   },
   "module": "./index.js",
   "types": "./index.d.ts",
-  "gitHead": "f54b0f4eaed317d59fa7dbcdce20f4cdb0734420"
+  "gitHead": "f76f55793a0fb8d6b869dd8ddce03970de061e34"
 }

package/platforms/electrobun/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elizaos/electrobun",
-  "version": "2.0.3-beta.3",
+  "version": "2.0.3-beta.4",
   "type": "module",
   "files": [
     "assets",
@@ -25,14 +25,14 @@
     "build:native-effects": "bash scripts/build-macos-effects.sh"
   },
   "dependencies": {
-    "@elizaos/agent": "2.0.3-beta.3",
-    "@elizaos/app-core": "2.0.3-beta.3",
-    "@elizaos/plugin-browser": "2.0.3-beta.3",
-    "@elizaos/plugin-capacitor-bridge": "2.0.3-beta.3",
-    "@elizaos/plugin-registry": "2.0.3-beta.3",
-    "@elizaos/plugin-remote-manifest": "2.0.3-beta.3",
-    "@elizaos/plugin-streaming": "2.0.3-beta.3",
-    "@elizaos/shared": "2.0.3-beta.3",
+    "@elizaos/agent": "2.0.3-beta.4",
+    "@elizaos/app-core": "2.0.3-beta.4",
+    "@elizaos/plugin-browser": "2.0.3-beta.4",
+    "@elizaos/plugin-capacitor-bridge": "2.0.3-beta.4",
+    "@elizaos/plugin-registry": "2.0.3-beta.4",
+    "@elizaos/plugin-remote-manifest": "2.0.3-beta.4",
+    "@elizaos/plugin-streaming": "2.0.3-beta.4",
+    "@elizaos/shared": "2.0.3-beta.4",
     "bonjour-service": "1.4.2",
     "electrobun": "^1.18.1"
   },
@@ -46,5 +46,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f54b0f4eaed317d59fa7dbcdce20f4cdb0734420"
+  "gitHead": "f76f55793a0fb8d6b869dd8ddce03970de061e34"
 }

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

@@ -0,0 +1,110 @@
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+
+/**
+ * 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;
+}
+
+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"));
+    }
+  }
+  return includeDirs;
+}
+
+export function resolveDefaultAndroidAssetsDir({ root = process.cwd() } = {}) {
+  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",
+  );
+}

package/scripts/aosp/compile-libllama.mjs

@@ -187,8 +187,20 @@ 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`).
@@ -401,55 +413,6 @@ 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"));
-    }
-  }
-  return includeDirs;
-}
-
 /**
  * GGML_VULKAN CMake flags for the android-arm64 Vulkan backend. Points cmake at
  * the NDK's host `glslc` (the shader compiler ggml-vulkan's codegen invokes),
@@ -609,39 +572,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 +705,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

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

@@ -6,7 +6,7 @@ import {
   resolveAndroidNdkHostDir,
   resolveDefaultAndroidAssetsDir,
   resolveHomebrewFormulaIncludeDirs,
-} from "./compile-libllama.mjs";
+} from "./compile-libllama-paths.mjs";
 
 const tmpDirs = [];