trajectories-sh 1.23.1 → 1.24.0

package/dist/{auth-4UEZSE4C.js → auth-NNBHKNIF.js}

@@ -5,7 +5,7 @@ import {
   isLoggedIn,
   saveApiKey,
   saveSession
-} from "./chunk-Q2ZEN43L.js";
+} from "./chunk-ERO5HP43.js";
 
 // src/auth.ts
 import { createServer } from "http";

package/dist/{chunk-35B24E3O.js → chunk-72L6XPK6.js}

@@ -149,6 +149,7 @@ function unpackScreenshotChunks(jobDir) {
 
 export {
   CHUNK_DIR,
+  mimeFor,
   buildScreenshotChunks,
   unpackScreenshotChunks
 };

package/dist/{chunk-Q2ZEN43L.js → chunk-ERO5HP43.js}

@@ -29,7 +29,7 @@ function getAccessToken() {
   return loadConfig().access_token;
 }
 async function getAuthHeader() {
-  const envKey = process.env.TRAJECTORIES_API_KEY;
+  const envKey = process.env.TRAJECTORIES_API_KEY || process.env.TRAJECTORIES_TOKEN;
   if (envKey && envKey.trim()) return `Bearer ${envKey.trim()}`;
   const config = loadConfig();
   if (config.api_key) return `Bearer ${config.api_key}`;

package/dist/{chunk-2ELJH3IV.js → chunk-HHUWMQ5S.js}

@@ -1,7 +1,7 @@
 import {
   getApiUrl,
   getAuthHeader
-} from "./chunk-Q2ZEN43L.js";
+} from "./chunk-ERO5HP43.js";
 
 // src/quota.ts
 async function fetchOrgUsage() {

package/dist/chunk-LOJZPDGI.js

@@ -0,0 +1,242 @@
+import {
+  CHUNK_DIR,
+  mimeFor,
+  unpackScreenshotChunks
+} from "./chunk-72L6XPK6.js";
+import {
+  getApiUrl,
+  getAuthHeader
+} from "./chunk-ERO5HP43.js";
+
+// src/download.ts
+import { existsSync, mkdirSync, readdirSync, readFileSync, statSync, 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 = 100;
+var CONCURRENCY = 25;
+var DOWNLOAD_TIMEOUT_MS = 18e4;
+var EXIT = {
+  OK: 0,
+  ERROR: 1,
+  USAGE: 2,
+  AUTH_REQUIRED: 3,
+  NOT_FOUND: 4
+};
+var CliError = class extends Error {
+  constructor(message, exitCode = EXIT.ERROR) {
+    super(message);
+    this.exitCode = exitCode;
+  }
+  exitCode;
+};
+async function httpError(resp, what) {
+  let detail = "";
+  try {
+    const body = await resp.json();
+    detail = typeof body.detail === "string" ? body.detail : "";
+    if (resp.status === 401 || resp.status === 403) {
+      return new CliError(
+        `${what}: authentication required (${resp.status}). ${body.how_to_authenticate?.cli ?? "Set TRAJECTORIES_API_KEY in the environment."}`,
+        EXIT.AUTH_REQUIRED
+      );
+    }
+    if (resp.status === 404) {
+      return new CliError(
+        `${what}: not found (404)${detail ? `: ${detail}` : ""}. If it is private, set TRAJECTORIES_API_KEY for an org member's key.`,
+        EXIT.NOT_FOUND
+      );
+    }
+  } catch {
+  }
+  return new CliError(`${what}: HTTP ${resp.status}${detail ? ` ${detail}` : ""}`, EXIT.ERROR);
+}
+function parseJobId(input) {
+  const trimmed = input.trim();
+  if (UUID_RE.test(trimmed) && !trimmed.includes("/")) {
+    return trimmed.match(UUID_RE)[0];
+  }
+  const shortMatch = trimmed.match(/\/t\/([0-9a-f-]{36})/i);
+  if (shortMatch) return shortMatch[1];
+  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 CliError(`Could not find a trajectory job ID in: ${input}`, EXIT.USAGE);
+}
+function parseProjectId(input) {
+  const trimmed = input.trim();
+  const m = trimmed.match(/\/projects\/([0-9a-f-]{36})/i) ?? (trimmed.includes("/") ? null : trimmed.match(UUID_RE));
+  if (!m) throw new CliError(`Could not find a project ID in: ${input}`, EXIT.USAGE);
+  return m[1] ?? m[0];
+}
+function isScreenshot(path) {
+  if (path.includes(`/${CHUNK_DIR}/`)) return true;
+  const parts = path.split("/");
+  return parts.length >= 3 && parts[1] === "agent" && mimeFor(parts[parts.length - 1]) != null;
+}
+async function planJob(input, options) {
+  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,
+      signal: AbortSignal.timeout(DOWNLOAD_TIMEOUT_MS)
+    });
+    if (!configResp.ok) throw await httpError(configResp, `Resolve job ${orgId}/${slug2}`);
+    const items = (await configResp.json()).items || [];
+    if (!items[0]?.id) throw new CliError(`Could not resolve job ID for ${orgId}/${slug2}`, EXIT.NOT_FOUND);
+    jobId = items[0].id;
+  }
+  const listResp = await fetch(`${apiUrl}/api/cli/download/${jobId}/files`, {
+    headers,
+    signal: AbortSignal.timeout(DOWNLOAD_TIMEOUT_MS)
+  });
+  if (!listResp.ok) throw await httpError(listResp, `List files for ${jobId}`);
+  const { slug, files: all } = await listResp.json();
+  const files = options.includeScreenshots ? all : all.filter((f) => !isScreenshot(f.path));
+  const trials = new Set(files.map((f) => f.path.split("/")[0]).filter((p) => p && !p.endsWith(".json") && !p.endsWith(".log")));
+  return {
+    jobId,
+    slug,
+    files,
+    bytes: files.reduce((s, f) => s + f.size, 0),
+    trials: trials.size,
+    trajectoryFiles: files.filter((f) => f.path.endsWith("/agent/trajectory.json")).length,
+    screenshotsSkipped: all.length - files.length
+  };
+}
+async function downloadPlannedJob(plan, outputDir, options) {
+  const apiUrl = getApiUrl();
+  const auth = await getAuthHeader();
+  const headers = {};
+  if (auth) headers["Authorization"] = auth;
+  const { jobId, files } = plan;
+  const log = options.quiet ? () => {
+  } : (m) => console.log(m);
+  const packedTrials = new Set(files.filter((f) => f.path.includes(`/${CHUNK_DIR}/`)).map((f) => f.path.split("/")[0]));
+  log(`  Job: ${plan.slug} (${jobId})`);
+  log(
+    `  ${files.length} files, ${(plan.bytes / 1024 / 1024).toFixed(1)} MB` + (packedTrials.size > 0 ? ` (screenshots of ${packedTrials.size} trial${packedTrials.size === 1 ? "" : "s"} packed)` : "") + (plan.screenshotsSkipped > 0 ? ` (${plan.screenshotsSkipped} screenshot files skipped; --include-screenshots to fetch)` : "")
+  );
+  mkdirSync(outputDir, { recursive: true });
+  const bar = options.quiet ? { tick: (_n = 0) => {
+  }, done: () => {
+  } } : new (await import("./progress-H7WNKHDR.js")).ProgressBar({ total: files.length, totalBytes: plan.bytes, label: "\u2193" });
+  let downloaded = 0;
+  let downloadedBytes = 0;
+  const failed = [];
+  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(DOWNLOAD_TIMEOUT_MS)
+    });
+    const 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);
+    }
+    let next = 0;
+    const worker = async () => {
+      while (next < batch.length) {
+        const file = batch[next++];
+        const signedUrl = urlMap.get(file.path);
+        const downloadUrl = signedUrl ?? `${apiUrl}/api/cli/download/${jobId}/file?path=${encodeURIComponent(file.path)}`;
+        const downloadHeaders = signedUrl ? {} : headers;
+        let ok = false;
+        for (let attempt = 0; attempt < 3 && !ok; attempt++) {
+          try {
+            const resp = await fetch(downloadUrl, { headers: downloadHeaders, signal: AbortSignal.timeout(DOWNLOAD_TIMEOUT_MS) });
+            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++;
+            downloadedBytes += data.length;
+            bar.tick(data.length);
+            ok = true;
+          } catch {
+            if (attempt < 2) await new Promise((r) => setTimeout(r, 1e3 * (attempt + 1)));
+          }
+        }
+        if (!ok) {
+          failed.push(file.path);
+          bar.tick(0);
+        }
+      }
+    };
+    await Promise.all(Array.from({ length: Math.min(CONCURRENCY, batch.length) }, worker));
+  }
+  bar.done();
+  let screenshotsUnpacked = 0;
+  if (packedTrials.size > 0) {
+    const unpacked = unpackScreenshotChunks(outputDir);
+    screenshotsUnpacked = unpacked.imagesWritten;
+    if (unpacked.imagesWritten > 0) {
+      log(`  \u2713 Unpacked ${unpacked.imagesWritten} screenshots across ${unpacked.trialsUnpacked} trial${unpacked.trialsUnpacked === 1 ? "" : "s"}`);
+    }
+  }
+  return { ...plan, outputDir, downloaded, downloadedBytes, failed, screenshotsUnpacked };
+}
+async function downloadJob(input, outputDir, options = { includeScreenshots: true, quiet: false }) {
+  const plan = await planJob(input, options);
+  return downloadPlannedJob(plan, outputDir, options);
+}
+function writeJsonl(rootDir, jobDirs, outFile) {
+  const lines = [];
+  for (const job of jobDirs) {
+    if (!existsSync(job.dir)) continue;
+    for (const trial of readdirSync(job.dir, { withFileTypes: true })) {
+      if (!trial.isDirectory()) continue;
+      const trajPath = join(job.dir, trial.name, "agent", "trajectory.json");
+      if (!existsSync(trajPath)) continue;
+      let result = null;
+      const resultPath = join(job.dir, trial.name, "result.json");
+      if (existsSync(resultPath)) {
+        try {
+          result = JSON.parse(readFileSync(resultPath, "utf-8"));
+        } catch {
+        }
+      }
+      const trajectory = JSON.parse(readFileSync(trajPath, "utf-8"));
+      lines.push(JSON.stringify({ job_id: job.jobId, job_slug: job.slug, trial_name: trial.name, result, trajectory }));
+    }
+  }
+  mkdirSync(dirname(outFile), { recursive: true });
+  writeFileSync(outFile, lines.map((l) => l + "\n").join(""));
+  return lines.length;
+}
+function dirBytes(dir) {
+  if (!existsSync(dir)) return 0;
+  let total = 0;
+  for (const e of readdirSync(dir, { withFileTypes: true })) {
+    const p = join(dir, e.name);
+    total += e.isDirectory() ? dirBytes(p) : statSync(p).size;
+  }
+  return total;
+}
+
+export {
+  DOWNLOAD_TIMEOUT_MS,
+  EXIT,
+  CliError,
+  httpError,
+  parseJobId,
+  parseProjectId,
+  planJob,
+  downloadPlannedJob,
+  downloadJob,
+  writeJsonl,
+  dirBytes
+};

package/dist/cli.js

@@ -6,14 +6,34 @@ import { readFileSync } from "fs";
 import { fileURLToPath } from "url";
 import { dirname, join } from "path";
 var __dirname = dirname(fileURLToPath(import.meta.url));
-var version = "1.23.1";
+var version = "1.24.0";
 try {
   const pkg = JSON.parse(readFileSync(join(__dirname, "..", "package.json"), "utf-8"));
   version = pkg.version;
 } catch {
 }
 var program = new Command();
-program.name("trajectories").description("trajectories.sh \u2014 Upload and explore trajectories and tasks").version(version);
+program.exitOverride((err) => {
+  if (err.code === "commander.helpDisplayed" || err.code === "commander.version" || err.code === "commander.help") process.exit(0);
+  process.exit(2);
+});
+program.name("trajectories").description("trajectories.sh \u2014 Upload and explore trajectories and tasks").version(version).addHelpText(
+  "after",
+  `
+Examples:
+  $ npx trajectories-sh@latest download project https://www.trajectories.sh/projects/<id>
+  $ npx trajectories-sh@latest download trajectory https://www.trajectories.sh/t/<id> --out ./run
+  $ npx trajectories-sh@latest download project <url> --dry-run --json      # plan only, machine-readable
+
+Auth:
+  Public and unlisted data needs none. For private data set TRAJECTORIES_API_KEY
+  (alias: TRAJECTORIES_TOKEN) in the environment; nothing prompts when it is set.
+
+Exit codes:
+  0 ok \xB7 1 error \xB7 2 bad arguments \xB7 3 authentication required \xB7 4 not found
+
+Machine-readable guide: https://www.trajectories.sh/llms.txt`
+);
 var auth = program.command("auth").description("Manage authentication");
 auth.command("login").description("Log in to trajectories.sh via your browser").option("--api-key <key>", "Use an API key instead (recommended for CI)").action(async (opts) => {
   const ora = (await import("ora")).default;
@@ -21,7 +41,7 @@ auth.command("login").description("Log in to trajectories.sh via your browser").
   if (opts.apiKey) {
     const spinner = ora("Validating API key...").start();
     try {
-      const { loginWithApiKey } = await import("./auth-4UEZSE4C.js");
+      const { loginWithApiKey } = await import("./auth-NNBHKNIF.js");
       await loginWithApiKey(opts.apiKey);
       spinner.succeed("Logged in with API key");
     } catch (e) {
@@ -33,7 +53,7 @@ auth.command("login").description("Log in to trajectories.sh via your browser").
   console.log(chalk.bold("\n  Opening browser to log in...\n"));
   console.log(chalk.dim("  If the browser doesn't open, visit:"));
   try {
-    const { loginWithBrowser } = await import("./auth-4UEZSE4C.js");
+    const { loginWithBrowser } = await import("./auth-NNBHKNIF.js");
     const { email } = await loginWithBrowser();
     console.log(chalk.green(`
   \u2713 Logged in as ${email}
@@ -48,13 +68,13 @@ auth.command("login").description("Log in to trajectories.sh via your browser").
 });
 auth.command("logout").description("Log out and remove saved credentials").action(async () => {
   const chalk = (await import("chalk")).default;
-  const { logout } = await import("./auth-4UEZSE4C.js");
+  const { logout } = await import("./auth-NNBHKNIF.js");
   logout();
   console.log(chalk.green("  \u2713 Logged out. Credentials removed."));
 });
 auth.command("status").description("Show current authentication status").action(async () => {
   const chalk = (await import("chalk")).default;
-  const { status } = await import("./auth-4UEZSE4C.js");
+  const { status } = await import("./auth-NNBHKNIF.js");
   const s = status();
   if (s.loggedIn) {
     console.log(chalk.green("  \u2713 Authenticated"));
@@ -81,7 +101,7 @@ async function uploadTrajectoryAction(pathArg, opts) {
   if (opts.apiKey) {
     process.env.TRAJECTORIES_API_KEY = String(opts.apiKey);
   }
-  const { isLoggedIn } = await import("./config-4XJRECIW.js");
+  const { isLoggedIn } = await import("./config-QS2IT5DI.js");
   if (!isLoggedIn()) {
     console.error(
       chalk.red(
@@ -98,7 +118,7 @@ async function uploadTrajectoryAction(pathArg, opts) {
     );
   }
   if (isZip) {
-    const { uploadZip } = await import("./upload-CIW2CHKX.js");
+    const { uploadZip } = await import("./upload-6HQ5A2H7.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 +147,7 @@ async function uploadTrajectoryAction(pathArg, opts) {
   Uploading trajectory ${pathArg} \u2192 ${chalk.cyan(slug)}
 `));
   try {
-    const { uploadJob } = await import("./upload-CIW2CHKX.js");
+    const { uploadJob } = await import("./upload-6HQ5A2H7.js");
     const result = await uploadJob(pathArg, {
       slug,
       name: opts.name
@@ -159,7 +179,7 @@ async function uploadTaskAction(directory, opts) {
   if (opts.apiKey) {
     process.env.TRAJECTORIES_API_KEY = String(opts.apiKey);
   }
-  const { isLoggedIn } = await import("./config-4XJRECIW.js");
+  const { isLoggedIn } = await import("./config-QS2IT5DI.js");
   if (!isLoggedIn()) {
     console.error(
       chalk.red(
@@ -173,7 +193,7 @@ async function uploadTaskAction(directory, opts) {
   Uploading task ${directory} \u2192 ${chalk.cyan(name)}
 `));
   try {
-    const { pushTask } = await import("./push-task-OZTAROKW.js");
+    const { pushTask } = await import("./push-task-JGGRVTJ3.js");
     const result = await pushTask(directory, {
       name: opts.name,
       visibility: opts.visibility
@@ -194,30 +214,113 @@ async function uploadTaskAction(directory, opts) {
     process.exit(1);
   }
 }
+function exitWith(e, json) {
+  const code = typeof e?.exitCode === "number" ? e.exitCode : 1;
+  if (json) {
+    console.log(JSON.stringify({ ok: false, error: String(e?.message ?? e), exit_code: code }));
+  } else {
+    console.error(`
+  \u2717 ${e?.message ?? e}
+`);
+  }
+  process.exit(code);
+}
+function downloadOptions(opts, defaultScreenshots) {
+  return {
+    includeScreenshots: opts.includeScreenshots === true ? true : opts.screenshots === false ? false : defaultScreenshots,
+    quiet: Boolean(opts.json)
+  };
+}
 async function downloadTrajectoryAction(url, opts) {
   const chalk = (await import("chalk")).default;
-  console.log(chalk.bold(`
+  const json = Boolean(opts.json);
+  try {
+    const { planJob, downloadPlannedJob, parseJobId } = await import("./download-BWJDAVMM.js");
+    const options = downloadOptions(opts, true);
+    const plan = await planJob(url, options);
+    const outputDir = opts.out ?? opts.output ?? parseJobId(url).replace(/^org:/, "").replace(/:/g, "-");
+    if (opts.dryRun) {
+      if (json) {
+        console.log(JSON.stringify({ ok: true, dry_run: true, job: { id: plan.jobId, slug: plan.slug, trials: plan.trials, files: plan.files.length, bytes: plan.bytes, trajectory_files: plan.trajectoryFiles, screenshots_skipped: plan.screenshotsSkipped }, out: outputDir }));
+      } else {
+        console.log(chalk.bold(`
+  Would download ${plan.slug}`));
+        console.log(`    ${plan.files.length} files, ${(plan.bytes / 1024 / 1024).toFixed(1)} MB, ${plan.trials} trials, ${plan.trajectoryFiles} trajectory.json`);
+        console.log(`    Output: ${outputDir}
+`);
+      }
+      return;
+    }
+    if (!json) console.log(chalk.bold(`
   Downloading trajectory...
 `));
+    const result = await downloadPlannedJob(plan, outputDir, options);
+    if (json) {
+      console.log(JSON.stringify({ ok: result.failed.length === 0, job: { id: result.jobId, slug: result.slug, trials: result.trials, files: result.downloaded, bytes: result.downloadedBytes, trajectory_files: result.trajectoryFiles, screenshots_unpacked: result.screenshotsUnpacked, failed: result.failed }, out: outputDir }));
+    } else {
+      console.log(chalk.green.bold(`  \u2713 Downloaded ${result.downloaded} files`));
+      console.log(`    Size: ${(result.downloadedBytes / 1024 / 1024).toFixed(1)} MB`);
+      console.log(`    Output: ${outputDir}
+`);
+      if (result.failed.length) console.error(chalk.yellow(`  ${result.failed.length} file(s) failed to download.`));
+    }
+    if (result.failed.length) process.exit(1);
+  } catch (e) {
+    exitWith(e, json);
+  }
+}
+async function downloadProjectAction(url, opts) {
+  const chalk = (await import("chalk")).default;
+  const json = Boolean(opts.json);
   try {
-    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`));
-    console.log(`    Size: ${(result.totalSize / 1024 / 1024).toFixed(1)} MB`);
-    console.log(`    Output: ${outputDir}
+    const { planProject, downloadProject, defaultProjectDir } = await import("./download-project-XN4OPF3M.js");
+    const options = { ...downloadOptions(opts, false), format: opts.format === "jsonl" ? "jsonl" : "json" };
+    const plan = await planProject(url, options);
+    const outputDir = opts.out ?? defaultProjectDir(plan.project);
+    const summary = (jobs2) => ({
+      project: { id: plan.project.id, name: plan.project.name, slug: plan.project.slug, jobs: plan.jobs.length, trials: plan.project.n_trials },
+      out: outputDir,
+      jobs: jobs2,
+      files: jobs2.reduce((s, j) => s + j.files, 0),
+      bytes: jobs2.reduce((s, j) => s + j.bytes, 0),
+      trajectory_files: jobs2.reduce((s, j) => s + j.trajectory_files, 0)
+    });
+    if (opts.dryRun) {
+      const jobs2 = plan.jobs.map((j) => ({ id: j.jobId, slug: j.slug, trials: j.trials, files: j.files.length, bytes: j.bytes, trajectory_files: j.trajectoryFiles }));
+      if (json) {
+        console.log(JSON.stringify({ ok: true, dry_run: true, ...summary(jobs2) }));
+      } else {
+        console.log(chalk.bold(`
+  Would download ${plan.project.name ?? plan.project.id}`));
+        for (const j of jobs2) console.log(`    ${j.slug}: ${j.files} files, ${(j.bytes / 1024 / 1024).toFixed(1)} MB, ${j.trials} trials`);
+        console.log(`    Total: ${plan.files} files, ${(plan.bytes / 1024 / 1024).toFixed(1)} MB, ${plan.trajectoryFiles} trajectory.json \u2192 ${outputDir}
 `);
+      }
+      return;
+    }
+    if (!json) console.log(chalk.bold(`
+  Downloading project ${plan.project.name ?? plan.project.id} (${plan.jobs.length} trajectory sets)...`));
+    const result = await downloadProject(plan, outputDir, options);
+    const jobs = result.jobs.map((j) => ({ id: j.jobId, slug: j.slug, trials: j.trials, files: j.downloaded, bytes: j.downloadedBytes, trajectory_files: j.trajectoryFiles, failed: j.failed }));
+    const failed = result.jobs.reduce((s, j) => s + j.failed.length, 0);
+    if (json) {
+      console.log(JSON.stringify({ ok: failed === 0, ...summary(jobs), jsonl: result.jsonl }));
+    } else {
+      console.log(chalk.green.bold(`
+  \u2713 Downloaded ${plan.jobs.length} trajectory sets, ${jobs.reduce((s, j) => s + j.files, 0)} files`));
+      console.log(`    Output: ${outputDir}
+`);
+      if (failed) console.error(chalk.yellow(`  ${failed} file(s) failed to download.`));
+    }
+    if (failed) process.exit(1);
   } catch (e) {
-    console.error(chalk.red(`
-  \u2717 ${e.message}
-`));
-    process.exit(1);
+    exitWith(e, json);
   }
 }
 async function deleteTrajectoryAction(url, opts) {
   const chalk = (await import("chalk")).default;
-  const { parseJobId } = await import("./download-M6UVD5S5.js");
-  const { getApiUrl, getAuthHeader } = await import("./config-4XJRECIW.js");
+  const { parseJobId } = await import("./download-BWJDAVMM.js");
+  const { getApiUrl, getAuthHeader } = await import("./config-QS2IT5DI.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"));
@@ -284,7 +387,7 @@ function printCommentError(error, json) {
 }
 async function addCommentAction(targetInput, opts) {
   try {
-    const { addComment, formatComment, parseCommentTarget, readCommentBody } = await import("./comments-PK7DDP36.js");
+    const { addComment, formatComment, parseCommentTarget, readCommentBody } = await import("./comments-M3EX3VOU.js");
     const target = parseCommentTarget(targetInput, opts);
     const body = await readCommentBody(opts);
     const comment2 = await addComment(target, body);
@@ -300,7 +403,7 @@ ${formatComment(comment2)}
 }
 async function listCommentsAction(targetInput, opts) {
   try {
-    const { formatComment, listComments, parseCommentTarget } = await import("./comments-PK7DDP36.js");
+    const { formatComment, listComments, parseCommentTarget } = await import("./comments-M3EX3VOU.js");
     const target = parseCommentTarget(targetInput, opts);
     const comments = await listComments(target);
     if (opts.json) {
@@ -318,7 +421,7 @@ ${comments.map(formatComment).join("\n\n")}
 }
 async function updateCommentAction(commentId, opts) {
   try {
-    const { formatComment, readCommentBody, updateComment } = await import("./comments-PK7DDP36.js");
+    const { formatComment, readCommentBody, updateComment } = await import("./comments-M3EX3VOU.js");
     const body = await readCommentBody(opts);
     const comment2 = await updateComment(commentId, body);
     if (opts.json) console.log(JSON.stringify(comment2));
@@ -349,7 +452,7 @@ async function deleteCommentAction(commentId, opts) {
         return;
       }
     }
-    const { deleteComment } = await import("./comments-PK7DDP36.js");
+    const { deleteComment } = await import("./comments-M3EX3VOU.js");
     await deleteComment(commentId);
     const result = { status: "deleted", comment_id: commentId };
     if (opts.json) console.log(JSON.stringify(result));
@@ -361,8 +464,24 @@ async function deleteCommentAction(commentId, opts) {
 var upload = program.command("upload").description("Upload trajectories or tasks");
 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);
+var download = program.command("download").description("Download trajectories (a whole project, or one trajectory set)").addHelpText(
+  "after",
+  `
+Output layout: <out>/<job-slug>/<trial-name>/agent/trajectory.json (+ result.json, config.json, verifier/, artifacts/)
+Exit codes:    0 ok \xB7 1 error \xB7 2 bad arguments \xB7 3 authentication required \xB7 4 not found`
+);
+download.command("project <url>").description("Download every trajectory set in a project (URL like https://www.trajectories.sh/projects/<id>)").option("-o, --out <dir>", "Output directory (default: project slug)").option("--format <fmt>", "json (files as stored) or jsonl (also write trajectories.jsonl, one trial per line)", "json").option("--include-screenshots", "Also fetch screenshots (large; off by default for projects)").option("--json", "Print one JSON summary line to stdout and nothing else").option("--dry-run", "Print what would be fetched (jobs, trials, files, bytes) and exit without downloading").addHelpText(
+  "after",
+  `
+Example:
+  $ trajectories download project https://www.trajectories.sh/projects/3ddb7729-c33f-473c-90b7-4c0f92d09e85 --out ./alder-ridge --json`
+).action(downloadProjectAction);
+download.command("trajectory <url>").description("Download one trajectory set (URL like https://www.trajectories.sh/t/<id>)").option("-o, --out <dir>", "Output directory (default: derived from the URL)").option("--output <dir>", "Alias of --out (kept for older scripts)").option("--no-screenshots", "Skip screenshots (they are fetched by default for a single set)").option("--include-screenshots", "Explicitly fetch screenshots (the default)").option("--json", "Print one JSON summary line to stdout and nothing else").option("--dry-run", "Print what would be fetched and exit without downloading").addHelpText(
+  "after",
+  `
+Example:
+  $ trajectories download trajectory https://www.trajectories.sh/t/6e1ea650-a7b7-44e9-bfd2-693bc4fb1758 --out ./run`
+).action(downloadTrajectoryAction);
 var del = program.command("delete").description("Delete trajectories");
 del.command("trajectory <url>").description("Delete a trajectory job from trajectories.sh").option("-y, --yes", "Skip confirmation prompt").action(deleteTrajectoryAction);
 var comment = program.command("comment").description("Manage trajectory comments");
@@ -383,13 +502,13 @@ addCommentBodyOptions(
 ).action(updateCommentAction);
 comment.command("delete <comment-id>").description("Delete one of your comments").option("-y, --yes", "Skip confirmation prompt").option("--json", "Print machine-readable JSON").action(deleteCommentAction);
 async function resolveProject(ref) {
-  const { listProjects, resolveProjectRef } = await import("./projects-ESYLKFUR.js");
+  const { listProjects, resolveProjectRef } = await import("./projects-END2CFCS.js");
   const projects = await listProjects();
   return { ...resolveProjectRef(ref, projects), projects };
 }
 async function listProjectsAction(opts) {
   try {
-    const { listProjects } = await import("./projects-ESYLKFUR.js");
+    const { listProjects } = await import("./projects-END2CFCS.js");
     const projects = await listProjects();
     if (opts.json) {
       console.log(JSON.stringify(projects, null, 2));
@@ -419,7 +538,7 @@ async function listProjectsAction(opts) {
 }
 async function showProjectAction(ref, opts) {
   try {
-    const { getProject } = await import("./projects-ESYLKFUR.js");
+    const { getProject } = await import("./projects-END2CFCS.js");
     const { id } = await resolveProject(ref);
     const project2 = await getProject(id);
     if (opts.json) {
@@ -448,7 +567,7 @@ async function showProjectAction(ref, opts) {
 }
 async function createProjectAction(name, opts) {
   try {
-    const { createProject } = await import("./projects-ESYLKFUR.js");
+    const { createProject } = await import("./projects-END2CFCS.js");
     const project2 = await createProject({
       name,
       description: opts.description,
@@ -479,7 +598,7 @@ async function updateProjectAction(ref, opts) {
     if (Object.keys(patch).length === 0) {
       throw new Error("Nothing to update. Pass --name, --description, --color, --slug or --visibility");
     }
-    const { updateProject } = await import("./projects-ESYLKFUR.js");
+    const { updateProject } = await import("./projects-END2CFCS.js");
     const { id } = await resolveProject(ref);
     const project2 = await updateProject(id, patch);
     if (opts.json) console.log(JSON.stringify(project2));
@@ -492,7 +611,7 @@ async function updateProjectAction(ref, opts) {
 }
 async function deleteProjectAction(ref, opts) {
   try {
-    const { deleteProject } = await import("./projects-ESYLKFUR.js");
+    const { deleteProject } = await import("./projects-END2CFCS.js");
     const { id, project: project2 } = await resolveProject(ref);
     const label = project2?.name ? `"${project2.name}"` : id;
     if (!opts.yes) {
@@ -523,7 +642,7 @@ async function deleteProjectAction(ref, opts) {
 }
 async function projectAddAction(ref, sets, opts) {
   try {
-    const { assignJobs } = await import("./projects-ESYLKFUR.js");
+    const { assignJobs } = await import("./projects-END2CFCS.js");
     const { id, project: project2 } = await resolveProject(ref);
     const result = await assignJobs(id, sets, "add");
     if (opts.json) {
@@ -542,7 +661,7 @@ async function projectAddAction(ref, sets, opts) {
 }
 async function projectRemoveAction(refOrSet, sets, opts) {
   try {
-    const { assignJobs } = await import("./projects-ESYLKFUR.js");
+    const { assignJobs } = await import("./projects-END2CFCS.js");
     if (opts.all) {
       const result2 = await assignJobs(null, [refOrSet, ...sets], "remove");
       if (opts.json) console.log(JSON.stringify(result2));
@@ -588,8 +707,8 @@ project.command("add <project> <sets...>").description("File one or more traject
 project.command("remove <project|set> [sets...]").description("Remove trajectory sets from a project, or from all with --all").option("--all", "Unfile the given sets from every project").option("--json", "Print machine-readable JSON").action(projectRemoveAction);
 program.command("whoami").description("Show current authentication status").action(async () => {
   const chalk = (await import("chalk")).default;
-  const { status } = await import("./auth-4UEZSE4C.js");
-  const { getApiUrl } = await import("./config-4XJRECIW.js");
+  const { status } = await import("./auth-NNBHKNIF.js");
+  const { getApiUrl } = await import("./config-QS2IT5DI.js");
   const s = status();
   if (s.loggedIn) {
     console.log(chalk.green("  \u2713 Authenticated"));

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

@@ -1,11 +1,11 @@
 import {
   parseJobId
-} from "./chunk-IUSBK45Q.js";
-import "./chunk-35B24E3O.js";
+} from "./chunk-LOJZPDGI.js";
+import "./chunk-72L6XPK6.js";
 import {
   getApiUrl,
   getAuthHeader
-} from "./chunk-Q2ZEN43L.js";
+} from "./chunk-ERO5HP43.js";
 
 // src/comments.ts
 import { readFileSync } from "fs";

package/dist/{config-4XJRECIW.js → config-QS2IT5DI.js}

@@ -11,7 +11,7 @@ import {
   saveApiKey,
   saveApiUrl,
   saveSession
-} from "./chunk-Q2ZEN43L.js";
+} from "./chunk-ERO5HP43.js";
 export {
   CONFIG_DIR,
   CONFIG_FILE,

package/dist/download-BWJDAVMM.js

@@ -0,0 +1,28 @@
+import {
+  CliError,
+  DOWNLOAD_TIMEOUT_MS,
+  EXIT,
+  dirBytes,
+  downloadJob,
+  downloadPlannedJob,
+  httpError,
+  parseJobId,
+  parseProjectId,
+  planJob,
+  writeJsonl
+} from "./chunk-LOJZPDGI.js";
+import "./chunk-72L6XPK6.js";
+import "./chunk-ERO5HP43.js";
+export {
+  CliError,
+  DOWNLOAD_TIMEOUT_MS,
+  EXIT,
+  dirBytes,
+  downloadJob,
+  downloadPlannedJob,
+  httpError,
+  parseJobId,
+  parseProjectId,
+  planJob,
+  writeJsonl
+};

package/dist/download-project-XN4OPF3M.js

@@ -0,0 +1,70 @@
+import {
+  CliError,
+  DOWNLOAD_TIMEOUT_MS,
+  EXIT,
+  downloadPlannedJob,
+  httpError,
+  parseProjectId,
+  planJob,
+  writeJsonl
+} from "./chunk-LOJZPDGI.js";
+import "./chunk-72L6XPK6.js";
+import {
+  getApiUrl,
+  getAuthHeader
+} from "./chunk-ERO5HP43.js";
+
+// src/download-project.ts
+import { join } from "path";
+async function fetchProjectManifest(input) {
+  const projectId = parseProjectId(input);
+  const auth = await getAuthHeader();
+  const headers = { Accept: "application/json" };
+  if (auth) headers["Authorization"] = auth;
+  const resp = await fetch(`${getApiUrl()}/api/public/projects/${projectId}/export`, {
+    headers,
+    signal: AbortSignal.timeout(DOWNLOAD_TIMEOUT_MS)
+  });
+  if (!resp.ok) throw await httpError(resp, `Project ${projectId}`);
+  return await resp.json();
+}
+async function planProject(input, options) {
+  const project = await fetchProjectManifest(input);
+  if (!project.jobs.length) throw new CliError(`Project "${project.name ?? project.id}" has no downloadable trajectory sets.`, EXIT.NOT_FOUND);
+  const jobs = [];
+  for (const job of project.jobs) jobs.push(await planJob(job.id, options));
+  return {
+    project,
+    jobs,
+    bytes: jobs.reduce((s, j) => s + j.bytes, 0),
+    files: jobs.reduce((s, j) => s + j.files.length, 0),
+    trajectoryFiles: jobs.reduce((s, j) => s + j.trajectoryFiles, 0)
+  };
+}
+async function downloadProject(plan, outputDir, options) {
+  const log = options.quiet ? () => {
+  } : (m) => console.log(m);
+  const results = [];
+  for (const [i, job] of plan.jobs.entries()) {
+    log(`
+  [${i + 1}/${plan.jobs.length}] ${job.slug}`);
+    results.push(await downloadPlannedJob(job, join(outputDir, job.slug), options));
+  }
+  let jsonl = null;
+  if (options.format === "jsonl") {
+    const path = join(outputDir, "trajectories.jsonl");
+    const trials = writeJsonl(outputDir, results.map((r) => ({ jobId: r.jobId, slug: r.slug, dir: r.outputDir })), path);
+    jsonl = { path, trials };
+    log(`  \u2713 Wrote ${trials} trials to ${path}`);
+  }
+  return { project: plan.project, outputDir, jobs: results, jsonl };
+}
+function defaultProjectDir(project) {
+  return project.slug || project.id;
+}
+export {
+  defaultProjectDir,
+  downloadProject,
+  fetchProjectManifest,
+  planProject
+};

package/dist/{projects-ESYLKFUR.js → projects-END2CFCS.js}

@@ -1,11 +1,11 @@
 import {
   parseJobId
-} from "./chunk-IUSBK45Q.js";
-import "./chunk-35B24E3O.js";
+} from "./chunk-LOJZPDGI.js";
+import "./chunk-72L6XPK6.js";
 import {
   getApiUrl,
   getAuthHeader
-} from "./chunk-Q2ZEN43L.js";
+} from "./chunk-ERO5HP43.js";
 
 // src/projects.ts
 var PROJECT_COLORS = [

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

@@ -1,10 +1,10 @@
 import {
   preflightQuota
-} from "./chunk-2ELJH3IV.js";
+} from "./chunk-HHUWMQ5S.js";
 import {
   getApiUrl,
   getAuthHeader
-} from "./chunk-Q2ZEN43L.js";
+} from "./chunk-ERO5HP43.js";
 
 // src/push-task.ts
 import { readFileSync, existsSync, readdirSync } from "fs";

package/dist/{upload-CIW2CHKX.js → upload-6HQ5A2H7.js}

@@ -1,13 +1,13 @@
 import {
   preflightQuota
-} from "./chunk-2ELJH3IV.js";
+} from "./chunk-HHUWMQ5S.js";
 import {
   buildScreenshotChunks
-} from "./chunk-35B24E3O.js";
+} from "./chunk-72L6XPK6.js";
 import {
   getApiUrl,
   getAuthHeader
-} from "./chunk-Q2ZEN43L.js";
+} from "./chunk-ERO5HP43.js";
 
 // src/upload.ts
 import { readdirSync, statSync, readFileSync, writeFileSync, mkdirSync, copyFileSync, unlinkSync } from "fs";

package/package.json

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

package/dist/chunk-IUSBK45Q.js

@@ -1,148 +0,0 @@
-import {
-  CHUNK_DIR,
-  unpackScreenshotChunks
-} from "./chunk-35B24E3O.js";
-import {
-  getApiUrl,
-  getAuthHeader
-} from "./chunk-Q2ZEN43L.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 = 100;
-var CONCURRENCY = 25;
-var DOWNLOAD_TIMEOUT_MS = 18e4;
-function parseJobId(input) {
-  const trimmed = input.trim();
-  if (UUID_RE.test(trimmed) && !trimmed.includes("/")) {
-    return trimmed.match(UUID_RE)[0];
-  }
-  const shortMatch = trimmed.match(/\/t\/([0-9a-f-]{36})/i);
-  if (shortMatch) return shortMatch[1];
-  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,
-      signal: AbortSignal.timeout(DOWNLOAD_TIMEOUT_MS)
-    });
-    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(DOWNLOAD_TIMEOUT_MS)
-  });
-  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);
-  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` + (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" });
-  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(DOWNLOAD_TIMEOUT_MS)
-    });
-    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(DOWNLOAD_TIMEOUT_MS)
-            });
-            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();
-  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 };
-}
-
-export {
-  DOWNLOAD_TIMEOUT_MS,
-  parseJobId,
-  downloadJob
-};

package/dist/download-M6UVD5S5.js

@@ -1,12 +0,0 @@
-import {
-  DOWNLOAD_TIMEOUT_MS,
-  downloadJob,
-  parseJobId
-} from "./chunk-IUSBK45Q.js";
-import "./chunk-35B24E3O.js";
-import "./chunk-Q2ZEN43L.js";
-export {
-  DOWNLOAD_TIMEOUT_MS,
-  downloadJob,
-  parseJobId
-};