@forwardimpact/libeval 0.1.51 → 0.1.53

package/src/benchmark/task-family.js

@@ -2,7 +2,7 @@
  * Task-family loader. A task family is a directory under
  *   <root>/
  *     apm.lock.yaml
- *     .claude/                # pre-staged skills + agents (P1)
+ *     .claude/                # pre-staged skills + agents
  *     tasks/<task_name>/
  *       agent.task.md
  *       supervisor.task.md    # optional; appended to the task as supervisor context
@@ -17,45 +17,55 @@
  * a temp dir and `familyRevision` becomes `git:<sha>` of HEAD at clone time.
  * Local paths use the canonical-tree algorithm from design § Family revision
  * algorithm so the result is stable across operating systems.
+ *
+ * Filesystem and subprocess access route through the injected `runtime` bag
+ * (`runtime.fs` async, `runtime.subprocess.run` one-shot, `tmpdir` derived
+ * from `runtime.proc.env`).
  */
 
-import { spawn } from "node:child_process";
 import { createHash } from "node:crypto";
-import {
-  access,
-  constants,
-  lstat,
-  mkdtemp,
-  readdir,
-  readFile,
-  realpath,
-} from "node:fs/promises";
-import { tmpdir } from "node:os";
 import { join, posix, relative, resolve, sep } from "node:path";
 
 const GIT_URL_RE = /^(git@|https?:\/\/|ssh:\/\/|git:\/\/)/;
 const SKIP_DIRS = new Set([".git", "node_modules"]);
+// POSIX `X_OK` (execute permission); node's fs honours the numeric mode, so we
+// avoid importing `node:fs`'s `constants` (which would light the fs smell).
+const X_OK = 1;
+
+/**
+ * Derive the system temp dir from the env (node's `os.tmpdir()` is itself an
+ * env-respecting wrapper). The runtime bag has no `os` slot by design.
+ * @param {import("@forwardimpact/libutil/runtime").Runtime} runtime
+ * @returns {string}
+ */
+function tmpdir(runtime) {
+  return runtime.proc.env.TMPDIR ?? "/tmp";
+}
 
 /**
  * Load a task family from a local path or git URL.
  * @param {string} rootPathOrGitUrl
+ * @param {import("@forwardimpact/libutil/runtime").Runtime} runtime
  * @returns {Promise<TaskFamily>}
  */
-export async function loadTaskFamily(rootPathOrGitUrl) {
+export async function loadTaskFamily(rootPathOrGitUrl, runtime) {
+  if (!runtime) throw new Error("runtime is required");
   const isGit = GIT_URL_RE.test(rootPathOrGitUrl);
   let rootPath;
   let familyRevision;
   if (isGit) {
-    const dir = await mkdtemp(join(tmpdir(), "fit-benchmark-family-"));
-    await gitClone(rootPathOrGitUrl, dir);
+    const dir = await runtime.fs.mkdtemp(
+      join(tmpdir(runtime), "fit-benchmark-family-"),
+    );
+    await gitClone(runtime, rootPathOrGitUrl, dir);
     rootPath = dir;
-    familyRevision = "git:" + (await gitHead(dir));
+    familyRevision = "git:" + (await gitHead(runtime, dir));
   } else {
     rootPath = resolve(rootPathOrGitUrl);
-    familyRevision = "sha256:" + (await canonicalTreeHash(rootPath));
+    familyRevision = "sha256:" + (await canonicalTreeHash(runtime, rootPath));
   }
 
-  const tasks = await discoverTasks(rootPath);
+  const tasks = await discoverTasks(runtime, rootPath);
 
   return {
     rootPath,
@@ -73,27 +83,30 @@ export async function loadTaskFamily(rootPathOrGitUrl) {
  * @param {TaskFamily} _family
  * @param {string} judgeProfilesDir
  * @param {string} judgeProfile
+ * @param {import("@forwardimpact/libutil/runtime").Runtime} runtime
  * @returns {Promise<void>}
  */
 export async function assertJudgeProfileStaged(
   _family,
   judgeProfilesDir,
   judgeProfile,
+  runtime,
 ) {
   const candidate = join(judgeProfilesDir, `${judgeProfile}.md`);
   try {
-    await access(candidate);
+    await runtime.fs.access(candidate);
   } catch {
     throw new Error(`judge profile not staged: ${candidate}`);
   }
 }
 
-async function discoverTasks(rootPath) {
+async function discoverTasks(runtime, rootPath) {
+  const fs = runtime.fs;
   const tasksRoot = join(rootPath, "tasks");
   const tasks = [];
   let entries;
   try {
-    entries = await readdir(tasksRoot, { withFileTypes: true });
+    entries = await fs.readdir(tasksRoot, { withFileTypes: true });
   } catch (e) {
     if (e.code === "ENOENT") return tasks;
     throw e;
@@ -110,11 +123,15 @@ async function discoverTasks(rootPath) {
       paths: {
         taskDir,
         instructions: join(taskDir, "agent.task.md"),
-        supervisor: (await fileExists(supervisorPath)) ? supervisorPath : null,
-        judge: (await fileExists(judgePath)) ? judgePath : null,
+        supervisor: (await fileExists(fs, supervisorPath))
+          ? supervisorPath
+          : null,
+        judge: (await fileExists(fs, judgePath)) ? judgePath : null,
         hooks: join(taskDir, "hooks"),
-        preflight: (await fileExecutable(preflightPath)) ? preflightPath : null,
-        invariants: (await fileExecutable(invariantsPath))
+        preflight: (await fileExecutable(fs, preflightPath))
+          ? preflightPath
+          : null,
+        invariants: (await fileExecutable(fs, invariantsPath))
           ? invariantsPath
           : null,
         specs: join(taskDir, "specs"),
@@ -126,18 +143,18 @@ async function discoverTasks(rootPath) {
   return tasks;
 }
 
-async function fileExists(path) {
+async function fileExists(fs, path) {
   try {
-    await access(path);
+    await fs.access(path);
     return true;
   } catch {
     return false;
   }
 }
 
-async function fileExecutable(path) {
+async function fileExecutable(fs, path) {
   try {
-    await access(path, constants.X_OK);
+    await fs.access(path, X_OK);
     return true;
   } catch {
     return false;
@@ -151,16 +168,18 @@ async function fileExecutable(path) {
  *   sort by NFC-normalised POSIX-style root-relative path
  *   row = <rel-path>\0<hex-sha256>\n
  *   sha256(concat(rows))
+ * @param {import("@forwardimpact/libutil/runtime").Runtime} runtime
  * @param {string} rootPath
  * @returns {Promise<string>} hex digest
  */
-async function canonicalTreeHash(rootPath) {
-  const real = await realpath(rootPath);
+async function canonicalTreeHash(runtime, rootPath) {
+  const fs = runtime.fs;
+  const real = await fs.realpath(rootPath);
   const rows = [];
-  for await (const filePath of walkFiles(real)) {
+  for await (const filePath of walkFiles(fs, real)) {
     const rel = toPosix(relative(real, filePath)).normalize("NFC");
-    const target = await realpath(filePath);
-    const bytes = await readFile(target);
+    const target = await fs.realpath(filePath);
+    const bytes = await fs.readFile(target);
     const hex = createHash("sha256").update(bytes).digest("hex");
     rows.push({ rel, hex });
   }
@@ -170,15 +189,15 @@ async function canonicalTreeHash(rootPath) {
   return acc.digest("hex");
 }
 
-async function* walkFiles(dir) {
-  const entries = await readdir(dir, { withFileTypes: true });
+async function* walkFiles(fs, dir) {
+  const entries = await fs.readdir(dir, { withFileTypes: true });
   for (const entry of entries) {
     const full = join(dir, entry.name);
     if (entry.isDirectory()) {
       if (SKIP_DIRS.has(entry.name)) continue;
-      yield* walkFiles(full);
+      yield* walkFiles(fs, full);
     } else if (entry.isSymbolicLink()) {
-      const resolvedFile = await resolveSymlinkToFile(full);
+      const resolvedFile = await resolveSymlinkToFile(fs, full);
       if (resolvedFile) yield full;
     } else if (entry.isFile()) {
       yield full;
@@ -190,12 +209,12 @@ async function* walkFiles(dir) {
  * Return the resolved path if `linkPath` is a symlink to a regular file.
  * Returns null for dangling symlinks or links to non-file targets.
  */
-async function resolveSymlinkToFile(linkPath) {
-  const st = await lstat(linkPath);
+async function resolveSymlinkToFile(fs, linkPath) {
+  const st = await fs.lstat(linkPath);
   if (!st.isSymbolicLink()) return null;
   try {
-    const resolved = await realpath(linkPath);
-    const tstat = await lstat(resolved);
+    const resolved = await fs.realpath(linkPath);
+    const tstat = await fs.lstat(resolved);
     return tstat.isFile() ? resolved : null;
   } catch {
     return null;
@@ -207,32 +226,24 @@ function toPosix(p) {
   return p.split(sep).join(posix.sep);
 }
 
-async function gitClone(url, dir) {
-  await run("git", ["clone", "--depth", "1", url, dir]);
+async function gitClone(runtime, url, dir) {
+  await git(runtime, ["clone", "--depth", "1", url, dir]);
 }
 
-async function gitHead(dir) {
-  const out = await run("git", ["-C", dir, "rev-parse", "HEAD"]);
+async function gitHead(runtime, dir) {
+  const out = await git(runtime, ["-C", dir, "rev-parse", "HEAD"]);
   return out.trim();
 }
 
-function run(cmd, args) {
-  return new Promise((res, rej) => {
-    const child = spawn(cmd, args, { stdio: ["ignore", "pipe", "pipe"] });
-    let stdout = "";
-    let stderr = "";
-    child.stdout.on("data", (d) => {
-      stdout += d.toString();
-    });
-    child.stderr.on("data", (d) => {
-      stderr += d.toString();
-    });
-    child.on("error", rej);
-    child.on("close", (code) => {
-      if (code === 0) res(stdout);
-      else rej(new Error(`${cmd} ${args.join(" ")} exited ${code}: ${stderr}`));
-    });
-  });
+async function git(runtime, args) {
+  const { stdout, stderr, exitCode } = await runtime.subprocess.run(
+    "git",
+    args,
+  );
+  if (exitCode !== 0) {
+    throw new Error(`git ${args.join(" ")} exited ${exitCode}: ${stderr}`);
+  }
+  return stdout;
 }
 
 /**

package/src/benchmark/workdir.js

@@ -5,16 +5,17 @@
  *
  * The Workdir handle threads `cwd`, `port`, `pgid`, and trace paths through
  * runAgent → invariants → judge → teardown.
+ *
+ * Filesystem, subprocess, clock, and process-signal access all route through
+ * the injected `runtime` bag. Only raw TCP plumbing (`node:net`) stays direct —
+ * it is not an ambient-dependency smell and the runtime bag models no socket
+ * surface.
  */
 
-import { spawn } from "node:child_process";
-import { cp, mkdir } from "node:fs/promises";
 import { createServer } from "node:net";
 import { connect } from "node:net";
 import { join } from "node:path";
 
-import { createDefaultRuntime } from "@forwardimpact/libutil/runtime";
-
 import { loadEnv } from "./env-loader.js";
 
 const DEFAULT_TERM_GRACE_MS = 5_000;
@@ -39,6 +40,8 @@ export class WorkdirManager {
    * @param {object} deps
    * @param {string} deps.stagingDir - Output of `installApm(...)`.
    * @param {string} deps.runOutputDir - Root run-output directory (parent of `runs/`).
+   * @param {import("@forwardimpact/libutil/runtime").Runtime} deps.runtime -
+   *   Ambient collaborators; uses `fs`, `subprocess`, `clock`, `proc`.
    */
   constructor({
     stagingDir,
@@ -49,14 +52,12 @@ export class WorkdirManager {
   }) {
     if (!stagingDir) throw new Error("stagingDir is required");
     if (!runOutputDir) throw new Error("runOutputDir is required");
+    if (!runtime) throw new Error("runtime is required");
     this.stagingDir = stagingDir;
     this.runOutputDir = runOutputDir;
     this.termGraceMs = termGraceMs ?? DEFAULT_TERM_GRACE_MS;
     this.familyRootPath = familyRootPath ?? null;
-    // `loadEnv` is the only collaborator routed through the runtime today; the
-    // rest of this manager still uses raw streaming/net/process-group APIs the
-    // runtime surface does not yet cover.
-    this.runtime = runtime ?? null;
+    this.runtime = runtime;
   }
 
   /**
@@ -66,36 +67,39 @@ export class WorkdirManager {
    * @returns {Promise<Workdir>}
    */
   async start(task, runIndex) {
+    const fs = this.runtime.fs;
     const slug = task.id.replace("/", "__");
     const runDir = join(this.runOutputDir, "runs", slug, String(runIndex));
     const cwd = join(runDir, "cwd");
-    await mkdir(cwd, { recursive: true });
+    await fs.mkdir(cwd, { recursive: true });
 
-    await cp(task.paths.workdir, cwd, { recursive: true }).catch((e) => {
-      if (e.code !== "ENOENT") throw e;
-    });
-    await cp(task.paths.specs, join(cwd, "specs"), {
-      recursive: true,
-    }).catch((e) => {
+    await fs.cp(task.paths.workdir, cwd, { recursive: true }).catch((e) => {
       if (e.code !== "ENOENT") throw e;
     });
-    await cp(join(this.stagingDir, ".claude"), join(cwd, ".claude"), {
-      recursive: true,
-    });
-    await cp(join(this.stagingDir, "node_modules"), join(cwd, "node_modules"), {
+    await fs
+      .cp(task.paths.specs, join(cwd, "specs"), {
+        recursive: true,
+      })
+      .catch((e) => {
+        if (e.code !== "ENOENT") throw e;
+      });
+    await fs.cp(join(this.stagingDir, ".claude"), join(cwd, ".claude"), {
       recursive: true,
-    }).catch((e) => {
-      if (e.code !== "ENOENT") throw e;
     });
+    await fs
+      .cp(join(this.stagingDir, "node_modules"), join(cwd, "node_modules"), {
+        recursive: true,
+      })
+      .catch((e) => {
+        if (e.code !== "ENOENT") throw e;
+      });
 
     const envDirs = [
       ...(this.familyRootPath ? [this.familyRootPath] : []),
       ...(task.paths.taskDir ? [task.paths.taskDir] : []),
     ];
     const envNames =
-      envDirs.length > 0
-        ? await loadEnv(envDirs, cwd, this.runtime ?? createDefaultRuntime())
-        : [];
+      envDirs.length > 0 ? await loadEnv(envDirs, cwd, this.runtime) : [];
 
     const port = await allocatePort();
     const agentTracePath = join(runDir, "agent.ndjson");
@@ -103,7 +107,7 @@ export class WorkdirManager {
     const judgeTracePath = join(runDir, "judge.ndjson");
 
     const preflight = task.paths.preflight
-      ? await runPreflight(task.paths.preflight, cwd, port)
+      ? await runPreflight(this.runtime, task.paths.preflight, cwd, port)
       : { pgid: 0 };
 
     return {
@@ -126,81 +130,71 @@ export class WorkdirManager {
    * @returns {Promise<{portFree: boolean, descendants: number}>}
    */
   async teardown(workdir) {
+    const { proc, clock } = this.runtime;
     if (workdir.pgid && workdir.pgid > 0) {
       try {
-        process.kill(-workdir.pgid, "SIGTERM");
+        proc.kill(-workdir.pgid, "SIGTERM");
       } catch {
         // Process group already gone — fine.
       }
-      await sleep(this.termGraceMs);
+      await clock.sleep(this.termGraceMs);
       try {
-        process.kill(-workdir.pgid, "SIGKILL");
+        proc.kill(-workdir.pgid, "SIGKILL");
       } catch {
         // Already exited.
       }
       // Poll briefly until the process group is empty — SIGKILL returns
       // before the kernel finishes reaping descendants.
       await waitFor(
-        async () => (await countDescendants(workdir.pgid)) === 0,
+        this.runtime,
+        async () => (await countDescendants(this.runtime, workdir.pgid)) === 0,
         2_000,
       );
     }
     const portFree = await isPortFree(workdir.port);
-    const descendants = await countDescendants(workdir.pgid);
+    const descendants = await countDescendants(this.runtime, workdir.pgid);
     return { portFree, descendants };
   }
 }
 
 /**
  * Spawn preflight. Stays detached so we can SIGTERM the whole process group.
+ * @param {import("@forwardimpact/libutil/runtime").Runtime} runtime
  * @param {string} script
  * @param {string} cwd - Agent CWD passed via $WORKDIR.
  * @param {number} port - Free TCP port passed via $PORT.
  * @returns {Promise<{pgid: number, error?: {phase: string, message: string, exitCode: number}}>}
  */
-function runPreflight(script, cwd, port) {
-  return new Promise((res, rej) => {
-    let stderr = "";
-    const child = spawn(script, [], {
-      cwd,
-      env: { ...process.env, WORKDIR: cwd, PORT: String(port) },
-      detached: true,
-      stdio: ["ignore", "pipe", "pipe"],
-    });
-    if (child.pid === undefined) {
-      rej(new Error(`failed to spawn preflight: ${script}`));
-      return;
-    }
-    const pgid = child.pid;
-    child.stderr.on("data", (d) => {
-      stderr += d.toString();
-    });
-    child.on("error", (e) => {
-      res({
-        pgid,
-        error: {
-          phase: "preflight",
-          message: `preflight failed to spawn: ${e.message}`,
-          exitCode: -1,
-        },
-      });
-    });
-    child.on("exit", (code, signal) => {
-      if (code === 0) {
-        res({ pgid });
-        return;
-      }
-      const message = stderr.trim() || `preflight exited with signal ${signal}`;
-      res({
-        pgid,
-        error: {
-          phase: "preflight",
-          message,
-          exitCode: typeof code === "number" ? code : -1,
-        },
-      });
-    });
+async function runPreflight(runtime, script, cwd, port) {
+  const child = runtime.subprocess.spawn(script, [], {
+    cwd,
+    env: { ...runtime.proc.env, WORKDIR: cwd, PORT: String(port) },
+    detached: true,
+    stdio: ["ignore", "pipe", "pipe"],
   });
+  if (child.pid === undefined) {
+    throw new Error(`failed to spawn preflight: ${script}`);
+  }
+  const pgid = child.pid;
+  let stderr = "";
+  const drainStdout = (async () => {
+    for await (const _chunk of child.stdout) {
+      // discard
+    }
+  })();
+  for await (const chunk of child.stderr) stderr += chunk.toString();
+  await drainStdout;
+  const code = await child.exitCode;
+  if (code === 0) return { pgid };
+  const message = stderr.trim() || `preflight exited with code ${code}`;
+  return {
+    pgid,
+    error: {
+      phase: "preflight",
+      message,
+      exitCode: typeof code === "number" ? code : -1,
+    },
+  };
 }
 
 function allocatePort() {
@@ -236,37 +230,35 @@ function isPortFree(port) {
   });
 }
 
-function countDescendants(pgid) {
-  if (!pgid || pgid <= 0) return Promise.resolve(0);
-  return new Promise((res) => {
-    const child = spawn("ps", ["-o", "pid=", "-g", String(pgid)], {
+async function countDescendants(runtime, pgid) {
+  if (!pgid || pgid <= 0) return 0;
+  const child = runtime.subprocess.spawn(
+    "ps",
+    ["-o", "pid=", "-g", String(pgid)],
+    {
       stdio: ["ignore", "pipe", "ignore"],
-    });
-    let out = "";
-    child.stdout.on("data", (d) => {
-      out += d.toString();
-    });
-    child.on("error", () => res(0));
-    child.on("close", () => {
-      const pids = out
-        .split("\n")
-        .map((s) => s.trim())
-        .filter(Boolean)
-        .filter((s) => Number(s) !== process.pid);
-      res(pids.length);
-    });
-  });
-}
-
-function sleep(ms) {
-  return new Promise((r) => setTimeout(r, ms));
+    },
+  );
+  let out = "";
+  try {
+    for await (const chunk of child.stdout) out += chunk.toString();
+    await child.exitCode;
+  } catch {
+    return 0;
+  }
+  const pids = out
+    .split("\n")
+    .map((s) => s.trim())
+    .filter(Boolean)
+    .filter((s) => Number(s) !== runtime.proc.pid);
+  return pids.length;
 }
 
-async function waitFor(predicate, timeoutMs) {
-  const deadline = Date.now() + timeoutMs;
-  while (Date.now() < deadline) {
+async function waitFor(runtime, predicate, timeoutMs) {
+  const deadline = runtime.clock.now() + timeoutMs;
+  while (runtime.clock.now() < deadline) {
     if (await predicate()) return true;
-    await sleep(50);
+    await runtime.clock.sleep(50);
   }
   return false;
 }

package/src/commands/benchmark-invariants.js

@@ -1,6 +1,6 @@
 /**
  * `fit-benchmark invariants` — check a single task's invariants against a
- * post-run workdir directory without invoking an agent (P6/P7). Useful for
+ * post-run workdir directory without invoking an agent. Useful for
  * re-checking an agent's output against revised grading material.
  */
 
@@ -27,7 +27,7 @@ export async function runBenchmarkInvariantsCommand(ctx) {
   if (!workdirArg)
     return { ok: false, code: 1, error: "--workdir is required" };
 
-  const family = await loadTaskFamily(familyInput);
+  const family = await loadTaskFamily(familyInput, runtime);
   const task = family.tasks().find((t) => t.id === taskId);
   if (!task)
     return { ok: false, code: 1, error: `task not found in family: ${taskId}` };
@@ -36,7 +36,7 @@ export async function runBenchmarkInvariantsCommand(ctx) {
   const cwd = join(runDir, "cwd");
   const port = await allocatePort();
 
-  const invariants = await runInvariants(task, { cwd, port, runDir });
+  const invariants = await runInvariants(task, { cwd, port, runDir }, runtime);
   const record = {
     taskId: task.id,
     invariants,

package/src/commands/benchmark-report.js

@@ -40,6 +40,7 @@ export async function runBenchmarkReportCommand(ctx) {
     inputDir: resolve(inputDir),
     kValues,
     includeRuns: format === "text",
+    runtime,
   });
   if (format === "text") {
     runtime.proc.stdout.write(renderTextReport(report, kValues) + "\n");

package/src/commands/benchmark-run.js

@@ -33,7 +33,7 @@ export async function runBenchmarkRunCommand(ctx) {
   delete runtime.proc.env.NODE_EXTRA_CA_CERTS;
 
   const { query } = await import("@anthropic-ai/claude-agent-sdk");
-  const runner = createBenchmarkRunner({ ...opts, query });
+  const runner = createBenchmarkRunner({ ...opts, query, runtime });
 
   let anyFail = false;
   for await (const record of runner.run()) {

package/src/commands/by-discussion.js

@@ -1,4 +1,3 @@
-import { closeSync, openSync, readSync } from "node:fs";
 import { join } from "node:path";
 
 const FIRST_LINE_CAP = 64 * 1024;
@@ -6,25 +5,25 @@ const FIRST_LINE_CAP = 64 * 1024;
 /**
  * Read the first newline-terminated line of a file, bounded to the first
  * {@link FIRST_LINE_CAP} bytes. Trace `.ndjson` files can be many MB; the
- * Step 2.6 meta header is always small, so a bounded `readSync` avoids
- * loading whole files into memory just to inspect the header. This uses
- * `node:fs` directly because the `runtime.fsSync` surface exposes no
- * positional `openSync`/`readSync` — the file is grandfathered for
- * `import:fs` in `check-ambient-deps.deny.yml` until that seam exists.
+ * Step 2.6 meta header is always small, so a bounded positional read avoids
+ * loading whole files into memory just to inspect the header. The positional
+ * `openSync`/`readSync`/`closeSync` trio is read off the injected
+ * `runtime.fsSync` surface.
  *
+ * @param {object} fsSync - Sync filesystem surface (`runtime.fsSync`).
  * @param {string} path
  * @returns {string}
  */
-function readFirstLine(path) {
-  const fd = openSync(path, "r");
+function readFirstLine(fsSync, path) {
+  const fd = fsSync.openSync(path, "r");
   try {
     const buf = Buffer.alloc(FIRST_LINE_CAP);
-    const bytes = readSync(fd, buf, 0, buf.length, 0);
+    const bytes = fsSync.readSync(fd, buf, 0, buf.length, 0);
     const text = buf.toString("utf8", 0, bytes);
     const nl = text.indexOf("\n");
     return nl === -1 ? text : text.slice(0, nl);
   } finally {
-    closeSync(fd);
+    fsSync.closeSync(fd);
   }
 }
 
@@ -53,7 +52,7 @@ export function findTracesByDiscussion(dir, discussionId, fsSync) {
     const path = join(dir, entry);
     let firstLine;
     try {
-      firstLine = readFirstLine(path);
+      firstLine = readFirstLine(fsSync, path);
     } catch {
       continue;
     }

package/src/commands/discuss.js

@@ -1,5 +1,5 @@
-import { createWriteStream } from "node:fs";
 import { resolve } from "node:path";
+import { isoTimestamp } from "@forwardimpact/libutil";
 import { createDiscusser } from "../discusser.js";
 import { createRedactor } from "../redaction.js";
 import { createTeeWriter } from "../tee-writer.js";
@@ -80,13 +80,14 @@ export async function runDiscussCommand(ctx) {
   const redactor = createRedactor({ runtime });
 
   const fileStream = opts.outputPath
-    ? createWriteStream(opts.outputPath)
+    ? runtime.fs.createWriteStream(opts.outputPath)
     : null;
   const output = fileStream
     ? createTeeWriter({
         fileStream,
         textStream: runtime.proc.stdout,
         mode: "supervised",
+        now: () => isoTimestamp(runtime.clock.now()),
       })
     : runtime.proc.stdout;