trajectories-sh 1.18.0 → 1.18.1

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

@@ -95,7 +95,7 @@ async function uploadTrajectoryAction(directory, opts) {
   Uploading trajectory ${directory} \u2192 ${chalk.cyan(slug)}
 `));
   try {
-    const { uploadJob } = await import("./upload-NR7SFMZZ.js");
+    const { uploadJob } = await import("./upload-JHU236SW.js");
     const result = await uploadJob(directory, {
       slug,
       name: opts.name
@@ -141,7 +141,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

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-JHU236SW.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");
@@ -328,40 +331,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 +488,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 +503,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 };
 }

package/package.json

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