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

package/scripts/ios-xcframework/build-xcframework.mjs

@@ -29,7 +29,7 @@
  *   - xcodebuild -create-xcframework failure = hard error.
  */
 
-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";
@@ -41,9 +41,10 @@ const __dirname = path.dirname(__filename);
 
 // packages/app-core/scripts/ios-xcframework → packages/app-core/scripts
 const SCRIPTS_DIR = path.resolve(__dirname, "..");
-const MTP_BUILD_SCRIPT = path.join(
+const MTP_BUILD_SCRIPT = path.join(SCRIPTS_DIR, "build-llama-cpp-mtp.mjs");
+const RECURSIVE_CLEANUP_SCRIPT = path.resolve(
   SCRIPTS_DIR,
-  "build-llama-cpp-mtp.mjs",
+  "../../scripts/rm-path-recursive.mjs",
 );
 
 // Per AGENTS.md §3, the required kernels for any Eliza-1 binary.
@@ -273,6 +274,20 @@ function run(cmd, args, opts = {}) {
   }
 }
 
+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,
+    });
+  }
+}
+
 /**
  * @param {string} cmd
  * @param {string[]} args
@@ -350,7 +365,7 @@ function buildStaticFramework(tmpDir, slice, target) {
     `${target.platform}-arm64${target.isSimulator ? "-simulator" : ""}`,
     "LlamaCpp.framework",
   );
-  fs.rmSync(frameworkDir, { recursive: true, force: true });
+  removeDirectoryRecursive(frameworkDir);
   fs.mkdirSync(frameworkDir, { recursive: true });
 
   // Combine every produced .a into one universal-of-one archive named
@@ -580,11 +595,7 @@ async function main() {
       console.log(
         `[ios-xcframework] simulator slice missing — invoking mtp build`,
       );
-      run("node", [
-        MTP_BUILD_SCRIPT,
-        "--target",
-        "ios-arm64-simulator-metal",
-      ]);
+      run("node", [MTP_BUILD_SCRIPT, "--target", "ios-arm64-simulator-metal"]);
     }
   }
 
@@ -621,7 +632,7 @@ async function main() {
     });
 
     fs.mkdirSync(path.dirname(args.output), { recursive: true });
-    fs.rmSync(args.output, { recursive: true, force: true });
+    removeDirectoryRecursive(args.output);
 
     run("xcodebuild", [
       "-create-xcframework",
@@ -638,7 +649,7 @@ async function main() {
     }
     console.log(`[ios-xcframework] wrote ${args.output}`);
   } finally {
-    fs.rmSync(tmpDir, { recursive: true, force: true });
+    removeDirectoryRecursive(tmpDir);
   }
 }
 

package/scripts/ios-xcframework/run-physical-device-smoke.mjs

@@ -26,7 +26,7 @@
  * real Eliza-1 bundle smoke can run.
  */
 
-import { spawn, spawnSync } from "node:child_process";
+import { execFileSync, spawn, spawnSync } from "node:child_process";
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
@@ -38,6 +38,12 @@ const __dirname = path.dirname(__filename);
 const REPO_ROOT = path.resolve(__dirname, "..", "..", "..", "..");
 const APP_DIR = path.join(REPO_ROOT, "packages", "app");
 const XCFRAMEWORK_BUILD_SCRIPT = path.join(__dirname, "build-xcframework.mjs");
+const RECURSIVE_CLEANUP_SCRIPT = path.join(
+  REPO_ROOT,
+  "packages",
+  "scripts",
+  "rm-path-recursive.mjs",
+);
 
 const LLAMA_SYMBOLS = [
   "llama_init_context",
@@ -196,9 +202,13 @@ function parseArgs(argv) {
         args.xcodebuildArgs.push(next());
         break;
       case "--help":
+        printHelp();
+        process.exit(0);
+        break;
       case "-h":
         printHelp();
         process.exit(0);
+        break;
       default:
         throw new Error(`Unknown argument: ${a}`);
     }
@@ -1049,7 +1059,9 @@ function extractBenchmarkResults(text) {
   const results = [];
   const re = /ELIZA_IOS_TPS_RESULT\s+(\{[^\n]+\})/g;
   let match;
-  while ((match = re.exec(text)) !== null) {
+  while (true) {
+    match = re.exec(text);
+    if (match === null) break;
     try {
       results.push(JSON.parse(match[1]));
     } catch {
@@ -1469,6 +1481,55 @@ final class ElizaIosRuntimeSmokeTests: XCTestCase {
   private let voiceSymbols: [String] = ${swiftArray(voiceSymbols)}
   private let benchmarkResourceName = ${jsString(benchmarkResourceName)}
 
+  private func thermalStateName() -> String {
+    switch ProcessInfo.processInfo.thermalState {
+    case .nominal:
+      return "nominal"
+    case .fair:
+      return "fair"
+    case .serious:
+      return "serious"
+    case .critical:
+      return "critical"
+    @unknown default:
+      return "unknown"
+    }
+  }
+
+  private func memoryFootprintBytes() -> Int64? {
+    var info = task_vm_info_data_t()
+    var count = mach_msg_type_number_t(MemoryLayout<task_vm_info_data_t>.stride / MemoryLayout<integer_t>.stride)
+    let result = withUnsafeMutablePointer(to: &info) { pointer in
+      pointer.withMemoryRebound(to: integer_t.self, capacity: Int(count)) { rebound in
+        task_info(mach_task_self_, task_flavor_t(TASK_VM_INFO), rebound, &count)
+      }
+    }
+    guard result == KERN_SUCCESS else {
+      return nil
+    }
+    return Int64(info.phys_footprint)
+  }
+
+  private func addBenchmarkTelemetry(
+    to report: inout [String: Any],
+    memoryBeforeBytes: Int64?,
+    memoryAfterBytes: Int64?,
+    thermalStateBefore: String,
+    thermalStateAfter: String
+  ) {
+    report["thermal_state_before"] = thermalStateBefore
+    report["thermal_state_after"] = thermalStateAfter
+    if let memoryBeforeBytes {
+      report["memory_footprint_before_bytes"] = memoryBeforeBytes
+    }
+    if let memoryAfterBytes {
+      report["memory_footprint_after_bytes"] = memoryAfterBytes
+    }
+    if let memoryBeforeBytes, let memoryAfterBytes {
+      report["memory_footprint_delta_bytes"] = memoryAfterBytes - memoryBeforeBytes
+    }
+  }
+
   func testMetalDeviceIsAvailableOnPhysicalIos() throws {
     XCTAssertNil(ProcessInfo.processInfo.environment["SIMULATOR_DEVICE_NAME"], "This smoke must run on physical iOS hardware, not a simulator.")
     let device = MTLCreateSystemDefaultDevice()
@@ -1517,11 +1578,15 @@ final class ElizaIosRuntimeSmokeTests: XCTestCase {
     )
 
     for mode in ["cpu", "metal"] {
+      let memoryBeforeBytes = memoryFootprintBytes()
+      let thermalStateBefore = thermalStateName()
       let ptr = modelURL.path.withCString { cPath in
         mode.withCString { cMode in
           eliza_ios_text_benchmark_run(cPath, cMode)
         }
       }
+      let memoryAfterBytes = memoryFootprintBytes()
+      let thermalStateAfter = thermalStateName()
       let raw = try XCTUnwrap(ptr, "eliza_ios_text_benchmark_run returned null for \\(mode)")
       defer { eliza_ios_ffi_abi_smoke_free(raw) }
 
@@ -1530,7 +1595,7 @@ final class ElizaIosRuntimeSmokeTests: XCTestCase {
       let jsonObject = try JSONSerialization.jsonObject(with: data)
       let json = try XCTUnwrap(jsonObject as? [String: Any], "Benchmark result is not a JSON object for \\(mode): \\(text)")
       if let error = json["error"] as? String {
-        let report: [String: Any] = [
+        var report: [String: Any] = [
           "mode": mode,
           "model": benchmarkResourceName,
           "error": error,
@@ -1540,6 +1605,13 @@ final class ElizaIosRuntimeSmokeTests: XCTestCase {
           "prompt_per_second": 0,
           "predicted_per_second": 0
         ]
+        addBenchmarkTelemetry(
+          to: &report,
+          memoryBeforeBytes: memoryBeforeBytes,
+          memoryAfterBytes: memoryAfterBytes,
+          thermalStateBefore: thermalStateBefore,
+          thermalStateAfter: thermalStateAfter
+        )
         let reportData = try JSONSerialization.data(withJSONObject: report, options: [.sortedKeys])
         print("ELIZA_IOS_TPS_RESULT " + String(data: reportData, encoding: .utf8)!)
         XCTFail("llama_completion failed for \\(mode): \\(error)")
@@ -1555,7 +1627,7 @@ final class ElizaIosRuntimeSmokeTests: XCTestCase {
       XCTAssertGreaterThan(predictedPerSecond, 0, "predicted_per_second must be positive for \\(mode)")
       XCTAssertGreaterThan(predicted, 0, "tokens_predicted must be positive for \\(mode)")
 
-      let report: [String: Any] = [
+      var report: [String: Any] = [
         "mode": mode,
         "model": benchmarkResourceName,
         "tokens_predicted": predicted,
@@ -1563,6 +1635,13 @@ final class ElizaIosRuntimeSmokeTests: XCTestCase {
         "prompt_per_second": promptPerSecond,
         "predicted_per_second": predictedPerSecond
       ]
+      addBenchmarkTelemetry(
+        to: &report,
+        memoryBeforeBytes: memoryBeforeBytes,
+        memoryAfterBytes: memoryAfterBytes,
+        thermalStateBefore: thermalStateBefore,
+        thermalStateAfter: thermalStateAfter
+      )
       let reportData = try JSONSerialization.data(withJSONObject: report, options: [.sortedKeys])
       print("ELIZA_IOS_TPS_RESULT " + String(data: reportData, encoding: .utf8)!)
     }
@@ -1639,6 +1718,20 @@ function writeReport(reportPath, report) {
   );
 }
 
+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,
+    });
+  }
+}
+
 function hasXcodebuildArg(args, flag) {
   return args.xcodebuildArgs.includes(flag);
 }
@@ -1753,7 +1846,7 @@ async function main() {
     };
     writeReport(args.report, report);
     if (tempDir && !args.keepTemp) {
-      fs.rmSync(tempDir, { recursive: true, force: true });
+      removeDirectoryRecursive(tempDir);
     }
     process.stderr.write(`${report.error}\n`);
     process.exit(signal === "SIGINT" ? 130 : 143);
@@ -1933,7 +2026,7 @@ async function main() {
     process.off("SIGINT", signalHandler);
     process.off("SIGTERM", signalHandler);
     if (tempDir && !args.keepTemp) {
-      fs.rmSync(tempDir, { recursive: true, force: true });
+      removeDirectoryRecursive(tempDir);
     } else if (tempDir) {
       console.log(`[ios-smoke] kept temp package at ${tempDir}`);
     }