Merge branch 'develop' of https://github.com/elizaOS/eliza into feat/benchmarks-trajectory-replay

Author: Shaw

cloud/apps/api/tsconfig.json

@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "target": "ES2022",
-    "lib": ["ES2023", "WebWorker", "DOM.Iterable"],
+    "lib": ["ES2023", "WebWorker", "DOM", "DOM.Iterable"],
     "module": "ESNext",
     "moduleResolution": "Bundler",
     "noEmit": true,
@@ -21,6 +21,8 @@
       "@/types/*": ["../../packages/types/*"],
       "@/api/*": ["./*"],
       "@elizaos/billing": ["../../packages/billing/src/index.ts"],
+      "@elizaos/core": ["../../../packages/core/src/index.node.ts"],
+      "@elizaos/core/*": ["../../../packages/core/src/*"],
       "@elizaos/plugin-sql": ["../../../plugins/plugin-sql/src/index.ts"],
       "drizzle-orm": ["../../../plugins/plugin-sql/node_modules/drizzle-orm"],
       "drizzle-orm/*": ["../../../plugins/plugin-sql/node_modules/drizzle-orm/*"],

cloud/apps/frontend/tsconfig.json

@@ -12,7 +12,7 @@
     "skipLibCheck": true,
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "allowImportingTsExtensions": false,
+    "allowImportingTsExtensions": true,
     "types": ["vite/client", "node"],
     "composite": false,
     "declaration": false,
@@ -25,6 +25,8 @@
       "@/packages/*": ["../../packages/*"],
       "@elizaos/billing": ["../../packages/billing/src/index.ts"],
       "@elizaos/cloud-ui": ["../../packages/ui/src/index.ts"],
+      "@elizaos/core": ["../../../packages/core/src/index.node.ts"],
+      "@elizaos/core/*": ["../../../packages/core/src/*"],
       "@elizaos/plugin-sql": ["../../../plugins/plugin-sql/src/index.ts"],
       "@/*": ["./src/*"]
     }

cloud/packages/tests/unit/advertising-provider-contracts.test.ts

@@ -57,7 +57,7 @@ describe("advertising provider contracts", () => {
         status: 200,
         headers: { "content-type": "application/json" },
       });
-    }) as typeof fetch;
+    }) as unknown as typeof fetch;
 
     const { googleAdsProvider } = await import(
       `../../lib/services/advertising/providers/google.ts?case=${Date.now()}`
@@ -112,7 +112,7 @@ describe("advertising provider contracts", () => {
         status: 200,
         headers: { "content-type": "application/json" },
       });
-    }) as typeof fetch;
+    }) as unknown as typeof fetch;
 
     const { metaAdsProvider } = await import(
       `../../lib/services/advertising/providers/meta.ts?case=${Date.now()}`
@@ -144,7 +144,7 @@ describe("advertising provider contracts", () => {
         status: 200,
         headers: { "content-type": "application/json" },
       });
-    }) as typeof fetch;
+    }) as unknown as typeof fetch;
 
     const { tiktokAdsProvider } = await import(
       `../../lib/services/advertising/providers/tiktok.ts?case=${Date.now()}`

cloud/packages/tests/unit/x402-payment-requests.test.ts

@@ -36,6 +36,8 @@ function paymentFixture(overrides: Partial<Record<string, unknown>> = {}) {
   };
 }
 
+type TestPayment = ReturnType<typeof paymentFixture>;
+
 async function loadService() {
   const mod = await import(
     new URL(
@@ -44,8 +46,8 @@ async function loadService() {
     ).href
   );
   return mod.x402PaymentRequestsService as {
-    toView: (payment: ReturnType<typeof paymentFixture>) => Record<string, unknown>;
-    toPublicView: (payment: ReturnType<typeof paymentFixture>) => Record<string, unknown>;
+    toView: (paymentRequest: TestPayment) => Record<string, unknown>;
+    toPublicView: (paymentRequest: TestPayment) => Record<string, unknown>;
     settle: (
       id: string,
       paymentPayloadInput: unknown,

packages/agent/src/external-modules.d.ts

@@ -335,11 +335,11 @@ declare module "@elizaos/plugin-openai";
 declare module "@elizaos/plugin-shell";
 declare module "@elizaos/plugin-x402" {
   import type {
+    IAgentRuntime,
     PaymentEnabledRoute,
     Route,
     RouteRequest,
     RouteResponse,
-    IAgentRuntime,
   } from "@elizaos/core";
 
   export interface X402StartupValidationResult {

packages/agent/tsconfig.json

@@ -40,6 +40,9 @@
       "@elizaos/capacitor-contacts": [
         "../native-plugins/contacts/src/index.ts"
       ],
+      "@elizaos/capacitor-llama": [
+        "../native-plugins/llama/src/index.ts"
+      ],
       "@elizaos/capacitor-phone": [
         "../native-plugins/phone/src/index.ts"
       ],
@@ -161,7 +164,8 @@
       "@elizaos/plugin-discord-local/*": [
         "../../plugins/plugin-discord-local/src/*"
       ],
-      "@elizaos/*": ["../../node_modules/@elizaos/*"]
+      "@elizaos/*": ["../../node_modules/@elizaos/*"],
+      "puppeteer-core": ["./node_modules/puppeteer-core"]
     }
   },
   "include": [

plugins/plugin-agent-orchestrator/__tests__/unit/session-log-reader.test.ts

@@ -80,7 +80,10 @@ function makeFixtureJsonl(): string {
             type: "tool_use",
             id: "toolu-grep-1",
             name: "Grep",
-            input: { pattern: "openExternalUrl", output_mode: "files_with_matches" },
+            input: {
+              pattern: "openExternalUrl",
+              output_mode: "files_with_matches",
+            },
           },
         ],
         stop_reason: "tool_use",
@@ -133,14 +136,14 @@ function makeFixtureJsonl(): string {
       sessionId: "session-fixture-1",
     },
   ];
-  return lines.map((l) => JSON.stringify(l)).join("\n") + "\n{not json}\n";
+  return `${lines.map((l) => JSON.stringify(l)).join("\n")}\n{not json}\n`;
 }
 
 describe("session-log-reader: path resolution", () => {
   it("encodes Claude Code project dir paths (/ and . → -)", () => {
-    expect(
-      encodeClaudeCodeProjectDir("/Users/x/.milady/workspaces/abc"),
-    ).toBe("-Users-x--milady-workspaces-abc");
+    expect(encodeClaudeCodeProjectDir("/Users/x/.milady/workspaces/abc")).toBe(
+      "-Users-x--milady-workspaces-abc",
+    );
   });
 
   it("returns both canonical and workspace-local candidates", () => {
@@ -175,12 +178,22 @@ describe("session-log-reader: path resolution", () => {
       encodeClaudeCodeProjectDir(workdir),
     );
     await mkdir(projectsDir, { recursive: true });
-    const older = join(projectsDir, "00000000-0000-0000-0000-000000000001.jsonl");
-    const newer = join(projectsDir, "00000000-0000-0000-0000-000000000002.jsonl");
+    const older = join(
+      projectsDir,
+      "00000000-0000-0000-0000-000000000001.jsonl",
+    );
+    const newer = join(
+      projectsDir,
+      "00000000-0000-0000-0000-000000000002.jsonl",
+    );
     await writeFile(older, "");
     await new Promise((r) => setTimeout(r, 10));
     await writeFile(newer, "");
-    const located = await findClaudeCodeSessionLogFile(workdir, undefined, home);
+    const located = await findClaudeCodeSessionLogFile(
+      workdir,
+      undefined,
+      home,
+    );
     expect(located?.filePath).toBe(newer);
   });
 });
@@ -302,7 +315,9 @@ describe("session-log-reader: normalization", () => {
         ],
       },
     });
-    const events = [parseSessionLogLine(raw)!];
+    const parsed = parseSessionLogLine(raw);
+    if (!parsed) throw new Error("expected session log event");
+    const events = [parsed];
     const steps = normalizeSessionEvents(events, "p");
     expect(steps).toHaveLength(1);
     expect(steps[0].toolError).toBe(true);

plugins/plugin-agent-orchestrator/src/services/pty-service.ts

@@ -89,8 +89,8 @@ import {
   toPiCommand,
 } from "./pty-types.js";
 import {
-  mergeSessionLogIntoTrajectory,
   type MergeSessionLogResult,
+  mergeSessionLogIntoTrajectory,
 } from "./session-log-merger.js";
 import { readClaudeCodeSession } from "./session-log-reader.js";
 import { CLAUDE_SKILL_ESSENTIALS } from "./skill-essentials.js";

plugins/plugin-agent-orchestrator/src/services/session-log-merger.ts

@@ -28,8 +28,8 @@
  */
 
 import {
-  type IAgentRuntime,
   annotateActiveTrajectoryStep,
+  type IAgentRuntime,
   resolveTrajectoryLogger,
 } from "@elizaos/core";
 import type {
@@ -81,8 +81,11 @@ function buildChildTrajectoryId(parentStepId: string): string {
 }
 
 function isLlmStep(step: NormalizedTrajectoryStep): boolean {
-  return step.kind === "reasoning" || step.kind === "text" ||
-    step.kind === "tool_call";
+  return (
+    step.kind === "reasoning" ||
+    step.kind === "text" ||
+    step.kind === "tool_call"
+  );
 }
 
 function buildLlmDetails(
@@ -118,9 +121,7 @@ function buildLlmDetails(
   };
 }
 
-function buildToolResultScript(
-  step: NormalizedTrajectoryStep,
-): string {
+function buildToolResultScript(step: NormalizedTrajectoryStep): string {
   // The trajectory step `script` field is the natural place to land tool
   // result payloads — it's already used elsewhere for action exec output.
   // Cap is enforced inside the storage layer; we hand the full string
@@ -173,7 +174,7 @@ export async function mergeSessionLogIntoTrajectory(
   }
 
   const childTrajectoryId = buildChildTrajectoryId(parentStepId);
-  await trajectoryLogger.startTrajectory(childTrajectoryId, {
+  const startOptions = {
     agentId: runtime.agentId,
     source: "claude-code-session",
     metadata: {
@@ -186,7 +187,8 @@ export async function mergeSessionLogIntoTrajectory(
       totalUsage: capture.totalUsage,
       models: capture.models,
     },
-  });
+  };
+  await trajectoryLogger.startTrajectory(childTrajectoryId, startOptions);
 
   let stepsWritten = 0;
   for (const step of capture.steps) {
@@ -196,8 +198,8 @@ export async function mergeSessionLogIntoTrajectory(
       // the well-known fields and trust the schema-derived consumer.
       trajectoryLogger.logLlmCall({
         stepId: step.stepId,
-        ...(details as never),
-      });
+        ...details,
+      } as Parameters<NonNullable<typeof trajectoryLogger.logLlmCall>>[0]);
       stepsWritten += 1;
       continue;
     }
@@ -212,7 +214,6 @@ export async function mergeSessionLogIntoTrajectory(
         script: buildToolResultScript(step),
       });
       stepsWritten += 1;
-      continue;
     }
   }
 

plugins/plugin-agent-orchestrator/src/services/session-log-reader.ts

@@ -35,7 +35,7 @@
  * @module services/session-log-reader
  */
 
-import { readFile, readdir, stat } from "node:fs/promises";
+import { readdir, readFile, stat } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join } from "node:path";
 
@@ -229,7 +229,10 @@ export function buildSessionLogCandidates(
 ): CandidateSessionLogPath[] {
   const encoded = encodeClaudeCodeProjectDir(workdir);
   return [
-    { dir: join(home, ".claude", "projects", encoded), label: "claude-projects" },
+    {
+      dir: join(home, ".claude", "projects", encoded),
+      label: "claude-projects",
+    },
     {
       dir: join(workdir, ".claude", "session-logs"),
       label: "workspace-local",
@@ -244,9 +247,7 @@ interface SessionLogReaderLogger {
 
 const NOOP_LOGGER: SessionLogReaderLogger = {};
 
-async function listSessionLogFilesIn(
-  dir: string,
-): Promise<string[]> {
+async function listSessionLogFilesIn(dir: string): Promise<string[]> {
   try {
     const entries = await readdir(dir, { withFileTypes: true });
     const files: string[] = [];
@@ -362,6 +363,30 @@ function asNullableString(value: unknown): string | null {
   return typeof value === "string" ? value : null;
 }
 
+function isClaudeCodeAssistantEvent(
+  event: ClaudeCodeSessionEvent,
+): event is ClaudeCodeAssistantEvent {
+  if (event.type !== "assistant") return false;
+  const message = (event as { message?: unknown }).message;
+  return (
+    isRecord(message) &&
+    message.role === "assistant" &&
+    Array.isArray(message.content)
+  );
+}
+
+function isClaudeCodeUserEvent(
+  event: ClaudeCodeSessionEvent,
+): event is ClaudeCodeUserEvent {
+  if (event.type !== "user") return false;
+  const message = (event as { message?: unknown }).message;
+  return (
+    isRecord(message) &&
+    message.role === "user" &&
+    (typeof message.content === "string" || Array.isArray(message.content))
+  );
+}
+
 /**
  * Parse one JSONL line into a typed event. Returns `null` when the line is
  * blank, malformed, or lacks the required `type` field. We don't throw —
@@ -483,7 +508,11 @@ function flattenToolResultContent(
   return parts.join("\n");
 }
 
-function makeChildStepId(parentStepId: string, uuid: string, idx: number): string {
+function makeChildStepId(
+  parentStepId: string,
+  uuid: string,
+  idx: number,
+): string {
   // Compose a stable, parent-scoped child id. Keeping the parent step prefix
   // makes it easy to grep + group child rows back to the parent in BI tools.
   const suffix = uuid && uuid.length > 0 ? uuid.slice(0, 12) : `n${idx}`;
@@ -505,7 +534,7 @@ export function normalizeSessionEvents(
   let idx = 0;
 
   for (const event of events) {
-    if (event.type === "assistant") {
+    if (isClaudeCodeAssistantEvent(event)) {
       const ts = parseTimestamp(event.timestamp);
       const model = event.message.model;
       const usage = event.message.usage;
@@ -561,7 +590,7 @@ export function normalizeSessionEvents(
       continue;
     }
 
-    if (event.type === "user") {
+    if (isClaudeCodeUserEvent(event)) {
       const ts = parseTimestamp(event.timestamp);
       const content = event.message.content;
       if (typeof content === "string") continue;
@@ -587,25 +616,21 @@ export function normalizeSessionEvents(
   return out;
 }
 
-function aggregateUsage(
-  events: ClaudeCodeSessionEvent[],
-): ClaudeCodeUsage {
+function aggregateUsage(events: ClaudeCodeSessionEvent[]): ClaudeCodeUsage {
   const total: ClaudeCodeUsage = {};
   for (const event of events) {
-    if (event.type !== "assistant") continue;
+    if (!isClaudeCodeAssistantEvent(event)) continue;
     const usage = event.message.usage;
     if (!usage) continue;
     if (typeof usage.input_tokens === "number") {
       total.input_tokens = (total.input_tokens ?? 0) + usage.input_tokens;
     }
     if (typeof usage.output_tokens === "number") {
-      total.output_tokens =
-        (total.output_tokens ?? 0) + usage.output_tokens;
+      total.output_tokens = (total.output_tokens ?? 0) + usage.output_tokens;
     }
     if (typeof usage.cache_read_input_tokens === "number") {
       total.cache_read_input_tokens =
-        (total.cache_read_input_tokens ?? 0) +
-        usage.cache_read_input_tokens;
+        (total.cache_read_input_tokens ?? 0) + usage.cache_read_input_tokens;
     }
     if (typeof usage.cache_creation_input_tokens === "number") {
       total.cache_creation_input_tokens =