trajectories-sh 1.18.0 → 1.18.2

package/dist/chunk-2ELJH3IV.js

@@ -0,0 +1,55 @@
+import {
+  getApiUrl,
+  getAuthHeader
+} from "./chunk-Q2ZEN43L.js";
+
+// src/quota.ts
+async function fetchOrgUsage() {
+  const auth = await getAuthHeader();
+  if (!auth) return null;
+  try {
+    const resp = await fetch(`${getApiUrl()}/api/cli/usage`, {
+      headers: { Authorization: auth },
+      signal: AbortSignal.timeout(1e4)
+    });
+    if (!resp.ok) return null;
+    return await resp.json();
+  } catch {
+    return null;
+  }
+}
+function planUpgradeLabel(plan) {
+  return plan === "free" ? "Team" : "Premiere";
+}
+async function preflightQuota(check) {
+  const usage = await fetchOrgUsage();
+  if (!usage) return;
+  if (usage.plan === "premiere") return;
+  const plan = planUpgradeLabel(usage.plan);
+  if (check.kind === "trajectory") {
+    if (usage.trajectory_count >= usage.trajectory_limit) {
+      throw new Error(
+        `Trajectory limit reached (${usage.trajectory_count.toLocaleString()}/${usage.trajectory_limit.toLocaleString()}). Upgrade to ${plan} for more: https://trajectories.sh/pricing`
+      );
+    }
+    const projected = usage.storage_bytes_used + check.projectedAddedBytes;
+    if (projected > usage.storage_limit_bytes) {
+      const usedGB = (usage.storage_bytes_used / 1024 ** 3).toFixed(1);
+      const uploadGB = (check.projectedAddedBytes / 1024 ** 3).toFixed(1);
+      const limitGB = (usage.storage_limit_bytes / 1024 ** 3).toFixed(0);
+      throw new Error(
+        `Storage limit would be exceeded (${usedGB} GB used + ${uploadGB} GB upload > ${limitGB} GB limit). Upgrade to ${plan} for more: https://trajectories.sh/pricing`
+      );
+    }
+    return;
+  }
+  if (usage.task_count + check.newTaskCount > usage.task_limit) {
+    throw new Error(
+      `Task limit reached (${usage.task_count.toLocaleString()}/${usage.task_limit.toLocaleString()}). Upgrade to ${plan} for more: https://trajectories.sh/pricing`
+    );
+  }
+}
+
+export {
+  preflightQuota
+};

package/dist/cli.js

@@ -64,11 +64,18 @@ auth.command("status").description("Show current authentication status").action(
     console.log(chalk.dim("  Not logged in. Run: trajectories auth login"));
   }
 });
-async function uploadTrajectoryAction(directory, opts) {
+async function uploadTrajectoryAction(pathArg, opts) {
   const chalk = (await import("chalk")).default;
   const { existsSync, statSync } = await import("fs");
-  if (!existsSync(directory) || !statSync(directory).isDirectory()) {
-    console.error(chalk.red(`  \u2717 Directory not found: ${directory}`));
+  const exists = existsSync(pathArg);
+  const isZip = pathArg.toLowerCase().endsWith(".zip");
+  const isDir = exists && statSync(pathArg).isDirectory();
+  if (!exists) {
+    console.error(chalk.red(`  \u2717 Path not found: ${pathArg}`));
+    process.exit(1);
+  }
+  if (!isDir && !isZip) {
+    console.error(chalk.red(`  \u2717 ${pathArg} is not a directory or .zip file`));
     process.exit(1);
   }
   if (opts.apiKey) {
@@ -90,13 +97,38 @@ async function uploadTrajectoryAction(directory, opts) {
       )
     );
   }
-  const slug = opts.slug ?? directory.replace(/\/+$/, "").split("/").pop();
+  if (isZip) {
+    const { uploadZip } = await import("./upload-3CRW3BJ6.js");
+    const slug2 = opts.slug ?? pathArg.replace(/\.zip$/i, "").replace(/\/+$/, "").split("/").pop();
+    console.log(chalk.bold(`
+  Uploading ZIP ${pathArg} \u2192 ${chalk.cyan(slug2)}
+`));
+    try {
+      const results = await uploadZip(pathArg, { slug: slug2, name: opts.name });
+      for (const r of results) {
+        console.log(chalk.green.bold(`  \u2713 ${r.slug}`));
+        console.log(`    Trials: ${r.nTrials}`);
+        if (r.meanReward != null) {
+          console.log(`    Pass rate: ${(r.meanReward * 100).toFixed(0)}%`);
+        }
+        console.log(`    Viewer: ${r.viewerUrl}`);
+      }
+      console.log("");
+    } catch (e) {
+      console.error(chalk.red(`
+  \u2717 ${e.message}
+`));
+      process.exit(1);
+    }
+    return;
+  }
+  const slug = opts.slug ?? pathArg.replace(/\/+$/, "").split("/").pop();
   console.log(chalk.bold(`
-  Uploading trajectory ${directory} \u2192 ${chalk.cyan(slug)}
+  Uploading trajectory ${pathArg} \u2192 ${chalk.cyan(slug)}
 `));
   try {
-    const { uploadJob } = await import("./upload-NR7SFMZZ.js");
-    const result = await uploadJob(directory, {
+    const { uploadJob } = await import("./upload-3CRW3BJ6.js");
+    const result = await uploadJob(pathArg, {
       slug,
       name: opts.name
     });
@@ -141,7 +173,7 @@ async function uploadTaskAction(directory, opts) {
   Uploading task ${directory} \u2192 ${chalk.cyan(name)}
 `));
   try {
-    const { pushTask } = await import("./push-task-IZZNF3ZA.js");
+    const { pushTask } = await import("./push-task-OZTAROKW.js");
     const result = await pushTask(directory, {
       name: opts.name,
       visibility: opts.visibility
@@ -242,7 +274,7 @@ async function deleteTrajectoryAction(url, opts) {
   }
 }
 var upload = program.command("upload").description("Upload trajectories or tasks");
-upload.command("trajectory <directory>").description("Upload a trajectory job directory (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("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);
 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);

package/dist/{push-task-IZZNF3ZA.js → push-task-OZTAROKW.js}

@@ -1,3 +1,6 @@
+import {
+  preflightQuota
+} from "./chunk-2ELJH3IV.js";
 import {
   getApiUrl,
   getAuthHeader
@@ -116,18 +119,9 @@ async function pushTask(dir, opts) {
       "No task content found. A task needs at least an instruction.md, Dockerfile, or test file."
     );
   }
-  const apiUrl = getApiUrl();
-  try {
-    const usageResp = await fetch(`${apiUrl}/api/cli/usage`, {
-      headers: { Authorization: auth },
-      signal: AbortSignal.timeout(1e4)
-    });
-    if (usageResp.ok) {
-      const usage = await usageResp.json();
-    }
-  } catch {
-  }
+  await preflightQuota({ kind: "task", newTaskCount: 1 });
   console.log("  Uploading...");
+  const apiUrl = getApiUrl();
   const resp = await fetch(`${apiUrl}/api/cli/push-task`, {
     method: "POST",
     headers: {

package/dist/{upload-NR7SFMZZ.js → upload-3CRW3BJ6.js}

@@ -1,3 +1,6 @@
+import {
+  preflightQuota
+} from "./chunk-2ELJH3IV.js";
 import {
   getApiUrl,
   getAuthHeader
@@ -10,7 +13,7 @@ import { tmpdir } from "os";
 import { randomBytes, createHash } from "crypto";
 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 ?? "512");
+var CONCURRENCY = Number(process.env.TRAJECTORIES_CLI_CONCURRENCY ?? "256");
 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");
@@ -47,6 +50,48 @@ async function apiPost(path, body, timeout = 3e5) {
     signal: AbortSignal.timeout(timeout)
   });
 }
+async function uploadZip(zipPath, opts) {
+  const { readFileSync: readFileSync2, statSync: statSync2 } = await import("fs");
+  const { getApiUrl: _getApiUrl, getAuthHeader: _getAuthHeader } = await import("./config-4XJRECIW.js");
+  const auth = await _getAuthHeader();
+  if (!auth) throw new Error("Not authenticated. Run: trajectories auth login");
+  const fileStat = statSync2(zipPath);
+  const sizeMB = (fileStat.size / (1024 * 1024)).toFixed(1);
+  console.log(`  ZIP size: ${sizeMB} MB`);
+  console.log("  Uploading to server (server-side extraction)...");
+  const fileData = readFileSync2(zipPath);
+  const formData = new FormData();
+  formData.append("file", new Blob([fileData]), zipPath.split("/").pop() ?? "upload.zip");
+  if (opts.slug) formData.append("slug", opts.slug);
+  if (opts.name) formData.append("name", opts.name);
+  formData.append("visibility", "unlisted");
+  const apiUrl = _getApiUrl();
+  const resp = await fetch(`${apiUrl}/api/cli/push/zip`, {
+    method: "POST",
+    headers: { Authorization: auth },
+    body: formData,
+    signal: AbortSignal.timeout(36e5)
+  });
+  if (!resp.ok) {
+    let detail;
+    try {
+      const body = await resp.json();
+      detail = body.detail || JSON.stringify(body);
+    } catch {
+      detail = await resp.text();
+    }
+    throw new Error(`ZIP upload failed (${resp.status}): ${detail}`);
+  }
+  const result = await resp.json();
+  const siteUrl = apiUrl.includes("localhost") ? "http://localhost:3000" : apiUrl.replace("api.", "").replace(/\/$/, "");
+  return result.jobs.map((j) => ({
+    jobId: j.job_id,
+    slug: j.slug,
+    nTrials: j.n_trials,
+    meanReward: j.mean_reward ?? void 0,
+    viewerUrl: `${siteUrl}/t/${j.job_id}`
+  }));
+}
 async function convertToWebP(dir) {
   const { files } = collectFiles(dir);
   const pngs = files.filter((f) => f.relPath.toLowerCase().endsWith(".png"));
@@ -328,40 +373,11 @@ ${samples}${more}
 `
     );
   }
+  await preflightQuota({ kind: "trajectory", projectedAddedBytes: totalSize });
   process.stdout.write(`  Hashing...\r`);
   const t0 = Date.now();
   const contentHash = await computeContentHash(files);
   console.log(`  Hash: ${contentHash.slice(0, 16)}... (${((Date.now() - t0) / 1e3).toFixed(1)}s)`);
-  try {
-    const auth = await getAuthHeader();
-    const usageResp = await fetch(`${getApiUrl()}/api/cli/usage`, {
-      headers: auth ? { Authorization: auth } : {},
-      signal: AbortSignal.timeout(1e4)
-    });
-    if (usageResp.status === 200) {
-      const usage = await usageResp.json();
-      if (usage.plan !== "premiere") {
-        if (usage.trajectory_count >= usage.trajectory_limit) {
-          const plan = usage.plan === "free" ? "Team" : "Premiere";
-          throw new Error(
-            `Trajectory limit reached (${usage.trajectory_count.toLocaleString()}/${usage.trajectory_limit.toLocaleString()}). Upgrade to ${plan} for more: https://trajectories.sh/pricing`
-          );
-        }
-        const projectedStorage = usage.storage_bytes_used + totalSize;
-        if (projectedStorage > usage.storage_limit_bytes) {
-          const usedGB = (usage.storage_bytes_used / 1024 ** 3).toFixed(1);
-          const uploadGB = (totalSize / 1024 ** 3).toFixed(1);
-          const limitGB = (usage.storage_limit_bytes / 1024 ** 3).toFixed(0);
-          const plan = usage.plan === "free" ? "Team" : "Premiere";
-          throw new Error(
-            `Storage limit would be exceeded (${usedGB} GB used + ${uploadGB} GB upload > ${limitGB} GB limit). Upgrade to ${plan} for more: https://trajectories.sh/pricing`
-          );
-        }
-      }
-    }
-  } catch (e) {
-    if (e.message?.includes("limit")) throw e;
-  }
   const initResp = await apiPost("/api/cli/push/init", { slug, name, visibility, estimated_bytes: totalSize, content_hash: contentHash });
   if (!initResp.ok) {
     throw new Error(`Init failed: ${await initResp.text()}`);
@@ -514,7 +530,7 @@ async function fetchSignedUrlsForBatch(jobId, paths) {
 async function uploadOneFileWithError(file, signedUrl) {
   const data = readFileSync(file.absPath);
   let lastError = "unknown error";
-  for (let attempt = 0; attempt < 3; attempt++) {
+  for (let attempt = 0; attempt < 5; attempt++) {
     try {
       const resp = await fetch(signedUrl, {
         method: "PUT",
@@ -529,10 +545,14 @@ async function uploadOneFileWithError(file, signedUrl) {
         if (body) lastError += ` \u2014 ${body.slice(0, 150).replace(/\s+/g, " ")}`;
       } catch {
       }
+      if (resp.status === 503 || resp.status === 429) {
+        await sleep(2e3 * (attempt + 1));
+        continue;
+      }
     } catch (e) {
       lastError = `fetch error: ${e?.name ?? "Error"} ${e?.message ?? e}`;
     }
-    if (attempt < 2) await sleep(1e3 * (attempt + 1));
+    if (attempt < 4) await sleep(1e3 * (attempt + 1));
   }
   return { ok: false, error: lastError };
 }
@@ -544,5 +564,6 @@ function truncate(s, n) {
 }
 export {
   collectFiles,
-  uploadJob
+  uploadJob,
+  uploadZip
 };

package/package.json

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