trajectories-sh 1.18.9 → 1.21.0

package/dist/{download-HTNOD7O4.js → chunk-PF2EMA6Q.js}

@@ -9,6 +9,7 @@ import { join, dirname } from "path";
 var UUID_RE = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/i;
 var BATCH_SIZE = 100;
 var CONCURRENCY = 25;
+var DOWNLOAD_TIMEOUT_MS = 18e4;
 function parseJobId(input) {
   const trimmed = input.trim();
   if (UUID_RE.test(trimmed) && !trimmed.includes("/")) {
@@ -34,7 +35,10 @@ async function downloadJob(input, outputDir) {
   let jobId = parseJobId(input);
   if (jobId.startsWith("org:")) {
     const [, orgId, slug2] = jobId.split(":");
-    const configResp = await fetch(`${apiUrl}/api/viewer/${orgId}/${slug2}/api/jobs`, { headers });
+    const configResp = await fetch(`${apiUrl}/api/viewer/${orgId}/${slug2}/api/jobs`, {
+      headers,
+      signal: AbortSignal.timeout(DOWNLOAD_TIMEOUT_MS)
+    });
     if (!configResp.ok) throw new Error(`Could not resolve job: ${orgId}/${slug2}`);
     const configData = await configResp.json();
     const items = configData.items || [];
@@ -46,7 +50,7 @@ async function downloadJob(input, outputDir) {
   }
   const listResp = await fetch(`${apiUrl}/api/cli/download/${jobId}/files`, {
     headers,
-    signal: AbortSignal.timeout(3e4)
+    signal: AbortSignal.timeout(DOWNLOAD_TIMEOUT_MS)
   });
   if (!listResp.ok) {
     throw new Error(`Failed to list files: ${await listResp.text()}`);
@@ -66,7 +70,7 @@ async function downloadJob(input, outputDir) {
       method: "POST",
       headers: { ...headers, "Content-Type": "application/json" },
       body: JSON.stringify({ paths: batch.map((f) => f.path) }),
-      signal: AbortSignal.timeout(3e4)
+      signal: AbortSignal.timeout(DOWNLOAD_TIMEOUT_MS)
     });
     let urlMap = /* @__PURE__ */ new Map();
     if (urlResp.ok) {
@@ -85,7 +89,7 @@ async function downloadJob(input, outputDir) {
           try {
             const resp = await fetch(downloadUrl, {
               headers: downloadHeaders,
-              signal: AbortSignal.timeout(12e4)
+              signal: AbortSignal.timeout(DOWNLOAD_TIMEOUT_MS)
             });
             if (!resp.ok) throw new Error(`HTTP ${resp.status}`);
             const data = Buffer.from(await resp.arrayBuffer());
@@ -121,7 +125,9 @@ async function downloadJob(input, outputDir) {
   bar.done();
   return { files: downloaded, totalSize };
 }
+
 export {
-  downloadJob,
-  parseJobId
+  DOWNLOAD_TIMEOUT_MS,
+  parseJobId,
+  downloadJob
 };

package/dist/cli.js

@@ -6,7 +6,7 @@ import { readFileSync } from "fs";
 import { fileURLToPath } from "url";
 import { dirname, join } from "path";
 var __dirname = dirname(fileURLToPath(import.meta.url));
-var version = "1.8.0";
+var version = "1.20.0";
 try {
   const pkg = JSON.parse(readFileSync(join(__dirname, "..", "package.json"), "utf-8"));
   version = pkg.version;
@@ -98,7 +98,7 @@ async function uploadTrajectoryAction(pathArg, opts) {
     );
   }
   if (isZip) {
-    const { uploadZip } = await import("./upload-2OUEVJOQ.js");
+    const { uploadZip } = await import("./upload-4QD3JFJE.js");
     const slug2 = opts.slug ?? pathArg.replace(/\.zip$/i, "").replace(/\/+$/, "").split("/").pop();
     console.log(chalk.bold(`
   Uploading ZIP ${pathArg} \u2192 ${chalk.cyan(slug2)}
@@ -127,7 +127,7 @@ async function uploadTrajectoryAction(pathArg, opts) {
   Uploading trajectory ${pathArg} \u2192 ${chalk.cyan(slug)}
 `));
   try {
-    const { uploadJob } = await import("./upload-2OUEVJOQ.js");
+    const { uploadJob } = await import("./upload-4QD3JFJE.js");
     const result = await uploadJob(pathArg, {
       slug,
       name: opts.name
@@ -200,7 +200,7 @@ async function downloadTrajectoryAction(url, opts) {
   Downloading trajectory...
 `));
   try {
-    const { downloadJob, parseJobId } = await import("./download-HTNOD7O4.js");
+    const { downloadJob, parseJobId } = await import("./download-4L7DZO3X.js");
     const outputDir = opts.output ?? parseJobId(url).replace(/^org:/, "").replace(/:/g, "-");
     const result = await downloadJob(url, outputDir);
     console.log(chalk.green.bold(`  \u2713 Downloaded ${result.files} files`));
@@ -216,7 +216,7 @@ async function downloadTrajectoryAction(url, opts) {
 }
 async function deleteTrajectoryAction(url, opts) {
   const chalk = (await import("chalk")).default;
-  const { parseJobId } = await import("./download-HTNOD7O4.js");
+  const { parseJobId } = await import("./download-4L7DZO3X.js");
   const { getApiUrl, getAuthHeader } = await import("./config-4XJRECIW.js");
   let jobId = parseJobId(url);
   if (jobId.startsWith("org:")) {
@@ -273,6 +273,91 @@ async function deleteTrajectoryAction(url, opts) {
     process.exit(1);
   }
 }
+function printCommentError(error, json) {
+  const message = error?.message || String(error);
+  if (json) {
+    console.error(JSON.stringify({ error: { message, status: error?.status ?? null } }));
+  } else {
+    console.error(`  \u2717 ${message}`);
+  }
+  process.exitCode = 1;
+}
+async function addCommentAction(targetInput, opts) {
+  try {
+    const { addComment, formatComment, parseCommentTarget, readCommentBody } = await import("./comments-RDCVHCZ7.js");
+    const target = parseCommentTarget(targetInput, opts);
+    const body = await readCommentBody(opts);
+    const comment2 = await addComment(target, body);
+    if (opts.json) console.log(JSON.stringify(comment2));
+    else console.log(`
+  \u2713 Comment added
+
+${formatComment(comment2)}
+`);
+  } catch (error) {
+    printCommentError(error, Boolean(opts.json));
+  }
+}
+async function listCommentsAction(targetInput, opts) {
+  try {
+    const { formatComment, listComments, parseCommentTarget } = await import("./comments-RDCVHCZ7.js");
+    const target = parseCommentTarget(targetInput, opts);
+    const comments = await listComments(target);
+    if (opts.json) {
+      console.log(JSON.stringify(comments));
+    } else if (comments.length === 0) {
+      console.log("  No comments found.");
+    } else {
+      console.log(`
+${comments.map(formatComment).join("\n\n")}
+`);
+    }
+  } catch (error) {
+    printCommentError(error, Boolean(opts.json));
+  }
+}
+async function updateCommentAction(commentId, opts) {
+  try {
+    const { formatComment, readCommentBody, updateComment } = await import("./comments-RDCVHCZ7.js");
+    const body = await readCommentBody(opts);
+    const comment2 = await updateComment(commentId, body);
+    if (opts.json) console.log(JSON.stringify(comment2));
+    else console.log(`
+  \u2713 Comment updated
+
+${formatComment(comment2)}
+`);
+  } catch (error) {
+    printCommentError(error, Boolean(opts.json));
+  }
+}
+async function deleteCommentAction(commentId, opts) {
+  try {
+    if (!opts.yes) {
+      if (!process.stdin.isTTY) {
+        throw new Error("Refusing non-interactive deletion without --yes");
+      }
+      const readline = await import("readline");
+      const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+      const answer = await new Promise((resolve) => {
+        rl.question(`  Delete comment ${commentId}? (y/N) `, resolve);
+      });
+      rl.close();
+      if (answer.toLowerCase() !== "y" && answer.toLowerCase() !== "yes") {
+        if (opts.json) console.log(JSON.stringify({ status: "cancelled", comment_id: commentId }));
+        else console.log("  Cancelled.");
+        return;
+      }
+    }
+    const { deleteComment } = await import("./comments-RDCVHCZ7.js");
+    await deleteComment(commentId);
+    const result = { status: "deleted", comment_id: commentId };
+    if (opts.json) console.log(JSON.stringify(result));
+    else console.log(`  \u2713 Deleted comment ${commentId}`);
+  } catch (error) {
+    printCommentError(error, Boolean(opts.json));
+  }
+}
 var upload = program.command("upload").description("Upload trajectories or tasks");
 upload.command("trajectory <path>").description("Upload a trajectory job directory or ZIP file (always uploaded as unlisted)").option("-s, --slug <slug>", "URL slug (default: directory name)").option("-n, --name <name>", "Display name (default: slug)").option("--api-key <key>", "API key (or set TRAJECTORIES_API_KEY in your env)").option("-v, --visibility <vis>", "(deprecated, ignored \u2014 set visibility in the UI)").action(uploadTrajectoryAction);
 upload.command("task <directory>").description("Upload a benchmark task directory").option("-n, --name <name>", "Task name (default: directory name)").option("--api-key <key>", "API key (or set TRAJECTORIES_API_KEY in your env)").option("-v, --visibility <vis>", "public or private", "public").action(uploadTaskAction);
@@ -280,6 +365,23 @@ var download = program.command("download").description("Download trajectories");
 download.command("trajectory <url>").description("Download a trajectory job from trajectories.sh").option("-o, --output <dir>", "Output directory (default: slug name)").action(downloadTrajectoryAction);
 var del = program.command("delete").description("Delete trajectories");
 del.command("trajectory <url>").description("Delete a trajectory job from trajectories.sh").option("-y, --yes", "Skip confirmation prompt").action(deleteTrajectoryAction);
+var comment = program.command("comment").description("Manage trajectory comments");
+function addCommentTargetOptions(command) {
+  return command.option("-t, --trial <trial>", "Trial UUID or trial name").option("-s, --step <step>", "ATIF step ID (not an array index)").option("--phase <phase>", "Step phase: action or result").option("--json", "Print machine-readable JSON");
+}
+function addCommentBodyOptions(command) {
+  return command.option("-m, --message <text>", "Comment body").option("-F, --file <path>", "Read comment body from a file; use - for stdin");
+}
+addCommentBodyOptions(addCommentTargetOptions(
+  comment.command("add <target>").description("Add a comment to a trajectory, trial, or step")
+)).action(addCommentAction);
+addCommentTargetOptions(
+  comment.command("list <target>").description("List comments at a trajectory, trial, or step")
+).action(listCommentsAction);
+addCommentBodyOptions(
+  comment.command("update <comment-id>").description("Update the body of one of your comments").option("--json", "Print machine-readable JSON")
+).action(updateCommentAction);
+comment.command("delete <comment-id>").description("Delete one of your comments").option("-y, --yes", "Skip confirmation prompt").option("--json", "Print machine-readable JSON").action(deleteCommentAction);
 program.command("whoami").description("Show current authentication status").action(async () => {
   const chalk = (await import("chalk")).default;
   const { status } = await import("./auth-4UEZSE4C.js");
@@ -293,4 +395,4 @@ program.command("whoami").description("Show current authentication status").acti
     console.log(chalk.dim("  Not logged in. Run: trajectories auth login"));
   }
 });
-program.parse();
+await program.parseAsync();

package/dist/comments-RDCVHCZ7.js

@@ -0,0 +1,169 @@
+import {
+  parseJobId
+} from "./chunk-PF2EMA6Q.js";
+import {
+  getApiUrl,
+  getAuthHeader
+} from "./chunk-Q2ZEN43L.js";
+
+// src/comments.ts
+import { readFileSync } from "fs";
+var UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+function parseCommentTarget(input, opts = {}) {
+  let urlTrial;
+  let urlStep;
+  let urlPhase;
+  try {
+    const url = new URL(input);
+    urlTrial = url.searchParams.get("trial") ?? void 0;
+    urlStep = url.searchParams.get("step") ?? void 0;
+    urlPhase = url.searchParams.get("phase") ?? void 0;
+  } catch {
+  }
+  const trial = opts.trial ?? urlTrial;
+  const rawStep = opts.step ?? urlStep;
+  const rawPhase = opts.phase ?? urlPhase ?? (rawStep !== void 0 ? "action" : void 0);
+  const target = { jobId: parseJobId(input) };
+  if (target.jobId.startsWith("org:")) {
+    throw new Error("Legacy trajectory URLs are not supported for comments; use a /t/<uuid> URL or job UUID");
+  }
+  if (trial) {
+    if (UUID_RE.test(trial)) target.trialId = trial;
+    else target.trialName = trial;
+  }
+  if (rawStep !== void 0) {
+    const stepId = typeof rawStep === "number" ? rawStep : Number(rawStep);
+    if (!Number.isInteger(stepId) || stepId < 0) {
+      throw new Error("Step must be a non-negative integer");
+    }
+    target.stepId = stepId;
+  }
+  if (rawPhase !== void 0) {
+    if (rawPhase !== "action" && rawPhase !== "result") {
+      throw new Error("Phase must be 'action' or 'result'");
+    }
+    target.phase = rawPhase;
+  }
+  if (target.stepId !== void 0 && !target.trialId && !target.trialName) {
+    throw new Error("A step comment requires --trial or a URL containing ?trial=");
+  }
+  if (target.phase && target.stepId === void 0) {
+    throw new Error("--phase requires --step or a URL containing ?step=");
+  }
+  return target;
+}
+async function readStdin() {
+  const chunks = [];
+  for await (const chunk of process.stdin) {
+    chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+  }
+  return Buffer.concat(chunks).toString("utf-8");
+}
+async function readCommentBody(opts) {
+  if (opts.message !== void 0 && opts.file !== void 0) {
+    throw new Error("Use only one comment source: --message, --file, or stdin");
+  }
+  let body;
+  if (opts.message !== void 0) {
+    body = opts.message;
+  } else if (opts.file !== void 0) {
+    body = opts.file === "-" ? await readStdin() : readFileSync(opts.file, "utf-8");
+  } else if (!process.stdin.isTTY) {
+    body = await readStdin();
+  } else {
+    throw new Error("Provide a comment with --message, --file, or piped stdin");
+  }
+  body = body.trim();
+  if (!body) throw new Error("Comment body cannot be empty");
+  return body;
+}
+function targetPayload(target) {
+  const payload = {};
+  if (target.trialId) payload.trial_id = target.trialId;
+  if (target.trialName) payload.trial_name = target.trialName;
+  if (target.stepId !== void 0) payload.step_id = target.stepId;
+  if (target.phase) payload.phase = target.phase;
+  return payload;
+}
+async function apiRequest(path, init = {}, requireAuth = false) {
+  const auth = await getAuthHeader();
+  if (requireAuth && !auth) {
+    throw new Error("Not authenticated. Run: trajectories auth login");
+  }
+  const headers = {
+    ...init.headers
+  };
+  if (auth) headers.Authorization = auth;
+  const response = await fetch(`${getApiUrl()}${path}`, { ...init, headers });
+  if (!response.ok) {
+    const responseText = await response.text();
+    let detail = responseText;
+    try {
+      const payload = JSON.parse(responseText);
+      if (typeof payload?.detail === "string") detail = payload.detail;
+    } catch {
+    }
+    const message = detail || `Request failed (${response.status})`;
+    const error = new Error(message);
+    error.status = response.status;
+    throw error;
+  }
+  return response.json();
+}
+async function addComment(target, body) {
+  return apiRequest(
+    `/api/org/trajectories/${target.jobId}/comments`,
+    {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ body, ...targetPayload(target) })
+    },
+    true
+  );
+}
+async function listComments(target) {
+  const params = new URLSearchParams();
+  if (target.trialId) params.set("trial_id", target.trialId);
+  if (target.trialName) params.set("trial_name", target.trialName);
+  if (target.stepId !== void 0) params.set("step_id", String(target.stepId));
+  if (target.phase) params.set("phase", target.phase);
+  const encoded = params.toString();
+  const query = encoded ? `?${encoded}` : "";
+  return apiRequest(
+    `/api/org/trajectories/${target.jobId}/comments${query}`
+  );
+}
+async function updateComment(commentId, body) {
+  return apiRequest(
+    `/api/org/trajectories/comments/${commentId}`,
+    {
+      method: "PATCH",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ body })
+    },
+    true
+  );
+}
+async function deleteComment(commentId) {
+  return apiRequest(
+    `/api/org/trajectories/comments/${commentId}`,
+    { method: "DELETE" },
+    true
+  );
+}
+function formatComment(comment) {
+  const scope = comment.step_id != null ? `step ${comment.step_id}${comment.phase ? ` (${comment.phase})` : ""}` : comment.trial_id ? `trial ${comment.trial_id}` : "trajectory";
+  const author = comment.author_name || comment.user_id;
+  const when = comment.updated_at || comment.created_at || "";
+  return `[${comment.id}] ${author} \xB7 ${scope}${when ? ` \xB7 ${when}` : ""}
+${comment.body}`;
+}
+export {
+  addComment,
+  deleteComment,
+  formatComment,
+  listComments,
+  parseCommentTarget,
+  readCommentBody,
+  updateComment
+};

package/dist/download-4L7DZO3X.js

@@ -0,0 +1,11 @@
+import {
+  DOWNLOAD_TIMEOUT_MS,
+  downloadJob,
+  parseJobId
+} from "./chunk-PF2EMA6Q.js";
+import "./chunk-Q2ZEN43L.js";
+export {
+  DOWNLOAD_TIMEOUT_MS,
+  downloadJob,
+  parseJobId
+};

package/dist/{upload-2OUEVJOQ.js → upload-4QD3JFJE.js}

@@ -7,13 +7,107 @@ import {
 } from "./chunk-Q2ZEN43L.js";
 
 // src/upload.ts
-import { readdirSync, statSync, readFileSync, writeFileSync, mkdirSync, copyFileSync, unlinkSync } from "fs";
-import { join, relative, dirname } from "path";
+import { readdirSync as readdirSync2, statSync, readFileSync as readFileSync2, writeFileSync as writeFileSync2, mkdirSync as mkdirSync2, copyFileSync, unlinkSync } from "fs";
+import { join as join2, relative, dirname } from "path";
 import { tmpdir } from "os";
 import { randomBytes, createHash } from "crypto";
+
+// src/screenshot-chunks.ts
+import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync } from "fs";
+import { extname, join } from "path";
+var CHUNK_DIR = "_screenshot_chunks";
+var MANIFEST_NAME = "manifest.json";
+var MANIFEST_VERSION = 1;
+var CHUNK_TARGET_BYTES = 4 * 1024 * 1024;
+var IMAGE_MIME_BY_EXT = {
+  ".webp": "image/webp",
+  ".png": "image/png",
+  ".jpg": "image/jpeg",
+  ".jpeg": "image/jpeg",
+  ".gif": "image/gif"
+};
+function mimeFor(path) {
+  return IMAGE_MIME_BY_EXT[extname(path).toLowerCase()] ?? null;
+}
+function referencedImagePaths(trajectory) {
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  const collect = (parts) => {
+    if (!Array.isArray(parts)) return;
+    for (const part of parts) {
+      if (!part || typeof part !== "object" || part.type !== "image") continue;
+      const path = part.source?.path;
+      if (typeof path === "string" && path && !seen.has(path)) {
+        seen.add(path);
+        out.push(path);
+      }
+    }
+  };
+  for (const step of Array.isArray(trajectory?.steps) ? trajectory.steps : []) {
+    if (!step || typeof step !== "object") continue;
+    collect(step.message);
+    for (const r of Array.isArray(step.observation?.results) ? step.observation.results : []) {
+      if (r && typeof r === "object") collect(r.content);
+    }
+  }
+  return out;
+}
+function buildScreenshotChunks(jobDir, outDir, opts = {}) {
+  const targetBytes = opts.targetBytes ?? CHUNK_TARGET_BYTES;
+  const files = [];
+  let imagesPacked = 0;
+  let trialsPacked = 0;
+  for (const entry of readdirSync(jobDir, { withFileTypes: true })) {
+    if (!entry.isDirectory() || entry.name.startsWith(".")) continue;
+    const trial = entry.name;
+    const trajPath = join(jobDir, trial, "agent", "trajectory.json");
+    if (!existsSync(trajPath)) continue;
+    let paths;
+    try {
+      paths = referencedImagePaths(JSON.parse(readFileSync(trajPath, "utf-8")));
+    } catch {
+      continue;
+    }
+    const images = paths.map((p) => ({ p, abs: join(jobDir, trial, "agent", p), mime: mimeFor(p) })).filter((x) => x.mime && existsSync(x.abs));
+    if (images.length === 0) continue;
+    const relDir = `${trial}/${CHUNK_DIR}/agent`;
+    const absDir = join(outDir, relDir);
+    mkdirSync(absDir, { recursive: true });
+    const manifest = { version: MANIFEST_VERSION, chunks: [] };
+    let current = null;
+    const seal = () => {
+      if (!current) return;
+      const abs = join(absDir, current.name);
+      writeFileSync(abs, Buffer.concat(current.parts));
+      manifest.chunks.push({ name: current.name, size: current.size, entries: current.entries });
+      files.push({ absPath: abs, relPath: `${relDir}/${current.name}`, size: current.size });
+      current = null;
+    };
+    for (const { p, abs, mime } of images) {
+      const data = readFileSync(abs);
+      if (current && current.size + data.length > targetBytes) seal();
+      if (!current) {
+        current = { name: `chunk-${String(manifest.chunks.length).padStart(3, "0")}.bin`, parts: [], entries: [], size: 0 };
+      }
+      current.entries.push([p, current.size, data.length, mime]);
+      current.parts.push(data);
+      current.size += data.length;
+      imagesPacked++;
+    }
+    seal();
+    const manifestAbs = join(absDir, MANIFEST_NAME);
+    const manifestBytes = Buffer.from(JSON.stringify(manifest));
+    writeFileSync(manifestAbs, manifestBytes);
+    files.push({ absPath: manifestAbs, relPath: `${relDir}/${MANIFEST_NAME}`, size: manifestBytes.length });
+    trialsPacked++;
+  }
+  return { files, imagesPacked, trialsPacked };
+}
+
+// src/upload.ts
 var SKIP = /* @__PURE__ */ new Set(["__pycache__", ".DS_Store", ".git", "node_modules"]);
 var MAX_FILE_SIZE = 50 * 1024 * 1024;
-var CONCURRENCY = Number(process.env.TRAJECTORIES_CLI_CONCURRENCY ?? "256");
+var CONCURRENCY = Number(process.env.TRAJECTORIES_CLI_CONCURRENCY ?? "24");
 var BATCH_SIZE = Number(process.env.TRAJECTORIES_CLI_BATCH_SIZE ?? "500");
 var WEBP_CONCURRENCY = Number(process.env.TRAJECTORIES_CLI_WEBP_CONCURRENCY ?? "4");
 var HASH_CONCURRENCY = Number(process.env.TRAJECTORIES_CLI_HASH_CONCURRENCY ?? "16");
@@ -21,9 +115,9 @@ function collectFiles(dir) {
   const files = [];
   const skipped = [];
   function walk(current) {
-    for (const entry of readdirSync(current, { withFileTypes: true })) {
+    for (const entry of readdirSync2(current, { withFileTypes: true })) {
       if (SKIP.has(entry.name)) continue;
-      const full = join(current, entry.name);
+      const full = join2(current, entry.name);
       if (entry.isDirectory()) {
         walk(full);
       } else if (entry.isFile()) {
@@ -172,13 +266,13 @@ async function convertToWebP(dir) {
     console.log("  \u26A0 sharp not available, skipping WebP conversion");
     return { convertedDir: dir, pngsConverted: 0, savedBytes: 0 };
   }
-  const tmpDir = join(tmpdir(), `trajectories-webp-${randomBytes(4).toString("hex")}`);
+  const tmpDir = join2(tmpdir(), `trajectories-webp-${randomBytes(4).toString("hex")}`);
   function copyDir(src, dest) {
-    mkdirSync(dest, { recursive: true });
-    for (const entry of readdirSync(src, { withFileTypes: true })) {
+    mkdirSync2(dest, { recursive: true });
+    for (const entry of readdirSync2(src, { withFileTypes: true })) {
       if (SKIP.has(entry.name)) continue;
-      const srcPath = join(src, entry.name);
-      const destPath = join(dest, entry.name);
+      const srcPath = join2(src, entry.name);
+      const destPath = join2(dest, entry.name);
       if (entry.isDirectory()) {
         copyDir(srcPath, destPath);
       } else {
@@ -206,7 +300,7 @@ async function convertToWebP(dir) {
   let processed = 0;
   const total = pngs.length;
   async function convertOne(f) {
-    const srcPath = join(tmpDir, f.relPath);
+    const srcPath = join2(tmpDir, f.relPath);
     const webpPath = srcPath.replace(/\.png$/i, ".webp");
     try {
       await pngToWebp(srcPath, webpPath);
@@ -238,10 +332,10 @@ async function convertToWebP(dir) {
   const trajFiles = collectFiles(tmpDir).files.filter((f) => f.relPath.endsWith("trajectory.json"));
   for (const tf of trajFiles) {
     try {
-      let content = readFileSync(tf.absPath, "utf-8");
+      let content = readFileSync2(tf.absPath, "utf-8");
       const original = content;
       content = content.replace(/screenshots\/([^"]+)\.png/g, (match, name) => {
-        const webpPath = join(dirname(tf.absPath), "screenshots", `${name}.webp`);
+        const webpPath = join2(dirname(tf.absPath), "screenshots", `${name}.webp`);
         try {
           statSync(webpPath);
           return `screenshots/${name}.webp`;
@@ -250,7 +344,7 @@ async function convertToWebP(dir) {
         }
       });
       if (content !== original) {
-        writeFileSync(tf.absPath, content);
+        writeFileSync2(tf.absPath, content);
       }
     } catch {
     }
@@ -296,7 +390,7 @@ function validateAtifFormat(dir) {
     errors.push("Missing result.json at the job root");
   } else {
     try {
-      const jobResult = JSON.parse(readFileSync(join(dir, "result.json"), "utf-8"));
+      const jobResult = JSON.parse(readFileSync2(join2(dir, "result.json"), "utf-8"));
       const jobRequired = [
         ["n_total_trials", "n_total_trials (number of trials)"],
         ["started_at", "started_at (ISO timestamp)"],
@@ -332,9 +426,9 @@ function validateAtifFormat(dir) {
     return errors;
   }
   for (const trial of trialDirs) {
-    const trialResultPath = join(dir, trial, "result.json");
+    const trialResultPath = join2(dir, trial, "result.json");
     try {
-      const data = JSON.parse(readFileSync(trialResultPath, "utf-8"));
+      const data = JSON.parse(readFileSync2(trialResultPath, "utf-8"));
       const required = [
         ["task_name", "task_name (string)"],
         ["started_at", "started_at (ISO timestamp)"],
@@ -364,7 +458,7 @@ function validateAtifFormat(dir) {
       errors.push(`Trial "${trial}": missing agent/trajectory.json`);
     } else {
       try {
-        const trajData = JSON.parse(readFileSync(join(dir, trajectoryRelPath), "utf-8"));
+        const trajData = JSON.parse(readFileSync2(join2(dir, trajectoryRelPath), "utf-8"));
         const steps = trajData.steps ?? [];
         const missingImages = [];
         for (const step of steps) {
@@ -445,7 +539,16 @@ ${samples}${more}
   const t0 = Date.now();
   const contentHash = await computeContentHash(files);
   console.log(`  Hash: ${contentHash.slice(0, 16)}... (${((Date.now() - t0) / 1e3).toFixed(1)}s)`);
-  const initResp = await apiPost("/api/cli/push/init", { slug, name, visibility, estimated_bytes: totalSize, content_hash: contentHash });
+  const chunkDir = join2(tmpdir(), `trajectories-chunks-${randomBytes(4).toString("hex")}`);
+  const chunkBuild = buildScreenshotChunks(convertedDir, chunkDir);
+  const uploadFiles = [...files, ...chunkBuild.files];
+  const chunkBytes = chunkBuild.files.reduce((s, f) => s + f.size, 0);
+  if (chunkBuild.imagesPacked > 0) {
+    console.log(
+      `  \u2713 Packed ${chunkBuild.imagesPacked} screenshots into ${chunkBuild.files.length - chunkBuild.trialsPacked} chunks (${(chunkBytes / 1024 / 1024).toFixed(1)} MB) across ${chunkBuild.trialsPacked} trial${chunkBuild.trialsPacked === 1 ? "" : "s"}`
+    );
+  }
+  const initResp = await apiPost("/api/cli/push/init", { slug, name, visibility, estimated_bytes: totalSize + chunkBytes, content_hash: contentHash });
   if (!initResp.ok) {
     throw new Error(`Init failed: ${await initResp.text()}`);
   }
@@ -459,26 +562,37 @@ ${samples}${more}
     console.log(`  \u24D8 This content was already uploaded as '${initBody.existing_duplicate.slug}' \u2014 uploading anyway.`);
     console.log(`    Existing: ${existingDuplicateUrl}`);
   }
-  await uploadDirect(jobId, files);
-  console.log("  Finalizing...");
-  const finalResp = await apiPost(`/api/cli/push/${jobId}/finalize`, {});
-  if (!finalResp.ok) {
-    let detail;
+  const { rmSync } = await import("fs");
+  const cleanupTemp = () => {
     try {
-      const body = await finalResp.json();
-      detail = body.detail || JSON.stringify(body);
+      rmSync(chunkDir, { recursive: true, force: true });
     } catch {
-      detail = await finalResp.text();
     }
-    throw new Error(`Finalize failed (${finalResp.status}): ${detail}`);
-  }
-  const result = await finalResp.json();
-  if (convertedDir !== dir) {
-    try {
-      const { rmSync } = await import("fs");
-      rmSync(convertedDir, { recursive: true, force: true });
-    } catch {
+    if (convertedDir !== dir) {
+      try {
+        rmSync(convertedDir, { recursive: true, force: true });
+      } catch {
+      }
     }
+  };
+  let result;
+  try {
+    await uploadDirect(jobId, uploadFiles);
+    console.log("  Finalizing...");
+    const finalResp = await apiPost(`/api/cli/push/${jobId}/finalize`, {});
+    if (!finalResp.ok) {
+      let detail;
+      try {
+        const body = await finalResp.json();
+        detail = body.detail || JSON.stringify(body);
+      } catch {
+        detail = await finalResp.text();
+      }
+      throw new Error(`Finalize failed (${finalResp.status}): ${detail}`);
+    }
+    result = await finalResp.json();
+  } finally {
+    cleanupTemp();
   }
   const apiUrl = getApiUrl();
   const siteUrl = apiUrl.includes("localhost") ? "http://localhost:3000" : apiUrl.replace("api.", "").replace(/\/$/, "");
@@ -595,9 +709,10 @@ async function fetchSignedUrlsForBatch(jobId, paths) {
   return { urlMap, errors };
 }
 async function uploadOneFileWithError(file, signedUrl) {
-  const data = readFileSync(file.absPath);
+  const data = readFileSync2(file.absPath);
   let lastError = "unknown error";
-  for (let attempt = 0; attempt < 5; attempt++) {
+  const MAX_ATTEMPTS = 8;
+  for (let attempt = 0; attempt < MAX_ATTEMPTS; attempt++) {
     try {
       const resp = await fetch(signedUrl, {
         method: "PUT",
@@ -607,22 +722,37 @@ async function uploadOneFileWithError(file, signedUrl) {
       });
       if (resp.ok) return { ok: true };
       lastError = `HTTP ${resp.status} ${resp.statusText}`;
+      let body = "";
       try {
-        const body = await resp.text();
+        body = await resp.text();
         if (body) lastError += ` \u2014 ${body.slice(0, 150).replace(/\s+/g, " ")}`;
       } catch {
       }
-      if (resp.status === 503 || resp.status === 429) {
-        await sleep(2e3 * (attempt + 1));
+      const isTransient = isTransientUploadError(resp.status, body);
+      if (isTransient) {
+        const base = Math.min(2e3 * Math.pow(2, attempt), 3e4);
+        const jitter = base * (0.8 + Math.random() * 0.4);
+        await sleep(jitter);
         continue;
       }
     } catch (e) {
       lastError = `fetch error: ${e?.name ?? "Error"} ${e?.message ?? e}`;
+      const base = Math.min(2e3 * Math.pow(2, attempt), 3e4);
+      const jitter = base * (0.8 + Math.random() * 0.4);
+      if (attempt < MAX_ATTEMPTS - 1) await sleep(jitter);
+      continue;
     }
-    if (attempt < 4) await sleep(1e3 * (attempt + 1));
+    if (attempt < MAX_ATTEMPTS - 1) await sleep(1e3 * (attempt + 1));
   }
   return { ok: false, error: lastError };
 }
+function isTransientUploadError(status, body) {
+  if (status === 429 || status === 502 || status === 503 || status === 504) return true;
+  if (status === 544) return true;
+  if (!body) return false;
+  const lower = body.toLowerCase();
+  return lower.includes("databaseconnectionlimit") || lower.includes("databasetimeout") || lower.includes('"statuscode":"503"') || lower.includes('"statuscode":"504"') || lower.includes('"statuscode":"544"') || lower.includes("too many connections") || lower.includes("connection timed out");
+}
 function sleep(ms) {
   return new Promise((r) => setTimeout(r, ms));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trajectories-sh",
-  "version": "1.18.9",
+  "version": "1.21.0",
   "description": "CLI for uploading trajectory jobs to trajectories.sh",
   "type": "module",
   "bin": {
@@ -10,6 +10,7 @@
   "scripts": {
     "build": "tsup src/cli.ts --format esm --target node18 --clean",
     "dev": "tsx src/cli.ts",
+    "test": "tsx --test src/*.test.ts",
     "prepublishOnly": "npm run build"
   },
   "files": [