trajectories-sh 1.13.0 → 1.14.0

package/dist/cli.js

@@ -89,7 +89,7 @@ async function uploadTrajectoryAction(directory, opts) {
   Uploading trajectory ${directory} \u2192 ${chalk.cyan(slug)}
 `));
   try {
-    const { uploadJob } = await import("./upload-CDNIKYW3.js");
+    const { uploadJob } = await import("./upload-DKXZOGUF.js");
     const result = await uploadJob(directory, {
       slug,
       name: opts.name,

package/dist/{upload-CDNIKYW3.js → upload-DKXZOGUF.js}

@@ -403,14 +403,15 @@ async function uploadDirect(jobId, files) {
   const pending = /* @__PURE__ */ new Set();
   for (let bi = 0; bi < batches.length; bi++) {
     const batch = batches[bi];
-    const urlMap = await nextUrlsPromise;
+    const { urlMap, errors: urlErrors } = await nextUrlsPromise;
     nextUrlsPromise = bi + 1 < batches.length ? fetchSignedUrlsForBatch(jobId, batches[bi + 1].map((f) => f.relPath)) : null;
     for (const file of batch) {
       if (!urlMap.has(file.relPath)) {
         failedFiles.push(file.relPath);
+        const serverError = urlErrors.get(file.relPath);
         failureReasons.push({
           path: file.relPath,
-          reason: "no signed URL from server after retries"
+          reason: serverError ? `signed-url error: ${truncate(serverError, 140)}` : "no signed URL from server after retries"
         });
         bar.tick(0);
         continue;
@@ -438,21 +439,31 @@ async function uploadDirect(jobId, files) {
   bar.done();
   if (failedFiles.length > 0) {
     const byReason = /* @__PURE__ */ new Map();
-    for (const { reason } of failureReasons) {
-      byReason.set(reason, (byReason.get(reason) ?? 0) + 1);
+    for (const { reason, path } of failureReasons) {
+      const existing = byReason.get(reason);
+      if (existing) {
+        existing.count++;
+      } else {
+        byReason.set(reason, { count: 1, samplePath: path });
+      }
     }
-    const reasonLines = [...byReason.entries()].sort((a, b) => b[1] - a[1]).map(([reason, count]) => `  ${count}\xD7 ${reason}`).join("\n");
-    const samplePath = failedFiles[0];
+    const reasonLines = [...byReason.entries()].sort((a, b) => b[1].count - a[1].count).map(([reason, { count, samplePath }]) => `  ${count}\xD7 ${reason}
+     e.g. ${samplePath}`).join("\n");
     throw new Error(
-      `Upload incomplete: ${failedFiles.length}/${files.length} file(s) failed. First failed file: ${samplePath}.
+      `Upload incomplete: ${failedFiles.length}/${files.length} file(s) failed.
 Failure breakdown:
 ${reasonLines}
-Retry the upload or check your network connection.`
+
+If these look like 409 / "already exists" errors, the previous upload
+attempt left stale files at the same storage path. Retry the upload \u2014
+the server now heals those on the next push_init. Otherwise retry
+after a minute or check https://status.supabase.com.`
     );
   }
 }
 async function fetchSignedUrlsForBatch(jobId, paths) {
   const urlMap = /* @__PURE__ */ new Map();
+  const errors = /* @__PURE__ */ new Map();
   let pending = paths.slice();
   const attempts = 4;
   for (let attempt = 0; attempt < attempts && pending.length > 0; attempt++) {
@@ -471,13 +482,15 @@ async function fetchSignedUrlsForBatch(jobId, paths) {
     for (const u of urls) {
       if (u.signed_url) {
         urlMap.set(u.path, u.signed_url);
+        errors.delete(u.path);
       } else {
+        if (u.error) errors.set(u.path, u.error);
         stillPending.push(u.path);
       }
     }
     pending = stillPending;
   }
-  return urlMap;
+  return { urlMap, errors };
 }
 async function uploadOneFileWithError(file, signedUrl) {
   const data = readFileSync(file.absPath);
@@ -507,6 +520,9 @@ async function uploadOneFileWithError(file, signedUrl) {
 function sleep(ms) {
   return new Promise((r) => setTimeout(r, ms));
 }
+function truncate(s, n) {
+  return s.length > n ? s.slice(0, n - 1) + "\u2026" : s;
+}
 export {
   collectFiles,
   uploadJob

package/package.json

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