trajectories-sh 1.5.1 → 1.6.1

package/dist/cli.js

@@ -81,7 +81,7 @@ program.command("upload <directory>").description("Upload a trajectory job direc
   Pushing ${directory} \u2192 ${chalk.cyan(slug)}
 `));
   try {
-    const { uploadJob } = await import("./upload-3VEY2SEN.js");
+    const { uploadJob } = await import("./upload-NTDQN32Q.js");
     const result = await uploadJob(directory, {
       slug,
       name: opts.name,
@@ -107,7 +107,7 @@ program.command("download <url>").description("Download a trajectory job from tr
   Downloading trajectory...
 `));
   try {
-    const { downloadJob, parseJobId } = await import("./download-YWW2BV6K.js");
+    const { downloadJob, parseJobId } = await import("./download-MFG34QU2.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`));
@@ -121,6 +121,68 @@ program.command("download <url>").description("Download a trajectory job from tr
     process.exit(1);
   }
 });
+program.command("delete <url>").description("Delete a trajectory job from trajectories.sh").option("-y, --yes", "Skip confirmation prompt").action(async (url, opts) => {
+  const chalk = (await import("chalk")).default;
+  const { parseJobId } = await import("./download-MFG34QU2.js");
+  const { getApiUrl, getAuthHeader } = await import("./config-NOIAMV2U.js");
+  let jobId = parseJobId(url);
+  if (jobId.startsWith("org:")) {
+    console.error(chalk.red("\n  \u2717 Please use a direct job URL or UUID for deletion.\n"));
+    process.exit(1);
+  }
+  const auth2 = await getAuthHeader();
+  if (!auth2) {
+    console.error(chalk.red("  \u2717 Not authenticated. Run: trajectories auth login"));
+    process.exit(1);
+  }
+  const apiUrl = getApiUrl();
+  const headers = { Authorization: auth2 };
+  try {
+    const previewResp = await fetch(`${apiUrl}/api/cli/delete/${jobId}/preview`, { headers });
+    if (!previewResp.ok) {
+      const text = await previewResp.text();
+      throw new Error(text);
+    }
+    const preview = await previewResp.json();
+    const sizeMB = (preview.storage_bytes / 1024 / 1024).toFixed(1);
+    console.log(chalk.bold(`
+  About to delete:
+`));
+    console.log(`    Name:    ${preview.name}`);
+    console.log(`    Slug:    ${preview.slug}`);
+    console.log(`    Trials:  ${preview.n_trials}`);
+    console.log(`    Files:   ${preview.file_count}`);
+    console.log(`    Storage: ${sizeMB} MB
+`);
+    if (!opts.yes) {
+      const readline = await import("readline");
+      const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+      const answer = await new Promise((resolve) => {
+        rl.question(chalk.yellow("  Are you sure? (y/N) "), resolve);
+      });
+      rl.close();
+      if (answer.toLowerCase() !== "y" && answer.toLowerCase() !== "yes") {
+        console.log(chalk.dim("\n  Cancelled.\n"));
+        process.exit(0);
+      }
+    }
+    const deleteResp = await fetch(`${apiUrl}/api/cli/delete/${jobId}`, {
+      method: "DELETE",
+      headers
+    });
+    if (!deleteResp.ok) throw new Error(await deleteResp.text());
+    const result = await deleteResp.json();
+    console.log(chalk.green.bold(`
+  \u2713 Deleted successfully`));
+    console.log(`    Freed: ${(result.storage_freed_bytes / 1024 / 1024).toFixed(1)} MB
+`);
+  } catch (e) {
+    console.error(chalk.red(`
+  \u2717 ${e.message}
+`));
+    process.exit(1);
+  }
+});
 program.command("whoami").description("Show current authentication status").action(async () => {
   const chalk = (await import("chalk")).default;
   const { status } = await import("./auth-UD3KTSHK.js");

package/dist/download-MFG34QU2.js

@@ -0,0 +1,125 @@
+import {
+  getApiUrl,
+  getAuthHeader
+} from "./chunk-P6J5X7LP.js";
+
+// src/download.ts
+import { mkdirSync, writeFileSync } from "fs";
+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 = 30;
+var CONCURRENCY = 12;
+function parseJobId(input) {
+  const trimmed = input.trim();
+  if (UUID_RE.test(trimmed) && !trimmed.includes("/")) {
+    return trimmed.match(UUID_RE)[0];
+  }
+  const trajMatch = trimmed.match(/\/trajectories\/([0-9a-f-]{36})/i);
+  if (trajMatch) return trajMatch[1];
+  const trajViewerMatch = trimmed.match(/\/traj\/([0-9a-f-]{36})\/([^/]+)/i);
+  if (trajViewerMatch) {
+    return `org:${trajViewerMatch[1]}:${trajViewerMatch[2]}`;
+  }
+  const anyUuid = trimmed.match(UUID_RE);
+  if (anyUuid) return anyUuid[0];
+  throw new Error(`Could not find a trajectory job ID in: ${input}`);
+}
+async function downloadJob(input, outputDir) {
+  const apiUrl = getApiUrl();
+  const auth = await getAuthHeader();
+  const headers = {};
+  if (auth) headers["Authorization"] = auth;
+  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 });
+    if (!configResp.ok) throw new Error(`Could not resolve job: ${orgId}/${slug2}`);
+    const configData = await configResp.json();
+    const items = configData.items || [];
+    if (items.length > 0 && items[0].id) {
+      jobId = items[0].id;
+    } else {
+      throw new Error(`Could not resolve job ID for ${orgId}/${slug2}`);
+    }
+  }
+  const listResp = await fetch(`${apiUrl}/api/cli/download/${jobId}/files`, {
+    headers,
+    signal: AbortSignal.timeout(3e4)
+  });
+  if (!listResp.ok) {
+    throw new Error(`Failed to list files: ${await listResp.text()}`);
+  }
+  const { slug, files } = await listResp.json();
+  const totalBytes = files.reduce((s, f) => s + f.size, 0);
+  console.log(`  Job: ${slug} (${jobId})`);
+  console.log(`  ${files.length} files, ${(totalBytes / 1024 / 1024).toFixed(1)} MB`);
+  mkdirSync(outputDir, { recursive: true });
+  const { ProgressBar } = await import("./progress-2P5L7X24.js");
+  const bar = new ProgressBar({ total: files.length, totalBytes, label: "\u2193" });
+  let downloaded = 0;
+  let totalSize = 0;
+  for (let batchStart = 0; batchStart < files.length; batchStart += BATCH_SIZE) {
+    const batch = files.slice(batchStart, batchStart + BATCH_SIZE);
+    const urlResp = await fetch(`${apiUrl}/api/cli/download/${jobId}/signed-urls`, {
+      method: "POST",
+      headers: { ...headers, "Content-Type": "application/json" },
+      body: JSON.stringify({ paths: batch.map((f) => f.path) }),
+      signal: AbortSignal.timeout(3e4)
+    });
+    let urlMap = /* @__PURE__ */ new Map();
+    if (urlResp.ok) {
+      const { urls } = await urlResp.json();
+      for (const u of urls) {
+        if (u.signed_url) urlMap.set(u.path, u.signed_url);
+      }
+    }
+    const pending = [];
+    for (const file of batch) {
+      const signedUrl = urlMap.get(file.path);
+      const downloadUrl = signedUrl ?? `${apiUrl}/api/cli/download/${jobId}/file?path=${encodeURIComponent(file.path)}`;
+      const downloadHeaders = signedUrl ? {} : headers;
+      const task = (async () => {
+        for (let attempt = 0; attempt < 3; attempt++) {
+          try {
+            const resp = await fetch(downloadUrl, {
+              headers: downloadHeaders,
+              signal: AbortSignal.timeout(12e4)
+            });
+            if (!resp.ok) throw new Error(`HTTP ${resp.status}`);
+            const data = Buffer.from(await resp.arrayBuffer());
+            const outPath = join(outputDir, file.path);
+            mkdirSync(dirname(outPath), { recursive: true });
+            writeFileSync(outPath, data);
+            downloaded++;
+            totalSize += data.length;
+            bar.tick(data.length);
+            return;
+          } catch {
+            if (attempt < 2) await new Promise((r) => setTimeout(r, 1e3 * (attempt + 1)));
+          }
+        }
+        bar.tick(0);
+      })();
+      pending.push(task);
+      if (pending.length >= CONCURRENCY) {
+        await Promise.race(pending);
+        const next = [];
+        for (const p of pending) {
+          let settled = false;
+          p.then(() => settled = true, () => settled = true);
+          if (!settled) next.push(p);
+        }
+        if (next.length === pending.length) await Promise.race(pending);
+        pending.length = 0;
+        pending.push(...next);
+      }
+    }
+    await Promise.all(pending);
+  }
+  bar.done();
+  return { files: downloaded, totalSize };
+}
+export {
+  downloadJob,
+  parseJobId
+};

package/dist/progress-2P5L7X24.js

@@ -0,0 +1,56 @@
+// src/progress.ts
+var ProgressBar = class {
+  total;
+  totalBytes;
+  current = 0;
+  currentBytes = 0;
+  startTime;
+  label;
+  constructor(opts) {
+    this.total = opts.total;
+    this.totalBytes = opts.totalBytes;
+    this.label = opts.label;
+    this.startTime = Date.now();
+  }
+  tick(bytes = 0) {
+    this.current++;
+    this.currentBytes += bytes;
+    this.render();
+  }
+  render() {
+    const pct = this.total > 0 ? Math.round(this.current / this.total * 100) : 0;
+    const elapsed = (Date.now() - this.startTime) / 1e3;
+    const bytesPerSec = elapsed > 0 ? this.currentBytes / elapsed : 0;
+    const sizeDone = formatBytes(this.currentBytes);
+    const sizeTotal = formatBytes(this.totalBytes);
+    const speed = formatBytes(bytesPerSec) + "/s";
+    let eta = "";
+    if (bytesPerSec > 0 && this.currentBytes < this.totalBytes) {
+      const remaining = (this.totalBytes - this.currentBytes) / bytesPerSec;
+      eta = remaining < 60 ? `${remaining.toFixed(0)}s` : `${(remaining / 60).toFixed(1)}m`;
+    }
+    const barWidth = 20;
+    const filled = Math.round(this.current / this.total * barWidth);
+    const bar = "\u2588".repeat(filled) + "\u2591".repeat(barWidth - filled);
+    process.stdout.write(
+      `  ${this.label} ${bar} ${pct}% ${this.current}/${this.total} ${sizeDone}/${sizeTotal} ${speed}${eta ? ` ETA ${eta}` : ""}\r`
+    );
+  }
+  done() {
+    const elapsed = ((Date.now() - this.startTime) / 1e3).toFixed(1);
+    const size = formatBytes(this.currentBytes);
+    process.stdout.write(
+      `  ${this.label} ${"\u2588".repeat(20)} 100% ${this.current}/${this.total} ${size} in ${elapsed}s
+`
+    );
+  }
+};
+function formatBytes(bytes) {
+  if (bytes < 1024) return `${bytes}B`;
+  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(0)}KB`;
+  if (bytes < 1024 * 1024 * 1024) return `${(bytes / (1024 * 1024)).toFixed(1)}MB`;
+  return `${(bytes / (1024 * 1024 * 1024)).toFixed(2)}GB`;
+}
+export {
+  ProgressBar
+};

package/dist/{upload-3VEY2SEN.js → upload-NTDQN32Q.js}

@@ -206,7 +206,9 @@ async function uploadJob(dir, opts) {
   };
 }
 async function uploadDirect(jobId, files) {
-  let uploaded = 0;
+  const { ProgressBar } = await import("./progress-2P5L7X24.js");
+  const totalBytes = files.reduce((s, f) => s + f.size, 0);
+  const bar = new ProgressBar({ total: files.length, totalBytes, label: "\u2191" });
   let errors = 0;
   for (let batchStart = 0; batchStart < files.length; batchStart += BATCH_SIZE) {
     const batch = files.slice(batchStart, batchStart + BATCH_SIZE);
@@ -222,7 +224,7 @@ async function uploadDirect(jobId, files) {
       if (u.signed_url) urlMap.set(u.path, u.signed_url);
       else {
         errors++;
-        console.log(`  \u2717 ${u.path} (no signed URL: ${u.error})`);
+        bar.tick(0);
       }
     }
     const pending = [];
@@ -233,14 +235,10 @@ async function uploadDirect(jobId, files) {
       const task = (async () => {
         const ok = await uploadOneFile(file, signedUrl);
         if (ok) {
-          uploaded++;
+          bar.tick(file.size);
         } else {
           errors++;
-          console.log(`  \u2717 ${file.relPath}`);
-        }
-        const total = uploaded + errors;
-        if (total % 10 === 0 || total === files.length) {
-          process.stdout.write(`  \u2191 ${uploaded}/${files.length} uploaded\r`);
+          bar.tick(0);
         }
       })();
       pending.push(task);
@@ -257,11 +255,9 @@ async function uploadDirect(jobId, files) {
     }
     await Promise.all(pending);
   }
-  console.log("");
+  bar.done();
   if (errors > 0) {
-    console.log(`  Uploaded: ${uploaded}, Errors: ${errors}`);
-  } else {
-    console.log(`  \u2713 All ${uploaded} files uploaded directly to storage`);
+    console.log(`  \u26A0 ${errors} file(s) failed to upload`);
   }
 }
 async function uploadOneFile(file, signedUrl) {

package/package.json

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

package/dist/download-YWW2BV6K.js

@@ -1,111 +0,0 @@
-import {
-  getApiUrl,
-  getAuthHeader
-} from "./chunk-P6J5X7LP.js";
-
-// src/download.ts
-import { mkdirSync, writeFileSync } from "fs";
-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;
-function parseJobId(input) {
-  const trimmed = input.trim();
-  if (UUID_RE.test(trimmed) && !trimmed.includes("/")) {
-    return trimmed.match(UUID_RE)[0];
-  }
-  const trajMatch = trimmed.match(/\/trajectories\/([0-9a-f-]{36})/i);
-  if (trajMatch) return trajMatch[1];
-  const trajViewerMatch = trimmed.match(/\/traj\/([0-9a-f-]{36})\/([^/]+)/i);
-  if (trajViewerMatch) {
-    return `org:${trajViewerMatch[1]}:${trajViewerMatch[2]}`;
-  }
-  const anyUuid = trimmed.match(UUID_RE);
-  if (anyUuid) return anyUuid[0];
-  throw new Error(`Could not find a trajectory job ID in: ${input}`);
-}
-async function downloadJob(input, outputDir) {
-  const apiUrl = getApiUrl();
-  const auth = await getAuthHeader();
-  const headers = {};
-  if (auth) headers["Authorization"] = auth;
-  let jobId = parseJobId(input);
-  if (jobId.startsWith("org:")) {
-    const [, orgId, slug2] = jobId.split(":");
-    const resp = await fetch(`${apiUrl}/api/org/trajectories/public/${orgId}?slug=${slug2}`, { headers });
-    if (!resp.ok) {
-      const configResp = await fetch(`${apiUrl}/api/viewer/${orgId}/${slug2}/api/jobs`, { headers });
-      if (!configResp.ok) throw new Error(`Could not resolve job: ${orgId}/${slug2}`);
-      const configData = await configResp.json();
-      const items = configData.items || [];
-      if (items.length > 0 && items[0].id) {
-        jobId = items[0].id;
-      } else {
-        throw new Error(`Could not resolve job ID for ${orgId}/${slug2}`);
-      }
-    } else {
-      const data = await resp.json();
-      jobId = data.id;
-    }
-  }
-  const listResp = await fetch(`${apiUrl}/api/cli/download/${jobId}/files`, {
-    headers,
-    signal: AbortSignal.timeout(3e4)
-  });
-  if (!listResp.ok) {
-    const text = await listResp.text();
-    throw new Error(`Failed to list files: ${text}`);
-  }
-  const { slug, files } = await listResp.json();
-  console.log(`  Job: ${slug} (${jobId})`);
-  console.log(`  ${files.length} files to download`);
-  mkdirSync(outputDir, { recursive: true });
-  let downloaded = 0;
-  let totalSize = 0;
-  const concurrency = 8;
-  const pending = [];
-  for (const file of files) {
-    const task = (async () => {
-      for (let attempt = 0; attempt < 3; attempt++) {
-        try {
-          const fileResp = await fetch(
-            `${apiUrl}/api/cli/download/${jobId}/file?path=${encodeURIComponent(file.path)}`,
-            { headers, signal: AbortSignal.timeout(6e4) }
-          );
-          if (!fileResp.ok) throw new Error(`HTTP ${fileResp.status}`);
-          const data = Buffer.from(await fileResp.arrayBuffer());
-          const outPath = join(outputDir, file.path);
-          mkdirSync(dirname(outPath), { recursive: true });
-          writeFileSync(outPath, data);
-          downloaded++;
-          totalSize += data.length;
-          if (downloaded % 10 === 0 || downloaded === files.length) {
-            process.stdout.write(`  \u2193 ${downloaded}/${files.length} downloaded\r`);
-          }
-          return;
-        } catch {
-          if (attempt < 2) await new Promise((r) => setTimeout(r, 1e3 * (attempt + 1)));
-        }
-      }
-      console.log(`  \u2717 ${file.path}`);
-    })();
-    pending.push(task);
-    if (pending.length >= concurrency) {
-      await Promise.race(pending);
-      const next = [];
-      for (const p of pending) {
-        let settled = false;
-        p.then(() => settled = true, () => settled = true);
-        if (!settled) next.push(p);
-      }
-      if (next.length === pending.length) await Promise.race(pending);
-      pending.length = 0;
-      pending.push(...next);
-    }
-  }
-  await Promise.all(pending);
-  console.log("");
-  return { files: downloaded, totalSize };
-}
-export {
-  downloadJob,
-  parseJobId
-};