@plune-ai/cli 0.14.3 → 0.16.0

package/dist/cli.cjs

@@ -75,8 +75,8 @@ var env_exports = {};
 __export(env_exports, {
   loadEnv: () => loadEnv
 });
-function loadEnv(configDir) {
-  (0, import_dotenv.config)({ path: path.join(configDir, ".env"), override: false });
+function loadEnv(dir) {
+  (0, import_dotenv.config)({ path: path.join(dir, ".env"), override: false });
 }
 var import_dotenv, path;
 var init_env = __esm({
@@ -523,11 +523,25 @@ var init_prices = __esm({
     "use strict";
     init_cjs_shims();
     PRICE_TABLE = {
-      // Anthropic
+      // Anthropic, current models. Source: platform.claude.com/docs/en/about-claude/pricing — base
+      // input and output tokens per million, read on 2026-09-29, kept here per thousand.
+      "claude-fable-5-1": { input_per_1k_usd: 0.01, output_per_1k_usd: 0.05 },
+      "claude-opus-5-5": { input_per_1k_usd: 4e-3, output_per_1k_usd: 0.02 },
+      "claude-sonnet-5-5": { input_per_1k_usd: 2e-3, output_per_1k_usd: 0.01 },
+      "claude-haiku-4-5": { input_per_1k_usd: 1e-3, output_per_1k_usd: 5e-3 },
+      // The dated id of the same model; a config may name either.
+      "claude-haiku-4-5-20251001": { input_per_1k_usd: 1e-3, output_per_1k_usd: 5e-3 },
+      // Anthropic, older ids: unchanged, so a config that still names one prices as it did. Anthropic has
+      // retired these models — a new project should not start on them.
       "claude-3-5-haiku-latest": { input_per_1k_usd: 8e-4, output_per_1k_usd: 4e-3 },
       "claude-3-5-sonnet-latest": { input_per_1k_usd: 3e-3, output_per_1k_usd: 0.015 },
       "claude-3-opus-latest": { input_per_1k_usd: 0.015, output_per_1k_usd: 0.075 },
-      // OpenAI
+      // OpenAI, current models. Source: developers.openai.com/api/docs/pricing — standard tier, the
+      // short-context rates (a long-context request costs more), read on 2026-09-29.
+      "gpt-6-astra": { input_per_1k_usd: 0.01, output_per_1k_usd: 0.05 },
+      "gpt-6.1-sol": { input_per_1k_usd: 2e-3, output_per_1k_usd: 0.01 },
+      "gpt-6-luna": { input_per_1k_usd: 1e-4, output_per_1k_usd: 5e-4 },
+      // OpenAI, older ids: unchanged (the same rates the page above still lists for both).
       "gpt-4o": { input_per_1k_usd: 25e-4, output_per_1k_usd: 0.01 },
       "gpt-4o-mini": { input_per_1k_usd: 15e-5, output_per_1k_usd: 6e-4 },
       // OpenAI via OpenRouter (namespaced ids). OpenRouter passes OpenAI list price through for
@@ -776,6 +790,25 @@ var init_providers = __esm({
   }
 });
 
+// src/providers/estimate.ts
+function makeEstimateProvider(config, pricing) {
+  return {
+    complete: () => Promise.reject(
+      new Error("The --dry-run provider only estimates cost; it never calls a model.")
+    ),
+    estimateCost: (usage, reportedCostUsd) => ({
+      cost_usd: resolveCost(usage, config.model, reportedCostUsd, pricing)
+    })
+  };
+}
+var init_estimate = __esm({
+  "src/providers/estimate.ts"() {
+    "use strict";
+    init_cjs_shims();
+    init_cost();
+  }
+});
+
 // src/providers/mock.ts
 function makeMockProvider() {
   return {
@@ -1878,11 +1911,16 @@ __export(run_exports, {
 function isMockMode(env) {
   return env["PLUNE_MOCK_PROVIDER"] === "1";
 }
+function resolveProviderFor(config, dryRun) {
+  if (isMockMode(process.env)) return () => makeMockProvider();
+  if (dryRun) return (cfg) => makeEstimateProvider(cfg, config.pricing);
+  return (cfg) => getProvider(cfg, process.env, config.pricing);
+}
 function buildRealDeps(config, baseDir, dryRun) {
   const dir = path5.join(baseDir, ".plune");
   fs5.mkdirSync(dir, { recursive: true });
   return {
-    resolveProvider: isMockMode(process.env) ? () => makeMockProvider() : (cfg) => getProvider(cfg, process.env, config.pricing),
+    resolveProvider: resolveProviderFor(config, dryRun),
     embedder: getDefaultEmbedder(),
     cache: dryRun ? NOOP_CACHE : openCache(path5.join(dir, "cache.db")),
     now: Date.now,
@@ -1929,6 +1967,7 @@ var init_run2 = __esm({
     path5 = __toESM(require("path"), 1);
     init_loader();
     init_providers();
+    init_estimate();
     init_mock();
     init_embeddings();
     init_cache2();
@@ -2241,7 +2280,7 @@ function createClient(opts) {
   const wait = opts.wait ?? sleep;
   const base = opts.apiUrl.replace(/\/+$/, "");
   const scrub = (text2) => opts.token === "" ? text2 : text2.split(opts.token).join("***");
-  async function send(method, path14, body) {
+  async function send(method, path15, payload) {
     let last = {
       kind: "unavailable",
       status: null,
@@ -2250,13 +2289,13 @@ function createClient(opts) {
     for (let attempt = 0; attempt <= RETRY_DELAYS_MS.length; attempt += 1) {
       let res;
       try {
-        res = await doFetch(`${base}${path14}`, {
+        res = await doFetch(`${base}${path15}`, {
           method,
-          headers: { "content-type": "application/json", authorization: `Bearer ${opts.token}` },
+          headers: { "content-type": payload?.type ?? "application/json", authorization: `Bearer ${opts.token}` },
           // A DELETE carries none. Sending `"undefined"` as a body is what a naive
           // `JSON.stringify(body)` would do, and some proxies answer that with a 400 nobody can
           // explain.
-          ...body === void 0 ? {} : { body: JSON.stringify(body) }
+          ...payload === void 0 ? {} : { body: payload.body }
         });
       } catch (err) {
         last = { kind: "unavailable", status: null, detail: scrub(String(err)) };
@@ -2282,8 +2321,9 @@ function createClient(opts) {
     return { ok: false, ...last };
   }
   return {
-    post: (path14, body) => send("POST", path14, body),
-    del: (path14) => send("DELETE", path14)
+    post: (path15, body) => send("POST", path15, { body: JSON.stringify(body), type: "application/json" }),
+    upload: (path15, bytes, contentType) => send("POST", path15, { body: bytes, type: contentType }),
+    del: (path15) => send("DELETE", path15)
   };
 }
 var import_node_http, import_node_https, RETRY_DELAYS_MS, IDLE_MS, sleep;
@@ -2359,13 +2399,35 @@ function defaultRunTitle(env = process.env, now = /* @__PURE__ */ new Date(), cw
   const where = flag(env, "CI") || flag(env, "GITHUB_ACTIONS") ? "ci" : "local";
   return `${path6.basename(cwd)} \xB7 ${stamp} \xB7 ${where}`;
 }
-var path6, UNSUPPORTED_VARS;
+function ciCommit(reported, env = process.env) {
+  const said = typeof reported === "object" && reported !== null ? reported : {};
+  const text2 = (raw) => typeof raw === "string" && raw.trim() !== "" ? raw.trim() : void 0;
+  const provider = PROVIDERS.find((p) => value(env, p.is) !== void 0);
+  const job = {
+    sha: provider === void 0 ? void 0 : value(env, provider.sha),
+    branch: provider?.branch.map((name) => value(env, name)).find((v) => v !== void 0)
+  };
+  const sha = text2(said["commitHash"]);
+  const sameCommit = sha === void 0 || sha === job.sha;
+  const commit = sha ?? job.sha;
+  const branch = text2(said["branch"]) ?? (sameCommit ? job.branch : void 0);
+  return {
+    ...commit !== void 0 ? { sha: commit } : {},
+    ...branch !== void 0 ? { branch } : {}
+  };
+}
+var path6, UNSUPPORTED_VARS, PROVIDERS;
 var init_env2 = __esm({
   "src/reporter-core/env.ts"() {
     "use strict";
     init_cjs_shims();
     path6 = __toESM(require("path"), 1);
     UNSUPPORTED_VARS = ["PLUNE_GROUP"];
+    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"] },
+      { is: "JENKINS_URL", sha: "GIT_COMMIT", branch: ["GIT_BRANCH"] }
+    ];
   }
 });
 
@@ -2376,6 +2438,8 @@ function appendBatch(file, batch) {
     ts: (/* @__PURE__ */ new Date()).toISOString(),
     runId: batch.runId,
     externalKey: batch.externalKey,
+    ...batch.session !== void 0 ? { session: batch.session } : {},
+    ...batch.meta !== void 0 ? { meta: batch.meta } : {},
     results: batch.results
   };
   fs6.appendFileSync(file, `${JSON.stringify(line)}
@@ -2393,6 +2457,19 @@ var init_fallback = __esm({
 });
 
 // src/reporter-core/session.ts
+function nameOf(file) {
+  const own = file.name.split(/[\\/]/).pop()?.trim() || (0, import_node_path2.basename)(file.path);
+  const fileExt = (0, import_node_path2.extname)(file.path);
+  const ownExt = (0, import_node_path2.extname)(own);
+  const typed = ownExt !== "" && (ownExt.toLowerCase() === fileExt.toLowerCase() || TYPE_BY_EXTENSION[ownExt.toLowerCase()] !== void 0);
+  const ext = typed ? ownExt : fileExt;
+  let stem = typed ? own.slice(0, -ownExt.length) : own;
+  if (stem.length + ext.length > NAME_MAX) {
+    stem = stem.slice(0, Math.max(0, NAME_MAX - ext.length));
+    if (/[\uD800-\uDBFF]$/.test(stem)) stem = stem.slice(0, -1);
+  }
+  return `${stem}${ext}`;
+}
 function boundKey(key) {
   if (key.value.length <= KEY_MAX) return key;
   const digest = (0, import_node_crypto2.createHash)("sha256").update(key.value).digest("hex").slice(0, 16);
@@ -2400,6 +2477,12 @@ function boundKey(key) {
   if (/[\uD800-\uDBFF]$/.test(head)) head = head.slice(0, -1);
   return { ...key, value: `${head}#${digest}` };
 }
+function whyUnoffered(out) {
+  if (out.ok || out.status !== 429) return "other";
+  if (/review queue quota reached/i.test(out.detail)) return "queue";
+  if (/test case quota reached/i.test(out.detail)) return "cases";
+  return "other";
+}
 function boundTitle(title) {
   return title.length <= TITLE_MAX ? title : `${title.slice(0, TITLE_MAX - 1)}\u2026`;
 }
@@ -2441,6 +2524,7 @@ async function startRun(passed, declared) {
 `));
   const fallbackPath = cfg.fallbackPath ?? DEFAULT_FALLBACK_PATH;
   const externalKey = cfg.externalKey ?? null;
+  const sessionMarker = (0, import_node_crypto2.randomUUID)();
   const batchSize = Math.min(cfg.batchSize ?? BATCH_DEFAULT, BATCH_MAX);
   const offerDiscovered = cfg.offerDiscovered ?? false;
   const token = cfg.token ?? loadToken() ?? "";
@@ -2458,7 +2542,8 @@ async function startRun(passed, declared) {
     offered: 0,
     created: 0,
     unoffered: 0,
-    deferred: 0
+    deferred: 0,
+    screenshots: { uploaded: 0, skipped: 0, failed: 0 }
   };
   const resolved = /* @__PURE__ */ new Map();
   let buffer = [];
@@ -2468,6 +2553,7 @@ async function startRun(passed, declared) {
   let offline = token === "";
   let done = false;
   const shortened = /* @__PURE__ */ new Set();
+  const skipsSaid = /* @__PURE__ */ new Set();
   function bound(keys) {
     return keys.map((key) => {
       const fit = boundKey(key);
@@ -2490,7 +2576,13 @@ async function startRun(passed, declared) {
     log(`plune: ignoring ${env.ignored.join(", ")} \u2014 a run has nowhere to store them yet.`);
   }
   function defer(results) {
-    appendBatch(fallbackPath, { runId, externalKey, results });
+    appendBatch(fallbackPath, {
+      runId,
+      externalKey,
+      session: sessionMarker,
+      ...cfg.meta !== void 0 ? { meta: cfg.meta } : {},
+      results
+    });
     stats.deferred += results.length;
   }
   async function resolveKeys(values) {
@@ -2587,6 +2679,7 @@ async function startRun(passed, declared) {
       });
       if (!out.ok || !Array.isArray(out.body?.results)) {
         stats.unoffered = batches.slice(index).reduce((n, rest) => n + rest.length, 0);
+        stats.unofferedWhy = whyUnoffered(out);
         log(
           `plune: could not offer ${stats.unoffered} unknown test(s) for review (${out.ok ? "the answer had no results" : out.detail || out.kind}).`
         );
@@ -2596,6 +2689,60 @@ async function startRun(passed, declared) {
       stats.created += out.body.results.filter((r) => r?.outcome === "created").length;
     }
   }
+  function skip(name, why) {
+    stats.screenshots.skipped += 1;
+    if (skipsSaid.has(why)) return;
+    skipsSaid.add(why);
+    log(`plune: screenshot "${name}" not uploaded \u2014 ${SKIPPED[why]}.`);
+  }
+  async function uploadOne(shot) {
+    let bytes;
+    try {
+      if ((await import_node_fs2.promises.stat(shot.path)).size > SCREENSHOT_BYTES) return skip(shot.name, "size");
+      bytes = await import_node_fs2.promises.readFile(shot.path);
+    } catch {
+      return skip(shot.name, "missing");
+    }
+    const out = await client.upload(
+      `/v1/results/${encodeURIComponent(shot.id)}/files?name=${encodeURIComponent(shot.name)}`,
+      bytes,
+      shot.type
+    );
+    if (out.ok) {
+      stats.screenshots.uploaded += 1;
+      return;
+    }
+    stats.screenshots.failed += 1;
+    if (stats.screenshots.failed === 1) {
+      log(`plune: could not upload a screenshot (${out.detail || out.kind}) \u2014 its result is reported without it.`);
+    }
+  }
+  async function upload(items, filesByKey) {
+    if (filesByKey.size === 0 || !Array.isArray(items)) return;
+    const shots = [];
+    for (const item of items) {
+      if (item?.status !== "accepted" || typeof item.id !== "string" || typeof item.resultKey !== "string") continue;
+      let room = SCREENSHOTS_PER_RESULT;
+      for (const file of filesByKey.get(item.resultKey) ?? []) {
+        const type = file.contentType?.split(";")[0]?.trim().toLowerCase() || TYPE_BY_EXTENSION[(0, import_node_path2.extname)(file.path).toLowerCase()];
+        if (!type?.startsWith("image/")) continue;
+        const name = nameOf(file);
+        if (file.name.startsWith("_")) skip(name, "hidden");
+        else if (!SCREENSHOT_TYPES.has(type)) skip(name, "type");
+        else if (room === 0) skip(name, "limit");
+        else {
+          room -= 1;
+          shots.push({ id: item.id, name, type, path: file.path });
+        }
+      }
+    }
+    let next = 0;
+    await Promise.all(
+      Array.from({ length: Math.min(UPLOADS_AT_ONCE, shots.length) }, async () => {
+        while (next < shots.length) await uploadOne(shots[next++]);
+      })
+    );
+  }
   async function flush() {
     if (buffer.length === 0) return;
     const pending = buffer;
@@ -2607,11 +2754,13 @@ async function startRun(passed, declared) {
     await resolveKeys(pending.flatMap((p) => p.keys));
     const submissions = [];
     const unanswered = [];
+    const filesByKey = /* @__PURE__ */ new Map();
     for (const result of pending) {
       const match = matchFor(result);
       if (match.kind === "found") {
-        const { keys: _keys, ...rest } = result;
+        const { keys: _keys, files, ...rest } = result;
         submissions.push({ ...rest, testCaseId: match.testCaseId });
+        if (files !== void 0) filesByKey.set(result.resultKey, files);
       } else if (match.kind === "unmatched") {
         stats.unresolved += 1;
         remember(result);
@@ -2629,14 +2778,16 @@ async function startRun(passed, declared) {
         defer(part);
         continue;
       }
-      const out = await client.post(`/v1/runs/${runId}/results`, {
-        results: part
-      });
+      const out = await client.post(
+        `/v1/runs/${runId}/results`,
+        { results: part }
+      );
       const counts = out.ok ? out.body?.counts : void 0;
       const told = COUNTED.filter((k) => typeof counts?.[k] === "number");
       if (told.length > 0) {
         for (const k of told) stats[k] += counts[k];
         progress();
+        await upload(out.ok ? out.body?.items : void 0, filesByKey);
         continue;
       }
       if (out.ok) {
@@ -2666,6 +2817,12 @@ async function startRun(passed, declared) {
     if (stats.unresolved > 0) parts.push(`${stats.unresolved} with no matching test case`);
     if (stats.offered > 0) parts.push(`${stats.offered} offered for review`);
     if (stats.created > 0) parts.push(`${stats.created} added as cases (trusted source)`);
+    const shots = stats.screenshots;
+    if (shots.uploaded + shots.skipped + shots.failed > 0) {
+      parts.push(
+        `${shots.uploaded} screenshot(s) uploaded` + (shots.skipped > 0 ? `, ${shots.skipped} skipped` : "") + (shots.failed > 0 ? `, ${shots.failed} failed to upload` : "")
+      );
+    }
     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`);
     log(`plune: ${parts.join(" \xB7 ")}`);
@@ -2717,12 +2874,14 @@ async function startRun(passed, declared) {
     }
   };
 }
-var import_node_crypto2, RESOLVE_CHUNK, BATCH_MAX, DISCOVER_MAX, BATCH_DEFAULT, EXPECTED_MAX, KEY_MAX, TITLE_MAX, COUNTED, BATCH_BYTES, ENVELOPE_BYTES;
+var import_node_crypto2, import_node_fs2, import_node_path2, RESOLVE_CHUNK, BATCH_MAX, DISCOVER_MAX, BATCH_DEFAULT, EXPECTED_MAX, KEY_MAX, TITLE_MAX, COUNTED, SCREENSHOT_TYPES, SCREENSHOT_BYTES, SCREENSHOTS_PER_RESULT, TYPE_BY_EXTENSION, UPLOADS_AT_ONCE, NAME_MAX, SKIPPED, BATCH_BYTES, ENVELOPE_BYTES;
 var init_session = __esm({
   "src/reporter-core/session.ts"() {
     "use strict";
     init_cjs_shims();
     import_node_crypto2 = require("crypto");
+    import_node_fs2 = require("fs");
+    import_node_path2 = require("path");
     init_api_url();
     init_credentials();
     init_client();
@@ -2736,6 +2895,24 @@ var init_session = __esm({
     KEY_MAX = 1024;
     TITLE_MAX = 300;
     COUNTED = ["accepted", "duplicate", "conflict", "rejected"];
+    SCREENSHOT_TYPES = /* @__PURE__ */ new Set(["image/png", "image/jpeg", "image/webp"]);
+    SCREENSHOT_BYTES = 2 * 1024 * 1024;
+    SCREENSHOTS_PER_RESULT = 20;
+    TYPE_BY_EXTENSION = {
+      ".png": "image/png",
+      ".jpg": "image/jpeg",
+      ".jpeg": "image/jpeg",
+      ".webp": "image/webp"
+    };
+    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",
+      type: "Plune takes PNG, JPEG and WebP",
+      limit: `a result holds at most ${SCREENSHOTS_PER_RESULT}`,
+      missing: "the file cannot be read on this machine",
+      size: "Plune takes a file of at most 2 MB"
+    };
     BATCH_BYTES = 8 * 1024 * 1024;
     ENVELOPE_BYTES = Buffer.byteLength(JSON.stringify({ results: [] }));
   }
@@ -2859,23 +3036,42 @@ async function handleRunReport(options = {}) {
   if (lines.length === 0) throw new RunCommandError(`Nothing to send \u2014 ${file} is empty.`);
   const { client } = connect(options);
   const result = { batches: lines.length, sent: 0, failed: 0 };
+  const groups = [];
+  const bySession = /* @__PURE__ */ new Map();
   for (const line of lines) {
-    const pending = line.results.filter(isPending);
-    const ready = line.results.filter((r) => !isPending(r));
-    if (line.runId !== null && ready.length > 0) {
-      const out = await client.post(`/v1/runs/${line.runId}/results`, { results: ready });
-      if (out.ok) result.sent += ready.length;
-      else {
-        result.failed += ready.length;
-        write(`Could not send ${ready.length} result(s) to run ${line.runId} \u2014 ${out.detail || out.kind}.`);
+    const group = line.session === void 0 ? void 0 : bySession.get(line.session);
+    if (group !== void 0) {
+      group.push(line);
+      continue;
+    }
+    const alone = [line];
+    groups.push(alone);
+    if (line.session !== void 0) bySession.set(line.session, alone);
+  }
+  for (const group of groups) {
+    for (const line of group) {
+      const ready = line.results.filter((r) => !isPending(r));
+      if (line.runId !== null && ready.length > 0) {
+        const out = await client.post(`/v1/runs/${line.runId}/results`, { results: ready });
+        if (out.ok) result.sent += ready.length;
+        else {
+          result.failed += ready.length;
+          write(
+            `Could not send ${ready.length} result(s) to run ${line.runId} \u2014 ${out.detail || out.kind}.`
+          );
+        }
       }
     }
+    const pending = group.flatMap((line) => line.results.filter(isPending));
     if (pending.length > 0) {
+      const first = group[0];
       const session = await startRun({
         ...options.apiUrl !== void 0 ? { apiUrl: options.apiUrl } : {},
         ...options.token !== void 0 ? { token: options.token } : {},
         ...options.fetchImpl !== void 0 ? { fetchImpl: options.fetchImpl } : {},
-        ...line.externalKey !== null ? { externalKey: line.externalKey } : {},
+        ...first.externalKey !== null ? { externalKey: first.externalKey } : {},
+        // Where the run came from, as the reporter recorded it (plune#927) — never this machine's own.
+        ...first.meta !== void 0 ? { meta: first.meta } : {},
         // The replay does not know whether the run is complete, so it must not say that it is.
         log: write
       });
@@ -2886,15 +3082,34 @@ async function handleRunReport(options = {}) {
     }
   }
   write(`Replayed ${result.batches} batch(es) from ${file}: ${result.sent} sent, ${result.failed} not.`);
+  if (result.failed === 0) {
+    const sentAs = sentName(file, (options.now ?? Date.now)());
+    try {
+      fs7.renameSync(file, sentAs);
+      write(
+        `Every result was sent \u2014 ${file} is now ${sentAs}, so a later replay does not send them twice.`
+      );
+    } catch (err) {
+      const why = err instanceof Error ? err.message : String(err);
+      write(
+        `Every result was sent, but ${file} could not be renamed (${why}) \u2014 take it away by hand, or a later replay sends them again.`
+      );
+    }
+  }
   return result;
 }
-var import_node_child_process, fs7, NoTokenError, RunCommandError, isPending;
+function sentName(file, at) {
+  const { dir, name, ext } = path8.parse(file);
+  return path8.join(dir, `${name}.${new Date(at).toISOString().replace(/[:.]/g, "-")}.sent${ext}`);
+}
+var import_node_child_process, fs7, path8, NoTokenError, RunCommandError, isPending;
 var init_run_lifecycle = __esm({
   "src/cli/commands/run-lifecycle.ts"() {
     "use strict";
     init_cjs_shims();
     import_node_child_process = require("child_process");
     fs7 = __toESM(require("fs"), 1);
+    path8 = __toESM(require("path"), 1);
     init_api_url();
     init_credentials();
     init_client();
@@ -3102,7 +3317,12 @@ function errorTextOf(detail) {
   const head = [detail.attrs["message"], detail.attrs["type"]].filter((s) => s !== void 0 && s !== "");
   return [...head, detail.text.trim()].filter((s) => s !== "").join("\n\n");
 }
-function keyOf(classname, name) {
+function playwrightOf(classname, name) {
+  if (!SPEC_FILE.test(classname)) return void 0;
+  return { file: classname.replaceAll("\\", "/"), titles: name.split(" \u203A ") };
+}
+function keyOf(classname, name, playwright) {
+  if (playwright !== void 0) return { kind: "path-title", value: [playwright.file, ...playwright.titles].join("#") };
   return { kind: "path-title", value: classname === "" ? name : `${classname}#${name}` };
 }
 function titleOf(classname, name) {
@@ -3142,12 +3362,15 @@ function readJUnit(source, file) {
     const name = test.attrs["name"] ?? "";
     const classname = test.attrs["classname"] ?? test.attrs["class"] ?? "";
     const { status, detail } = outcomeOf(test);
-    const key = keyOf(classname, name);
+    const playwright = playwrightOf(classname, name);
+    const key = keyOf(classname, name, playwright);
+    const stated = TOKEN.exec(playwright?.titles.at(-1) ?? name)?.[1];
     const specRef = specRefOf(test, suite, classname);
     const errorContext = errorTextOf(detail);
     const execution = executionOf(test, suite);
     return {
       resultKey: resultKey(key.value, 0),
+      ...stated !== void 0 ? { testCaseId: stated } : {},
       keys: [key],
       source: SOURCE,
       rawStatus: status,
@@ -3161,7 +3384,7 @@ function readJUnit(source, file) {
 function looksLikeJUnit(source) {
   return /<\s*testsuites?\b/.test(source.slice(0, 4096));
 }
-var SOURCE;
+var SOURCE, TOKEN, SPEC_FILE;
 var init_junit = __esm({
   "src/importers/junit.ts"() {
     "use strict";
@@ -3169,6 +3392,8 @@ var init_junit = __esm({
     init_result_key();
     init_xml();
     SOURCE = "junit";
+    TOKEN = /@P([A-Za-z0-9_-]+)/;
+    SPEC_FILE = /\.(?:spec|test)\.[cm]?[jt]sx?$/;
   }
 });
 
@@ -3191,15 +3416,18 @@ function failureOf(attempt, home = (0, import_node_os2.homedir)()) {
   return Object.keys(failure).length === 0 ? void 0 : failure;
 }
 function repoRootOf(dir, stopAt) {
-  for (let here = (0, import_node_path2.resolve)(dir); ; here = (0, import_node_path2.dirname)(here)) {
-    if ((0, import_node_fs2.existsSync)((0, import_node_path2.join)(here, ".git"))) return here;
-    if (here === stopAt || (0, import_node_path2.dirname)(here) === here) return void 0;
+  for (let here = (0, import_node_path3.resolve)(dir); ; here = (0, import_node_path3.dirname)(here)) {
+    if ((0, import_node_fs3.existsSync)((0, import_node_path3.join)(here, ".git"))) return here;
+    if (here === stopAt || (0, import_node_path3.dirname)(here) === here) return void 0;
   }
 }
 function errorContextOf(attempt, home = (0, import_node_os2.homedir)()) {
   const text2 = attempt.errors.map((e) => e.text).filter((t) => t !== "").join("\n\n");
   return cut(machineless(text2, attempt.repoRoot, home));
 }
+function filesOf(attempt) {
+  return attempt.attachments.filter((a) => a.path !== void 0);
+}
 function machineless(raw, repoRoot, home) {
   let text2 = (0, import_node_util.stripVTControlCharacters)(raw).replaceAll("\x1B", "");
   const root = repoRoot === void 0 ? void 0 : pathIn(repoRoot);
@@ -3209,12 +3437,12 @@ function machineless(raw, repoRoot, home) {
   if (repoRoot === void 0) text2 = text2.replace(ANY_HOME, "~");
   return text2;
 }
-function pathIn(path14) {
-  const parts = path14.split(/[\\/]+/);
+function pathIn(path15) {
+  const parts = path15.split(/[\\/]+/);
   while (parts.length > 1 && parts.at(-1) === "") parts.pop();
   if (!parts.some((part) => part !== "" && !/^[A-Za-z]:$/.test(part))) return void 0;
   const joined = parts.map((part) => part.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("[\\\\/]+");
-  const escaped = /^\/(?!\/)/.test(path14) ? joined.replace("[\\\\/]+", "\\\\*\\/") : joined;
+  const escaped = /^\/(?!\/)/.test(path15) ? joined.replace("[\\\\/]+", "\\\\*\\/") : joined;
   const url = "(?:(?:file|webpack|webpack-internal):(?:\\\\*\\/){2,3})?";
   return new RegExp(`${url}${escaped}`, /^[A-Za-z]:$/.test(parts[0]) ? "gi" : "g");
 }
@@ -3259,12 +3487,12 @@ function placeOf(error, testFile) {
 }
 function fileOf(raw) {
   if (!raw.startsWith("file://")) return raw;
-  let path14 = raw.slice("file://".length);
+  let path15 = raw.slice("file://".length);
   try {
-    path14 = decodeURIComponent(path14);
+    path15 = decodeURIComponent(path15);
   } catch {
   }
-  return /^\/[A-Za-z]:\//.test(path14) ? path14.slice(1) : path14;
+  return /^\/[A-Za-z]:\//.test(path15) ? path15.slice(1) : path15;
 }
 function fromRoot(place, root) {
   if (place === void 0 || root === void 0 || !Number.isInteger(place.line) || place.line < 1) return void 0;
@@ -3279,14 +3507,14 @@ function fromRoot(place, root) {
 function webLink(href) {
   return href !== void 0 && /^https?:\/\//i.test(href) && URL.canParse(href) ? href : void 0;
 }
-var import_node_fs2, import_node_os2, import_node_path2, import_node_util, PATH_START, TEXT_LIMIT, HEADLINE_LIMIT, jsonBytes, ANY_HOME, fileNameOf, omitted, METADATA_TYPE, REPO_RELATIVE, FRAME, FRAME_MAX, firstLine, normal;
+var import_node_fs3, import_node_os2, import_node_path3, import_node_util, PATH_START, TEXT_LIMIT, HEADLINE_LIMIT, jsonBytes, ANY_HOME, fileNameOf, omitted, METADATA_TYPE, REPO_RELATIVE, FRAME, FRAME_MAX, firstLine, normal;
 var init_failure_detail = __esm({
   "src/reporter-core/failure-detail.ts"() {
     "use strict";
     init_cjs_shims();
-    import_node_fs2 = require("fs");
+    import_node_fs3 = require("fs");
     import_node_os2 = require("os");
-    import_node_path2 = require("path");
+    import_node_path3 = require("path");
     import_node_util = require("util");
     PATH_START = "(?<![\\w.~%/\\\\-])";
     TEXT_LIMIT = 524288;
@@ -3300,7 +3528,7 @@ var init_failure_detail = __esm({
     FRAME = /^\s+at (?:.*? \()?(.+?):(\d+):(\d+)\)?$/;
     FRAME_MAX = 8192;
     firstLine = (text2) => (0, import_node_util.stripVTControlCharacters)(text2).split("\n").map((line) => line.trim()).find((line) => line !== "");
-    normal = (path14) => import_node_path2.posix.normalize(path14.replace(/\\/g, "/")).replace(/^([a-z]):/, (_, drive) => `${drive.toUpperCase()}:`);
+    normal = (path15) => import_node_path3.posix.normalize(path15.replace(/\\/g, "/")).replace(/^([a-z]):/, (_, drive) => `${drive.toUpperCase()}:`);
   }
 });
 
@@ -3308,7 +3536,7 @@ var init_failure_detail = __esm({
 function statedIdOf(test, title) {
   const annotation = test.annotations?.find((a) => a.type === "PluneId")?.description;
   if (annotation !== void 0 && annotation !== "") return annotation;
-  return TOKEN.exec(title)?.[1];
+  return TOKEN2.exec(title)?.[1];
 }
 function attemptOf(result, file, ctx) {
   const steps = (list2) => (list2 ?? []).map((s) => ({ title: s.title ?? "", failed: s.error !== void 0, steps: steps(s.steps) }));
@@ -3319,10 +3547,10 @@ function attemptOf(result, file, ctx) {
       ...typeof at?.file === "string" && typeof at.line === "number" ? { location: { file: at.file, line: at.line, ...typeof at.column === "number" ? { column: at.column } : {} } } : {}
     })),
     steps: steps(result.steps),
-    attachments: (result.attachments ?? []).map(({ name, contentType, path: path14 }) => ({
+    attachments: (result.attachments ?? []).map(({ name, contentType, path: path15 }) => ({
       name: name ?? "",
       ...contentType !== void 0 ? { contentType } : {},
-      ...path14 !== void 0 ? { path: path14 } : {}
+      ...path15 !== void 0 ? { path: path15 } : {}
     })),
     ...ctx.buildHref !== void 0 ? { buildHref: ctx.buildHref } : {},
     // Spec files are posix and relative to the root dir; the core reads either slash.
@@ -3338,6 +3566,7 @@ function pendingFrom(spec, test, result, file, titles, ctx) {
   const attempt = attemptOf(result, file, ctx);
   const errorContext = errorContextOf(attempt);
   const failure = NOT_FAILED.has(attempt.status) ? void 0 : failureOf(attempt);
+  const files = filesOf(attempt);
   const keys = [
     ...test.id !== void 0 ? [{ kind: "playwright-id", value: test.id }] : [],
     { kind: "path-title", value: pathTitle }
@@ -3366,7 +3595,8 @@ function pendingFrom(spec, test, result, file, titles, ctx) {
       }
     } : {},
     ...errorContext !== "" ? { errorContext } : {},
-    ...failure !== void 0 ? { failure } : {}
+    ...failure !== void 0 ? { failure } : {},
+    ...files.length > 0 ? { files } : {}
   };
 }
 function walk(suite, describes, depth, ctx, out) {
@@ -3393,7 +3623,7 @@ function readPlaywrightJson(source, file) {
   const { config, suites } = parsed;
   const rootDir = typeof config?.rootDir === "string" ? config.rootDir : void 0;
   const buildHref = config?.metadata?.ci?.buildHref;
-  const repoRoot = rootDir !== void 0 && (0, import_node_fs3.existsSync)(rootDir) ? repoRootOf(rootDir) : void 0;
+  const repoRoot = rootDir !== void 0 && (0, import_node_fs4.existsSync)(rootDir) ? repoRootOf(rootDir) : void 0;
   const ctx = {
     ...rootDir !== void 0 ? { rootDir } : {},
     ...repoRoot !== void 0 ? { repoRoot } : {},
@@ -3402,21 +3632,26 @@ function readPlaywrightJson(source, file) {
   const out = [];
   for (const suite of suites) walk(suite, [], 0, ctx, out);
   const ciUrl = webLink(ctx.buildHref);
-  return ciUrl === void 0 ? { results: out } : { results: out, ciUrl };
+  const ci = config?.metadata?.ci;
+  return {
+    results: out,
+    ...ciUrl !== void 0 ? { ciUrl } : {},
+    ...ci !== void 0 ? { ci } : {}
+  };
 }
 function looksLikePlaywrightJson(source) {
   return /^\s*\{/.test(source) && source.includes('"suites"');
 }
-var import_node_fs3, SOURCE2, TOKEN, NOT_FAILED, JsonReportError;
+var import_node_fs4, SOURCE2, TOKEN2, NOT_FAILED, JsonReportError;
 var init_playwright_json = __esm({
   "src/importers/playwright-json.ts"() {
     "use strict";
     init_cjs_shims();
-    import_node_fs3 = require("fs");
+    import_node_fs4 = require("fs");
     init_failure_detail();
     init_result_key();
     SOURCE2 = "playwright";
-    TOKEN = /@P([A-Za-z0-9_-]+)/;
+    TOKEN2 = /@P([A-Za-z0-9_-]+)/;
     NOT_FAILED = /* @__PURE__ */ new Set(["passed", "skipped"]);
     JsonReportError = class extends Error {
       constructor(file, detail) {
@@ -3485,7 +3720,7 @@ async function handleRunImport(options) {
   } catch {
     throw new RunCommandError(`Cannot read ${options.file}.`);
   }
-  const { format, results, ciUrl } = readReport(source, options.file, options.format);
+  const { format, results, ciUrl, ci } = readReport(source, options.file, options.format);
   if (results.length === 0) {
     throw new RunCommandError(`No test cases in ${options.file} \u2014 it parsed, but there is nothing in it.`);
   }
@@ -3502,7 +3737,10 @@ async function handleRunImport(options) {
       ...options.create === true ? { offerDiscovered: true } : {},
       kind: "automated",
       // The CI run the report names, never this machine's: whoever imports may be another job (#790).
-      meta: { runner: format, ...ciUrl !== void 0 ? { ciUrl } : {} },
+      // The commit and branch likewise, where the report names a commit; a report that names none —
+      // JUnit's never does — takes this job's own, which is where the tests ran when import follows
+      // them in one job (plune-ai/plune#927).
+      meta: { runner: format, ...ciUrl !== void 0 ? { ciUrl } : {}, ...ciCommit(ci) },
       log: write
     },
     // The file is the complete list of what ran, so the platform can resolve every test in one
@@ -3526,7 +3764,9 @@ async function handleRunImport(options) {
     offered: stats.offered,
     created: stats.created,
     unoffered: stats.unoffered,
+    ...stats.unofferedWhy !== void 0 ? { unofferedWhy: stats.unofferedWhy } : {},
     deferred: stats.deferred,
+    screenshots: { ...stats.screenshots },
     unlocatable: results.filter((r) => r.specRef === void 0).length,
     offering: options.create === true
   };
@@ -3550,6 +3790,12 @@ function describe(result, apiUrl) {
   if (result.conflict > 0 || result.rejected > 0) {
     lines.push(`${result.conflict} conflicted and ${result.rejected} were refused.`);
   }
+  const shots = result.screenshots;
+  if (shots.uploaded + shots.skipped + shots.failed > 0) {
+    lines.push(
+      `${shots.uploaded} screenshot(s) uploaded to their results` + (shots.skipped > 0 ? `, ${shots.skipped} skipped` : "") + (shots.failed > 0 ? `, ${shots.failed} could not be uploaded` : "") + "."
+    );
+  }
   if (result.deferred > 0) {
     lines.push(
       `${result.deferred} could not be sent and are in the fallback file \u2014 "plune run report" retries them.`
@@ -3569,7 +3815,7 @@ function describe(result, apiUrl) {
   }
   if (result.unoffered > 0) {
     lines.push(
-      `${result.unoffered} more could not be offered \u2014 the review queue is full. Approve or reject what is waiting, then import this report again to offer the rest.`
+      `${result.unoffered} more could not be offered \u2014 ${NEXT[result.unofferedWhy ?? "other"]}`
     );
   }
   if (result.unlocatable > 0) {
@@ -3580,7 +3826,7 @@ function describe(result, apiUrl) {
   if (result.runId !== null) lines.push(runUrl2(apiUrl, result.runId));
   return lines;
 }
-var fs8;
+var fs8, NEXT;
 var init_run_import = __esm({
   "src/cli/commands/run-import.ts"() {
     "use strict";
@@ -3592,6 +3838,11 @@ var init_run_import = __esm({
     init_api_url();
     init_credentials();
     init_env2();
+    NEXT = {
+      queue: "the review queue is full. Approve or reject what is waiting, then import this report again to offer the rest.",
+      cases: "the project is at its test case limit. Delete cases you no longer need, or ask an operator to raise the limit, then import this report again to offer the rest.",
+      other: 'the reason is in the "could not offer" line above.'
+    };
   }
 });
 
@@ -3608,7 +3859,7 @@ function isRunResult(v) {
 }
 function handleReport(opts = {}) {
   const cwd = opts.cwd ?? process.cwd();
-  const file = path8.join(cwd, ".plune", "last-run.json");
+  const file = path9.join(cwd, ".plune", "last-run.json");
   let raw;
   try {
     raw = fs9.readFileSync(file, "utf8");
@@ -3626,13 +3877,13 @@ function handleReport(opts = {}) {
   }
   return parsed;
 }
-var fs9, path8, ReportNotFoundError;
+var fs9, path9, ReportNotFoundError;
 var init_report = __esm({
   "src/cli/commands/report.ts"() {
     "use strict";
     init_cjs_shims();
     fs9 = __toESM(require("fs"), 1);
-    path8 = __toESM(require("path"), 1);
+    path9 = __toESM(require("path"), 1);
     ReportNotFoundError = class extends Error {
       code = "NO_SAVED_RUN";
       constructor(message) {
@@ -3836,7 +4087,7 @@ async function runInitWizard(cwd) {
     process.exit(1);
     return;
   }
-  const defaultModel = provider === "anthropic" ? "claude-3-opus" : "gpt-4o";
+  const defaultModel = provider === "anthropic" ? "claude-sonnet-5-5" : "gpt-4o-mini";
   const model = await clack.text({
     message: "Model name:",
     defaultValue: defaultModel,
@@ -3856,7 +4107,7 @@ async function runInitWizard(cwd) {
     process.exit(1);
     return;
   }
-  const outputPath = path9.join(cwd, "plune.yaml");
+  const outputPath = path10.join(cwd, "plune.yaml");
   if (fs11.existsSync(outputPath)) {
     const overwrite = await clack.confirm({
       message: "plune.yaml already exists. Overwrite?"
@@ -3900,14 +4151,14 @@ async function runInitWizard(cwd) {
   spin.stop("plune.yaml created!");
   clack.outro("plune.yaml is ready.");
 }
-var clack, fs11, path9, import_yaml2;
+var clack, fs11, path10, import_yaml2;
 var init_wizard = __esm({
   "src/config/init/wizard.ts"() {
     "use strict";
     init_cjs_shims();
     clack = __toESM(require("@clack/prompts"), 1);
     fs11 = __toESM(require("fs"), 1);
-    path9 = __toESM(require("path"), 1);
+    path10 = __toESM(require("path"), 1);
     import_yaml2 = require("yaml");
     init_errors();
   }
@@ -3915,21 +4166,21 @@ var init_wizard = __esm({
 
 // src/cli/templates/index.ts
 function writeTemplateFile(cwd, rel, content, force) {
-  const target = path10.join(cwd, rel);
+  const target = path11.join(cwd, rel);
   if (!force && fs12.existsSync(target)) {
     return "skipped";
   }
-  fs12.mkdirSync(path10.dirname(target), { recursive: true });
+  fs12.mkdirSync(path11.dirname(target), { recursive: true });
   fs12.writeFileSync(target, content, "utf8");
   return "written";
 }
-var fs12, path10, ENV_EXAMPLE_TPL, EXAMPLE_JSONL_TPL, PLUNE_YAML_TPL;
+var fs12, path11, ENV_EXAMPLE_TPL, EXAMPLE_JSONL_TPL, PLUNE_YAML_TPL;
 var init_templates = __esm({
   "src/cli/templates/index.ts"() {
     "use strict";
     init_cjs_shims();
     fs12 = __toESM(require("fs"), 1);
-    path10 = __toESM(require("path"), 1);
+    path11 = __toESM(require("path"), 1);
     ENV_EXAMPLE_TPL = `# Copy this file to .env and replace the placeholders with your real keys.
 # .env is gitignored; .env.example is safe to commit.
 # Plune reads whichever key matches your configured provider.
@@ -3950,7 +4201,7 @@ OPENROUTER_API_KEY=YOUR_OPENROUTER_API_KEY_HERE
 version: 1
 provider:
   type: anthropic
-  model: claude-3-5-sonnet-latest
+  model: claude-sonnet-5-5
 evals:
   - id: example
     prompt: "Answer concisely. {{question}}"
@@ -4185,7 +4436,7 @@ __export(sync_exports, {
   reportSyncFailure: () => reportSyncFailure
 });
 function readRun(cwd, file) {
-  const target = file !== void 0 ? path11.resolve(cwd, file) : path11.join(cwd, ".plune", "last-run.json");
+  const target = file !== void 0 ? path12.resolve(cwd, file) : path12.join(cwd, ".plune", "last-run.json");
   let raw;
   try {
     raw = fs13.readFileSync(target, "utf8");
@@ -4252,13 +4503,13 @@ function reportSyncFailure(err, write) {
   }
   return null;
 }
-var fs13, path11, NotLoggedInError, TokenRejectedError2, SyncFileError, SyncNetworkError, SyncHttpError;
+var fs13, path12, NotLoggedInError, TokenRejectedError2, SyncFileError, SyncNetworkError, SyncHttpError;
 var init_sync = __esm({
   "src/cli/commands/sync.ts"() {
     "use strict";
     init_cjs_shims();
     fs13 = __toESM(require("fs"), 1);
-    path11 = __toESM(require("path"), 1);
+    path12 = __toESM(require("path"), 1);
     init_run_result_schema();
     init_api_url();
     init_credentials();
@@ -4308,9 +4559,9 @@ async function findLatestCairnRun(runsDir = "runs") {
   let newest;
   for (const entry of entries) {
     if (!entry.isDirectory()) continue;
-    const dir = path12.join(runsDir, entry.name);
+    const dir = path13.join(runsDir, entry.name);
     try {
-      const report = await fs14.lstat(path12.join(dir, "report.json"));
+      const report = await fs14.lstat(path13.join(dir, "report.json"));
       if (!report.isFile()) continue;
       if (newest === void 0 || report.mtimeMs > newest.at) {
         newest = { dir, at: report.mtimeMs };
@@ -4329,7 +4580,7 @@ async function readJson(file) {
   }
 }
 async function defaultReadEvidence(dir) {
-  const raw = await readJson(path12.join(dir, "api-evidence.json"));
+  const raw = await readJson(path13.join(dir, "api-evidence.json"));
   if (!Array.isArray(raw)) return void 0;
   return raw.map((r) => {
     const rec = asRecord(r);
@@ -4371,7 +4622,7 @@ function casesFromApi(report, verdicts) {
   });
 }
 async function readCairnRun(dir, deps = {}) {
-  const raw = await readJson(path12.join(dir, "report.json"));
+  const raw = await readJson(path13.join(dir, "report.json"));
   if (raw === void 0) throw new CairnRunNotFoundError(dir);
   const report = asRecord(raw);
   if (report["schemaVersion"] !== SUPPORTED_ARTIFACT_VERSION) {
@@ -4401,20 +4652,20 @@ async function readCairnRun(dir, deps = {}) {
   return {
     schemaVersion: INGEST_SCHEMA_VERSION,
     run: {
-      runId: str(report["runId"], path12.basename(dir)),
+      runId: str(report["runId"], path13.basename(dir)),
       mode,
       target: str(report["url"], "unknown")
     },
     cases
   };
 }
-var fs14, path12, SUPPORTED_ARTIFACT_VERSION, INGEST_SCHEMA_VERSION, NoCairnRunsError, CairnRunNotFoundError, CairnRunVersionError, CairnRunPartialError, CairnEvidenceAmbiguousError, asRecord, str;
+var fs14, path13, SUPPORTED_ARTIFACT_VERSION, INGEST_SCHEMA_VERSION, NoCairnRunsError, CairnRunNotFoundError, CairnRunVersionError, CairnRunPartialError, CairnEvidenceAmbiguousError, asRecord, str;
 var init_cairn_artifact = __esm({
   "src/cli/commands/cairn-artifact.ts"() {
     "use strict";
     init_cjs_shims();
     fs14 = __toESM(require("fs/promises"), 1);
-    path12 = __toESM(require("path"), 1);
+    path13 = __toESM(require("path"), 1);
     SUPPORTED_ARTIFACT_VERSION = 1;
     INGEST_SCHEMA_VERSION = 1;
     NoCairnRunsError = class extends Error {
@@ -4581,7 +4832,7 @@ __export(cases_exports, {
 function gitDirty(file) {
   try {
     const out = (0, import_node_child_process2.execFileSync)("git", ["status", "--porcelain", "--", file], {
-      cwd: path13.dirname(file),
+      cwd: path14.dirname(file),
       stdio: ["ignore", "pipe", "ignore"],
       encoding: "utf8"
     });
@@ -4607,9 +4858,9 @@ async function handlePull(deps = {}) {
   const cwd = deps.cwd ?? process.cwd();
   const apiUrl = resolveApiUrl(deps.apiUrl);
   const token = tokenOf(deps);
-  const file = path13.resolve(cwd, deps.file ?? DEFAULT_CASES_FILE);
+  const file = path14.resolve(cwd, deps.file ?? DEFAULT_CASES_FILE);
   if (fs15.existsSync(file) && !deps.force && (deps.isDirty ?? gitDirty)(file))
-    throw new DirtyFileError(path13.relative(cwd, file) || file);
+    throw new DirtyFileError(path14.relative(cwd, file) || file);
   const doFetch = deps.fetchImpl ?? fetch;
   const endpoint = deps.suiteId !== void 0 ? `${apiUrl}/v1/suites/${encodeURIComponent(deps.suiteId)}/markdown` : `${apiUrl}/v1/test-cases/markdown`;
   let res;
@@ -4624,7 +4875,7 @@ async function handlePull(deps = {}) {
     throw new SyncHttpError(res.status, detail);
   }
   const text2 = await res.text();
-  fs15.mkdirSync(path13.dirname(file), { recursive: true });
+  fs15.mkdirSync(path14.dirname(file), { recursive: true });
   fs15.writeFileSync(file, text2, "utf8");
   return { file, cases: Number(res.headers.get("x-plune-cases") ?? "0") };
 }
@@ -4632,7 +4883,7 @@ async function handlePush(deps = {}) {
   const cwd = deps.cwd ?? process.cwd();
   const apiUrl = resolveApiUrl(deps.apiUrl);
   const token = tokenOf(deps);
-  const file = path13.resolve(cwd, deps.file ?? DEFAULT_CASES_FILE);
+  const file = path14.resolve(cwd, deps.file ?? DEFAULT_CASES_FILE);
   let text2;
   try {
     text2 = fs15.readFileSync(file, "utf8");
@@ -4686,18 +4937,18 @@ function reportCasesFailure(err, write) {
   }
   return null;
 }
-var import_node_child_process2, fs15, path13, DEFAULT_CASES_FILE, DirtyFileError;
+var import_node_child_process2, fs15, path14, DEFAULT_CASES_FILE, DirtyFileError;
 var init_cases = __esm({
   "src/cli/commands/cases.ts"() {
     "use strict";
     init_cjs_shims();
     import_node_child_process2 = require("child_process");
     fs15 = __toESM(require("fs"), 1);
-    path13 = __toESM(require("path"), 1);
+    path14 = __toESM(require("path"), 1);
     init_api_url();
     init_credentials();
     init_sync();
-    DEFAULT_CASES_FILE = path13.join("plune", "cases.md");
+    DEFAULT_CASES_FILE = path14.join("plune", "cases.md");
     DirtyFileError = class extends Error {
       constructor(file) {
         super(`${file} has uncommitted changes; commit them or pass --force to overwrite.`);
@@ -4778,11 +5029,11 @@ module.exports = __toCommonJS(cli_exports);
 init_cjs_shims();
 init_api_url();
 var import_commander = require("commander");
-var import_node_fs4 = require("fs");
-var import_node_path3 = require("path");
+var import_node_fs5 = require("fs");
+var import_node_path4 = require("path");
 var import_node_url = require("url");
-var __dirname = (0, import_node_path3.dirname)((0, import_node_url.fileURLToPath)(importMetaUrl));
-var pkg = JSON.parse((0, import_node_fs4.readFileSync)((0, import_node_path3.join)(__dirname, "..", "package.json"), "utf-8"));
+var __dirname = (0, import_node_path4.dirname)((0, import_node_url.fileURLToPath)(importMetaUrl));
+var pkg = JSON.parse((0, import_node_fs5.readFileSync)((0, import_node_path4.join)(__dirname, "..", "package.json"), "utf-8"));
 function toFormat(s) {
   return s === "json" || s === "markdown" ? s : "console";
 }
@@ -4791,7 +5042,7 @@ function shouldColor(outputPath) {
 }
 function writeReport(text2, outputPath) {
   if (outputPath !== void 0) {
-    (0, import_node_fs4.writeFileSync)(outputPath, text2);
+    (0, import_node_fs5.writeFileSync)(outputPath, text2);
   } else {
     process.stdout.write(text2 + "\n");
   }
@@ -4833,6 +5084,12 @@ function createProgram() {
   const program = new import_commander.Command();
   program.name("plune").description("Plune \u2014 AI-powered assertion testing CLI").version(pkg.version);
   program.option("-c, --config <path>", "Path to plune.yaml config file (applies to all commands)").option("-v, --verbose", "Verbose output, including stack traces on unexpected errors", false).option("--no-color", "Disable colored output regardless of TTY");
+  program.hook("preAction", async (_program, action) => {
+    const { loadEnv: loadEnv2 } = await Promise.resolve().then(() => (init_env(), env_exports));
+    const { config } = action.optsWithGlobals();
+    if (config !== void 0) loadEnv2((0, import_node_path4.dirname)((0, import_node_path4.resolve)(config)));
+    loadEnv2(process.cwd());
+  });
   const runCommand = program.command("run").description("Run assertions against a dataset").option("--dry-run", "Estimate cost/tokens; do not call the model", false).option("--config <path>", "Path to plune.yaml config file").option(
     "--only <selector>",
     "Run a subset by eval id or tag (repeatable)",
@@ -4843,21 +5100,18 @@ function createProgram() {
       const globals = command.optsWithGlobals();
       const configPath = globals.config;
       const [
-        { loadEnv: loadEnv2 },
         { handleRun: handleRun2 },
         { exitCodeFor: exitCodeFor2, RunConfigError: RunConfigError2 },
         { renderReport: renderReport2 },
         { ConfigNotFoundError: ConfigNotFoundError2, ConfigValidationError: ConfigValidationError2, YamlParseError: YamlParseError2 },
         { AuthError: AuthError2 }
       ] = await Promise.all([
-        Promise.resolve().then(() => (init_env(), env_exports)),
         Promise.resolve().then(() => (init_run2(), run_exports)),
         Promise.resolve().then(() => (init_orchestrator(), orchestrator_exports)),
         Promise.resolve().then(() => (init_reporters(), reporters_exports)),
         Promise.resolve().then(() => (init_errors(), errors_exports)),
         Promise.resolve().then(() => (init_errors2(), errors_exports2))
       ]);
-      loadEnv2(configPath !== void 0 ? (0, import_node_path3.dirname)((0, import_node_path3.resolve)(configPath)) : process.cwd());
       try {
         const result = await handleRun2({
           dryRun: options.dryRun,
@@ -5017,13 +5271,11 @@ function createProgram() {
   );
   program.command("report").description("Render the most recent run in a chosen format").option("--format <fmt>", "console | json | markdown", "console").option("-o, --output <path>", "Write the report to a file instead of stdout").action(async (options, command) => {
     const globals = command.optsWithGlobals();
-    const [{ loadEnv: loadEnv2 }, { handleReport: handleReport2, ReportNotFoundError: ReportNotFoundError2 }, { renderReport: renderReport2 }] = await Promise.all([
-      Promise.resolve().then(() => (init_env(), env_exports)),
+    const [{ handleReport: handleReport2, ReportNotFoundError: ReportNotFoundError2 }, { renderReport: renderReport2 }] = await Promise.all([
       Promise.resolve().then(() => (init_report(), report_exports)),
       Promise.resolve().then(() => (init_reporters(), reporters_exports))
     ]);
-    const cwd = globals.config !== void 0 ? (0, import_node_path3.dirname)((0, import_node_path3.resolve)(globals.config)) : process.cwd();
-    loadEnv2(cwd);
+    const cwd = globals.config !== void 0 ? (0, import_node_path4.dirname)((0, import_node_path4.resolve)(globals.config)) : process.cwd();
     try {
       const result = handleReport2({ cwd });
       const text2 = renderReport2(result, toFormat(options.format), {
@@ -5087,10 +5339,10 @@ function createProgram() {
     const { handleLogin: handleLogin2, reportLoginFailure: reportLoginFailure2 } = await Promise.resolve().then(() => (init_login(), login_exports));
     try {
       const token = options.token ?? await readTokenFromStdin();
-      const { path: path14, verified } = await handleLogin2({ token, skipVerify: options.skipVerify });
+      const { path: path15, verified } = await handleLogin2({ token, skipVerify: options.skipVerify });
       process.stdout.write(
-        verified ? `Logged in. Token checked against the API and saved to ${path14}
-` : `Token saved to ${path14} WITHOUT being checked (--skip-verify).
+        verified ? `Logged in. Token checked against the API and saved to ${path15}
+` : `Token saved to ${path15} WITHOUT being checked (--skip-verify).
 `
       );
     } catch (err) {
@@ -5107,9 +5359,9 @@ function createProgram() {
     const verbose = command.optsWithGlobals().verbose === true;
     const { handleLogout: handleLogout2 } = await Promise.resolve().then(() => (init_logout(), logout_exports));
     try {
-      const { removed, path: path14 } = handleLogout2();
+      const { removed, path: path15 } = handleLogout2();
       process.stdout.write(
-        removed ? `Logged out. Removed ${path14}
+        removed ? `Logged out. Removed ${path15}
 ` : "Not logged in \u2014 nothing to remove.\n"
       );
     } catch (err) {
@@ -5120,7 +5372,7 @@ function createProgram() {
     const globals = command.optsWithGlobals();
     const verbose = globals.verbose === true;
     const { handleSync: handleSync2, reportSyncFailure: reportSyncFailure2 } = await Promise.resolve().then(() => (init_sync(), sync_exports));
-    const cwd = globals.config !== void 0 ? (0, import_node_path3.dirname)((0, import_node_path3.resolve)(globals.config)) : process.cwd();
+    const cwd = globals.config !== void 0 ? (0, import_node_path4.dirname)((0, import_node_path4.resolve)(globals.config)) : process.cwd();
     try {
       const { id, url } = await handleSync2({
         cwd,
@@ -5238,7 +5490,7 @@ function isMainModule() {
   const entry = process.argv[1];
   if (entry === void 0) return false;
   try {
-    return (0, import_node_fs4.realpathSync)(entry) === (0, import_node_fs4.realpathSync)((0, import_node_url.fileURLToPath)(importMetaUrl));
+    return (0, import_node_fs5.realpathSync)(entry) === (0, import_node_fs5.realpathSync)((0, import_node_url.fileURLToPath)(importMetaUrl));
   } catch {
     return false;
   }