perf: split trajectory export paths

src/trajectory/export.test.ts

@@ -2,16 +2,17 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import type { Message, Usage } from "@mariozechner/pi-ai";
-import { afterEach, describe, expect, it } from "vitest";
+import { afterAll, beforeAll, describe, expect, it } from "vitest";
 import { exportTrajectoryBundle, resolveDefaultTrajectoryExportDir } from "./export.js";
-import { resolveTrajectoryPointerFilePath } from "./runtime.js";
+import { resolveTrajectoryPointerFilePath } from "./paths.js";
 import type { TrajectoryEvent } from "./types.js";
 
-const tempDirs: string[] = [];
+let tempRoot = "";
+let tempDirId = 0;
 
 function makeTempDir(): string {
-  const dir = fs.mkdtempSync(path.join(os.tmpdir(), "openclaw-trajectory-"));
-  tempDirs.push(dir);
+  const dir = path.join(tempRoot, `case-${tempDirId++}`);
+  fs.mkdirSync(dir, { recursive: true });
   return dir;
 }
 
@@ -179,9 +180,13 @@ function writeToolCallSessionFile(sessionFile: string): void {
   );
 }
 
-afterEach(() => {
-  for (const dir of tempDirs.splice(0)) {
-    fs.rmSync(dir, { recursive: true, force: true });
+beforeAll(() => {
+  tempRoot = fs.mkdtempSync(path.join(os.tmpdir(), "openclaw-trajectory-"));
+});
+
+afterAll(() => {
+  if (tempRoot) {
+    fs.rmSync(tempRoot, { recursive: true, force: true });
   }
 });
 

src/trajectory/export.ts

@@ -23,7 +23,7 @@ import {
   resolveTrajectoryFilePath,
   resolveTrajectoryPointerFilePath,
   safeTrajectorySessionFileName,
-} from "./runtime.js";
+} from "./paths.js";
 import type {
   TrajectoryBundleManifest,
   TrajectoryEvent,

src/trajectory/paths.ts

@@ -0,0 +1,69 @@
+import fs from "node:fs";
+import path from "node:path";
+import { resolveHomeRelativePath } from "../infra/home-dir.js";
+
+export const TRAJECTORY_RUNTIME_FILE_MAX_BYTES = 50 * 1024 * 1024;
+export const TRAJECTORY_RUNTIME_EVENT_MAX_BYTES = 256 * 1024;
+
+type TrajectoryPointerOpenFlagConstants = Pick<
+  typeof fs.constants,
+  "O_CREAT" | "O_TRUNC" | "O_WRONLY"
+> &
+  Partial<Pick<typeof fs.constants, "O_NOFOLLOW">>;
+
+export function safeTrajectorySessionFileName(sessionId: string): string {
+  const safe = sessionId.replaceAll(/[^A-Za-z0-9_-]/g, "_").slice(0, 120);
+  return /[A-Za-z0-9]/u.test(safe) ? safe : "session";
+}
+
+export function resolveTrajectoryPointerOpenFlags(
+  constants: TrajectoryPointerOpenFlagConstants = fs.constants,
+): number {
+  const noFollow = constants.O_NOFOLLOW;
+  return (
+    constants.O_CREAT |
+    constants.O_TRUNC |
+    constants.O_WRONLY |
+    (typeof noFollow === "number" ? noFollow : 0)
+  );
+}
+
+function resolveContainedPath(baseDir: string, fileName: string): string {
+  const resolvedBase = path.resolve(baseDir);
+  const resolvedFile = path.resolve(resolvedBase, fileName);
+  const relative = path.relative(resolvedBase, resolvedFile);
+  if (!relative || relative.startsWith("..") || path.isAbsolute(relative)) {
+    throw new Error("Trajectory file path escaped its configured directory");
+  }
+  return resolvedFile;
+}
+
+export function resolveTrajectoryFilePath(params: {
+  env?: NodeJS.ProcessEnv;
+  sessionFile?: string;
+  sessionId: string;
+}): string {
+  const env = params.env ?? process.env;
+  const dirOverride = env.OPENCLAW_TRAJECTORY_DIR?.trim();
+  if (dirOverride) {
+    return resolveContainedPath(
+      resolveHomeRelativePath(dirOverride),
+      `${safeTrajectorySessionFileName(params.sessionId)}.jsonl`,
+    );
+  }
+  if (!params.sessionFile) {
+    return path.join(
+      process.cwd(),
+      `${safeTrajectorySessionFileName(params.sessionId)}.trajectory.jsonl`,
+    );
+  }
+  return params.sessionFile.endsWith(".jsonl")
+    ? `${params.sessionFile.slice(0, -".jsonl".length)}.trajectory.jsonl`
+    : `${params.sessionFile}.trajectory.jsonl`;
+}
+
+export function resolveTrajectoryPointerFilePath(sessionFile: string): string {
+  return sessionFile.endsWith(".jsonl")
+    ? `${sessionFile.slice(0, -".jsonl".length)}.trajectory-path.json`
+    : `${sessionFile}.trajectory-path.json`;
+}

src/trajectory/runtime.ts

@@ -3,11 +3,26 @@ import path from "node:path";
 import { sanitizeDiagnosticPayload } from "../agents/payload-redaction.js";
 import { getQueuedFileWriter, type QueuedFileWriter } from "../agents/queued-file-writer.js";
 import type { OpenClawConfig } from "../config/types.openclaw.js";
-import { resolveUserPath } from "../utils.js";
 import { parseBooleanValue } from "../utils/boolean.js";
 import { safeJsonStringify } from "../utils/safe-json.js";
+import {
+  TRAJECTORY_RUNTIME_EVENT_MAX_BYTES,
+  TRAJECTORY_RUNTIME_FILE_MAX_BYTES,
+  resolveTrajectoryFilePath,
+  resolveTrajectoryPointerFilePath,
+  resolveTrajectoryPointerOpenFlags,
+} from "./paths.js";
 import type { TrajectoryEvent, TrajectoryToolDefinition } from "./types.js";
 
+export {
+  TRAJECTORY_RUNTIME_EVENT_MAX_BYTES,
+  TRAJECTORY_RUNTIME_FILE_MAX_BYTES,
+  resolveTrajectoryFilePath,
+  resolveTrajectoryPointerFilePath,
+  resolveTrajectoryPointerOpenFlags,
+  safeTrajectorySessionFileName,
+} from "./paths.js";
+
 type TrajectoryRuntimeInit = {
   cfg?: OpenClawConfig;
   env?: NodeJS.ProcessEnv;
@@ -30,73 +45,8 @@ type TrajectoryRuntimeRecorder = {
 };
 
 const writers = new Map<string, QueuedFileWriter>();
-export const TRAJECTORY_RUNTIME_FILE_MAX_BYTES = 50 * 1024 * 1024;
-export const TRAJECTORY_RUNTIME_EVENT_MAX_BYTES = 256 * 1024;
 const MAX_TRAJECTORY_WRITERS = 100;
 
-type TrajectoryPointerOpenFlagConstants = Pick<
-  typeof fs.constants,
-  "O_CREAT" | "O_TRUNC" | "O_WRONLY"
-> &
-  Partial<Pick<typeof fs.constants, "O_NOFOLLOW">>;
-
-export function safeTrajectorySessionFileName(sessionId: string): string {
-  const safe = sessionId.replaceAll(/[^A-Za-z0-9_-]/g, "_").slice(0, 120);
-  return /[A-Za-z0-9]/u.test(safe) ? safe : "session";
-}
-
-export function resolveTrajectoryPointerOpenFlags(
-  constants: TrajectoryPointerOpenFlagConstants = fs.constants,
-): number {
-  const noFollow = constants.O_NOFOLLOW;
-  return (
-    constants.O_CREAT |
-    constants.O_TRUNC |
-    constants.O_WRONLY |
-    (typeof noFollow === "number" ? noFollow : 0)
-  );
-}
-
-function resolveContainedPath(baseDir: string, fileName: string): string {
-  const resolvedBase = path.resolve(baseDir);
-  const resolvedFile = path.resolve(resolvedBase, fileName);
-  const relative = path.relative(resolvedBase, resolvedFile);
-  if (!relative || relative.startsWith("..") || path.isAbsolute(relative)) {
-    throw new Error("Trajectory file path escaped its configured directory");
-  }
-  return resolvedFile;
-}
-
-export function resolveTrajectoryFilePath(params: {
-  env?: NodeJS.ProcessEnv;
-  sessionFile?: string;
-  sessionId: string;
-}): string {
-  const env = params.env ?? process.env;
-  const dirOverride = env.OPENCLAW_TRAJECTORY_DIR?.trim();
-  if (dirOverride) {
-    return resolveContainedPath(
-      resolveUserPath(dirOverride),
-      `${safeTrajectorySessionFileName(params.sessionId)}.jsonl`,
-    );
-  }
-  if (!params.sessionFile) {
-    return path.join(
-      process.cwd(),
-      `${safeTrajectorySessionFileName(params.sessionId)}.trajectory.jsonl`,
-    );
-  }
-  return params.sessionFile.endsWith(".jsonl")
-    ? `${params.sessionFile.slice(0, -".jsonl".length)}.trajectory.jsonl`
-    : `${params.sessionFile}.trajectory.jsonl`;
-}
-
-export function resolveTrajectoryPointerFilePath(sessionFile: string): string {
-  return sessionFile.endsWith(".jsonl")
-    ? `${sessionFile.slice(0, -".jsonl".length)}.trajectory-path.json`
-    : `${sessionFile}.trajectory-path.json`;
-}
-
 function writeTrajectoryPointerBestEffort(params: {
   filePath: string;
   sessionFile?: string;