trajectories-sh 1.0.2 → 1.2.0

package/dist/{auth-2SFY2XB2.js → auth-UD3KTSHK.js}

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

package/dist/{chunk-JSCDM6ZO.js → chunk-P6J5X7LP.js}

@@ -5,6 +5,8 @@ import { join } from "path";
 var CONFIG_DIR = join(homedir(), ".trajectories-sh");
 var CONFIG_FILE = join(CONFIG_DIR, "config.json");
 var DEFAULT_API_URL = "https://api.trajectories.sh";
+var SUPABASE_URL = "https://rwghorglubtbjfzjotzu.supabase.co";
+var SUPABASE_ANON_KEY = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InJ3Z2hvcmdsdWJ0YmpmempvdHp1Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NzEzNzc5MjUsImV4cCI6MjA4Njk1MzkyNX0.AmFQnkLH0m-LfxepAnq3pmhObtHPhB1VEhd4aJQk5iA";
 function loadConfig() {
   if (!existsSync(CONFIG_FILE)) return {};
   try {
@@ -26,12 +28,53 @@ function getApiKey() {
 function getAccessToken() {
   return loadConfig().access_token;
 }
-function getAuthHeader() {
+async function getAuthHeader() {
   const config = loadConfig();
   if (config.api_key) return `Bearer ${config.api_key}`;
-  if (config.access_token) return `Bearer ${config.access_token}`;
+  if (config.access_token && config.refresh_token) {
+    const refreshed = await refreshTokenIfNeeded(config);
+    return `Bearer ${refreshed}`;
+  }
   return void 0;
 }
+async function refreshTokenIfNeeded(config) {
+  const token = config.access_token;
+  try {
+    const payload = JSON.parse(
+      Buffer.from(token.split(".")[1], "base64").toString()
+    );
+    const nowSec = Math.floor(Date.now() / 1e3);
+    if (payload.exp && payload.exp > nowSec + 60) {
+      return token;
+    }
+  } catch {
+  }
+  try {
+    const resp = await fetch(`${SUPABASE_URL}/auth/v1/token?grant_type=refresh_token`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        apikey: SUPABASE_ANON_KEY
+      },
+      body: JSON.stringify({ refresh_token: config.refresh_token }),
+      signal: AbortSignal.timeout(1e4)
+    });
+    if (!resp.ok) {
+      throw new Error(`Refresh failed: ${resp.status}`);
+    }
+    const data = await resp.json();
+    saveSession({
+      access_token: data.access_token,
+      refresh_token: data.refresh_token,
+      email: config.user_email
+    });
+    return data.access_token;
+  } catch (e) {
+    throw new Error(
+      `Session expired. Run: trajectories auth login (${e.message})`
+    );
+  }
+}
 function getUserEmail() {
   return loadConfig().user_email;
 }

package/dist/cli.js

@@ -21,7 +21,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-2SFY2XB2.js");
+      const { loginWithApiKey } = await import("./auth-UD3KTSHK.js");
       await loginWithApiKey(opts.apiKey);
       spinner.succeed("Logged in with API key");
     } catch (e) {
@@ -33,7 +33,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-2SFY2XB2.js");
+    const { loginWithBrowser } = await import("./auth-UD3KTSHK.js");
     const { email } = await loginWithBrowser();
     console.log(chalk.green(`
   \u2713 Logged in as ${email}
@@ -48,13 +48,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-2SFY2XB2.js");
+  const { logout } = await import("./auth-UD3KTSHK.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-2SFY2XB2.js");
+  const { status } = await import("./auth-UD3KTSHK.js");
   const s = status();
   if (s.loggedIn) {
     console.log(chalk.green("  \u2713 Authenticated"));
@@ -71,7 +71,7 @@ program.command("upload <directory>").description("Upload a trajectory job direc
     console.error(chalk.red(`  \u2717 Directory not found: ${directory}`));
     process.exit(1);
   }
-  const { isLoggedIn } = await import("./config-Y3GNDGUO.js");
+  const { isLoggedIn } = await import("./config-NOIAMV2U.js");
   if (!isLoggedIn()) {
     console.error(chalk.red("  \u2717 Not authenticated. Run: trajectories auth login"));
     process.exit(1);
@@ -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-CANGE4U5.js");
+    const { uploadJob } = await import("./upload-SELQA4FS.js");
     const result = await uploadJob(directory, {
       slug,
       name: opts.name,
@@ -103,8 +103,8 @@ program.command("upload <directory>").description("Upload a trajectory job direc
 });
 program.command("whoami").description("Show current authentication status").action(async () => {
   const chalk = (await import("chalk")).default;
-  const { status } = await import("./auth-2SFY2XB2.js");
-  const { getApiUrl } = await import("./config-Y3GNDGUO.js");
+  const { status } = await import("./auth-UD3KTSHK.js");
+  const { getApiUrl } = await import("./config-NOIAMV2U.js");
   const s = status();
   if (s.loggedIn) {
     console.log(chalk.green("  \u2713 Authenticated"));

package/dist/{config-Y3GNDGUO.js → config-NOIAMV2U.js}

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

package/dist/upload-SELQA4FS.js

@@ -0,0 +1,154 @@
+import {
+  getApiUrl,
+  getAuthHeader
+} from "./chunk-P6J5X7LP.js";
+
+// src/upload.ts
+import { readdirSync, statSync, readFileSync } from "fs";
+import { join, relative } from "path";
+var SKIP = /* @__PURE__ */ new Set(["__pycache__", ".DS_Store", ".git", "node_modules"]);
+var MAX_FILE_SIZE = 50 * 1024 * 1024;
+var CONCURRENCY = 15;
+var BATCH_SIZE = 50;
+function collectFiles(dir) {
+  const files = [];
+  function walk(current) {
+    for (const entry of readdirSync(current, { withFileTypes: true })) {
+      if (SKIP.has(entry.name)) continue;
+      const full = join(current, entry.name);
+      if (entry.isDirectory()) {
+        walk(full);
+      } else if (entry.isFile()) {
+        const st = statSync(full);
+        if (st.size <= MAX_FILE_SIZE) {
+          files.push({ absPath: full, relPath: relative(dir, full), size: st.size });
+        }
+      }
+    }
+  }
+  walk(dir);
+  return files;
+}
+async function apiPost(path, body, timeout = 3e5) {
+  const auth = await getAuthHeader();
+  if (!auth) throw new Error("Not authenticated. Run: trajectories auth login");
+  return fetch(`${getApiUrl()}${path}`, {
+    method: "POST",
+    headers: { Authorization: auth, "Content-Type": "application/json" },
+    body: JSON.stringify(body),
+    signal: AbortSignal.timeout(timeout)
+  });
+}
+async function uploadJob(dir, opts) {
+  const slug = opts.slug ?? dir.replace(/\/+$/, "").split("/").pop();
+  const name = opts.name ?? slug;
+  const visibility = opts.visibility ?? "private";
+  const files = collectFiles(dir);
+  const totalSize = files.reduce((s, f) => s + f.size, 0);
+  console.log(`  ${files.length} files, ${(totalSize / 1024 / 1024).toFixed(1)} MB`);
+  const initResp = await apiPost("/api/cli/push/init", { slug, name, visibility });
+  if (!initResp.ok) {
+    throw new Error(`Init failed: ${await initResp.text()}`);
+  }
+  const { job_id: jobId } = await initResp.json();
+  console.log(`  Job ID: ${jobId}`);
+  await uploadDirect(jobId, files);
+  console.log("  Finalizing...");
+  const finalResp = await apiPost(`/api/cli/push/${jobId}/finalize`, {});
+  if (!finalResp.ok) {
+    throw new Error(`Finalize failed: ${await finalResp.text()}`);
+  }
+  const result = await finalResp.json();
+  return {
+    jobId,
+    slug: result.slug,
+    nTrials: result.n_trials,
+    meanReward: result.mean_reward,
+    viewerUrl: `${getApiUrl()}${result.viewer_url}`
+  };
+}
+async function uploadDirect(jobId, files) {
+  let uploaded = 0;
+  let errors = 0;
+  for (let batchStart = 0; batchStart < files.length; batchStart += BATCH_SIZE) {
+    const batch = files.slice(batchStart, batchStart + BATCH_SIZE);
+    const urlResp = await apiPost(`/api/cli/push/${jobId}/upload-urls`, {
+      paths: batch.map((f) => f.relPath)
+    });
+    if (!urlResp.ok) {
+      throw new Error(`Failed to get upload URLs: ${await urlResp.text()}`);
+    }
+    const { urls } = await urlResp.json();
+    const urlMap = /* @__PURE__ */ new Map();
+    for (const u of urls) {
+      if (u.signed_url) urlMap.set(u.path, u.signed_url);
+      else {
+        errors++;
+        console.log(`  \u2717 ${u.path} (no signed URL: ${u.error})`);
+      }
+    }
+    const pending = [];
+    let active = 0;
+    for (const file of batch) {
+      const signedUrl = urlMap.get(file.relPath);
+      if (!signedUrl) continue;
+      const task = (async () => {
+        const ok = await uploadOneFile(file, signedUrl);
+        if (ok) {
+          uploaded++;
+        } 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`);
+        }
+      })();
+      pending.push(task);
+      active++;
+      if (active >= CONCURRENCY) {
+        await Promise.race(pending);
+        pending.splice(0, pending.findIndex((p) => {
+          let settled = false;
+          p.then(() => settled = true, () => settled = true);
+          return !settled;
+        }));
+        active = pending.length;
+      }
+    }
+    await Promise.all(pending);
+  }
+  console.log("");
+  if (errors > 0) {
+    console.log(`  Uploaded: ${uploaded}, Errors: ${errors}`);
+  } else {
+    console.log(`  \u2713 All ${uploaded} files uploaded directly to storage`);
+  }
+}
+async function uploadOneFile(file, signedUrl) {
+  const data = readFileSync(file.absPath);
+  for (let attempt = 0; attempt < 3; attempt++) {
+    try {
+      const resp = await fetch(signedUrl, {
+        method: "PUT",
+        headers: {
+          "Content-Type": "application/octet-stream"
+        },
+        body: data,
+        signal: AbortSignal.timeout(12e4)
+      });
+      if (resp.ok) return true;
+    } catch {
+    }
+    if (attempt < 2) await sleep(1e3 * (attempt + 1));
+  }
+  return false;
+}
+function sleep(ms) {
+  return new Promise((r) => setTimeout(r, ms));
+}
+export {
+  collectFiles,
+  uploadJob
+};

package/package.json

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

package/dist/upload-CANGE4U5.js

@@ -1,261 +0,0 @@
-import {
-  getApiUrl,
-  getAuthHeader
-} from "./chunk-JSCDM6ZO.js";
-
-// src/upload.ts
-import { readdirSync, statSync, readFileSync } from "fs";
-import { join, relative } from "path";
-import { tmpdir } from "os";
-import { randomBytes } from "crypto";
-import { execFileSync } from "child_process";
-import * as tar from "tar";
-var SKIP = /* @__PURE__ */ new Set(["__pycache__", ".DS_Store", ".git", "node_modules"]);
-var MAX_FILE_SIZE = 50 * 1024 * 1024;
-var ARCHIVE_THRESHOLD = 50;
-var CHUNK_MAX_BYTES = 15 * 1024 * 1024;
-function collectFiles(dir) {
-  const files = [];
-  function walk(current) {
-    for (const entry of readdirSync(current, { withFileTypes: true })) {
-      if (SKIP.has(entry.name)) continue;
-      const full = join(current, entry.name);
-      if (entry.isDirectory()) {
-        walk(full);
-      } else if (entry.isFile()) {
-        const st = statSync(full);
-        if (st.size <= MAX_FILE_SIZE) {
-          files.push({ absPath: full, relPath: relative(dir, full), size: st.size });
-        }
-      }
-    }
-  }
-  walk(dir);
-  return files;
-}
-async function apiPost(path, body, timeout = 3e5) {
-  const auth = getAuthHeader();
-  if (!auth) throw new Error("Not authenticated. Run: trajectories auth login");
-  return fetch(`${getApiUrl()}${path}`, {
-    method: "POST",
-    headers: { Authorization: auth, "Content-Type": "application/json" },
-    body: JSON.stringify(body),
-    signal: AbortSignal.timeout(timeout)
-  });
-}
-async function apiPostFile(path, formData) {
-  const auth = getAuthHeader();
-  if (!auth) throw new Error("Not authenticated. Run: trajectories auth login");
-  return fetch(`${getApiUrl()}${path}`, {
-    method: "POST",
-    headers: { Authorization: auth },
-    body: formData,
-    signal: AbortSignal.timeout(3e5)
-  });
-}
-async function apiGet(path) {
-  const auth = getAuthHeader();
-  if (!auth) throw new Error("Not authenticated. Run: trajectories auth login");
-  return fetch(`${getApiUrl()}${path}`, {
-    headers: { Authorization: auth },
-    signal: AbortSignal.timeout(3e4)
-  });
-}
-async function uploadJob(dir, opts) {
-  const slug = opts.slug ?? dir.split("/").pop();
-  const name = opts.name ?? slug;
-  const visibility = opts.visibility ?? "private";
-  const files = collectFiles(dir);
-  const totalSize = files.reduce((s, f) => s + f.size, 0);
-  console.log(`  ${files.length} files, ${(totalSize / 1024 / 1024).toFixed(1)} MB`);
-  const initResp = await apiPost("/api/cli/push/init", { slug, name, visibility });
-  if (!initResp.ok) {
-    const text = await initResp.text();
-    throw new Error(`Init failed: ${text}`);
-  }
-  const { job_id: jobId } = await initResp.json();
-  console.log(`  Job ID: ${jobId}`);
-  if (files.length >= ARCHIVE_THRESHOLD) {
-    await uploadArchive(jobId, dir, files, totalSize);
-  } else {
-    await uploadFiles(jobId, files);
-  }
-  console.log("  Finalizing...");
-  const finalResp = await apiPost(`/api/cli/push/${jobId}/finalize`, {});
-  if (!finalResp.ok) {
-    throw new Error(`Finalize failed: ${await finalResp.text()}`);
-  }
-  const result = await finalResp.json();
-  return {
-    jobId,
-    slug: result.slug,
-    nTrials: result.n_trials,
-    meanReward: result.mean_reward,
-    viewerUrl: `${getApiUrl()}${result.viewer_url}`
-  };
-}
-async function uploadArchive(jobId, dir, files, totalSize) {
-  const archivePath = join(tmpdir(), `trajectories-${randomBytes(4).toString("hex")}.tar.gz`);
-  console.log(`  Compressing ${files.length} files...`);
-  await tar.create(
-    { gzip: true, file: archivePath, cwd: dir },
-    files.map((f) => f.relPath)
-  );
-  const archiveSize = statSync(archivePath).size;
-  const ratio = ((1 - archiveSize / totalSize) * 100).toFixed(0);
-  console.log(`  Archive: ${(archiveSize / 1024 / 1024).toFixed(1)} MB (${ratio}% compressed)`);
-  if (archiveSize <= CHUNK_MAX_BYTES) {
-    await doSignedUploadAndExtract(jobId, archivePath, archiveSize);
-  } else {
-    await uploadChunked(jobId, dir, files, totalSize);
-  }
-  try {
-    (await import("fs")).unlinkSync(archivePath);
-  } catch {
-  }
-}
-async function uploadChunked(jobId, dir, files, totalSize) {
-  const targetRawPerChunk = CHUNK_MAX_BYTES * 4;
-  const chunks = [[]];
-  let currentSize = 0;
-  for (const file of files) {
-    if (currentSize + file.size > targetRawPerChunk && chunks[chunks.length - 1].length > 0) {
-      chunks.push([]);
-      currentSize = 0;
-    }
-    chunks[chunks.length - 1].push(file);
-    currentSize += file.size;
-  }
-  console.log(`  Splitting into ${chunks.length} chunks (max ${CHUNK_MAX_BYTES / 1024 / 1024}MB each)`);
-  for (let i = 0; i < chunks.length; i++) {
-    const chunk = chunks[i];
-    const label = ` chunk ${i + 1}/${chunks.length}`;
-    const chunkPath = join(tmpdir(), `trajectories-chunk-${i}-${randomBytes(4).toString("hex")}.tar.gz`);
-    console.log(`  Compressing${label} (${chunk.length} files)...`);
-    await tar.create(
-      { gzip: true, file: chunkPath, cwd: dir },
-      chunk.map((f) => f.relPath)
-    );
-    const chunkSize = statSync(chunkPath).size;
-    console.log(`  ${label}: ${(chunkSize / 1024 / 1024).toFixed(1)} MB`);
-    await doSignedUploadAndExtract(jobId, chunkPath, chunkSize, label);
-    try {
-      (await import("fs")).unlinkSync(chunkPath);
-    } catch {
-    }
-  }
-}
-async function doSignedUploadAndExtract(jobId, archivePath, archiveSize, label = "") {
-  const urlResp = await apiPost(`/api/cli/push/${jobId}/upload-url`, {});
-  if (!urlResp.ok) throw new Error(`Failed to get upload URL: ${await urlResp.text()}`);
-  const { signed_url: signedUrl } = await urlResp.json();
-  console.log("  Uploading archive...");
-  let uploaded = false;
-  for (let attempt = 0; attempt < 3; attempt++) {
-    try {
-      try {
-        const result = execFileSync("curl", [
-          "--http1.1",
-          "-s",
-          "-w",
-          "%{response_code}",
-          "-o",
-          "/dev/null",
-          "-X",
-          "PUT",
-          signedUrl,
-          "-H",
-          "Content-Type: application/gzip",
-          "-H",
-          "Expect:",
-          "--data-binary",
-          `@${archivePath}`,
-          "--max-time",
-          "600"
-        ], { encoding: "utf-8" });
-        if (result.trim() === "200" || result.trim() === "201") {
-          uploaded = true;
-          break;
-        }
-      } catch {
-        const body = readFileSync(archivePath);
-        const resp = await fetch(signedUrl, {
-          method: "PUT",
-          headers: { "Content-Type": "application/gzip" },
-          body,
-          signal: AbortSignal.timeout(6e5)
-        });
-        if (resp.ok) {
-          uploaded = true;
-          break;
-        }
-      }
-    } catch (e) {
-      console.log(`  Upload attempt ${attempt + 1} failed`);
-    }
-    if (attempt < 2) await sleep(5e3);
-  }
-  if (!uploaded) throw new Error("Archive upload failed after retries");
-  console.log("  Extracting on server...");
-  const extractResp = await apiPost(`/api/cli/push/${jobId}/extract`, {}, 3e4);
-  if (!extractResp.ok) throw new Error(`Extract failed: ${await extractResp.text()}`);
-  while (true) {
-    await sleep(3e3);
-    try {
-      const statusResp = await apiGet(`/api/cli/push/${jobId}/extract-status`);
-      if (!statusResp.ok) continue;
-      const status = await statusResp.json();
-      if (status.status === "done") {
-        console.log(`  \u2713 ${status.uploaded} files stored`);
-        return;
-      }
-      if (status.status === "error") throw new Error(`Extraction error: ${status.detail}`);
-      if (status.uploaded > 0) {
-        process.stdout.write(`    ${status.status}... ${status.uploaded} files stored\r`);
-      }
-    } catch (e) {
-      if (e.message?.includes("Extraction error")) throw e;
-    }
-  }
-}
-async function uploadFiles(jobId, files) {
-  let uploaded = 0;
-  let errors = 0;
-  for (const file of files) {
-    let ok = false;
-    for (let attempt = 0; attempt < 3; attempt++) {
-      try {
-        const formData = new FormData();
-        const blob = new Blob([readFileSync(file.absPath)]);
-        formData.append("file", blob, file.relPath);
-        formData.append("path", file.relPath);
-        const resp = await apiPostFile(`/api/cli/push/${jobId}/file`, formData);
-        if (resp.ok) {
-          ok = true;
-          break;
-        }
-      } catch {
-      }
-      if (attempt < 2) await sleep(1e3 * (attempt + 1));
-    }
-    if (ok) {
-      uploaded++;
-      console.log(`  \u2713 ${file.relPath}`);
-    } else {
-      errors++;
-      console.log(`  \u2717 ${file.relPath}`);
-    }
-  }
-  if (errors > 0) {
-    console.log(`  Uploaded: ${uploaded}, Errors: ${errors}`);
-  } else {
-    console.log(`  \u2713 All ${uploaded} files uploaded`);
-  }
-}
-function sleep(ms) {
-  return new Promise((r) => setTimeout(r, ms));
-}
-export {
-  collectFiles,
-  uploadJob
-};