@plune-ai/cli 0.21.0 → 0.22.0

package/README.md

@@ -120,7 +120,7 @@ the last resort, used only when `PLUNE_TOKEN` is set nowhere else. Nothing write
 | `plune login` | Save a [Plune platform](https://plune.ai/platform) API token so `sync` and `ingest` can reach it. The token is **checked against the API before it is saved**, so a wrong one fails here rather than two commands later. Get one at `https://beta.plune.ai` → Account → API tokens. Flags: `--token <token>` (omit to paste it or pipe it via stdin), `--skip-verify` (save without checking, for offline setup). In CI, skip this step: every platform command reads `PLUNE_TOKEN` from the environment first, and the saved login only when it is not set. |
 | `plune logout` | Remove the saved token. |
 | `plune sync` | Upload the latest local run to the platform. Flags: `--file <path>` to send a specific run JSON, `--fail-on-failures` to read the run's summary back once after the upload and exit with [the gate](#a-release-gate---fail-on-failures)'s code. |
-| `plune run import <file>` | Turn a **JUnit XML** or **Playwright JSON** report, or an **Allure `allure-results` folder**, into a run in Plune. Needs no provider key — nothing is generated. Flags: `--format junit\|playwright-json\|allure` (detected from the file when omitted; a folder is Allure), `--key <externalKey>` to land several reports in one run (with `PLUNE_SHARED_RUN=1` — see below), `--create` to offer unmatched tests to the review queue, `--fail-on-missing-attachments` to exit 1 when a file a JUnit report names with `[[ATTACHMENT\|path]]`, or an Allure result names as a `source`, is not there (the results are sent either way), `--fail-on-failures` to exit with [the gate](#a-release-gate---fail-on-failures)'s code on the summary the platform froze when this import finished the run. |
+| `plune run import <file>` | Turn a **JUnit XML** or **Playwright JSON** report, or an **Allure `allure-results` folder**, into a run in Plune. Needs no provider key — nothing is generated. Flags: `--format junit\|playwright-json\|allure` (detected from the file when omitted; a folder is Allure), `--key <externalKey>` to land several reports in one run (with `PLUNE_SHARED_RUN=1` — see below), `--create` to offer unmatched tests to the review queue, `--fail-on-missing-attachments` to exit 1 when a file a JUnit report names with `[[ATTACHMENT\|path]]`, or an Allure result names as a `source`, is not there (the results are sent either way), `--upload-concurrency <n>` for files uploaded at once ([1 to 32, default 4](#many-screenshots-upload-concurrency-and-retries)), `--fail-on-failures` to exit with [the gate](#a-release-gate---fail-on-failures)'s code on the summary the platform froze when this import finished the run. |
 | `plune run start` | Open a platform run — or join the one already carrying `--key` — and print its id. Flags: `--key <externalKey>` (generated when absent), `--json` for one machine-readable line. |
 | `plune run finish <id>` | Close a platform run. This is what the reporter tells you to do for a run it had to leave open. Flags: `--terminate` to record it as cut short, `--reason <text>`, `--fail-on-failures` to exit with [the gate](#a-release-gate---fail-on-failures)'s code on the summary the platform froze. |
 | `plune run exec -- <command>` | Open a run, run the command inside it, close the run — and exit with whatever the command returned. Sets `PLUNE_SHARED_RUN` for you, so anything reporting inside joins that run. Flags: `--key <externalKey>`, `--fail-on-failures` to exit with [the gate](#a-release-gate---fail-on-failures)'s code instead — or with the command's own when no result reached the run. |
@@ -322,6 +322,26 @@ job closes the run instead of the explicit `finish`.
 `plune run exec` sets it for you — anything reporting inside it, this command included, joins
 without closing.
 
+### Many screenshots: upload concurrency and retries
+
+Every file is its own request, so a report with thousands of screenshots is bound by the round trip, not
+by bandwidth. Files go four at a time by default; raise it on a runner with a slow link:
+
+```bash
+PLUNE_UPLOAD_CONCURRENCY=16 plune run import ./playwright.json     # 1 to 32, default 4
+plune run import ./playwright.json --upload-concurrency 16         # the same, as a flag (it wins)
+```
+
+When the platform answers 429 with a `Retry-After` (seconds or an HTTP date, never waited longer than 60 s),
+the request is tried again after that time plus up to half as much, and every other request of the import
+waits through the same pause. `PLUNE_UPLOAD_RETRIES` (0 to 20, default 6) says how many times; a 429 that
+names no time is the quota and is not retried. A platform that is down (a 5xx or no answer) is still tried
+twice (three times for a bucket). A file that stays refused is reported without it, never fails the import,
+and is counted in the line printed before the summary:
+`plune: files — 2758 uploaded, 0 skipped, 14 retried, 0 dropped, in 41.2 s (16 at once)`.
+A value outside the range is ignored with a warning, and the default is used. The Playwright reporter reads
+the same variables.
+
 ### When a test is deleted
 
 A test that vanishes from the code stays in Plune as an active case until something says otherwise.

package/dist/cli.cjs

@@ -2304,6 +2304,13 @@ var init_credentials = __esm({
 });
 
 // src/reporter-core/client.ts
+function parseRetryAfter(raw, now = Date.now()) {
+  const text2 = raw?.trim();
+  if (text2 === void 0 || text2 === "") return null;
+  const seconds = /^\d+(\.\d+)?$/.test(text2) ? Number(text2) : (Date.parse(text2) - now) / 1e3;
+  if (!Number.isFinite(seconds)) return null;
+  return Math.min(Math.max(seconds, 0) * 1e3, RETRY_AFTER_CAP_MS);
+}
 function nodeTransport(url, init, idleMs = IDLE_MS) {
   return new Promise((resolve9, reject) => {
     const target = new URL(url);
@@ -2371,12 +2378,6 @@ async function detailOf(res) {
     return { detail: "" };
   }
 }
-function retryAfterMs2(res) {
-  const raw = res.headers.get("retry-after");
-  if (raw === null) return null;
-  const seconds = Number(raw.trim());
-  return Number.isFinite(seconds) && seconds >= 0 ? seconds * 1e3 : null;
-}
 function classify(status) {
   if (status === 401 || status === 403) return "auth";
   if (status === 409) return "conflict";
@@ -2387,15 +2388,34 @@ function classify(status) {
 function createClient(opts) {
   const doFetch = opts.fetchImpl ?? nodeTransport;
   const wait = opts.wait ?? sleep;
+  const uploadRetries = opts.uploadRetries === void 0 ? void 0 : Math.max(0, Math.floor(opts.uploadRetries));
+  const random = opts.random ?? Math.random;
+  const now = opts.now ?? Date.now;
+  let pausedUntil = 0;
+  const jittered = (ms) => Math.round(ms * (1 + random() * 0.5));
+  async function backOff(attempt, said) {
+    opts.onRetry?.();
+    const ms = jittered(said ?? Math.min(BACKOFF_BASE_MS * 2 ** attempt, BACKOFF_CAP_MS));
+    const until = now() + ms;
+    pausedUntil = Math.max(pausedUntil, until);
+    await wait(ms);
+    return until;
+  }
+  async function respectPause(mine) {
+    const left = pausedUntil - now();
+    if (pausedUntil > mine && left > 0) await wait(left + Math.round(random() * 250));
+  }
   const base = opts.apiUrl.replace(/\/+$/, "");
   const scrub = (text2) => opts.token === "" ? text2 : text2.split(opts.token).join("***");
-  async function send(method, path17, payload) {
+  async function send(method, path17, payload, retries = DEFAULT_RETRIES) {
     let last = {
       kind: "unavailable",
       status: null,
       detail: "no attempt was made"
     };
-    for (let attempt = 0; attempt <= RETRY_DELAYS_MS.length; attempt += 1) {
+    let mine = 0;
+    for (let attempt = 0; attempt <= retries; attempt += 1) {
+      await respectPause(mine);
       let res;
       try {
         res = await doFetch(`${base}${path17}`, {
@@ -2408,7 +2428,8 @@ function createClient(opts) {
         });
       } catch (err) {
         last = { kind: "unavailable", status: null, detail: scrub(String(err)) };
-        if (attempt < RETRY_DELAYS_MS.length) await wait(RETRY_DELAYS_MS[attempt]);
+        if (attempt >= Math.min(retries, DEFAULT_RETRIES)) break;
+        mine = await backOff(attempt, null);
         continue;
       }
       if (res.ok) {
@@ -2423,25 +2444,28 @@ function createClient(opts) {
       const kind = classify(res.status);
       last = { kind, status: res.status, detail: scrub(said.detail), ...said.code !== void 0 ? { code: said.code } : {} };
       if (kind !== "unavailable") break;
-      if (res.status === 429 && retryAfterMs2(res) === null) {
+      const said429 = parseRetryAfter(res.headers.get("retry-after"), now());
+      if (res.status === 429 && said429 === null) {
         last.kind = "invalid";
         last.detail = "quota exceeded (no Retry-After)";
         if (said.detail) last.detail += ` \u2014 ${scrub(said.detail)}`;
         break;
       }
-      if (attempt < RETRY_DELAYS_MS.length) {
-        await wait(retryAfterMs2(res) ?? RETRY_DELAYS_MS[attempt]);
-      }
+      if (attempt >= (said429 === null ? Math.min(retries, DEFAULT_RETRIES) : retries)) break;
+      mine = await backOff(attempt, said429);
     }
     return { ok: false, ...last };
   }
   return {
-    post: (path17, body) => send("POST", path17, { body: JSON.stringify(body), type: "application/json" }),
-    upload: (path17, bytes, contentType) => send("POST", path17, { body: bytes, type: contentType }),
+    post: (path17, body, retries) => send("POST", path17, { body: JSON.stringify(body), type: "application/json" }, retries),
+    upload: (path17, bytes, contentType) => send("POST", path17, { body: bytes, type: contentType }, uploadRetries ?? DEFAULT_RETRIES),
     del: (path17) => send("DELETE", path17),
     async put(url, headers, source) {
+      const putRetries = uploadRetries ?? 3;
       let last = { ok: false, status: null, code: "network" };
-      for (let attempt = 0; attempt <= PUT_DELAYS_MS.length; attempt += 1) {
+      let mine = 0;
+      for (let attempt = 0; attempt <= putRetries; attempt += 1) {
+        await respectPause(mine);
         try {
           let status;
           let retryAfter;
@@ -2456,21 +2480,21 @@ function createClient(opts) {
           if (status >= 200 && status <= 299) return { ok: true };
           last = { ok: false, status, code: `bucket_${status}` };
           if (status < 500 && status !== 429) return last;
-          const seconds = retryAfter === null ? NaN : Number(retryAfter.trim());
-          if (attempt < PUT_DELAYS_MS.length) {
-            await wait(Number.isFinite(seconds) && seconds >= 0 ? Math.min(seconds, 60) * 1e3 : PUT_DELAYS_MS[attempt]);
-          }
+          const said = parseRetryAfter(retryAfter, now());
+          if (attempt >= (said === null ? Math.min(putRetries, 3) : putRetries)) return last;
+          mine = await backOff(attempt, said);
           continue;
         } catch (err) {
           last = { ok: false, status: null, code: codeOfError(err) };
         }
-        if (attempt < PUT_DELAYS_MS.length) await wait(PUT_DELAYS_MS[attempt]);
+        if (attempt >= Math.min(putRetries, 3)) return last;
+        mine = await backOff(attempt, null);
       }
       return last;
     }
   };
 }
-var import_node_fs2, import_node_stream, import_node_http, import_node_https, RETRY_DELAYS_MS, IDLE_MS, PUT_DELAYS_MS, withoutLength, codeOfError, sleep;
+var import_node_fs2, import_node_stream, import_node_http, import_node_https, BACKOFF_BASE_MS, BACKOFF_CAP_MS, DEFAULT_RETRIES, RETRY_AFTER_CAP_MS, IDLE_MS, withoutLength, codeOfError, sleep;
 var init_client = __esm({
   "src/reporter-core/client.ts"() {
     "use strict";
@@ -2479,9 +2503,11 @@ var init_client = __esm({
     import_node_stream = require("stream");
     import_node_http = require("http");
     import_node_https = require("https");
-    RETRY_DELAYS_MS = [300, 900];
+    BACKOFF_BASE_MS = 300;
+    BACKOFF_CAP_MS = 1e4;
+    DEFAULT_RETRIES = 2;
+    RETRY_AFTER_CAP_MS = 6e4;
     IDLE_MS = 3e5;
-    PUT_DELAYS_MS = [500, 1500, 4e3];
     withoutLength = (headers) => Object.fromEntries(Object.entries(headers).filter(([name]) => name.toLowerCase() !== "content-length"));
     codeOfError = (err) => {
       const code = err?.code;
@@ -2506,6 +2532,14 @@ function count(env, name) {
   const n = Number(raw);
   return Number.isInteger(n) && n > 0 ? n : void 0;
 }
+function bounded(env, name, range, warnings) {
+  const raw = value(env, name);
+  if (raw === void 0) return void 0;
+  const n = Number(raw);
+  if (/^\d+$/.test(raw) && n >= range.min && n <= range.max) return n;
+  warnings.push(`${name}=${JSON.stringify(raw.slice(0, 40))} is not a whole number from ${range.min} to ${range.max} \u2014 using ${range.default}.`);
+  return void 0;
+}
 function list(env, name) {
   const raw = value(env, name);
   if (raw === void 0) return void 0;
@@ -2518,6 +2552,9 @@ function readEnv(env = process.env) {
   const apiUrl = value(env, "PLUNE_API_URL");
   const fallbackPath = value(env, "PLUNE_FALLBACK");
   const batchSize = count(env, "PLUNE_BATCH_SIZE");
+  const warnings = [];
+  const uploadConcurrency = bounded(env, "PLUNE_UPLOAD_CONCURRENCY", UPLOAD_CONCURRENCY, warnings);
+  const uploadRetries = bounded(env, "PLUNE_UPLOAD_RETRIES", UPLOAD_RETRIES, warnings);
   const title = value(env, "PLUNE_RUN_TITLE");
   const environment = value(env, "PLUNE_ENV");
   const labels = list(env, "PLUNE_LABELS");
@@ -2530,6 +2567,8 @@ function readEnv(env = process.env) {
       ...apiUrl !== void 0 ? { apiUrl } : {},
       ...fallbackPath !== void 0 ? { fallbackPath } : {},
       ...batchSize !== void 0 ? { batchSize } : {},
+      ...uploadConcurrency !== void 0 ? { uploadConcurrency } : {},
+      ...uploadRetries !== void 0 ? { uploadRetries } : {},
       ...title !== void 0 ? { title } : {},
       ...environment !== void 0 ? { environment } : {},
       ...labels !== void 0 ? { labels } : {},
@@ -2542,7 +2581,8 @@ function readEnv(env = process.env) {
     // reporting into this run; `PROCEED` says the job will close it on its own schedule. Either
     // way this process must not be the one to call it finished.
     keepOpen: flag(env, "PLUNE_SHARED_RUN") || flag(env, "PLUNE_PROCEED"),
-    ignored: UNSUPPORTED_VARS.filter((name) => value(env, name) !== void 0)
+    ignored: UNSUPPORTED_VARS.filter((name) => value(env, name) !== void 0),
+    warnings
   };
 }
 function defaultRunTitle(env = process.env, now = /* @__PURE__ */ new Date(), cwd = process.cwd()) {
@@ -2568,13 +2608,15 @@ function ciCommit(reported, env = process.env) {
     ...branch !== void 0 ? { branch } : {}
   };
 }
-var path6, UNSUPPORTED_VARS, PROVIDERS;
+var path6, UNSUPPORTED_VARS, UPLOAD_CONCURRENCY, UPLOAD_RETRIES, PROVIDERS;
 var init_env2 = __esm({
   "src/reporter-core/env.ts"() {
     "use strict";
     init_cjs_shims();
     path6 = __toESM(require("path"), 1);
     UNSUPPORTED_VARS = ["PLUNE_GROUP"];
+    UPLOAD_CONCURRENCY = { min: 1, max: 32, default: 4 };
+    UPLOAD_RETRIES = { min: 0, max: 20, default: 6 };
     PROVIDERS = [
       { is: "GITHUB_ACTIONS", sha: "GITHUB_SHA", branch: ["GITHUB_HEAD_REF", "GITHUB_REF_NAME"] },
       { is: "GITLAB_CI", sha: "CI_COMMIT_SHA", branch: ["CI_COMMIT_REF_NAME"] },
@@ -2854,9 +2896,15 @@ async function startRun(passed, declared2) {
   const batchSize = Math.min(cfg.batchSize ?? BATCH_DEFAULT, BATCH_MAX);
   const offerDiscovered = cfg.offerDiscovered ?? false;
   const token = cfg.token ?? loadToken() ?? "";
+  const uploadsAtOnce = Math.min(Math.max(Math.floor(cfg.uploadConcurrency ?? UPLOAD_CONCURRENCY.default), UPLOAD_CONCURRENCY.min), UPLOAD_CONCURRENCY.max);
+  const uploadRetries = Math.min(Math.max(Math.floor(cfg.uploadRetries ?? UPLOAD_RETRIES.default), UPLOAD_RETRIES.min), UPLOAD_RETRIES.max);
+  let retried = 0;
+  let uploadMs = 0;
   const client = createClient({
     apiUrl: resolveApiUrl(cfg.apiUrl),
     token,
+    uploadRetries,
+    onRetry: () => void (retried += 1),
     ...cfg.fetchImpl !== void 0 ? { fetchImpl: cfg.fetchImpl } : {}
   });
   const stats = {
@@ -2907,6 +2955,7 @@ async function startRun(passed, declared2) {
   if (offline) {
     log('plune: no API token \u2014 run "plune login" first. Results will be written to the fallback file.');
   }
+  for (const warning of env.warnings) log(`plune: ${warning}`);
   if (env.ignored.length > 0) {
     log(`plune: ignoring ${env.ignored.join(", ")} \u2014 a run has nowhere to store them yet.`);
   }
@@ -3036,7 +3085,7 @@ async function startRun(passed, declared2) {
   function ask(job, size) {
     return client.post(`/v1/results/${encodeURIComponent(job.id)}/files/uploads`, {
       files: [{ name: job.name, contentType: job.type, size }]
-    });
+    }, uploadRetries);
   }
   function failed(job, why) {
     countsOf(job.kind).failed += 1;
@@ -3097,11 +3146,11 @@ async function startRun(passed, declared2) {
       if (fresh === void 0) return failedToBucket(job, "bad_answer");
       link = fresh;
     }
-    const done2 = await client.post(`/v1/files/${encodeURIComponent(link.id)}/complete`, {});
+    const done2 = await client.post(`/v1/files/${encodeURIComponent(link.id)}/complete`, {}, uploadRetries);
     if (!done2.ok) return failedToBucket(job, codeOf2(done2));
     countsOf(job.kind).uploaded += 1;
   }
-  let free = UPLOADS_AT_ONCE;
+  let free = uploadsAtOnce;
   const waiting = [];
   async function gated(work) {
     if (free === 0) await new Promise((resolve9) => waiting.push(resolve9));
@@ -3181,6 +3230,7 @@ async function startRun(passed, declared2) {
         }
       }
     }
+    const started = Date.now();
     const byResult = /* @__PURE__ */ new Map();
     for (const job of jobs) byResult.set(job.id, [...byResult.get(job.id) ?? [], job]);
     await Promise.all(
@@ -3193,6 +3243,7 @@ async function startRun(passed, declared2) {
         await Promise.all(work);
       })
     );
+    uploadMs += Date.now() - started;
   }
   async function flush() {
     if (buffer.length === 0) return;
@@ -3285,6 +3336,13 @@ async function startRun(passed, declared2) {
     }
     if (stats.deferred > 0) parts.push(`${stats.deferred} not delivered \u2014 written to ${fallbackPath}`);
     if (shortened.size > 0) parts.push(`${shortened.size} test name(s) shortened to fit a key`);
+    const files = [stats.screenshots, stats.textFiles, stats.otherFiles];
+    const total = (what) => files.reduce((n, counts) => n + counts[what], 0);
+    if (total("uploaded") + total("skipped") + total("failed") > 0) {
+      log(
+        `plune: files \u2014 ${total("uploaded")} uploaded, ${total("skipped")} skipped, ${retried} retried, ${total("failed")} dropped, in ${(uploadMs / 1e3).toFixed(1)} s (${uploadsAtOnce} at once)`
+      );
+    }
     log(`plune: ${parts.join(" \xB7 ")}`);
     if (stats.deferred > 0 && process.env["GITHUB_ACTIONS"] === "true") {
       log(`::warning::${stats.deferred} result(s) were not delivered to Plune \u2014 see the reporting step's log.`);
@@ -3339,7 +3397,7 @@ async function startRun(passed, declared2) {
     }
   };
 }
-var import_node_crypto2, import_node_fs4, import_node_path3, import_node_util2, RESOLVE_CHUNK, BATCH_MAX, DISCOVER_MAX, BATCH_DEFAULT, EXPECTED_MAX, KEY_MAX, TITLE_MAX, COUNTED, SCREENSHOT_TYPES, SCREENSHOT_BYTES, SCREENSHOTS_PER_RESULT, TEXT_BYTES, TEXTS_PER_RESULT, UTF8, TYPE_BY_EXTENSION, METADATA_TYPE2, UPLOADS_AT_ONCE, NAME_MAX, SKIPPED, BUCKET_FOUND, KINDS, codeOf2, BATCH_BYTES, ENVELOPE_BYTES;
+var import_node_crypto2, import_node_fs4, import_node_path3, import_node_util2, RESOLVE_CHUNK, BATCH_MAX, DISCOVER_MAX, BATCH_DEFAULT, EXPECTED_MAX, KEY_MAX, TITLE_MAX, COUNTED, SCREENSHOT_TYPES, SCREENSHOT_BYTES, SCREENSHOTS_PER_RESULT, TEXT_BYTES, TEXTS_PER_RESULT, UTF8, TYPE_BY_EXTENSION, METADATA_TYPE2, NAME_MAX, SKIPPED, BUCKET_FOUND, KINDS, codeOf2, BATCH_BYTES, ENVELOPE_BYTES;
 var init_session = __esm({
   "src/reporter-core/session.ts"() {
     "use strict";
@@ -3357,7 +3415,7 @@ var init_session = __esm({
     RESOLVE_CHUNK = 500;
     BATCH_MAX = 500;
     DISCOVER_MAX = 500;
-    BATCH_DEFAULT = 100;
+    BATCH_DEFAULT = 500;
     EXPECTED_MAX = 1e4;
     KEY_MAX = 1024;
     TITLE_MAX = 300;
@@ -3375,7 +3433,6 @@ var init_session = __esm({
       ".webp": "image/webp"
     };
     METADATA_TYPE2 = "application/plune.metadata+json";
-    UPLOADS_AT_ONCE = 4;
     NAME_MAX = 200;
     SKIPPED = {
       hidden: "its name starts with an underscore, which hides an attachment in Playwright's own reports too",
@@ -4958,6 +5015,7 @@ async function handleRunImport(options) {
       ...options.fetchImpl !== void 0 ? { fetchImpl: options.fetchImpl } : {},
       ...options.key !== void 0 ? { externalKey: options.key } : {},
       ...options.create === true ? { offerDiscovered: true } : {},
+      ...options.uploadConcurrency !== void 0 ? { uploadConcurrency: options.uploadConcurrency } : {},
       kind: "automated",
       // The CI run the report names, never this machine's: whoever imports may be another job (#790).
       // The commit and branch likewise, where the report names a commit; a report that names none —
@@ -6110,6 +6168,13 @@ function createProgram() {
     "--fail-on-missing-attachments",
     "Exit 1 when a file the report names ([[ATTACHMENT|path]] in JUnit, a source in allure-results) is not there; the results are sent either way",
     false
+  ).option(
+    "--upload-concurrency <n>",
+    "Files uploaded at once, 1 to 32 (default 4; PLUNE_UPLOAD_CONCURRENCY sets it too). A 429 is retried PLUNE_UPLOAD_RETRIES times (default 6)",
+    (v) => {
+      if (!/^\d+$/.test(v) || Number(v) < 1 || Number(v) > 32) throw new import_commander.InvalidArgumentError("a whole number from 1 to 32.");
+      return Number(v);
+    }
   ).option("--fail-on-failures", FAIL_ON_FAILURES, false).action(
     async (file, options, command) => {
       const [
@@ -6135,6 +6200,7 @@ function createProgram() {
           ...format !== void 0 ? { format } : {},
           ...options.key !== void 0 ? { key: options.key } : {},
           ...options.create ? { create: true } : {},
+          ...options.uploadConcurrency !== void 0 ? { uploadConcurrency: options.uploadConcurrency } : {},
           ...options.failOnFailures ? { failOnFailures: true } : {}
         });
         if (options.failOnMissingAttachments && imported.missingAttachments.length > 0) process.exitCode = 1;

package/dist/reporter-core.cjs

@@ -84,7 +84,17 @@ var import_node_fs2 = require("fs");
 var import_node_stream = require("stream");
 var import_node_http = require("http");
 var import_node_https = require("https");
-var RETRY_DELAYS_MS = [300, 900];
+var BACKOFF_BASE_MS = 300;
+var BACKOFF_CAP_MS = 1e4;
+var DEFAULT_RETRIES = 2;
+var RETRY_AFTER_CAP_MS = 6e4;
+function parseRetryAfter(raw, now = Date.now()) {
+  const text = raw?.trim();
+  if (text === void 0 || text === "") return null;
+  const seconds = /^\d+(\.\d+)?$/.test(text) ? Number(text) : (Date.parse(text) - now) / 1e3;
+  if (!Number.isFinite(seconds)) return null;
+  return Math.min(Math.max(seconds, 0) * 1e3, RETRY_AFTER_CAP_MS);
+}
 var IDLE_MS = 3e5;
 function nodeTransport(url, init, idleMs = IDLE_MS) {
   return new Promise((resolve2, reject) => {
@@ -115,7 +125,6 @@ function nodeTransport(url, init, idleMs = IDLE_MS) {
     req.end(init.body);
   });
 }
-var PUT_DELAYS_MS = [500, 1500, 4e3];
 var withoutLength = (headers) => Object.fromEntries(Object.entries(headers).filter(([name]) => name.toLowerCase() !== "content-length"));
 function nodePut(url, headers, source, idleMs) {
   return new Promise((resolve2, reject) => {
@@ -160,12 +169,6 @@ async function detailOf(res) {
     return { detail: "" };
   }
 }
-function retryAfterMs(res) {
-  const raw = res.headers.get("retry-after");
-  if (raw === null) return null;
-  const seconds = Number(raw.trim());
-  return Number.isFinite(seconds) && seconds >= 0 ? seconds * 1e3 : null;
-}
 function classify(status) {
   if (status === 401 || status === 403) return "auth";
   if (status === 409) return "conflict";
@@ -176,15 +179,34 @@ function classify(status) {
 function createClient(opts) {
   const doFetch = opts.fetchImpl ?? nodeTransport;
   const wait = opts.wait ?? sleep;
+  const uploadRetries = opts.uploadRetries === void 0 ? void 0 : Math.max(0, Math.floor(opts.uploadRetries));
+  const random = opts.random ?? Math.random;
+  const now = opts.now ?? Date.now;
+  let pausedUntil = 0;
+  const jittered = (ms) => Math.round(ms * (1 + random() * 0.5));
+  async function backOff(attempt, said) {
+    opts.onRetry?.();
+    const ms = jittered(said ?? Math.min(BACKOFF_BASE_MS * 2 ** attempt, BACKOFF_CAP_MS));
+    const until = now() + ms;
+    pausedUntil = Math.max(pausedUntil, until);
+    await wait(ms);
+    return until;
+  }
+  async function respectPause(mine) {
+    const left = pausedUntil - now();
+    if (pausedUntil > mine && left > 0) await wait(left + Math.round(random() * 250));
+  }
   const base = opts.apiUrl.replace(/\/+$/, "");
   const scrub = (text) => opts.token === "" ? text : text.split(opts.token).join("***");
-  async function send(method, path3, payload) {
+  async function send(method, path3, payload, retries = DEFAULT_RETRIES) {
     let last = {
       kind: "unavailable",
       status: null,
       detail: "no attempt was made"
     };
-    for (let attempt = 0; attempt <= RETRY_DELAYS_MS.length; attempt += 1) {
+    let mine = 0;
+    for (let attempt = 0; attempt <= retries; attempt += 1) {
+      await respectPause(mine);
       let res;
       try {
         res = await doFetch(`${base}${path3}`, {
@@ -197,7 +219,8 @@ function createClient(opts) {
         });
       } catch (err) {
         last = { kind: "unavailable", status: null, detail: scrub(String(err)) };
-        if (attempt < RETRY_DELAYS_MS.length) await wait(RETRY_DELAYS_MS[attempt]);
+        if (attempt >= Math.min(retries, DEFAULT_RETRIES)) break;
+        mine = await backOff(attempt, null);
         continue;
       }
       if (res.ok) {
@@ -212,25 +235,28 @@ function createClient(opts) {
       const kind = classify(res.status);
       last = { kind, status: res.status, detail: scrub(said.detail), ...said.code !== void 0 ? { code: said.code } : {} };
       if (kind !== "unavailable") break;
-      if (res.status === 429 && retryAfterMs(res) === null) {
+      const said429 = parseRetryAfter(res.headers.get("retry-after"), now());
+      if (res.status === 429 && said429 === null) {
         last.kind = "invalid";
         last.detail = "quota exceeded (no Retry-After)";
         if (said.detail) last.detail += ` \u2014 ${scrub(said.detail)}`;
         break;
       }
-      if (attempt < RETRY_DELAYS_MS.length) {
-        await wait(retryAfterMs(res) ?? RETRY_DELAYS_MS[attempt]);
-      }
+      if (attempt >= (said429 === null ? Math.min(retries, DEFAULT_RETRIES) : retries)) break;
+      mine = await backOff(attempt, said429);
     }
     return { ok: false, ...last };
   }
   return {
-    post: (path3, body) => send("POST", path3, { body: JSON.stringify(body), type: "application/json" }),
-    upload: (path3, bytes, contentType) => send("POST", path3, { body: bytes, type: contentType }),
+    post: (path3, body, retries) => send("POST", path3, { body: JSON.stringify(body), type: "application/json" }, retries),
+    upload: (path3, bytes, contentType) => send("POST", path3, { body: bytes, type: contentType }, uploadRetries ?? DEFAULT_RETRIES),
     del: (path3) => send("DELETE", path3),
     async put(url, headers, source) {
+      const putRetries = uploadRetries ?? 3;
       let last = { ok: false, status: null, code: "network" };
-      for (let attempt = 0; attempt <= PUT_DELAYS_MS.length; attempt += 1) {
+      let mine = 0;
+      for (let attempt = 0; attempt <= putRetries; attempt += 1) {
+        await respectPause(mine);
         try {
           let status;
           let retryAfter;
@@ -245,15 +271,15 @@ function createClient(opts) {
           if (status >= 200 && status <= 299) return { ok: true };
           last = { ok: false, status, code: `bucket_${status}` };
           if (status < 500 && status !== 429) return last;
-          const seconds = retryAfter === null ? NaN : Number(retryAfter.trim());
-          if (attempt < PUT_DELAYS_MS.length) {
-            await wait(Number.isFinite(seconds) && seconds >= 0 ? Math.min(seconds, 60) * 1e3 : PUT_DELAYS_MS[attempt]);
-          }
+          const said = parseRetryAfter(retryAfter, now());
+          if (attempt >= (said === null ? Math.min(putRetries, 3) : putRetries)) return last;
+          mine = await backOff(attempt, said);
           continue;
         } catch (err) {
           last = { ok: false, status: null, code: codeOfError(err) };
         }
-        if (attempt < PUT_DELAYS_MS.length) await wait(PUT_DELAYS_MS[attempt]);
+        if (attempt >= Math.min(putRetries, 3)) return last;
+        mine = await backOff(attempt, null);
       }
       return last;
     }
@@ -263,6 +289,8 @@ function createClient(opts) {
 // src/reporter-core/env.ts
 var path = __toESM(require("path"), 1);
 var UNSUPPORTED_VARS = ["PLUNE_GROUP"];
+var UPLOAD_CONCURRENCY = { min: 1, max: 32, default: 4 };
+var UPLOAD_RETRIES = { min: 0, max: 20, default: 6 };
 function value(env, name) {
   const raw = env[name]?.trim();
   return raw === void 0 || raw === "" ? void 0 : raw;
@@ -277,6 +305,14 @@ function count(env, name) {
   const n = Number(raw);
   return Number.isInteger(n) && n > 0 ? n : void 0;
 }
+function bounded(env, name, range, warnings) {
+  const raw = value(env, name);
+  if (raw === void 0) return void 0;
+  const n = Number(raw);
+  if (/^\d+$/.test(raw) && n >= range.min && n <= range.max) return n;
+  warnings.push(`${name}=${JSON.stringify(raw.slice(0, 40))} is not a whole number from ${range.min} to ${range.max} \u2014 using ${range.default}.`);
+  return void 0;
+}
 function list(env, name) {
   const raw = value(env, name);
   if (raw === void 0) return void 0;
@@ -289,6 +325,9 @@ function readEnv(env = process.env) {
   const apiUrl = value(env, "PLUNE_API_URL");
   const fallbackPath = value(env, "PLUNE_FALLBACK");
   const batchSize = count(env, "PLUNE_BATCH_SIZE");
+  const warnings = [];
+  const uploadConcurrency = bounded(env, "PLUNE_UPLOAD_CONCURRENCY", UPLOAD_CONCURRENCY, warnings);
+  const uploadRetries = bounded(env, "PLUNE_UPLOAD_RETRIES", UPLOAD_RETRIES, warnings);
   const title = value(env, "PLUNE_RUN_TITLE");
   const environment = value(env, "PLUNE_ENV");
   const labels = list(env, "PLUNE_LABELS");
@@ -301,6 +340,8 @@ function readEnv(env = process.env) {
       ...apiUrl !== void 0 ? { apiUrl } : {},
       ...fallbackPath !== void 0 ? { fallbackPath } : {},
       ...batchSize !== void 0 ? { batchSize } : {},
+      ...uploadConcurrency !== void 0 ? { uploadConcurrency } : {},
+      ...uploadRetries !== void 0 ? { uploadRetries } : {},
       ...title !== void 0 ? { title } : {},
       ...environment !== void 0 ? { environment } : {},
       ...labels !== void 0 ? { labels } : {},
@@ -313,7 +354,8 @@ function readEnv(env = process.env) {
     // reporting into this run; `PROCEED` says the job will close it on its own schedule. Either
     // way this process must not be the one to call it finished.
     keepOpen: flag(env, "PLUNE_SHARED_RUN") || flag(env, "PLUNE_PROCEED"),
-    ignored: UNSUPPORTED_VARS.filter((name) => value(env, name) !== void 0)
+    ignored: UNSUPPORTED_VARS.filter((name) => value(env, name) !== void 0),
+    warnings
   };
 }
 function defaultRunTitle(env = process.env, now = /* @__PURE__ */ new Date(), cwd = process.cwd()) {
@@ -499,7 +541,7 @@ function appendBatch(file, batch) {
 var RESOLVE_CHUNK = 500;
 var BATCH_MAX = 500;
 var DISCOVER_MAX = 500;
-var BATCH_DEFAULT = 100;
+var BATCH_DEFAULT = 500;
 var EXPECTED_MAX = 1e4;
 var KEY_MAX = 1024;
 var TITLE_MAX = 300;
@@ -517,7 +559,6 @@ var TYPE_BY_EXTENSION = {
   ".webp": "image/webp"
 };
 var METADATA_TYPE2 = "application/plune.metadata+json";
-var UPLOADS_AT_ONCE = 4;
 var NAME_MAX = 200;
 function nameOf(file) {
   const own = file.name.split(/[\\/]/).pop()?.trim() || (file.path === void 0 ? "" : (0, import_node_path3.basename)(file.path));
@@ -648,9 +689,15 @@ async function startRun(passed, declared) {
   const batchSize = Math.min(cfg.batchSize ?? BATCH_DEFAULT, BATCH_MAX);
   const offerDiscovered = cfg.offerDiscovered ?? false;
   const token = cfg.token ?? loadToken() ?? "";
+  const uploadsAtOnce = Math.min(Math.max(Math.floor(cfg.uploadConcurrency ?? UPLOAD_CONCURRENCY.default), UPLOAD_CONCURRENCY.min), UPLOAD_CONCURRENCY.max);
+  const uploadRetries = Math.min(Math.max(Math.floor(cfg.uploadRetries ?? UPLOAD_RETRIES.default), UPLOAD_RETRIES.min), UPLOAD_RETRIES.max);
+  let retried = 0;
+  let uploadMs = 0;
   const client = createClient({
     apiUrl: resolveApiUrl(cfg.apiUrl),
     token,
+    uploadRetries,
+    onRetry: () => void (retried += 1),
     ...cfg.fetchImpl !== void 0 ? { fetchImpl: cfg.fetchImpl } : {}
   });
   const stats = {
@@ -701,6 +748,7 @@ async function startRun(passed, declared) {
   if (offline) {
     log('plune: no API token \u2014 run "plune login" first. Results will be written to the fallback file.');
   }
+  for (const warning of env.warnings) log(`plune: ${warning}`);
   if (env.ignored.length > 0) {
     log(`plune: ignoring ${env.ignored.join(", ")} \u2014 a run has nowhere to store them yet.`);
   }
@@ -830,7 +878,7 @@ async function startRun(passed, declared) {
   function ask(job, size) {
     return client.post(`/v1/results/${encodeURIComponent(job.id)}/files/uploads`, {
       files: [{ name: job.name, contentType: job.type, size }]
-    });
+    }, uploadRetries);
   }
   function failed(job, why) {
     countsOf(job.kind).failed += 1;
@@ -891,11 +939,11 @@ async function startRun(passed, declared) {
       if (fresh === void 0) return failedToBucket(job, "bad_answer");
       link = fresh;
     }
-    const done2 = await client.post(`/v1/files/${encodeURIComponent(link.id)}/complete`, {});
+    const done2 = await client.post(`/v1/files/${encodeURIComponent(link.id)}/complete`, {}, uploadRetries);
     if (!done2.ok) return failedToBucket(job, codeOf(done2));
     countsOf(job.kind).uploaded += 1;
   }
-  let free = UPLOADS_AT_ONCE;
+  let free = uploadsAtOnce;
   const waiting = [];
   async function gated(work) {
     if (free === 0) await new Promise((resolve2) => waiting.push(resolve2));
@@ -975,6 +1023,7 @@ async function startRun(passed, declared) {
         }
       }
     }
+    const started = Date.now();
     const byResult = /* @__PURE__ */ new Map();
     for (const job of jobs) byResult.set(job.id, [...byResult.get(job.id) ?? [], job]);
     await Promise.all(
@@ -987,6 +1036,7 @@ async function startRun(passed, declared) {
         await Promise.all(work);
       })
     );
+    uploadMs += Date.now() - started;
   }
   async function flush() {
     if (buffer.length === 0) return;
@@ -1079,6 +1129,13 @@ async function startRun(passed, declared) {
     }
     if (stats.deferred > 0) parts.push(`${stats.deferred} not delivered \u2014 written to ${fallbackPath}`);
     if (shortened.size > 0) parts.push(`${shortened.size} test name(s) shortened to fit a key`);
+    const files = [stats.screenshots, stats.textFiles, stats.otherFiles];
+    const total = (what) => files.reduce((n, counts) => n + counts[what], 0);
+    if (total("uploaded") + total("skipped") + total("failed") > 0) {
+      log(
+        `plune: files \u2014 ${total("uploaded")} uploaded, ${total("skipped")} skipped, ${retried} retried, ${total("failed")} dropped, in ${(uploadMs / 1e3).toFixed(1)} s (${uploadsAtOnce} at once)`
+      );
+    }
     log(`plune: ${parts.join(" \xB7 ")}`);
     if (stats.deferred > 0 && process.env["GITHUB_ACTIONS"] === "true") {
       log(`::warning::${stats.deferred} result(s) were not delivered to Plune \u2014 see the reporting step's log.`);

package/dist/reporter-core.d.cts

@@ -326,6 +326,10 @@ interface ReporterConfig {
     labels?: string[];
     /** Results per request. The platform's ceiling is 500. */
     batchSize?: number;
+    /** Files in flight at once (`PLUNE_UPLOAD_CONCURRENCY`, 1 to 32, default 4). */
+    uploadConcurrency?: number;
+    /** Retries of a request the platform or a bucket asked to wait for (`PLUNE_UPLOAD_RETRIES`, 0 to 20, default 6). */
+    uploadRetries?: number;
     /** Where unsent batches go. Defaults beside the run file the CLI already writes. */
     fallbackPath?: string;
     /**
@@ -427,6 +431,8 @@ interface EnvSettings {
     keepOpen: boolean;
     /** Variables that were set and have nowhere to land. The caller says so once. */
     ignored: string[];
+    /** Variables that were set to something unusable and fell back to their default. The caller says so once. */
+    warnings: string[];
 }
 declare function readEnv(env?: NodeJS.ProcessEnv): EnvSettings;
 /**
@@ -582,9 +588,18 @@ interface ClientOptions {
     fetchImpl?: typeof fetch;
     /** Test seam — the same idea as `fetchImpl`, so a retry test costs milliseconds, not seconds. */
     wait?: (ms: number) => Promise<void>;
+    /** Retries of a file's requests (default 2 for the platform's, 3 for a bucket's): what `uploadRetries` is. */
+    uploadRetries?: number;
+    /** Test seam for the jitter: a number in [0, 1). */
+    random?: () => number;
+    /** Test seam for the clock the shared pause is read against. */
+    now?: () => number;
+    /** Called once for every retry that is about to wait. */
+    onRetry?: () => void;
 }
 interface PlatformClient {
-    post<T>(path: string, body: unknown): Promise<ClientOutcome<T>>;
+    /** `retries` after the first try: the default is 2; a file's requests ask for more. */
+    post<T>(path: string, body: unknown, retries?: number): Promise<ClientOutcome<T>>;
     /**
      * A file's bytes as the body, under the file's own type (platform ADR 0040) — not JSON. Through the
      * same retries as a POST, so a 429 on the platform's upload limit waits out its `Retry-After`.

package/dist/reporter-core.d.ts

@@ -326,6 +326,10 @@ interface ReporterConfig {
     labels?: string[];
     /** Results per request. The platform's ceiling is 500. */
     batchSize?: number;
+    /** Files in flight at once (`PLUNE_UPLOAD_CONCURRENCY`, 1 to 32, default 4). */
+    uploadConcurrency?: number;
+    /** Retries of a request the platform or a bucket asked to wait for (`PLUNE_UPLOAD_RETRIES`, 0 to 20, default 6). */
+    uploadRetries?: number;
     /** Where unsent batches go. Defaults beside the run file the CLI already writes. */
     fallbackPath?: string;
     /**
@@ -427,6 +431,8 @@ interface EnvSettings {
     keepOpen: boolean;
     /** Variables that were set and have nowhere to land. The caller says so once. */
     ignored: string[];
+    /** Variables that were set to something unusable and fell back to their default. The caller says so once. */
+    warnings: string[];
 }
 declare function readEnv(env?: NodeJS.ProcessEnv): EnvSettings;
 /**
@@ -582,9 +588,18 @@ interface ClientOptions {
     fetchImpl?: typeof fetch;
     /** Test seam — the same idea as `fetchImpl`, so a retry test costs milliseconds, not seconds. */
     wait?: (ms: number) => Promise<void>;
+    /** Retries of a file's requests (default 2 for the platform's, 3 for a bucket's): what `uploadRetries` is. */
+    uploadRetries?: number;
+    /** Test seam for the jitter: a number in [0, 1). */
+    random?: () => number;
+    /** Test seam for the clock the shared pause is read against. */
+    now?: () => number;
+    /** Called once for every retry that is about to wait. */
+    onRetry?: () => void;
 }
 interface PlatformClient {
-    post<T>(path: string, body: unknown): Promise<ClientOutcome<T>>;
+    /** `retries` after the first try: the default is 2; a file's requests ask for more. */
+    post<T>(path: string, body: unknown, retries?: number): Promise<ClientOutcome<T>>;
     /**
      * A file's bytes as the body, under the file's own type (platform ADR 0040) — not JSON. Through the
      * same retries as a POST, so a 429 on the platform's upload limit waits out its `Retry-After`.

package/dist/reporter-core.js

@@ -35,7 +35,17 @@ import { createReadStream, openAsBlob } from "fs";
 import { pipeline } from "stream";
 import { request as httpRequest } from "http";
 import { request as httpsRequest } from "https";
-var RETRY_DELAYS_MS = [300, 900];
+var BACKOFF_BASE_MS = 300;
+var BACKOFF_CAP_MS = 1e4;
+var DEFAULT_RETRIES = 2;
+var RETRY_AFTER_CAP_MS = 6e4;
+function parseRetryAfter(raw, now = Date.now()) {
+  const text = raw?.trim();
+  if (text === void 0 || text === "") return null;
+  const seconds = /^\d+(\.\d+)?$/.test(text) ? Number(text) : (Date.parse(text) - now) / 1e3;
+  if (!Number.isFinite(seconds)) return null;
+  return Math.min(Math.max(seconds, 0) * 1e3, RETRY_AFTER_CAP_MS);
+}
 var IDLE_MS = 3e5;
 function nodeTransport(url, init, idleMs = IDLE_MS) {
   return new Promise((resolve2, reject) => {
@@ -66,7 +76,6 @@ function nodeTransport(url, init, idleMs = IDLE_MS) {
     req.end(init.body);
   });
 }
-var PUT_DELAYS_MS = [500, 1500, 4e3];
 var withoutLength = (headers) => Object.fromEntries(Object.entries(headers).filter(([name]) => name.toLowerCase() !== "content-length"));
 function nodePut(url, headers, source, idleMs) {
   return new Promise((resolve2, reject) => {
@@ -111,12 +120,6 @@ async function detailOf(res) {
     return { detail: "" };
   }
 }
-function retryAfterMs(res) {
-  const raw = res.headers.get("retry-after");
-  if (raw === null) return null;
-  const seconds = Number(raw.trim());
-  return Number.isFinite(seconds) && seconds >= 0 ? seconds * 1e3 : null;
-}
 function classify(status) {
   if (status === 401 || status === 403) return "auth";
   if (status === 409) return "conflict";
@@ -127,15 +130,34 @@ function classify(status) {
 function createClient(opts) {
   const doFetch = opts.fetchImpl ?? nodeTransport;
   const wait = opts.wait ?? sleep;
+  const uploadRetries = opts.uploadRetries === void 0 ? void 0 : Math.max(0, Math.floor(opts.uploadRetries));
+  const random = opts.random ?? Math.random;
+  const now = opts.now ?? Date.now;
+  let pausedUntil = 0;
+  const jittered = (ms) => Math.round(ms * (1 + random() * 0.5));
+  async function backOff(attempt, said) {
+    opts.onRetry?.();
+    const ms = jittered(said ?? Math.min(BACKOFF_BASE_MS * 2 ** attempt, BACKOFF_CAP_MS));
+    const until = now() + ms;
+    pausedUntil = Math.max(pausedUntil, until);
+    await wait(ms);
+    return until;
+  }
+  async function respectPause(mine) {
+    const left = pausedUntil - now();
+    if (pausedUntil > mine && left > 0) await wait(left + Math.round(random() * 250));
+  }
   const base = opts.apiUrl.replace(/\/+$/, "");
   const scrub = (text) => opts.token === "" ? text : text.split(opts.token).join("***");
-  async function send(method, path3, payload) {
+  async function send(method, path3, payload, retries = DEFAULT_RETRIES) {
     let last = {
       kind: "unavailable",
       status: null,
       detail: "no attempt was made"
     };
-    for (let attempt = 0; attempt <= RETRY_DELAYS_MS.length; attempt += 1) {
+    let mine = 0;
+    for (let attempt = 0; attempt <= retries; attempt += 1) {
+      await respectPause(mine);
       let res;
       try {
         res = await doFetch(`${base}${path3}`, {
@@ -148,7 +170,8 @@ function createClient(opts) {
         });
       } catch (err) {
         last = { kind: "unavailable", status: null, detail: scrub(String(err)) };
-        if (attempt < RETRY_DELAYS_MS.length) await wait(RETRY_DELAYS_MS[attempt]);
+        if (attempt >= Math.min(retries, DEFAULT_RETRIES)) break;
+        mine = await backOff(attempt, null);
         continue;
       }
       if (res.ok) {
@@ -163,25 +186,28 @@ function createClient(opts) {
       const kind = classify(res.status);
       last = { kind, status: res.status, detail: scrub(said.detail), ...said.code !== void 0 ? { code: said.code } : {} };
       if (kind !== "unavailable") break;
-      if (res.status === 429 && retryAfterMs(res) === null) {
+      const said429 = parseRetryAfter(res.headers.get("retry-after"), now());
+      if (res.status === 429 && said429 === null) {
         last.kind = "invalid";
         last.detail = "quota exceeded (no Retry-After)";
         if (said.detail) last.detail += ` \u2014 ${scrub(said.detail)}`;
         break;
       }
-      if (attempt < RETRY_DELAYS_MS.length) {
-        await wait(retryAfterMs(res) ?? RETRY_DELAYS_MS[attempt]);
-      }
+      if (attempt >= (said429 === null ? Math.min(retries, DEFAULT_RETRIES) : retries)) break;
+      mine = await backOff(attempt, said429);
     }
     return { ok: false, ...last };
   }
   return {
-    post: (path3, body) => send("POST", path3, { body: JSON.stringify(body), type: "application/json" }),
-    upload: (path3, bytes, contentType) => send("POST", path3, { body: bytes, type: contentType }),
+    post: (path3, body, retries) => send("POST", path3, { body: JSON.stringify(body), type: "application/json" }, retries),
+    upload: (path3, bytes, contentType) => send("POST", path3, { body: bytes, type: contentType }, uploadRetries ?? DEFAULT_RETRIES),
     del: (path3) => send("DELETE", path3),
     async put(url, headers, source) {
+      const putRetries = uploadRetries ?? 3;
       let last = { ok: false, status: null, code: "network" };
-      for (let attempt = 0; attempt <= PUT_DELAYS_MS.length; attempt += 1) {
+      let mine = 0;
+      for (let attempt = 0; attempt <= putRetries; attempt += 1) {
+        await respectPause(mine);
         try {
           let status;
           let retryAfter;
@@ -196,15 +222,15 @@ function createClient(opts) {
           if (status >= 200 && status <= 299) return { ok: true };
           last = { ok: false, status, code: `bucket_${status}` };
           if (status < 500 && status !== 429) return last;
-          const seconds = retryAfter === null ? NaN : Number(retryAfter.trim());
-          if (attempt < PUT_DELAYS_MS.length) {
-            await wait(Number.isFinite(seconds) && seconds >= 0 ? Math.min(seconds, 60) * 1e3 : PUT_DELAYS_MS[attempt]);
-          }
+          const said = parseRetryAfter(retryAfter, now());
+          if (attempt >= (said === null ? Math.min(putRetries, 3) : putRetries)) return last;
+          mine = await backOff(attempt, said);
           continue;
         } catch (err) {
           last = { ok: false, status: null, code: codeOfError(err) };
         }
-        if (attempt < PUT_DELAYS_MS.length) await wait(PUT_DELAYS_MS[attempt]);
+        if (attempt >= Math.min(putRetries, 3)) return last;
+        mine = await backOff(attempt, null);
       }
       return last;
     }
@@ -214,6 +240,8 @@ function createClient(opts) {
 // src/reporter-core/env.ts
 import * as path from "path";
 var UNSUPPORTED_VARS = ["PLUNE_GROUP"];
+var UPLOAD_CONCURRENCY = { min: 1, max: 32, default: 4 };
+var UPLOAD_RETRIES = { min: 0, max: 20, default: 6 };
 function value(env, name) {
   const raw = env[name]?.trim();
   return raw === void 0 || raw === "" ? void 0 : raw;
@@ -228,6 +256,14 @@ function count(env, name) {
   const n = Number(raw);
   return Number.isInteger(n) && n > 0 ? n : void 0;
 }
+function bounded(env, name, range, warnings) {
+  const raw = value(env, name);
+  if (raw === void 0) return void 0;
+  const n = Number(raw);
+  if (/^\d+$/.test(raw) && n >= range.min && n <= range.max) return n;
+  warnings.push(`${name}=${JSON.stringify(raw.slice(0, 40))} is not a whole number from ${range.min} to ${range.max} \u2014 using ${range.default}.`);
+  return void 0;
+}
 function list(env, name) {
   const raw = value(env, name);
   if (raw === void 0) return void 0;
@@ -240,6 +276,9 @@ function readEnv(env = process.env) {
   const apiUrl = value(env, "PLUNE_API_URL");
   const fallbackPath = value(env, "PLUNE_FALLBACK");
   const batchSize = count(env, "PLUNE_BATCH_SIZE");
+  const warnings = [];
+  const uploadConcurrency = bounded(env, "PLUNE_UPLOAD_CONCURRENCY", UPLOAD_CONCURRENCY, warnings);
+  const uploadRetries = bounded(env, "PLUNE_UPLOAD_RETRIES", UPLOAD_RETRIES, warnings);
   const title = value(env, "PLUNE_RUN_TITLE");
   const environment = value(env, "PLUNE_ENV");
   const labels = list(env, "PLUNE_LABELS");
@@ -252,6 +291,8 @@ function readEnv(env = process.env) {
       ...apiUrl !== void 0 ? { apiUrl } : {},
       ...fallbackPath !== void 0 ? { fallbackPath } : {},
       ...batchSize !== void 0 ? { batchSize } : {},
+      ...uploadConcurrency !== void 0 ? { uploadConcurrency } : {},
+      ...uploadRetries !== void 0 ? { uploadRetries } : {},
       ...title !== void 0 ? { title } : {},
       ...environment !== void 0 ? { environment } : {},
       ...labels !== void 0 ? { labels } : {},
@@ -264,7 +305,8 @@ function readEnv(env = process.env) {
     // reporting into this run; `PROCEED` says the job will close it on its own schedule. Either
     // way this process must not be the one to call it finished.
     keepOpen: flag(env, "PLUNE_SHARED_RUN") || flag(env, "PLUNE_PROCEED"),
-    ignored: UNSUPPORTED_VARS.filter((name) => value(env, name) !== void 0)
+    ignored: UNSUPPORTED_VARS.filter((name) => value(env, name) !== void 0),
+    warnings
   };
 }
 function defaultRunTitle(env = process.env, now = /* @__PURE__ */ new Date(), cwd = process.cwd()) {
@@ -450,7 +492,7 @@ function appendBatch(file, batch) {
 var RESOLVE_CHUNK = 500;
 var BATCH_MAX = 500;
 var DISCOVER_MAX = 500;
-var BATCH_DEFAULT = 100;
+var BATCH_DEFAULT = 500;
 var EXPECTED_MAX = 1e4;
 var KEY_MAX = 1024;
 var TITLE_MAX = 300;
@@ -468,7 +510,6 @@ var TYPE_BY_EXTENSION = {
   ".webp": "image/webp"
 };
 var METADATA_TYPE2 = "application/plune.metadata+json";
-var UPLOADS_AT_ONCE = 4;
 var NAME_MAX = 200;
 function nameOf(file) {
   const own = file.name.split(/[\\/]/).pop()?.trim() || (file.path === void 0 ? "" : basename2(file.path));
@@ -599,9 +640,15 @@ async function startRun(passed, declared) {
   const batchSize = Math.min(cfg.batchSize ?? BATCH_DEFAULT, BATCH_MAX);
   const offerDiscovered = cfg.offerDiscovered ?? false;
   const token = cfg.token ?? loadToken() ?? "";
+  const uploadsAtOnce = Math.min(Math.max(Math.floor(cfg.uploadConcurrency ?? UPLOAD_CONCURRENCY.default), UPLOAD_CONCURRENCY.min), UPLOAD_CONCURRENCY.max);
+  const uploadRetries = Math.min(Math.max(Math.floor(cfg.uploadRetries ?? UPLOAD_RETRIES.default), UPLOAD_RETRIES.min), UPLOAD_RETRIES.max);
+  let retried = 0;
+  let uploadMs = 0;
   const client = createClient({
     apiUrl: resolveApiUrl(cfg.apiUrl),
     token,
+    uploadRetries,
+    onRetry: () => void (retried += 1),
     ...cfg.fetchImpl !== void 0 ? { fetchImpl: cfg.fetchImpl } : {}
   });
   const stats = {
@@ -652,6 +699,7 @@ async function startRun(passed, declared) {
   if (offline) {
     log('plune: no API token \u2014 run "plune login" first. Results will be written to the fallback file.');
   }
+  for (const warning of env.warnings) log(`plune: ${warning}`);
   if (env.ignored.length > 0) {
     log(`plune: ignoring ${env.ignored.join(", ")} \u2014 a run has nowhere to store them yet.`);
   }
@@ -781,7 +829,7 @@ async function startRun(passed, declared) {
   function ask(job, size) {
     return client.post(`/v1/results/${encodeURIComponent(job.id)}/files/uploads`, {
       files: [{ name: job.name, contentType: job.type, size }]
-    });
+    }, uploadRetries);
   }
   function failed(job, why) {
     countsOf(job.kind).failed += 1;
@@ -842,11 +890,11 @@ async function startRun(passed, declared) {
       if (fresh === void 0) return failedToBucket(job, "bad_answer");
       link = fresh;
     }
-    const done2 = await client.post(`/v1/files/${encodeURIComponent(link.id)}/complete`, {});
+    const done2 = await client.post(`/v1/files/${encodeURIComponent(link.id)}/complete`, {}, uploadRetries);
     if (!done2.ok) return failedToBucket(job, codeOf(done2));
     countsOf(job.kind).uploaded += 1;
   }
-  let free = UPLOADS_AT_ONCE;
+  let free = uploadsAtOnce;
   const waiting = [];
   async function gated(work) {
     if (free === 0) await new Promise((resolve2) => waiting.push(resolve2));
@@ -926,6 +974,7 @@ async function startRun(passed, declared) {
         }
       }
     }
+    const started = Date.now();
     const byResult = /* @__PURE__ */ new Map();
     for (const job of jobs) byResult.set(job.id, [...byResult.get(job.id) ?? [], job]);
     await Promise.all(
@@ -938,6 +987,7 @@ async function startRun(passed, declared) {
         await Promise.all(work);
       })
     );
+    uploadMs += Date.now() - started;
   }
   async function flush() {
     if (buffer.length === 0) return;
@@ -1030,6 +1080,13 @@ async function startRun(passed, declared) {
     }
     if (stats.deferred > 0) parts.push(`${stats.deferred} not delivered \u2014 written to ${fallbackPath}`);
     if (shortened.size > 0) parts.push(`${shortened.size} test name(s) shortened to fit a key`);
+    const files = [stats.screenshots, stats.textFiles, stats.otherFiles];
+    const total = (what) => files.reduce((n, counts) => n + counts[what], 0);
+    if (total("uploaded") + total("skipped") + total("failed") > 0) {
+      log(
+        `plune: files \u2014 ${total("uploaded")} uploaded, ${total("skipped")} skipped, ${retried} retried, ${total("failed")} dropped, in ${(uploadMs / 1e3).toFixed(1)} s (${uploadsAtOnce} at once)`
+      );
+    }
     log(`plune: ${parts.join(" \xB7 ")}`);
     if (stats.deferred > 0 && process.env["GITHUB_ACTIONS"] === "true") {
       log(`::warning::${stats.deferred} result(s) were not delivered to Plune \u2014 see the reporting step's log.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plune-ai/cli",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "AI-powered assertion testing for LLM apps — write assertions, run them against any provider, get a pass/fail report (local, CI, or diff).",
   "keywords": [
     "ai",