trajectories-sh 1.21.0 → 1.22.0

package/dist/chunk-35B24E3O.js

@@ -0,0 +1,154 @@
+// src/screenshot-chunks.ts
+import { existsSync, mkdirSync, readdirSync, readFileSync, rmSync, writeFileSync } from "fs";
+import { dirname, 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 = [];
+  const packedRelPaths = /* @__PURE__ */ new Set();
+  let packedBytes = 0;
+  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;
+      packedRelPaths.add(`${trial}/agent/${p}`);
+      packedBytes += 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, packedRelPaths, packedBytes, imagesPacked, trialsPacked };
+}
+function unpackScreenshotChunks(jobDir) {
+  let imagesWritten = 0;
+  let trialsUnpacked = 0;
+  if (!existsSync(jobDir)) return { imagesWritten, trialsUnpacked };
+  for (const entry of readdirSync(jobDir, { withFileTypes: true })) {
+    if (!entry.isDirectory()) continue;
+    const chunkRoot = join(jobDir, entry.name, CHUNK_DIR);
+    if (!existsSync(chunkRoot)) continue;
+    const agentDir = join(chunkRoot, "agent");
+    const manifestPath = join(agentDir, MANIFEST_NAME);
+    let clean = true;
+    if (existsSync(manifestPath)) {
+      let manifest = null;
+      try {
+        manifest = JSON.parse(readFileSync(manifestPath, "utf-8"));
+      } catch {
+        manifest = null;
+      }
+      if (manifest?.version === MANIFEST_VERSION && Array.isArray(manifest.chunks)) {
+        let wrote = false;
+        for (const chunk of manifest.chunks) {
+          const chunkPath = join(agentDir, chunk.name);
+          if (!existsSync(chunkPath)) {
+            console.warn(`  \u26A0 ${entry.name}: chunk ${chunk.name} missing; its screenshots were not restored`);
+            clean = false;
+            continue;
+          }
+          const data = readFileSync(chunkPath);
+          for (const [p, offset, length] of chunk.entries) {
+            if (p.includes("..") || p.startsWith("/")) continue;
+            const dest = join(jobDir, entry.name, "agent", p);
+            if (existsSync(dest)) continue;
+            if (offset + length > data.length) {
+              console.warn(`  \u26A0 ${entry.name}: ${p} extends past the end of ${chunk.name}; skipped`);
+              clean = false;
+              continue;
+            }
+            mkdirSync(dirname(dest), { recursive: true });
+            writeFileSync(dest, data.subarray(offset, offset + length));
+            imagesWritten++;
+            wrote = true;
+          }
+        }
+        if (wrote) trialsUnpacked++;
+      } else {
+        console.warn(`  \u26A0 ${entry.name}: unreadable screenshot chunk manifest; screenshots were not restored`);
+        clean = false;
+      }
+    }
+    if (clean) rmSync(chunkRoot, { recursive: true, force: true });
+  }
+  return { imagesWritten, trialsUnpacked };
+}
+
+export {
+  CHUNK_DIR,
+  buildScreenshotChunks,
+  unpackScreenshotChunks
+};

package/dist/{chunk-PF2EMA6Q.js → chunk-IUSBK45Q.js}

@@ -1,3 +1,7 @@
+import {
+  CHUNK_DIR,
+  unpackScreenshotChunks
+} from "./chunk-35B24E3O.js";
 import {
   getApiUrl,
   getAuthHeader
@@ -57,8 +61,13 @@ async function downloadJob(input, outputDir) {
   }
   const { slug, files } = await listResp.json();
   const totalBytes = files.reduce((s, f) => s + f.size, 0);
+  const packedTrials = new Set(
+    files.filter((f) => f.path.includes(`/${CHUNK_DIR}/`)).map((f) => f.path.split("/")[0])
+  );
   console.log(`  Job: ${slug} (${jobId})`);
-  console.log(`  ${files.length} files, ${(totalBytes / 1024 / 1024).toFixed(1)} MB`);
+  console.log(
+    `  ${files.length} files, ${(totalBytes / 1024 / 1024).toFixed(1)} MB` + (packedTrials.size > 0 ? ` (screenshots of ${packedTrials.size} trial${packedTrials.size === 1 ? "" : "s"} packed)` : "")
+  );
   mkdirSync(outputDir, { recursive: true });
   const { ProgressBar } = await import("./progress-H7WNKHDR.js");
   const bar = new ProgressBar({ total: files.length, totalBytes, label: "\u2193" });
@@ -123,6 +132,12 @@ async function downloadJob(input, outputDir) {
     await Promise.all(pending);
   }
   bar.done();
+  if (packedTrials.size > 0) {
+    const unpacked = unpackScreenshotChunks(outputDir);
+    if (unpacked.imagesWritten > 0) {
+      console.log(`  \u2713 Unpacked ${unpacked.imagesWritten} screenshots across ${unpacked.trialsUnpacked} trial${unpacked.trialsUnpacked === 1 ? "" : "s"}`);
+    }
+  }
   return { files: downloaded, totalSize };
 }
 

package/dist/cli.js

@@ -98,7 +98,7 @@ async function uploadTrajectoryAction(pathArg, opts) {
     );
   }
   if (isZip) {
-    const { uploadZip } = await import("./upload-4QD3JFJE.js");
+    const { uploadZip } = await import("./upload-CIW2CHKX.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-4QD3JFJE.js");
+    const { uploadJob } = await import("./upload-CIW2CHKX.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-4L7DZO3X.js");
+    const { downloadJob, parseJobId } = await import("./download-M6UVD5S5.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-4L7DZO3X.js");
+  const { parseJobId } = await import("./download-M6UVD5S5.js");
   const { getApiUrl, getAuthHeader } = await import("./config-4XJRECIW.js");
   let jobId = parseJobId(url);
   if (jobId.startsWith("org:")) {
@@ -284,7 +284,7 @@ function printCommentError(error, json) {
 }
 async function addCommentAction(targetInput, opts) {
   try {
-    const { addComment, formatComment, parseCommentTarget, readCommentBody } = await import("./comments-RDCVHCZ7.js");
+    const { addComment, formatComment, parseCommentTarget, readCommentBody } = await import("./comments-PK7DDP36.js");
     const target = parseCommentTarget(targetInput, opts);
     const body = await readCommentBody(opts);
     const comment2 = await addComment(target, body);
@@ -300,7 +300,7 @@ ${formatComment(comment2)}
 }
 async function listCommentsAction(targetInput, opts) {
   try {
-    const { formatComment, listComments, parseCommentTarget } = await import("./comments-RDCVHCZ7.js");
+    const { formatComment, listComments, parseCommentTarget } = await import("./comments-PK7DDP36.js");
     const target = parseCommentTarget(targetInput, opts);
     const comments = await listComments(target);
     if (opts.json) {
@@ -318,7 +318,7 @@ ${comments.map(formatComment).join("\n\n")}
 }
 async function updateCommentAction(commentId, opts) {
   try {
-    const { formatComment, readCommentBody, updateComment } = await import("./comments-RDCVHCZ7.js");
+    const { formatComment, readCommentBody, updateComment } = await import("./comments-PK7DDP36.js");
     const body = await readCommentBody(opts);
     const comment2 = await updateComment(commentId, body);
     if (opts.json) console.log(JSON.stringify(comment2));
@@ -349,7 +349,7 @@ async function deleteCommentAction(commentId, opts) {
         return;
       }
     }
-    const { deleteComment } = await import("./comments-RDCVHCZ7.js");
+    const { deleteComment } = await import("./comments-PK7DDP36.js");
     await deleteComment(commentId);
     const result = { status: "deleted", comment_id: commentId };
     if (opts.json) console.log(JSON.stringify(result));

package/dist/{comments-RDCVHCZ7.js → comments-PK7DDP36.js}

@@ -1,6 +1,7 @@
 import {
   parseJobId
-} from "./chunk-PF2EMA6Q.js";
+} from "./chunk-IUSBK45Q.js";
+import "./chunk-35B24E3O.js";
 import {
   getApiUrl,
   getAuthHeader

package/dist/{download-4L7DZO3X.js → download-M6UVD5S5.js}

@@ -2,7 +2,8 @@ import {
   DOWNLOAD_TIMEOUT_MS,
   downloadJob,
   parseJobId
-} from "./chunk-PF2EMA6Q.js";
+} from "./chunk-IUSBK45Q.js";
+import "./chunk-35B24E3O.js";
 import "./chunk-Q2ZEN43L.js";
 export {
   DOWNLOAD_TIMEOUT_MS,

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

@@ -1,110 +1,19 @@
 import {
   preflightQuota
 } from "./chunk-2ELJH3IV.js";
+import {
+  buildScreenshotChunks
+} from "./chunk-35B24E3O.js";
 import {
   getApiUrl,
   getAuthHeader
 } from "./chunk-Q2ZEN43L.js";
 
 // src/upload.ts
-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 { readdirSync, statSync, readFileSync, writeFileSync, mkdirSync, copyFileSync, unlinkSync } from "fs";
+import { join, 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 ?? "24");
@@ -115,9 +24,9 @@ function collectFiles(dir) {
   const files = [];
   const skipped = [];
   function walk(current) {
-    for (const entry of readdirSync2(current, { withFileTypes: true })) {
+    for (const entry of readdirSync(current, { withFileTypes: true })) {
       if (SKIP.has(entry.name)) continue;
-      const full = join2(current, entry.name);
+      const full = join(current, entry.name);
       if (entry.isDirectory()) {
         walk(full);
       } else if (entry.isFile()) {
@@ -266,13 +175,13 @@ async function convertToWebP(dir) {
     console.log("  \u26A0 sharp not available, skipping WebP conversion");
     return { convertedDir: dir, pngsConverted: 0, savedBytes: 0 };
   }
-  const tmpDir = join2(tmpdir(), `trajectories-webp-${randomBytes(4).toString("hex")}`);
+  const tmpDir = join(tmpdir(), `trajectories-webp-${randomBytes(4).toString("hex")}`);
   function copyDir(src, dest) {
-    mkdirSync2(dest, { recursive: true });
-    for (const entry of readdirSync2(src, { withFileTypes: true })) {
+    mkdirSync(dest, { recursive: true });
+    for (const entry of readdirSync(src, { withFileTypes: true })) {
       if (SKIP.has(entry.name)) continue;
-      const srcPath = join2(src, entry.name);
-      const destPath = join2(dest, entry.name);
+      const srcPath = join(src, entry.name);
+      const destPath = join(dest, entry.name);
       if (entry.isDirectory()) {
         copyDir(srcPath, destPath);
       } else {
@@ -300,7 +209,7 @@ async function convertToWebP(dir) {
   let processed = 0;
   const total = pngs.length;
   async function convertOne(f) {
-    const srcPath = join2(tmpDir, f.relPath);
+    const srcPath = join(tmpDir, f.relPath);
     const webpPath = srcPath.replace(/\.png$/i, ".webp");
     try {
       await pngToWebp(srcPath, webpPath);
@@ -332,10 +241,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 = readFileSync2(tf.absPath, "utf-8");
+      let content = readFileSync(tf.absPath, "utf-8");
       const original = content;
       content = content.replace(/screenshots\/([^"]+)\.png/g, (match, name) => {
-        const webpPath = join2(dirname(tf.absPath), "screenshots", `${name}.webp`);
+        const webpPath = join(dirname(tf.absPath), "screenshots", `${name}.webp`);
         try {
           statSync(webpPath);
           return `screenshots/${name}.webp`;
@@ -344,7 +253,7 @@ async function convertToWebP(dir) {
         }
       });
       if (content !== original) {
-        writeFileSync2(tf.absPath, content);
+        writeFileSync(tf.absPath, content);
       }
     } catch {
     }
@@ -390,7 +299,7 @@ function validateAtifFormat(dir) {
     errors.push("Missing result.json at the job root");
   } else {
     try {
-      const jobResult = JSON.parse(readFileSync2(join2(dir, "result.json"), "utf-8"));
+      const jobResult = JSON.parse(readFileSync(join(dir, "result.json"), "utf-8"));
       const jobRequired = [
         ["n_total_trials", "n_total_trials (number of trials)"],
         ["started_at", "started_at (ISO timestamp)"],
@@ -426,9 +335,9 @@ function validateAtifFormat(dir) {
     return errors;
   }
   for (const trial of trialDirs) {
-    const trialResultPath = join2(dir, trial, "result.json");
+    const trialResultPath = join(dir, trial, "result.json");
     try {
-      const data = JSON.parse(readFileSync2(trialResultPath, "utf-8"));
+      const data = JSON.parse(readFileSync(trialResultPath, "utf-8"));
       const required = [
         ["task_name", "task_name (string)"],
         ["started_at", "started_at (ISO timestamp)"],
@@ -458,7 +367,7 @@ function validateAtifFormat(dir) {
       errors.push(`Trial "${trial}": missing agent/trajectory.json`);
     } else {
       try {
-        const trajData = JSON.parse(readFileSync2(join2(dir, trajectoryRelPath), "utf-8"));
+        const trajData = JSON.parse(readFileSync(join(dir, trajectoryRelPath), "utf-8"));
         const steps = trajData.steps ?? [];
         const missingImages = [];
         for (const step of steps) {
@@ -539,16 +448,19 @@ ${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 chunkDir = join2(tmpdir(), `trajectories-chunks-${randomBytes(4).toString("hex")}`);
+  const chunkDir = join(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);
+  const uploadFiles = [
+    ...files.filter((f) => !chunkBuild.packedRelPaths.has(f.relPath.split("\\").join("/"))),
+    ...chunkBuild.files
+  ];
+  const uploadBytes = uploadFiles.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"}`
+      `  \u2713 Packed ${chunkBuild.imagesPacked} screenshots into ${chunkBuild.files.length - chunkBuild.trialsPacked} chunks (${(chunkBuild.packedBytes / 1024 / 1024).toFixed(1)} MB) across ${chunkBuild.trialsPacked} trial${chunkBuild.trialsPacked === 1 ? "" : "s"} \u2014 ${uploadFiles.length} uploads`
     );
   }
-  const initResp = await apiPost("/api/cli/push/init", { slug, name, visibility, estimated_bytes: totalSize + chunkBytes, content_hash: contentHash });
+  const initResp = await apiPost("/api/cli/push/init", { slug, name, visibility, estimated_bytes: uploadBytes, content_hash: contentHash });
   if (!initResp.ok) {
     throw new Error(`Init failed: ${await initResp.text()}`);
   }
@@ -709,7 +621,7 @@ async function fetchSignedUrlsForBatch(jobId, paths) {
   return { urlMap, errors };
 }
 async function uploadOneFileWithError(file, signedUrl) {
-  const data = readFileSync2(file.absPath);
+  const data = readFileSync(file.absPath);
   let lastError = "unknown error";
   const MAX_ATTEMPTS = 8;
   for (let attempt = 0; attempt < MAX_ATTEMPTS; attempt++) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trajectories-sh",
-  "version": "1.21.0",
+  "version": "1.22.0",
   "description": "CLI for uploading trajectory jobs to trajectories.sh",
   "type": "module",
   "bin": {