@olivervea/pipelines 2.0.0-beta.3 → 2.0.0-beta.30

package/src/harness/main.ts

@@ -2,29 +2,41 @@
 //   describe [--sentinels]   → manifest (canonical JSON) on stdout
 //   run <step>               → $OLVE_DIR/input.json → handler → $OLVE_DIR/work/output.json (+ result upload)
 //   map-trigger <trigger>    → $OLVE_DIR/input.json (event) → pipeline input → $OLVE_DIR/work/output.json
-import { mkdirSync, readFileSync } from "node:fs";
-import { join } from "node:path";
-import { isImplementation } from "../core/handlers.ts";
-import type { AnyStep } from "../core/steps.ts";
-import type { WebhookEvent } from "../core/webhooks.ts";
-import { pipelineData, type PipelineData, type StageNode } from "../builder/pipeline.ts";
-import { createCtx, formatLog } from "../ctx/index.ts";
-import { DescribeError, describePipeline, manifestText } from "../describe/describe.ts";
-import type { HarnessInfo } from "../util/handler-hash.ts";
-import { ENV, paths, runInfoFromEnv } from "./env.ts";
-import { EXIT } from "./exit.ts";
-import { executeStep, type Envelope, type Execution, type StepFunction } from "./execute.ts";
-import { MANIFEST_BEGIN, MANIFEST_END, packResult, removeStale, sentinelBlock, uploadFile, writeEnvelope } from "./result.ts";
-import { formatIssues, parseStrict } from "./validate.ts";
-
-/** step name → lazy import of `handlers/<name>.ts`. Literal import() paths so Bun bundles them. */
-export type HandlerRegistry = Readonly<Record<string, () => Promise<{ default: unknown }>>>;
+import { mkdirSync, readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { isImplementation } from '../core/handlers.ts';
+import { configRefPath, isConfigRef, unionAt } from '../core/config.ts';
+import type { AnyStep } from '../core/steps.ts';
+import { cellName, parseCell } from '../core/matrix.ts';
+import type { WebhookEvent } from '../core/webhooks.ts';
+import { pipelineData, type PipelineData, type StageNode } from '../builder/pipeline.ts';
+import { createCtx, formatLog } from '../ctx/index.ts';
+import { DescribeError, describePipeline, manifestText } from '../describe/describe.ts';
+import type { HarnessInfo } from '../util/code-hash.ts';
+import { callbackUrlsFromEnv, ENV, paths, runInfoFromEnv } from './env.ts';
+import { EXIT } from './exit.ts';
+import {
+  executeStep,
+  type Envelope,
+  type Execution,
+  type StepFunction,
+} from './execute.ts';
+import {
+  MANIFEST_BEGIN,
+  MANIFEST_END,
+  packResult,
+  removeStale,
+  sentinelBlock,
+  uploadFile,
+  writeEnvelope,
+} from './result.ts';
+import { formatIssues, parseStrict } from './validate.ts';
 
 export interface HarnessConfig {
-  /** Default export of pipeline.ts. */
+  /** Default export of the entry point. */
   pipeline: unknown;
-  handlers: HandlerRegistry;
-  handlerHashes: Readonly<Record<string, string>>;
+  /** Hash of the build (from the build; includes the harness identity). */
+  codeHash?: string;
   harness: HarnessInfo;
 }
 
@@ -38,57 +50,78 @@ export const defaultIO: HarnessIO = {
     await Bun.write(Bun.stdout, text);
   },
   stderr: (line) => {
-    process.stderr.write(line.endsWith("\n") ? line : line + "\n");
+    process.stderr.write(line.endsWith('\n') ? line : line + '\n');
   },
 };
 
-const USAGE = "usage: step describe [--sentinels] | step run <step> | step map-trigger <trigger>";
+const USAGE =
+  'usage: step describe [--sentinels] | step run <step> | step map-trigger <trigger>';
 
-export function allSteps(data: PipelineData): AnyStep[] {
-  const out: AnyStep[] = [];
-  const walk = (nodes: readonly StageNode[]) => {
-    for (const n of nodes) n.kind === "stage" ? out.push(...n.steps.map((s) => s.step)) : walk(n.nodes);
+/** Every step with the `select` case conditions (`<ref>.<discriminator>=<value>`) it sits in. */
+export function stepsWithCases(data: PipelineData): { step: AnyStep; cases: string[] }[] {
+  const out: { step: AnyStep; cases: string[] }[] = [];
+  const walk = (nodes: readonly StageNode[], cases: string[]) => {
+    for (const n of nodes) {
+      if (n.kind === 'stage') out.push(...n.steps.map((s) => ({ step: s.step, cases })));
+      else if (n.kind === 'when') walk(n.nodes, cases);
+      else {
+        const union = isConfigRef(n.on) ? unionAt(n.on) : undefined;
+        for (const [value, inner] of Object.entries(n.cases))
+          walk(
+            inner,
+            union
+              ? [...cases, `${configRefPath(n.on)}.${union.discriminator}=${value}`]
+              : cases,
+          );
+      }
+    }
   };
-  walk(data.nodes);
-  for (const fh of data.failureHandlers) if (!out.includes(fh.step)) out.push(fh.step);
+  walk(data.nodes, []);
+  for (const fh of data.failureHandlers) out.push({ step: fh.step, cases: [] });
   return out;
 }
 
+/** The step `run <name>` executes: the only one so named, or the one in the cases the service selected (`OLVE_CASES`). */
+export function findStep(
+  data: PipelineData,
+  name: string,
+  selected: readonly string[],
+): AnyStep | string {
+  const candidates = stepsWithCases(data).filter((c) => c.step.name === name);
+  const distinct = candidates.filter(
+    (c, i) => candidates.findIndex((d) => d.step === c.step) === i,
+  );
+  if (distinct.length === 0) return `unknown step '${name}'`;
+  if (distinct.length === 1) return distinct[0]!.step;
+  const chosen = distinct.filter((c) => c.cases.every((k) => selected.includes(k)));
+  if (chosen.length === 1) return chosen[0]!.step;
+  return `step '${name}' is in several select cases; ${ENV_CASES} must name the selected one (got ${JSON.stringify(selected)})`;
+}
+
+/** The select case conditions of the step being run (JSON array), set by the service for steps inside a select. */
+export const ENV_CASES = 'OLVE_CASES';
+
 /** Installs SIGTERM/SIGINT handlers that abort the returned signal (PID 1 ignores signals without them). */
 export function cancellation(): { signal: AbortSignal; dispose(): void } {
   const ac = new AbortController();
-  const onTerm = () => ac.abort("SIGTERM");
-  const onInt = () => (ac.signal.aborted ? process.exit(EXIT.sigint) : ac.abort("SIGINT"));
-  process.on("SIGTERM", onTerm);
-  process.on("SIGINT", onInt);
+  const onTerm = () => ac.abort('SIGTERM');
+  const onInt = () =>
+    ac.signal.aborted ? process.exit(EXIT.sigint) : ac.abort('SIGINT');
+  process.on('SIGTERM', onTerm);
+  process.on('SIGINT', onInt);
   return {
     signal: ac.signal,
     dispose() {
-      process.off("SIGTERM", onTerm);
-      process.off("SIGINT", onInt);
+      process.off('SIGTERM', onTerm);
+      process.off('SIGINT', onInt);
     },
   };
 }
 
-/** Resolves the function that implements `step` (library or handler module). */
-export async function resolveStepFunction(step: AnyStep, handlers: HandlerRegistry): Promise<StepFunction | string> {
-  if (step.kind !== "custom") {
-    if (!step.builtin) return `library step '${step.name}' (${step.kind}) has no implementation`;
-    return step.builtin.run as StepFunction;
-  }
-  const load = handlers[step.name];
-  if (!load) return `step '${step.name}' has no handler`;
-  let mod: { default: unknown };
-  try {
-    mod = await load();
-  } catch (e) {
-    return `the handler of step '${step.name}' failed to load: ${(e as Error)?.stack ?? String(e)}`;
-  }
-  const impl = mod.default;
-  if (!isImplementation(impl)) return `the handler of step '${step.name}' must default-export implement(<step '${step.name}'>, …)`;
-  if (impl.step !== step)
-    return `the handler of step '${step.name}' implements a different step object (it must be implement(<the '${step.name}' step from pipeline.ts>, …))`;
-  return impl.handler as unknown as StepFunction;
+/** The function `step` carries, or what is wrong. */
+export function resolveStepFunction(step: AnyStep): StepFunction | string {
+  if (isImplementation(step)) return step.handler as unknown as StepFunction;
+  return `step '${step.name}' has no implementation (stage implement(step({...}), fn))`;
 }
 
 /** Writes output.json, prints the sentinel block and uploads result.tar.gz when OLVE_RESULT_URL is set. */
@@ -100,7 +133,7 @@ export async function finish(exec: Execution, io: HarnessIO): Promise<number> {
   if (!url) return exec.exitCode;
   try {
     mkdirSync(p.tmp, { recursive: true });
-    const archive = join(p.tmp, "result.tar.gz");
+    const archive = join(p.tmp, 'result.tar.gz');
     await packResult(p.work, archive);
     await uploadFile(url, archive, io.stderr);
   } catch (e) {
@@ -110,18 +143,29 @@ export async function finish(exec: Execution, io: HarnessIO): Promise<number> {
   return exec.exitCode;
 }
 
-function readJson(path: string): { ok: true; value: unknown } | { ok: false; message: string } {
+function readJson(
+  path: string,
+): { ok: true; value: unknown } | { ok: false; message: string } {
   try {
-    return { ok: true, value: JSON.parse(readFileSync(path, "utf8")) };
+    return { ok: true, value: JSON.parse(readFileSync(path, 'utf8')) };
   } catch (e) {
     return { ok: false, message: `cannot read ${path}: ${(e as Error).message}` };
   }
 }
 
-async function describeMode(cfg: HarnessConfig, args: string[], io: HarnessIO): Promise<number> {
-  const sentinels = args.includes("--sentinels");
+async function describeMode(
+  cfg: HarnessConfig,
+  args: string[],
+  io: HarnessIO,
+): Promise<number> {
+  const sentinels = args.includes('--sentinels');
   try {
-    const text = manifestText(describePipeline(cfg.pipeline, { handlerNames: Object.keys(cfg.handlers), handlerHashes: cfg.handlerHashes, harness: cfg.harness }));
+    const text = manifestText(
+      describePipeline(cfg.pipeline, {
+        codeHash: cfg.codeHash,
+        harness: cfg.harness,
+      }),
+    );
     await io.stdout(sentinels ? `${MANIFEST_BEGIN}\n${text}${MANIFEST_END}\n` : text);
     return EXIT.ok;
   } catch (e) {
@@ -133,29 +177,55 @@ async function describeMode(cfg: HarnessConfig, args: string[], io: HarnessIO):
   }
 }
 
-async function runMode(cfg: HarnessConfig, name: string | undefined, io: HarnessIO): Promise<number> {
-  if (!name) return io.stderr(USAGE), EXIT.usage;
+async function runMode(
+  cfg: HarnessConfig,
+  name: string | undefined,
+  io: HarnessIO,
+): Promise<number> {
+  if (!name) return (io.stderr(USAGE), EXIT.usage);
   const data = pipelineData(cfg.pipeline);
-  const step = allSteps(data).find((s) => s.name === name);
-  if (!step) return io.stderr(`unknown step '${name}'`), EXIT.usage;
-  const fn = await resolveStepFunction(step, cfg.handlers);
-  if (typeof fn === "string") return io.stderr(fn), EXIT.configInvalid;
+  const step = findStep(data, name, selectedCases());
+  if (typeof step === 'string') return (io.stderr(step), EXIT.usage);
+  const fn = resolveStepFunction(step);
+  if (typeof fn === 'string') return (io.stderr(fn), EXIT.configInvalid);
 
   const p = paths();
   removeStale(p.work);
   mkdirSync(p.files, { recursive: true });
   mkdirSync(p.tmp, { recursive: true });
   const raw = readJson(p.input);
+  const cell = step.matrix
+    ? parseCell(step.name, step.matrix, process.env[ENV.cell])
+    : undefined;
   const cancel = cancellation();
   try {
     let exec: Execution;
-    if (!raw.ok) {
-      io.stderr(raw.message);
-      exec = { envelope: { status: "failed", error: { kind: "input", message: raw.message } }, exitCode: EXIT.inputInvalid };
+    if (!raw.ok || (cell && !cell.ok)) {
+      const message = !raw.ok ? raw.message : cell && !cell.ok ? cell.message : '';
+      io.stderr(message);
+      exec = {
+        envelope: { status: 'failed', error: { kind: 'input', message } },
+        exitCode: EXIT.inputInvalid,
+      };
     } else {
-      const run = runInfoFromEnv(step.name);
-      const ctx = createCtx({ run, secrets: step.secrets, paths: { root: p.root, workFiles: p.files, tmp: p.tmp }, signal: cancel.signal, logSink: io.stderr });
-      exec = await executeStep({ step, fn, rawInput: raw.value, ctx, workFiles: p.files, log: io.stderr });
+      const run = runInfoFromEnv(cell?.ok ? cellName(step.name, cell.cell) : step.name);
+      const ctx = createCtx({
+        run,
+        secrets: step.secrets,
+        paths: { root: p.root, workFiles: p.files, tmp: p.tmp },
+        signal: cancel.signal,
+        logSink: io.stderr,
+        callbackUrls: callbackUrlsFromEnv(),
+        ...(cell?.ok ? { cell: cell.cell } : {}),
+      });
+      exec = await executeStep({
+        step,
+        fn,
+        rawInput: raw.value,
+        ctx,
+        workFiles: p.files,
+        log: io.stderr,
+      });
     }
     return await finish(exec, io);
   } finally {
@@ -164,64 +234,121 @@ async function runMode(cfg: HarnessConfig, name: string | undefined, io: Harness
 }
 
 function isWebhookEvent(v: unknown): boolean {
-  if (typeof v !== "object" || v === null || Array.isArray(v) || !("body" in v)) return false;
+  if (typeof v !== 'object' || v === null || Array.isArray(v) || !('body' in v))
+    return false;
   const headers = (v as { headers?: unknown }).headers;
-  return typeof headers === "object" && headers !== null && !Array.isArray(headers);
+  return typeof headers === 'object' && headers !== null && !Array.isArray(headers);
 }
 
-async function mapTriggerMode(cfg: HarnessConfig, name: string | undefined, io: HarnessIO): Promise<number> {
-  if (!name) return io.stderr(USAGE), EXIT.usage;
+async function mapTriggerMode(
+  cfg: HarnessConfig,
+  name: string | undefined,
+  io: HarnessIO,
+): Promise<number> {
+  if (!name) return (io.stderr(USAGE), EXIT.usage);
   const data = pipelineData(cfg.pipeline);
   const trigger = data.triggers.find((t) => t.name === name);
-  if (!trigger) return io.stderr(`unknown trigger '${name}' (known: ${data.triggers.map((t) => t.name).join(", ") || "none"})`), EXIT.usage;
+  if (!trigger)
+    return (
+      io.stderr(
+        `unknown trigger '${name}' (known: ${data.triggers.map((t) => t.name).join(', ') || 'none'})`,
+      ),
+      EXIT.usage
+    );
   const p = paths();
   removeStale(p.work);
   mkdirSync(p.work, { recursive: true });
   const raw = readJson(p.input);
-  const fail = (kind: "input" | "output" | "handler", message: string, exitCode: number): Execution => {
+  const fail = (
+    kind: 'input' | 'output' | 'handler',
+    message: string,
+    exitCode: number,
+  ): Execution => {
     io.stderr(message);
-    return { envelope: { status: "failed", error: { kind, message } }, exitCode };
+    return { envelope: { status: 'failed', error: { kind, message } }, exitCode };
   };
   let exec: Execution;
-  if (!raw.ok) exec = fail("input", raw.message, EXIT.inputInvalid);
-  else if (trigger.kind === "poll" && (typeof raw.value !== "object" || raw.value === null || typeof (raw.value as { value?: unknown }).value !== "string"))
-    exec = fail("input", `poll trigger '${name}': the event must be {"value": "<string>"}`, EXIT.inputInvalid);
-  else if (trigger.kind === "push" && (typeof raw.value !== "object" || raw.value === null || Array.isArray(raw.value)))
-    exec = fail("input", `push trigger: the event must be the webhook payload object`, EXIT.inputInvalid);
-  else if (trigger.kind === "webhook" && !isWebhookEvent(raw.value))
-    exec = fail("input", `webhook trigger '${name}': the event must be {"headers": {...}, "body": ...}`, EXIT.inputInvalid);
+  if (!raw.ok) exec = fail('input', raw.message, EXIT.inputInvalid);
+  else if (
+    trigger.kind === 'poll' &&
+    (typeof raw.value !== 'object' ||
+      raw.value === null ||
+      typeof (raw.value as { value?: unknown }).value !== 'string')
+  )
+    exec = fail(
+      'input',
+      `poll trigger '${name}': the event must be {"value": "<string>"}`,
+      EXIT.inputInvalid,
+    );
+  else if (
+    trigger.kind === 'push' &&
+    (typeof raw.value !== 'object' || raw.value === null || Array.isArray(raw.value))
+  )
+    exec = fail(
+      'input',
+      `push trigger: the event must be the webhook payload object`,
+      EXIT.inputInvalid,
+    );
+  else if (trigger.kind === 'webhook' && !isWebhookEvent(raw.value))
+    exec = fail(
+      'input',
+      `webhook trigger '${name}': the event must be {"headers": {...}, "body": ...}`,
+      EXIT.inputInvalid,
+    );
   else {
     let mapped: unknown;
     let threw: unknown = undefined;
     try {
       mapped =
-        trigger.kind === "poll" ? await trigger.map((raw.value as { value: string }).value)
-        : trigger.kind === "webhook" ? await trigger.map(raw.value as WebhookEvent)
-        : await trigger.map(raw.value);
+        trigger.kind === 'poll'
+          ? await trigger.map((raw.value as { value: string }).value)
+          : trigger.kind === 'webhook'
+            ? await trigger.map(raw.value as WebhookEvent)
+            : await trigger.map(raw.value);
     } catch (e) {
-      threw = e ?? new Error("undefined");
+      threw = e ?? new Error('undefined');
     }
-    if (threw !== undefined) exec = fail("handler", `trigger '${name}' mapper threw: ${(threw as Error)?.message ?? String(threw)}`, EXIT.handlerFailed);
-    else if (mapped === null && trigger.kind === "webhook") exec = { envelope: { status: "skipped", reason: `trigger '${name}' ignored the delivery` }, exitCode: EXIT.ok };
+    if (threw !== undefined)
+      exec = fail(
+        'handler',
+        `trigger '${name}' mapper threw: ${(threw as Error)?.message ?? String(threw)}`,
+        EXIT.handlerFailed,
+      );
+    else if (mapped === null && trigger.kind === 'webhook')
+      exec = {
+        envelope: { status: 'skipped', reason: `trigger '${name}' ignored the delivery` },
+        exitCode: EXIT.ok,
+      };
     else {
-      const r = parseStrict(data.input.schema, mapped, "input");
+      const r = parseStrict(data.input.schema, mapped, 'input');
       exec = r.ok
-        ? { envelope: { status: "succeeded", output: r.value } satisfies Envelope, exitCode: EXIT.ok }
-        : fail("output", `trigger '${name}': mapped input does not match ${data.input.name}:\n  ${r.issues.join("\n  ")}`, EXIT.outputInvalid);
+        ? {
+            envelope: { status: 'succeeded', output: r.value } satisfies Envelope,
+            exitCode: EXIT.ok,
+          }
+        : fail(
+            'output',
+            `trigger '${name}': mapped input does not match ${data.input.name}:\n  ${r.issues.join('\n  ')}`,
+            EXIT.outputInvalid,
+          );
     }
   }
   return finish(exec, io);
 }
 
 /** Entry point of the compiled binary (and the dev runner). Returns the exit code. */
-export async function runHarness(cfg: HarnessConfig, argv: readonly string[], io: HarnessIO = defaultIO): Promise<number> {
+export async function runHarness(
+  cfg: HarnessConfig,
+  argv: readonly string[],
+  io: HarnessIO = defaultIO,
+): Promise<number> {
   const [mode, ...rest] = argv;
   switch (mode) {
-    case "describe":
+    case 'describe':
       return describeMode(cfg, rest, io);
-    case "run":
+    case 'run':
       return runMode(cfg, rest[0], io);
-    case "map-trigger":
+    case 'map-trigger':
       return mapTriggerMode(cfg, rest[0], io);
     default:
       io.stderr(USAGE);
@@ -230,3 +357,12 @@ export async function runHarness(cfg: HarnessConfig, argv: readonly string[], io
 }
 
 export { formatIssues, formatLog };
+
+function selectedCases(): string[] {
+  try {
+    const v = JSON.parse(process.env[ENV_CASES] ?? '[]') as unknown;
+    return Array.isArray(v) ? v.filter((x): x is string => typeof x === 'string') : [];
+  } catch {
+    return [];
+  }
+}

package/src/harness/result.ts

@@ -1,22 +1,29 @@
 // Writing, printing and uploading the result of `run` / `map-trigger`.
-import { existsSync, mkdirSync, readdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
-import { join } from "node:path";
-import { canonicalJson } from "../util/canonical.ts";
-import { dirEntries, writeTarGz, type TarEntry } from "../util/tar.ts";
-import { redactUrl } from "../ctx/files.ts";
-import type { Envelope } from "./execute.ts";
+import {
+  existsSync,
+  mkdirSync,
+  readdirSync,
+  renameSync,
+  rmSync,
+  writeFileSync,
+} from 'node:fs';
+import { join } from 'node:path';
+import { canonicalJson } from '../util/canonical.ts';
+import { dirEntries, writeTarGz, type TarEntry } from '../util/tar.ts';
+import { redactUrl } from '../ctx/files.ts';
+import type { Envelope } from './execute.ts';
 
-export const RESULT_BEGIN = "---OLVE-RESULT-BEGIN---";
-export const RESULT_END = "---OLVE-RESULT-END---";
-export const MANIFEST_BEGIN = "---OLVE-MANIFEST-BEGIN---";
-export const MANIFEST_END = "---OLVE-MANIFEST-END---";
+export const RESULT_BEGIN = '---OLVE-RESULT-BEGIN---';
+export const RESULT_END = '---OLVE-RESULT-END---';
+export const MANIFEST_BEGIN = '---OLVE-MANIFEST-BEGIN---';
+export const MANIFEST_END = '---OLVE-MANIFEST-END---';
 
 /** Atomically writes the envelope to `<work>/output.json`. */
 export function writeEnvelope(work: string, envelope: Envelope): string {
   mkdirSync(work, { recursive: true });
-  const path = join(work, "output.json");
-  writeFileSync(path + ".partial", canonicalJson(envelope));
-  renameSync(path + ".partial", path);
+  const path = join(work, 'output.json');
+  writeFileSync(path + '.partial', canonicalJson(envelope));
+  renameSync(path + '.partial', path);
   return path;
 }
 
@@ -27,9 +34,15 @@ export function sentinelBlock(envelope: Envelope): string {
 
 /** Packs output.json + files/ into result.tar.gz (deterministic). */
 export async function packResult(work: string, out: string): Promise<void> {
-  const entries: TarEntry[] = [{ path: "output.json", type: "file", mode: 0o644, source: join(work, "output.json") }];
-  const files = join(work, "files");
-  if (existsSync(files)) entries.push({ path: "files", type: "dir", mode: 0o755 }, ...dirEntries(files, "files"));
+  const entries: TarEntry[] = [
+    { path: 'output.json', type: 'file', mode: 0o644, source: join(work, 'output.json') },
+  ];
+  const files = join(work, 'files');
+  if (existsSync(files))
+    entries.push(
+      { path: 'files', type: 'dir', mode: 0o755 },
+      ...dirEntries(files, 'files'),
+    );
   await writeTarGz(out, entries);
 }
 
@@ -40,15 +53,20 @@ export async function uploadFile(
   url: string,
   file: string,
   log: (line: string) => void,
-  opts: { attempts?: number; baseDelayMs?: number } = {},
+  opts: {
+    attempts?: number;
+    baseDelayMs?: number;
+    sleep?: (ms: number) => Promise<void>;
+  } = {},
 ): Promise<void> {
   const attempts = opts.attempts ?? 5;
   const base = opts.baseDelayMs ?? 1000;
+  const sleep = opts.sleep ?? ((ms: number) => Bun.sleep(ms));
   for (let i = 1; ; i++) {
     let status = 0;
     let detail: string;
     try {
-      const res = await fetch(url, { method: "PUT", body: Bun.file(file) });
+      const res = await fetch(url, { method: 'PUT', body: Bun.file(file) });
       status = res.status;
       if (res.ok) return;
       detail = `HTTP ${res.status} ${res.statusText}`;
@@ -57,9 +75,10 @@ export async function uploadFile(
       detail = (e as Error).message;
     }
     const transient = status === 0 || TRANSIENT(status);
-    if (!transient || i >= attempts) throw new Error(`upload to ${redactUrl(url)} failed: ${detail}`);
+    if (!transient || i >= attempts)
+      throw new Error(`upload to ${redactUrl(url)} failed: ${detail}`);
     log(`upload to ${redactUrl(url)} failed (${detail}); retry ${i}/${attempts - 1}`);
-    await Bun.sleep(base * 2 ** (i - 1));
+    await sleep(base * 2 ** (i - 1));
   }
 }
 
@@ -68,8 +87,10 @@ export async function uploadFile(
  * *contents* of files/. The directories themselves are kept (olve-init creates them 1777).
  */
 export function removeStale(work: string): void {
-  rmSync(join(work, "output.json"), { force: true });
-  rmSync(join(work, "output.json.partial"), { force: true });
-  const files = join(work, "files");
-  if (existsSync(files)) for (const e of readdirSync(files)) rmSync(join(files, e), { recursive: true, force: true });
+  rmSync(join(work, 'output.json'), { force: true });
+  rmSync(join(work, 'output.json.partial'), { force: true });
+  const files = join(work, 'files');
+  if (existsSync(files))
+    for (const e of readdirSync(files))
+      rmSync(join(files, e), { recursive: true, force: true });
 }