@keepsnappy/agent 0.1.0-alpha.15 → 0.1.0-alpha.16

package/dist/keepsnappy.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // apps/agent/src/cli.ts
-import { resolve as resolve7 } from "node:path";
+import { resolve as resolve8 } from "node:path";
 import { parseArgs as parseArgs4 } from "node:util";
 
 // apps/agent/src/config.ts
@@ -1664,6 +1664,36 @@ var MEASURES = {
     decimals: 2,
     what: "The share of samples at heat level serious or above"
   },
+  "sampler.thermal.raw_start": {
+    unit: "state",
+    worse: "none",
+    at: ["journey"],
+    producer: "derive",
+    label: "Raw Android thermal status at the start (0–6)",
+    short: "raw Android thermal status at the start (0–6)",
+    decimals: 0,
+    what: "The first raw Android thermal status reported during the journey"
+  },
+  "sampler.thermal.raw_max": {
+    unit: "state",
+    worse: "none",
+    at: ["journey"],
+    producer: "derive",
+    label: "Raw Android thermal status (peak, 0–6)",
+    short: "raw Android thermal status (peak, 0–6)",
+    decimals: 0,
+    what: "The highest raw Android thermal status reported during the journey"
+  },
+  "sampler.thermal.raw_light_share": {
+    unit: "ratio",
+    worse: "none",
+    at: ["journey"],
+    producer: "derive",
+    label: "Share of Android samples at LIGHT or above",
+    short: "share of Android samples at LIGHT or above",
+    decimals: 2,
+    what: "The share of samples with a raw Android thermal status of 1 (LIGHT) or above, among samples reporting that status"
+  },
   "sampler.thermal.heats_up": {
     unit: "share",
     worse: "higher",
@@ -2103,6 +2133,7 @@ var DIMENSIONS = {
 };
 var BREAKDOWN_MEASURES = {
   self_ms: { unit: "ms", worse: "higher", label: "render time", decimals: 1 },
+  rolled_up_ms: { unit: "ms", worse: "none", label: "render time from libraries", decimals: 1 },
   total_ms: { unit: "ms", worse: "higher", label: "total render time", decimals: 1 },
   renders: { unit: "count", worse: "higher", label: "renders", decimals: 0 },
   mounts: { unit: "count", worse: "higher", label: "mounts", decimals: 0 },
@@ -2112,7 +2143,53 @@ var BREAKDOWN_MEASURES = {
 var measureDef = (id) => isMeasureId(id) ? MEASURES[id] : undefined;
 var HEAT_METRIC = "sampler.thermal.heats_up";
 var HEAT_LABEL = MEASURES[HEAT_METRIC].label;
+var FULL_ROW_MS = 2.5;
+// packages/facts/dist/src/components.js
+var FRAGMENT_VERSION = 2;
+var object = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
+var portable = (value) => typeof value === "string" && value.length > 0 && !/^(?:\/|[A-Za-z]:)/.test(value) && !value.includes("\\");
+var componentFile = (file) => portable(file) && !file.split("/").some((part) => part === ".." || part === "." || part === "");
+var isComponentName = (name) => typeof name === "string" && /^[\p{Lu}\p{Lt}][\p{ID_Continue}$\u200C\u200D]*$/u.test(name);
+var encodePart = (part) => encodeURIComponent(part).replace(/%2F/g, "/").replace(/%40/g, "@").replace(/~/g, "%7E");
+function decodePart(part) {
+  try {
+    const decoded = decodeURIComponent(part);
+    return encodePart(decoded) === part ? decoded : null;
+  } catch {
+    return null;
+  }
+}
+function componentKey(name, file) {
+  if (name !== "default" && !isComponentName(name) || !componentFile(file))
+    throw new Error("invalid client component name or file");
+  return `${name}@${encodePart(file)}`;
+}
+function parseComponentKey(key) {
+  if (typeof key !== "string")
+    return null;
+  const separator = key.indexOf("@");
+  const name = key.slice(0, separator);
+  const file = decodePart(key.slice(separator + 1));
+  if (separator < 1 || name !== "default" && !isComponentName(name) || !componentFile(file))
+    return null;
+  return componentKey(name, file) === key ? { name, file } : null;
+}
+function isComponentFragment(value) {
+  if (!object(value) || value.version !== FRAGMENT_VERSION || !portable(value.source) || typeof value.hash !== "string" || !/^[a-f0-9]{64}$/.test(value.hash) || !Array.isArray(value.components))
+    return false;
+  return value.components.every((component) => {
+    if (!object(component) || typeof component.key !== "string")
+      return false;
+    const parsed = parseComponentKey(component.key);
+    return parsed !== null && parsed.name === component.name && parsed.file === component.file && Number.isInteger(component.line) && component.line > 0;
+  });
+}
+function isComponentConfiguration(value) {
+  return object(value) && value.version === FRAGMENT_VERSION && typeof value.directory === "string" && /^[a-zA-Z0-9-]+$/.test(value.directory);
+}
+
 // packages/facts/dist/src/places.js
+var placeWithoutVisit = (id) => placeRef(id).stem.replace(/#(\d+|repeat)$/, "");
 var AFTER_3S = "+3s";
 var kindOf = (stem) => {
   if (stem === "*")
@@ -2136,16 +2213,97 @@ function placeRef(id) {
   const stem = after3s ? id.slice(0, -AFTER_3S.length) : id;
   return { id, kind: kindOf(stem), stem, segment: after3s ? "after3s" : "whole" };
 }
+var placeSegment = (name, file) => `${name}@${encodePart(file)}`;
+var buildPlaceId = (parts) => {
+  if (parts.kind === "screen")
+    return `screen:${parts.screen}#${parts.visit}`;
+  if (parts.kind === "launch")
+    return `launch:${parts.screen}`;
+  return `${parts.kind}:${parts.screen}›${parts.parent ? parts.parent + "›" : ""}${parts.target}${parts.k ? "~" + parts.k : ""}`;
+};
+function parseClientKey(key) {
+  const anonymous = key.startsWith("default@");
+  const parsed = parseComponentKey(anonymous ? "Default" + key.slice(7) : key);
+  if (!parsed)
+    return null;
+  const name = anonymous ? "default" : parsed.name;
+  return placeSegment(name, parsed.file) === key ? { name, file: parsed.file } : null;
+}
+var decodePlaceSegment = (key) => {
+  if (key === "(no screen)")
+    return { key, name: key, file: null };
+  const at = key.indexOf("@");
+  if (at < 1 || at === key.length - 1)
+    return null;
+  try {
+    const name = key.slice(0, at);
+    const file = decodePart(key.slice(at + 1));
+    if (file === null)
+      return null;
+    if (name !== "(outside app components)" && !parseClientKey(key))
+      return null;
+    return placeSegment(name, file) === key ? { key, name, file } : null;
+  } catch {
+    return null;
+  }
+};
+var placeParts = (id) => {
+  const stem = id.replace(/\+3s$/, "");
+  const suffix = /#(\d+|repeat)$/.exec(stem);
+  const base = suffix ? stem.slice(0, suffix.index) : stem;
+  const occurrence = /~(\d+)$/.exec(base);
+  const body = occurrence ? base.slice(0, occurrence.index) : base;
+  const colon = body.indexOf(":");
+  const kind = body.slice(0, colon);
+  if (kind !== "screen" && kind !== "launch" && kind !== "press" && kind !== "drag")
+    return null;
+  const segments = body.slice(colon + 1).split("›");
+  if (kind === "screen" || kind === "launch" ? segments.length !== 1 : segments.length < 2 || segments.length > 3)
+    return null;
+  const parts = segments.map(decodePlaceSegment);
+  if (parts.some((p) => p === null))
+    return null;
+  if (parts.slice(1).some((p) => p.name === "(no screen)"))
+    return null;
+  if (parts.length === 3 && parts[1].name === "(outside app components)")
+    return null;
+  const screen = parts[0];
+  const target = kind === "press" || kind === "drag" ? parts.at(-1) : null;
+  return {
+    kind,
+    screen,
+    target,
+    parent: parts.length === 3 ? parts[1] : null,
+    k: occurrence ? Number(occurrence[1]) : null,
+    visit: suffix ? suffix[1] === "repeat" ? "repeat" : Number(suffix[1]) : null,
+    outsideHost: target?.name === "(outside app components)" ? target.file : null
+  };
+};
 // packages/facts/dist/src/frame.js
 var UNKNOWN_REFRESH_HZ = 60;
 var LIMIT_FRAME_MS = 1000 / 60;
 function frameBudgetMs(refreshHz) {
   return 1000 / (refreshHz !== null && refreshHz !== undefined && Number.isFinite(refreshHz) && refreshHz > 0 ? refreshHz : UNKNOWN_REFRESH_HZ);
 }
+// packages/facts/dist/src/profile-items.js
+function encodeProfileItems(rows, fullRowMs = FULL_ROW_MS) {
+  const components = [], small = [];
+  for (const row of rows) {
+    if (row.selfMs === null || row.selfMs >= fullRowMs)
+      components.push(row);
+    else
+      small.push([row.key ?? row.name, row.selfMs]);
+  }
+  small.sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0]));
+  return { components, ...small.length ? { small } : {} };
+}
 // packages/derive/dist/src/launch.js
 var obj = (v) => typeof v === "object" && v !== null ? v : {};
 var isScreenWindow = (w) => w.raw.kind === "screen" || w.name.startsWith("screen:");
-var launchPlaceOf = (name) => `launch:${name.replace(/^screen:/, "").replace(/#\d+$/, "")}`;
+var launchPlaceOf = (name) => {
+  const p = placeParts(name);
+  return p ? buildPlaceId({ kind: "launch", screen: p.screen.key }) : `launch:${placeWithoutVisit(name).replace(/^screen:/, "")}`;
+};
 var isScreenName = (name) => name.startsWith("screen:") || name.startsWith("launch:");
 function withLaunchNames(windows) {
   const screens = windows.filter(isScreenWindow);
@@ -2154,6 +2312,9 @@ function withLaunchNames(windows) {
   const isLaunch = (w) => marked ? obj(w.raw.screen).launch === true : w === first;
   return windows.map((w) => isScreenWindow(w) && isLaunch(w) ? { ...w, name: launchPlaceOf(w.name) } : w);
 }
+
+// packages/derive/dist/src/model.js
+var DERIVATION_VERSION = 27;
 // packages/stats/dist/src/core/rng.js
 function splitmix32(seed) {
   let s = seed >>> 0;
@@ -3130,7 +3291,7 @@ var obj3 = (v) => typeof v === "object" && v !== null && !Array.isArray(v) ? v :
 var num2 = (v) => typeof v === "number" && Number.isFinite(v) ? v : undefined;
 var round = (x, digits = 3) => Math.round(x * 10 ** digits) / 10 ** digits;
 var HOST_COMPONENTS = new Set(["View", "Text", "Image", "TextInput", "ScrollView"]);
-var isHostComponent = (name) => HOST_COMPONENTS.has(name) || /^RCT[A-Z]/.test(name);
+var isHostComponent = (name) => !parseComponentKey(name) && (HOST_COMPONENTS.has(name) || /^RCT[A-Z]/.test(name));
 function causeCounts(raw, mounts) {
   const c = obj3(raw);
   const out = {};
@@ -3150,7 +3311,7 @@ function causeCounts(raw, mounts) {
   }
   return out;
 }
-function componentRow(row, causes) {
+function componentRow(row, causes, rollup, detail) {
   if (!Array.isArray(row) || typeof row[0] !== "string")
     return;
   const six = row.length >= 6;
@@ -3158,15 +3319,57 @@ function componentRow(row, causes) {
   const mounts = num2(row[2]) ?? 0;
   return {
     name: row[0],
+    ...detail !== false && Object.hasOwn(rollup, row[0]) ? rollupOf(rollup[row[0]]) : {},
     renders,
     mounts,
     instances: six ? num2(row[3]) ?? null : null,
     selfMs: num2(row[six ? 4 : 3]) ?? null,
     totalMs: num2(row[six ? 5 : 4]) ?? null,
-    causes: causeCounts(causes[row[0]], mounts)
+    causes: detail === false ? {} : causeCounts(causes[row[0]], mounts),
+    ...detail === undefined ? {} : { detailRenders: detail ? renders : 0 }
+  };
+}
+function rollupOf(raw) {
+  const x = obj3(raw), rest = obj3(x.rolledUpRest);
+  const rolledUp = (Array.isArray(x.rolledUp) ? x.rolledUp : []).flatMap((row) => Array.isArray(row) && typeof row[0] === "string" && num2(row[1]) !== undefined && num2(row[2]) !== undefined ? [{ name: row[0], ms: row[1], renders: row[2] }] : []);
+  return {
+    rolledUp,
+    rolledUpRest: { ms: num2(rest.ms) ?? 0, n: num2(rest.n) ?? 0, ...rest.saturated === true ? { saturated: true } : {} },
+    ...typeof x.parent === "string" ? { parent: x.parent, parentOccurrences: { [x.parent]: 1 } } : {},
+    ...num2(x.rolledUpMs) === undefined ? {} : { rolledUpMs: num2(x.rolledUpMs) }
+  };
+}
+function mergeRollups(a, b) {
+  const names = new Map;
+  for (const row of [...a.rolledUp ?? [], ...b.rolledUp ?? []]) {
+    const was = names.get(row.name);
+    names.set(row.name, { name: row.name, ms: (was?.ms ?? 0) + row.ms, renders: (was?.renders ?? 0) + row.renders });
+  }
+  const x = a.rolledUpRest, y = b.rolledUpRest;
+  return { rolledUp: [...names.values()], rolledUpRest: {
+    ms: (x?.ms ?? 0) + (y?.ms ?? 0),
+    n: Math.max(x?.n ?? 0, y?.n ?? 0),
+    ...x?.saturated || y?.saturated ? { saturated: true } : {},
+    ...x?.nAtLeast || y?.nAtLeast || x?.n && y?.n ? { nAtLeast: true } : {}
+  } };
+}
+function shownRollup(r, n) {
+  const ranked = [...r.rolledUp ?? []].sort((a, b) => b.ms - a.ms || a.name.localeCompare(b.name));
+  const cut = ranked.slice(5), rest = r.rolledUpRest;
+  return {
+    rolledUp: ranked.slice(0, 5).map((x) => ({ name: x.name, ms: round(x.ms / n), renders: round(x.renders / n) })),
+    rolledUpRest: { ms: round(((rest?.ms ?? 0) + cut.reduce((s, x) => s + x.ms, 0)) / n), n: Math.max(rest?.n ?? 0, cut.length), ...rest?.saturated ? { saturated: true } : {}, ...rest?.nAtLeast || rest?.n && cut.length ? { nAtLeast: true } : {} }
   };
 }
-function windowProfile(raw) {
+function outsideOf(profiles, n) {
+  const parts = profiles.flatMap((p) => p.outside ? [p.outside] : []);
+  if (!parts.length)
+    return {};
+  const merged = parts.reduce((a, b) => mergeRollups(a, b), {});
+  return { outside: { ...n === undefined ? merged : shownRollup(merged, n), selfMs: round(parts.reduce((s, p) => s + p.selfMs, 0) / (n ?? 1)), mountSelfMs: round(parts.reduce((s, p) => s + p.mountSelfMs, 0) / (n ?? 1)) } };
+}
+var stampsOf = (ps) => ps.every((p) => p.stamped !== undefined) ? { stamped: ps.reduce((s, p) => s + p.stamped, 0) } : {};
+function windowProfile(raw, detailCoverage = true) {
   const p = obj3(obj3(raw.react).profile);
   if (p.renderer !== "profiling" && p.renderer !== "production")
     return;
@@ -3187,11 +3390,14 @@ function windowProfile(raw) {
   }
   return {
     renderer: p.renderer,
+    ...Number.isSafeInteger(p.slowestCommitSeq) && p.slowestCommitSeq >= 0 && num2(r.max) !== undefined && r.max >= 0 ? { slowestCommit: { seq: p.slowestCommitSeq, endAtMs: num2(p.slowestCommitEndAtMs) ?? null, ms: r.max } } : {},
     commits: num2(p.commits) ?? 0,
+    ...num2(p.stamped) === undefined ? {} : { stamped: num2(p.stamped) },
+    ...p.outside && p.renderer === "profiling" ? { outside: { ...rollupOf(p.outside), selfMs: num2(obj3(p.outside).selfMs) ?? 0, mountSelfMs: num2(obj3(p.outside).mountSelfMs) ?? 0 } } : {},
     renderMs: p.renderer === "profiling" && sum !== undefined ? { sum, max: num2(r.max) ?? sum, n: num2(r.n) ?? 0 } : null,
     overBudget: Object.keys(overBudget).length ? overBudget : null,
     updaters,
-    components: (Array.isArray(p.components) ? p.components : []).map((row) => componentRow(row, causes)).filter((c) => !!c),
+    components: (Array.isArray(p.components) ? p.components : []).map((row, index) => componentRow(row, causes, obj3(p.rollup), detailCoverage ? index < (num2(p.detailRows) ?? Infinity) : undefined)).filter((c) => !!c),
     omitted: num2(p.omitted) ?? 0,
     selfMsTotal: num2(p.selfMsTotal) ?? null,
     mountSelfMs: num2(p.mountSelfMs) ?? null
@@ -3242,13 +3448,23 @@ function addComponent(into, c) {
   into.set(c.name, {
     name: c.name,
     renders: was.renders + c.renders,
+    ...was.detailRenders === undefined && c.detailRenders === undefined ? {} : { detailRenders: (was.detailRenders ?? was.renders) + (c.detailRenders ?? c.renders) },
     mounts: was.mounts + c.mounts,
     instances: was.instances === null && c.instances === null ? null : Math.max(was.instances ?? 0, c.instances ?? 0),
     selfMs: plus(was.selfMs, c.selfMs),
     totalMs: plus(was.totalMs, c.totalMs),
-    causes
+    causes,
+    ...was.rolledUpMs === undefined && c.rolledUpMs === undefined ? {} : { rolledUpMs: (was.rolledUpMs ?? 0) + (c.rolledUpMs ?? 0), ...mergeRollups(was, c) },
+    ...mergedParent(was, c)
   });
 }
+function mergedParent(a, b) {
+  const counts = { ...a.parentOccurrences };
+  for (const [k, v] of Object.entries(b.parentOccurrences ?? {}))
+    counts[k] = (counts[k] ?? 0) + v;
+  const parent = Object.keys(counts).sort((a, b) => counts[b] - counts[a] || a.localeCompare(b))[0];
+  return parent ? { parent, parentOccurrences: counts } : {};
+}
 function exactMountOf(profiles) {
   let selfMsTotal = 0;
   let mountSelfMs = 0;
@@ -3262,17 +3478,20 @@ function exactMountOf(profiles) {
   }
   return { selfMsTotal, mountSelfMs };
 }
-function occurrence(windows, budgetMs, idleNeutral = false, frameMs, upper = false) {
+function occurrence(windows, budgetMs, idleNeutral = false, frameMs, upper = false, allComponents = false) {
   const picked = [];
   for (const cl of clusters(windows)) {
     const withProfile = cl.flatMap((w) => {
-      const p = windowProfile(w.raw);
+      const p = windowProfile(w.raw, allComponents);
       return p ? [{ w, p }] : [];
     });
     if (!withProfile.length)
       continue;
     const weight = (x) => x.p.renderMs?.sum ?? x.p.components.reduce((s, c) => s + c.renders, 0);
-    picked.push(withProfile.reduce((best, x) => weight(x) > weight(best) || weight(x) === weight(best) && x.w.endWall - x.w.startWall > best.w.endWall - best.w.startWall ? x : best));
+    picked.push(withProfile.reduce((best, x) => {
+      const span = (y) => y.w.endWall - y.w.startWall;
+      return weight(x) > weight(best) || weight(x) === weight(best) && (span(x) > span(best) || allComponents && span(x) === span(best) && windowOrder(x.w, best.w) < 0) ? x : best;
+    }));
   }
   if (!picked.length)
     return;
@@ -3295,10 +3514,13 @@ function occurrence(windows, budgetMs, idleNeutral = false, frameMs, upper = fal
       overFrame = f === undefined || overFrame === undefined ? undefined : overFrame + f;
     }
   }
+  const chosen = [...picked].sort((a, b) => (b.p.renderMs?.max ?? -1) - (a.p.renderMs?.max ?? -1) || windowOrder(a.w, b.w))[0];
   const renderMs = timed ? picked.reduce((s, x) => s + (x.p.renderMs?.sum ?? 0), 0) : allIdle ? 0 : undefined;
   const parts = picked.map((x) => timerCarriedRenderMs(x.w.raw));
   const carried = parts.every((v) => v !== undefined) ? parts.reduce((s, v) => s + v, 0) : undefined;
   return {
+    window: chosen.w,
+    ...chosen.p.slowestCommit ? { slowestCommit: chosen.p.slowestCommit } : {},
     renderer: timed ? "profiling" : "production",
     commits: picked.reduce((s, x) => s + x.p.commits, 0),
     renderMs,
@@ -3308,20 +3530,24 @@ function occurrence(windows, budgetMs, idleNeutral = false, frameMs, upper = fal
     updaters,
     components,
     omitted: picked.reduce((s, x) => s + x.p.omitted, 0),
-    distinctInWindow: Math.max(...picked.map((x) => x.p.components.length + x.p.omitted)),
+    distinctInWindow: Math.max(...picked.map((x) => (allComponents ? x.p.components.filter((c) => !isHostComponent(c.name)).length : x.p.components.length) + x.p.omitted)),
     exactMount: exactMountOf(picked.map((x) => x.p)),
+    ...outsideOf(picked.map((x) => x.p)),
+    ...stampsOf(picked.map((x) => x.p)),
     ...allIdle ? { idle: true } : {},
     ...upper ? { timerCarriedMs: carried, renderMsUpper: renderMs === undefined || carried === undefined ? undefined : renderMs + carried } : {}
   };
 }
 var UPDATERS_KEPT = 5;
+var CPU_FUNCTIONS_KEPT = 10;
+var UNTIMED_COMPONENTS_KEPT = 10;
 var topCauses = (causes, renders) => {
   if (renders <= 0)
     return {};
   const entries = Object.entries(causes).sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0])).slice(0, 3);
   return Object.fromEntries(entries.map(([k, v]) => [k, round(v / renders)]));
 };
-function stepProfile(step, occ, budgetMs, topN, cpu, exactMount) {
+function stepProfile(step, occ, budgetMs, topN, cpu, exactMount, fullRowMs) {
   const n = occ.length;
   const mean = (x) => x / n;
   const timed = occ.every((o) => o.renderer === "profiling");
@@ -3334,8 +3560,9 @@ function stepProfile(step, occ, budgetMs, topN, cpu, exactMount) {
   const host = [...all.values()].filter((c) => isHostComponent(c.name));
   const rank = (a, b) => (timed ? (b.selfMs ?? 0) - (a.selfMs ?? 0) : 0) || b.renders - a.renders || a.name.localeCompare(b.name);
   own.sort(rank);
-  const kept = own.slice(0, topN);
-  const rest = own.slice(topN);
+  const limit = fullRowMs === undefined ? topN : timed ? own.length : UNTIMED_COMPONENTS_KEPT;
+  const kept = own.slice(0, limit);
+  const rest = own.slice(limit);
   const ms = (x) => timed && x !== null ? round(mean(x)) : null;
   const updaters = {};
   for (const o of occ)
@@ -3361,31 +3588,36 @@ function stepProfile(step, occ, budgetMs, topN, cpu, exactMount) {
     cpuOut = {
       busyMs: round(median(cpu.map((c) => c.busyMs))),
       symbolicated: sym.length ? sym.every(Boolean) : null,
-      functions: [...fns.values()].sort((a, b) => b.self - a.self || a.key.localeCompare(b.key)).slice(0, topN).map((f) => ({ key: f.key, name: f.name, selfMs: round(f.self / k), totalMs: f.total === null ? null : round(f.total / k) }))
+      functions: [...fns.values()].sort((a, b) => b.self - a.self || a.key.localeCompare(b.key)).slice(0, fullRowMs === undefined ? topN : CPU_FUNCTIONS_KEPT).map((f) => ({ key: f.key, name: f.name, selfMs: round(f.self / k), totalMs: f.total === null ? null : round(f.total / k) }))
     };
   }
+  const rows = kept.map((c) => ({
+    key: c.name,
+    ...c.parent ? { parent: c.parent } : {},
+    ...c.rolledUpMs === undefined ? {} : { rolledUpMs: round(mean(c.rolledUpMs)), ...shownRollup(c, n) },
+    name: c.name,
+    renders: round(mean(c.renders)),
+    mounts: round(mean(c.mounts)),
+    instances: c.instances,
+    selfMs: ms(c.selfMs),
+    totalMs: ms(c.totalMs),
+    causes: topCauses(c.causes, c.detailRenders ?? c.renders)
+  }));
   return {
     step,
     occurrences: n,
+    ...outsideOf(occ, n),
+    ...stampsOf(occ),
     renderer,
     frameBudgetMs: round(budgetMs, 1),
     commits: round(mean(commits)),
     renderMs: timed ? round(mean(occ.reduce((s, o) => s + (o.renderMs ?? 0), 0))) : null,
     commitMaxMs: timed ? round(Math.max(...occ.map((o) => o.commitMaxMs ?? 0))) : null,
-    components: kept.map((c) => ({
-      key: c.name,
-      name: c.name,
-      renders: round(mean(c.renders)),
-      mounts: round(mean(c.mounts)),
-      instances: c.instances,
-      selfMs: ms(c.selfMs),
-      totalMs: ms(c.totalMs),
-      causes: topCauses(c.causes, c.renders)
-    })),
+    ...fullRowMs !== undefined && timed ? encodeProfileItems(rows, fullRowMs) : { components: rows },
     host: { renders: round(mean(host.reduce((s, c) => s + c.renders, 0))), selfMs: ms(host.reduce((s, c) => s + (c.selfMs ?? 0), 0)) },
     omitted: {
       count: rest.length,
-      selfMs: ms(rest.reduce((s, c) => s + (c.selfMs ?? 0), 0)),
+      selfMs: fullRowMs !== undefined && timed && occ.some((o) => o.omitted > 0) ? exact.every((e) => e !== undefined) ? Math.max(0, ms(exact.reduce((s, e) => s + e.selfMsTotal, 0) - [...all.values()].reduce((s, c) => s + (c.selfMs ?? 0), 0) - occ.reduce((s, o) => s + (o.outside?.selfMs ?? 0), 0))) : null : ms(rest.reduce((s, c) => s + (c.selfMs ?? 0), 0)),
       sdkOmitted: occ.reduce((s, o) => s + o.omitted, 0)
     },
     updaters: commits > 0 ? Object.entries(updaters).sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0])).slice(0, UPDATERS_KEPT).map(([k, v]) => [k, round(v / commits)]) : [],
@@ -3423,7 +3655,7 @@ function profileMetrics(windows, steps, options = {}) {
   for (const [name, all] of [...byName].sort((a, b) => a[0].localeCompare(b[0])))
     groups.push([name, all.map((w) => [w])]);
   for (const [key, occs] of groups) {
-    const found = occs.map((ws) => occurrence(ws.filter((w) => w.raw.endReason !== "timeout"), budget, options.idleWindowsNeutral, options.countFrameMs, options.upperBound === true)).filter((o) => !!o);
+    const found = occs.map((ws) => occurrence(ws.filter((w) => w.raw.endReason !== "timeout"), budget, options.idleWindowsNeutral, options.countFrameMs, options.upperBound === true, options.fullRowMs !== undefined)).filter((o) => !!o);
     const decided = found.some((o) => !o.idle) && found.every((o) => o.idle || o.renderer === "profiling");
     const occ = decided ? found.map((o) => o.idle ? { ...o, renderer: "profiling" } : o) : found;
     const cpu = options.cpu?.get(key);
@@ -3438,10 +3670,21 @@ function profileMetrics(windows, steps, options = {}) {
       if (vals.length && vals.every((v) => v !== undefined))
         metrics.set(`${key}.${f}`, median(vals));
     }
-    profiles.push(stepProfile(key, occ, budget, topN, cpu, options.exactMount === true));
+    const profile = stepProfile(key, occ, budget, topN, cpu, options.exactMount === true, options.fullRowMs);
+    const kind = placeRef(key).kind;
+    const active = occ.filter((o) => !o.idle);
+    const selected = middleBy((active.length ? active : occ).filter((o) => o.window), (o) => o.commitMaxMs, (o) => num2(o.window.raw.id) ?? 0, (o) => num2(o.window.raw.t0) ?? o.window.startWall);
+    const identity = options.commitIdentity && metrics.has(`${key}.commit_max_ms`) && ["screen", "press", "drag", "other"].includes(kind) && selected?.slowestCommit;
+    const openedBy = selected?.window ? options.openedBy?.get(selected.window) : undefined;
+    profiles.push({ ...profile, ...identity ? { slowestCommit: identity } : {}, ...openedBy ? { openedBy } : {} });
   }
   return { metrics, profiles };
 }
+var windowOrder = (a, b) => (num2(a.raw.id) ?? 0) - (num2(b.raw.id) ?? 0) || (num2(a.raw.t0) ?? a.startWall) - (num2(b.raw.t0) ?? b.startWall);
+function middleBy(items, time, id, t0) {
+  const ordered = [...items].sort((a, b) => (time(a) ?? -1) - (time(b) ?? -1) || id(a) - id(b) || t0(a) - t0(b));
+  return ordered[Math.floor((ordered.length - 1) / 2)];
+}
 
 // packages/derive/dist/src/facts.js
 var ROUTE_CHANGE_ROW = "route_change";
@@ -4287,6 +4530,14 @@ function v6Metrics(windows, samples, t0, t1, version) {
     out.set("sampler.thermal.start", thermal[0]);
     out.set("sampler.thermal.hot_share", thermal.filter((v) => v >= 2).length / thermal.length);
   }
+  if (version >= 27) {
+    const raw = inRun.map((s) => num7(s.raw.thermalRaw)).filter((v) => v !== undefined);
+    if (raw.length) {
+      out.set("sampler.thermal.raw_start", raw[0]);
+      out.set("sampler.thermal.raw_max", Math.max(...raw));
+      out.set("sampler.thermal.raw_light_share", raw.filter((v) => v >= 1).length / raw.length);
+    }
+  }
   const hz = inRun.map((s) => num7(obj7(s.raw.frames).maxHz)).filter((v) => v !== undefined);
   if (hz.length)
     out.set("sampler.max_hz", Math.max(...hz));
@@ -4601,12 +4852,14 @@ function endsHome(windows, endCommandWall) {
 }
 function endMetrics(markers, events, samples, windows, launchMb, opts = {}) {
   const out = new Map;
-  const n = markers.some((m) => m.phase === "start") ? runEndCommand(markers, events, windows) : null;
+  const declared = markers.some((m) => m.phase === "start");
+  const readsEnd = declared || opts.markerless === true && events.gc.length > 0;
+  const n = readsEnd ? runEndCommand(markers, events, windows) : null;
   const command = n === null ? undefined : events.gc.find((g) => g.n === n && g.status === "ok");
-  const home = endsHome(windows, command?.wall);
+  const home = endsHome(windows, declared ? command?.wall : undefined);
   if (home !== undefined)
     out.set("sdk.journey_ends_home", home);
-  if (!markers.some((m) => m.phase === "start"))
+  if (!readsEnd)
     return out;
   out.set("sdk.end_gc", command ? 1 : 0);
   const g = n === null ? undefined : cleanOf(events, windows).get(n);
@@ -4614,6 +4867,8 @@ function endMetrics(markers, events, samples, windows, launchMb, opts = {}) {
     return out;
   const post = g.post === undefined ? undefined : footprintsBySeq(samples).get(g.post);
   const manual = opts.manualRead ? manualReadFootprint(samples, g.n) : undefined;
+  if (!declared && manual === undefined)
+    return out;
   const footprint = manual ?? post;
   if (footprint !== undefined) {
     if (opts.manualRead)
@@ -4678,8 +4933,7 @@ function keyFirstOpens(windows) {
 }
 
 // packages/derive/dist/src/derive.js
-var DERIVATION_VERSION = 23;
-var DERIVATION_VERSIONS = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23];
+var DERIVATION_VERSIONS = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 26, 27];
 var windowsForVersion = (windows, version = DERIVATION_VERSION) => version >= 22 ? keyFirstOpens(windows) : windows;
 function stepWindowsFor(windows, version = DERIVATION_VERSION) {
   return windowsForVersion(version >= 16 ? withLaunchNames(windows).filter((w) => !isBackgroundWindow(w)) : windows, version);
@@ -4698,6 +4952,22 @@ function samplerFrameBudgetMs(samples) {
   }
   return hz > 1 ? frameBudgetMs(Math.round(hz)) : undefined;
 }
+function profileOptions(windows, version, processWindows = windows) {
+  if (version < 26)
+    return {};
+  const processes = new Set(processWindows.map((w) => w.raw.react?.causes?.process).filter((p) => typeof p === "string"));
+  const presses = windows.filter((w) => w.raw.kind === "press" && placeRef(w.name).kind === "press" && placeRef(w.name).segment !== "after3s").sort((a, b) => appClock(b)[0] - appClock(a)[0] || a.name.localeCompare(b.name));
+  const openedBy = new Map;
+  for (const screen of windows.filter((w) => placeRef(w.name).kind === "screen")) {
+    const start = appClock(screen)[0], opener = presses.find((w) => {
+      const [from, to] = appClock(w);
+      return from <= start && start < to;
+    });
+    if (opener)
+      openedBy.set(screen, opener.name);
+  }
+  return { fullRowMs: FULL_ROW_MS, commitIdentity: processes.size <= 1, openedBy };
+}
 function deriveRun(input) {
   const { run, markers = [], ri, clockOffsetMs, samples = [], memWindow } = input;
   const version = input.derivationVersion ?? DERIVATION_VERSION;
@@ -4719,7 +4989,9 @@ function deriveRun(input) {
     return { rows, steps, run: final, profiles: [], derivationVersion: version };
   const budget = input.frameBudgetMs ?? (version >= 6 ? samplerFrameBudgetMs(samplesInRun(samples, final.t0, final.t1)) : undefined);
   const compareMs = version >= 20 ? LIMIT_FRAME_MS : budget ?? frameBudgetMs();
+  const allComponents = profileOptions(windows, version, input.windows);
   const prof = profileMetrics(windows, steps, {
+    ...allComponents,
     frameBudgetMs: version >= 11 ? compareMs : Number(compareMs.toFixed(1)),
     ...version >= 12 ? { countFrameMs: LIMIT_FRAME_MS } : {},
     ...cpu === undefined ? {} : { cpu },
@@ -4729,6 +5001,7 @@ function deriveRun(input) {
     ...version >= 16 ? { upperBound: true } : {}
   });
   const bg = backgroundMetrics(background, {
+    ...allComponents,
     frameBudgetMs: compareMs,
     countFrameMs: LIMIT_FRAME_MS,
     ...input.profileTopN === undefined ? {} : { topN: input.profileTopN },
@@ -4759,7 +5032,7 @@ function deriveRun(input) {
   if (version >= 19) {
     const events = input.events ?? { gc: [], appState: [] };
     const launch = extra.get("mem.launch_mb");
-    for (const [k, v] of [...endMetrics(markers, events, samplesInRun(samples, final.t0, final.t1), sdkWindows, launch, { manualRead: version >= 23 }), ...jsHeapMetrics(events, sdkWindows)])
+    for (const [k, v] of [...endMetrics(markers, events, samplesInRun(samples, final.t0, final.t1), sdkWindows, launch, { manualRead: version >= 23, markerless: version >= 24 }), ...jsHeapMetrics(events, sdkWindows)])
       extra.set(k, v);
   }
   const base = { run_id: final.run_id, arm: final.arm, block: final.block, valid: final.valid, invalid_reason: final.invalid_reason };
@@ -4962,44 +5235,24 @@ async function uploadRuns(deps, outDir, runs, opts) {
   return { uploaded, skipped };
 }
 
-// packages/present/dist/src/places.js
-var PLACE_KIND_WORDS = {
-  screen: "Screen",
-  launch: "Launch screen",
-  tap: "Tap",
-  scroll: "Scroll",
-  step: "Test step",
-  journey: "Whole journey",
-  background: "Background",
-  after3s: "3 s after"
-};
-var KIND_WORD = {
-  journey: PLACE_KIND_WORDS.journey,
-  screen: PLACE_KIND_WORDS.screen,
-  launch: PLACE_KIND_WORDS.launch,
-  press: PLACE_KIND_WORDS.tap,
-  drag: PLACE_KIND_WORDS.scroll,
-  step: PLACE_KIND_WORDS.step,
-  background: PLACE_KIND_WORDS.background
-};
-var BACKGROUND_SOURCES = {
-  websocket: "data pushed over a WebSocket",
-  launch: "work started at app launch",
-  link: "work of a deep link outside its screen",
-  touch: "work of a tap outside its window",
-  input: "work of typing outside its window"
-};
-var OPEN_MARK = /#(1|repeat)$/;
+// packages/present/dist/src/capital.js
+var upperFirst = (s) => s ? s.charAt(0).toUpperCase() + s.slice(1) : s;
+
+// packages/present/dist/src/placeWords.js
 var GENERIC_GROUPS = new Set(["app", "tabs", "root"]);
 var ORDINAL_SUFFIXES = ["th", "st", "nd", "rd"];
 var LAST_TEEN = 13;
 var FIRST_TEEN = 11;
 var words = (s) => s.replace(/[._\-]+/g, " ").replace(/\s+/g, " ").trim();
 var cap = (s) => s ? s[0].toUpperCase() + s.slice(1) : s;
+var nameWords = (s) => cap(words(s));
 var ordinal = (n) => {
   const inTeens = n % 100 >= FIRST_TEEN && n % 100 <= LAST_TEEN;
   return `${n}${inTeens ? "th" : ORDINAL_SUFFIXES[n % 10] ?? "th"}`;
 };
+function routeFileName(path) {
+  return path.split("/").filter((p) => p && !/^\(.*\)$/.test(p) && p !== "index").map(nameWords).join(" ") || "App start";
+}
 function screenName(path) {
   const parts = path.split("/").filter((p) => p && p !== "__root");
   const plain = parts.filter((p) => !/^\(.*\)$/.test(p) && !/^\[.*\]$/.test(p) && p !== "index");
@@ -5011,50 +5264,7 @@ function screenName(path) {
   const name = cap(words(leaf));
   return group && !GENERIC_GROUPS.has(group) && !plain.slice(0, -1).length ? `${cap(words(group))} › ${name}` : name;
 }
-function stemName(stem, kind) {
-  if (kind === "journey")
-    return PLACE_KIND_WORDS.journey;
-  if (kind === "other")
-    return words(stem);
-  const rest = stem.slice(stem.indexOf(":") + 1).replace(kind === "press" || kind === "drag" ? OPEN_MARK : /$^/, "");
-  if (kind === "background")
-    return `${KIND_WORD.background}: ${BACKGROUND_SOURCES[rest] ?? words(rest)}`;
-  if (kind === "launch")
-    return `${KIND_WORD.launch}: ${screenName(rest)}`;
-  if (kind !== "screen")
-    return `${KIND_WORD[kind]}: ${words(rest)}`;
-  const visitMark = /^(.*)#(\d+)$/.exec(rest);
-  const visit = visitMark ? Number(visitMark[2]) : 1;
-  return `${PLACE_KIND_WORDS.screen}: ${screenName(visitMark ? visitMark[1] : rest)}${visit > 1 ? ` (${ordinal(visit)} visit)` : ""}`;
-}
-function windowName(id) {
-  if (id === "flow")
-    return PLACE_KIND_WORDS.journey;
-  const ref = placeRef(id);
-  const name = stemName(ref.stem, ref.kind);
-  return ref.segment === "after3s" ? `${name} · ${PLACE_KIND_WORDS.after3s}` : name;
-}
-function placeKindWord(id) {
-  if (id === "flow")
-    return PLACE_KIND_WORDS.journey;
-  const { kind } = placeRef(id);
-  return kind === "other" ? "Window" : KIND_WORD[kind];
-}
-var ELEMENT_SEPARATORS = /(?<!\d)\.|\.(?!\d)|[_-]+/g;
-var elementWords = (testId) => testId.replace(ELEMENT_SEPARATORS, " ").replace(/\s+/g, " ").trim();
-function placeLabel(id, screen) {
-  if (id === "flow")
-    return PLACE_KIND_WORDS.journey;
-  const ref = placeRef(id);
-  const after = ref.segment === "after3s" ? ` · ${PLACE_KIND_WORDS.after3s}` : "";
-  if (ref.kind === "press" || ref.kind === "drag" || ref.kind === "step") {
-    const element = elementWords(ref.stem.slice(ref.stem.indexOf(":") + 1).replace(OPEN_MARK, ""));
-    return `${KIND_WORD[ref.kind]} · “${element}”${screen ? ` · ${screen}` : ""}${after}`;
-  }
-  const name = windowName(ref.stem);
-  const colon = name.indexOf(": ");
-  return `${colon > 0 && ref.kind !== "other" ? `${name.slice(0, colon)} · ${name.slice(colon + 2)}` : name}${after}`;
-}
+
 // packages/present/dist/src/states.js
 var STATE_WORDS = {
   worse: "Worse",
@@ -5064,7 +5274,9 @@ var STATE_WORDS = {
   "cant-tell": "Can’t tell"
 };
 var INFO_WORDS = { heat: "Phone heated up" };
+var isWorseState = (state) => state === "worse";
 var NOT_BLOCKING = "not blocking";
+
 // packages/present/dist/src/values.js
 var NO_VALUE = "–";
 var FALLBACK_DECIMALS = 1;
@@ -5120,6 +5332,143 @@ function fieldValueText(field, v) {
   const def = fieldDef(field.split(KEY_SEPARATOR)[0]);
   return format(def?.unit, def?.decimals ?? FALLBACK_DECIMALS, v);
 }
+
+// packages/present/dist/src/rowWords.js
+var GONE_TAILS = {
+  branch: { notInRun: "on main, not in this run", removed: "on main, not rendered in this run" },
+  journey: { notInRun: "in the sessions before, not in the newest session", removed: "in the sessions before, not rendered in the newest session" }
+};
+var ROW_STATE_WORDS = {
+  new: "New in this PR: not compared with main",
+  notInRun: upperFirst(GONE_TAILS.branch.notInRun),
+  removed: upperFirst(GONE_TAILS.branch.removed)
+};
+var JOURNEY_ROW_WORDS = {
+  new: "New in the newest session: not compared with the sessions before",
+  notInRun: upperFirst(GONE_TAILS.journey.notInRun),
+  removed: upperFirst(GONE_TAILS.journey.removed)
+};
+function placeShownName(p, o = {}) {
+  const target = p.target ? componentShownName(p.target.name, p.target.file) : libraryViewName(p.kind, p.host ?? "");
+  const named = p.target && p.parent ? `${target} in ${componentShownName(p.parent.name, p.parent.file)}${p.k ? `, ${ordinal(p.k)}` : ""}` : target;
+  return o.onScreen ? `${named} on ${o.onScreen}` : named;
+}
+var libraryViewName = (kind, hostType) => `${kind === "drag" ? "Scroll" : "Tap"} outside app components (${hostType})`;
+function componentShownName(name, file) {
+  if (name !== "default")
+    return name;
+  const path = file.replace(/\.[^.\/]+$/, "");
+  const route = /^(?:src\/)?app\/(.*)$/.exec(path)?.[1];
+  const parts = path.split("/");
+  const stem = parts.at(-1) ?? "";
+  if (route !== undefined && stem !== "_layout")
+    return routeFileName(route);
+  const label = stem === "index" || stem === "_layout" ? parts.at(-2) ?? stem : stem;
+  return nameWords(label);
+}
+
+// packages/present/dist/src/places.js
+var PLACE_KIND_WORDS = {
+  screen: "Screen",
+  launch: "Launch screen",
+  tap: "Tap",
+  scroll: "Scroll",
+  step: "Test step",
+  journey: "Whole journey",
+  background: "Background",
+  after3s: "3 s after"
+};
+var KIND_WORD = {
+  journey: PLACE_KIND_WORDS.journey,
+  screen: PLACE_KIND_WORDS.screen,
+  launch: PLACE_KIND_WORDS.launch,
+  press: PLACE_KIND_WORDS.tap,
+  drag: PLACE_KIND_WORDS.scroll,
+  step: PLACE_KIND_WORDS.step,
+  background: PLACE_KIND_WORDS.background
+};
+var BACKGROUND_SOURCES = {
+  websocket: "data pushed over a WebSocket",
+  launch: "work started at app launch",
+  link: "work of a deep link outside its screen",
+  touch: "work of a tap outside its window",
+  input: "work of typing outside its window"
+};
+var OPEN_MARK = /#(1|repeat)$/;
+function placeIdShownName(id, o = {}) {
+  const p = placeParts(id);
+  if (!p)
+    return null;
+  const component = (part) => ({ name: part.name, file: part.file ?? "" });
+  const screen = p.screen.name === "(no screen)" ? "" : p.screen.name === "(outside app components)" ? screenName(p.screen.file ?? "") : componentShownName(p.screen.name, p.screen.file ?? "");
+  if (p.kind === "screen" || p.kind === "launch")
+    return screen + (p.kind === "screen" && typeof p.visit === "number" && p.visit > 1 ? ` (${ordinal(p.visit)} visit)` : "");
+  return placeShownName({ kind: p.kind, target: p.outsideHost === null ? component(p.target) : null, parent: p.parent ? component(p.parent) : null, k: p.k, ...p.outsideHost === null ? {} : { host: p.outsideHost } }, { onScreen: o.onScreen === false ? undefined : screen });
+}
+var isLibraryPlace = (id) => placeParts(id)?.outsideHost != null;
+function stemName(stem, kind) {
+  const shown = placeIdShownName(stem);
+  if (shown !== null)
+    return isLibraryPlace(stem) ? shown : `${KIND_WORD[kind]}: ${shown}`;
+  if (kind === "journey")
+    return PLACE_KIND_WORDS.journey;
+  if (kind === "other")
+    return words(stem);
+  const rest = stem.slice(stem.indexOf(":") + 1).replace(kind === "press" || kind === "drag" ? OPEN_MARK : /$^/, "");
+  if (kind === "background")
+    return `${KIND_WORD.background}: ${BACKGROUND_SOURCES[rest] ?? words(rest)}`;
+  if (kind === "launch")
+    return `${KIND_WORD.launch}: ${screenName(rest)}`;
+  if (kind !== "screen")
+    return `${KIND_WORD[kind]}: ${words(rest)}`;
+  const visitMark = /^(.*)#(\d+)$/.exec(rest);
+  const visit = visitMark ? Number(visitMark[2]) : 1;
+  return `${PLACE_KIND_WORDS.screen}: ${screenName(visitMark ? visitMark[1] : rest)}${visit > 1 ? ` (${ordinal(visit)} visit)` : ""}`;
+}
+function windowName(id) {
+  if (id === "flow")
+    return PLACE_KIND_WORDS.journey;
+  const ref = placeRef(id);
+  const name = stemName(ref.stem, ref.kind);
+  return ref.segment === "after3s" ? `${name} · ${PLACE_KIND_WORDS.after3s}` : name;
+}
+function placeKindWord(id) {
+  if (id === "flow")
+    return PLACE_KIND_WORDS.journey;
+  const { kind } = placeRef(id);
+  return kind === "other" ? "Window" : KIND_WORD[kind];
+}
+var ELEMENT_SEPARATORS = /(?<!\d)\.|\.(?!\d)|[_-]+/g;
+var elementWords = (testId) => testId.replace(ELEMENT_SEPARATORS, " ").replace(/\s+/g, " ").trim();
+function placeLabel(id, screen) {
+  if (id === "flow")
+    return PLACE_KIND_WORDS.journey;
+  const ref = placeRef(id);
+  const after = ref.segment === "after3s" ? ` · ${PLACE_KIND_WORDS.after3s}` : "";
+  const shown = placeIdShownName(ref.stem);
+  if (shown !== null)
+    return isLibraryPlace(ref.stem) ? `${shown}${after}` : `${KIND_WORD[ref.kind]} · ${shown}${after}`;
+  if (ref.kind === "press" || ref.kind === "drag" || ref.kind === "step") {
+    const element = elementWords(ref.stem.slice(ref.stem.indexOf(":") + 1).replace(OPEN_MARK, ""));
+    return `${KIND_WORD[ref.kind]} · “${element}”${screen ? ` · ${screen}` : ""}${after}`;
+  }
+  const name = windowName(ref.stem);
+  const colon = name.indexOf(": ");
+  return `${colon > 0 && ref.kind !== "other" ? `${name.slice(0, colon)} · ${name.slice(colon + 2)}` : name}${after}`;
+}
+// packages/present/dist/src/words.js
+var REASON_WORDS = {
+  "no-baseline": "there are no main runs on this phone and journey yet",
+  "too-few-runs": "there are too few valid runs on a side",
+  "judged-measures-missing": "the judged measures are missing on a side",
+  "measured-differently": "the sides were measured differently",
+  "runs-unknown": "a change that would count has no value in some runs, so it cannot be confirmed in every run",
+  "facts-version-mismatch": "the sides were derived with different versions",
+  "not-judged-on-simulators": "timing is not judged on simulators",
+  "platforms-differ": "the sides ran on different platforms (iOS and Android are never compared)",
+  "not-enough-main": "main does not have enough sessions on this phone and journey yet"
+};
+var waitingWords = (runs) => `${runs} main ${runs === 1 ? "run waits" : "runs wait"} for a reprocess`;
 // packages/present/dist/src/stability.js
 var UNSTABLE_WORDS = {
   short: "main varies too much here",
@@ -5128,6 +5477,92 @@ var UNSTABLE_WORDS = {
   ratioTip: "1.0 = main’s run-to-run noise alone would pass the warning step about once in 100 comparisons.",
   what: "Main’s own runs vary too much here to tell, so a comparison there would mostly measure noise. It is shown with its values, never judged, never blocks and is never counted. It is judged again once main settles."
 };
+// packages/present/dist/src/present.js
+var ASPECT_WORDS = {
+  renderer: "React renderer",
+  reactExport: "React export",
+  causeSplit: "work split by its cause",
+  windowModel: "window model",
+  screenWindowModel: "screen window model",
+  cpuSource: "CPU source",
+  sdk: "SDK version",
+  driver: "driver",
+  driverVersion: "driver version",
+  journeyVersion: "journey version",
+  actionGc: "memory clean-up before each step",
+  endGc: "memory clean-up at the journey end",
+  cpuProfiling: "CPU profiling"
+};
+// packages/present/dist/src/main-history.js
+var MAIN_TIER_WORDS = {
+  same: "In norm",
+  better: STATE_WORDS.better,
+  cant: STATE_WORDS["cant-tell"],
+  slight: STATE_WORDS.warning,
+  worse: STATE_WORDS.worse
+};
+var MAIN_TIER_RANK = { worse: 0, slight: 1, cant: 2, better: 3, same: 4 };
+function mainCantWords(reason, config) {
+  if (!reason)
+    return "";
+  return reason.kind === "noisy_main" ? "main’s runs vary too much there" : `main has ${reason.earlier_sessions}${config.baseline.sessions === undefined ? "" : ` of ${config.baseline.sessions}`} earlier sessions${reason.since_label ? ` on ${reason.since_label}` : ""}`;
+}
+var waitingSessionsWords = (sessions) => `${sessions} older main ${sessions === 1 ? "session waits" : "sessions wait"} for a reprocess`;
+function mainPlaceReasonWords(reason, config) {
+  switch (reason.kind) {
+    case "no_baseline":
+    case "noisy_main":
+      return mainCantWords(reason, config);
+    case "higher":
+      return "Higher than main’s earlier sessions";
+    case "lower":
+      return "Lower than main’s earlier sessions";
+    case "missing_value":
+      return REASON_WORDS["runs-unknown"];
+    case "measured_differently":
+      return REASON_WORDS["measured-differently"];
+    case "core":
+      return reason.codes.map((code) => REASON_WORDS[code]).join("; ");
+  }
+}
+var MAIN_SUMMARY_PENDING = "Runs received; the summary is not computed yet.";
+var MAIN_NEWEST_SUMMARY_PENDING = `Newest: ${MAIN_SUMMARY_PENDING}`;
+var SHORT_ASPECT_WORDS = {
+  ...ASPECT_WORDS,
+  sdk: "SDK",
+  renderer: "Renderer",
+  endGc: "End GC",
+  causeSplit: "Cause split",
+  driver: "Driver",
+  driverVersion: "Driver",
+  journeyVersion: "Journey"
+};
+function mainSessionCantWords(places, reason, config) {
+  return `${STATE_WORDS["cant-tell"]} at ${places} place${places === 1 ? "" : "s"}: ${mainCantWords(reason, config)}`;
+}
+var KIND_PLURAL = {
+  screen: "screens",
+  press: "taps",
+  drag: "scrolls",
+  launch: "launch screens",
+  step: "test steps",
+  background: "background work",
+  other: "other places"
+};
+var listWords = (kinds) => {
+  const words = kinds.map((k) => KIND_PLURAL[k] ?? "other places");
+  return words.length < 2 ? words.join("") : `${words.slice(0, -1).join(", ")} and ${words.at(-1)}`;
+};
+function mainCutWords(v) {
+  const parts = [];
+  if (v.cuts.length)
+    parts.push(`Starts a new ${v.cuts.join(" and ")} baseline.`);
+  if (v.partial_render) {
+    const cut = listWords(v.partial_render.cut);
+    parts.push(`${cut[0].toUpperCase()}${cut.slice(1)} start a new render baseline; ${listWords(v.partial_render.kept)} keep theirs.`);
+  }
+  return parts.length ? parts.join(" ") : "Measures alike; no baseline cut.";
+}
 // apps/agent/src/summary.ts
 var fieldWord = (field) => measureDef(field)?.short ?? field;
 function plainMetric(metric) {
@@ -5209,7 +5644,13 @@ function movedCounts(sc) {
 }
 var placeCount = (rows) => new Set(rows.map((i) => `${i.scenario}|${i.device_id ?? ""}|${i.finding ?? placeRef(i.step ?? "*").stem}`)).size;
 var addCounts = (xs) => xs.reduce((a, c) => ({ worse: a.worse + c.worse, warnings: a.warnings + c.warnings, better: a.better + c.better, noChange: a.noChange + c.noChange, inconclusive: a.inconclusive + c.inconclusive }), { worse: 0, warnings: 0, better: 0, noChange: 0, inconclusive: 0 });
-var setupLine = (h) => h?.measured_differently?.length ? `Measured differently (${h.measured_differently.join(", ")}) — ${NOT_BLOCKING}` : null;
+var setupLine = (h) => {
+  const parts = [
+    h?.measured_differently?.length ? `Measured differently (${h.measured_differently.join(", ")}) — ${NOT_BLOCKING}` : "",
+    h?.waiting_for_reprocess ? waitingWords(h.waiting_for_reprocess) : ""
+  ].filter(Boolean);
+  return parts.length ? parts.join("; ") : null;
+};
 var keyHeader = (t) => ({ "x-keepsnappy-key": t.key });
 async function createRunSet(t, body) {
   const r = await call(t.fetch ?? fetch, t.url, "/v1/run-sets", keyHeader(t), body);
@@ -8827,15 +9268,18 @@ ${r.stderr}` : ""}`);
 }
 
 // apps/agent/src/run.ts
-function renameMetrics(rows, rename) {
+var matchesMetric = (prefix, metric) => metric === prefix || metric.startsWith(`${prefix}.`);
+function renameMetrics(rows, rename, warn = console.warn) {
+  for (const key of Object.keys(rename)) {
+    if (!rows.some((r) => [key, `step:${key}`].some((prefix) => matchesMetric(prefix, r.metric))))
+      warn(`steps.rename: key "${key}" matches no metric.`);
+  }
   const pairs = Object.entries(rename).flatMap(([a, b]) => [[a, b], [`step:${a}`, `step:${b}`]]);
   if (pairs.length === 0)
     return [...rows];
   return rows.map((r) => {
     for (const [from, to] of pairs) {
-      if (r.metric === from)
-        return { ...r, metric: to };
-      if (r.metric.startsWith(`${from}.`))
+      if (matchesMetric(from, r.metric))
         return { ...r, metric: `${to}${r.metric.slice(from.length)}` };
     }
     return r;
@@ -8853,7 +9297,7 @@ async function keepsnappyRun(deps, source, opts) {
     ...opts.markers ? { markers: opts.markers } : {},
     ...opts.clockOffsetMs === undefined ? {} : { clockOffsetMs: opts.clockOffsetMs }
   });
-  const rows = renameMetrics(raw, opts.config.steps.rename);
+  const rows = renameMetrics(raw, opts.config.steps.rename, deps.log);
   await deps.fs.writeFile(join8(opts.outDir, "metrics.csv"), toCsv(rows));
   const summary = summarize({ runs, outDir: opts.outDir });
   return { runs, rows, summary };
@@ -9272,10 +9716,20 @@ var nodeSpawner = {
     let stdout = "";
     let stderr = "";
     let error;
+    let timeout;
+    let killTimeout;
+    let closed = false;
     const child = spawn(cmd, [...args], {
-      env: { ...process.env, ...opts?.env },
-      ...opts?.timeoutMs ? { timeout: opts.timeoutMs } : {}
+      env: { ...process.env, ...opts?.env }
     });
+    if (opts?.timeoutMs) {
+      timeout = setTimeout(() => {
+        error = `timed out after ${opts.timeoutMs}ms`;
+        child.kill("SIGTERM");
+        if (!closed)
+          killTimeout = setTimeout(() => child.kill("SIGKILL"), opts.killAfterMs ?? 120000);
+      }, opts.timeoutMs);
+    }
     child.stdout.on("data", (d) => {
       stdout += d.toString();
       opts?.onOutput?.(d.toString());
@@ -9286,8 +9740,11 @@ var nodeSpawner = {
     });
     child.on("error", (e) => error = e.message);
     child.on("close", (code, signal) => {
-      if (signal && !error)
-        error = `killed by ${signal}`;
+      closed = true;
+      clearTimeout(timeout);
+      clearTimeout(killTimeout);
+      if (signal)
+        error = error ? `${error}; killed by ${signal}` : `killed by ${signal}`;
       resolve({ code, stdout, stderr, ...error ? { error } : {} });
     });
   })
@@ -9330,7 +9787,7 @@ async function aa(deps, outDir, opts = {}) {
 }
 
 // apps/agent/src/farm.ts
-import { dirname as dirname3, join as join12, resolve as resolve5 } from "node:path";
+import { dirname as dirname3, join as join13, resolve as resolve5 } from "node:path";
 
 // packages/appium-driver/dist/src/links.js
 var ALERT_POLL_MS = 250;
@@ -9628,18 +10085,13 @@ class WdError extends Error {
     this.wdError = wdError;
   }
 }
-// packages/appium-driver/dist/src/session.js
-var SDK_FLUSH_WORST_CASE_MS = 315000;
-var FLUSH_MARGIN_MS = 30000;
-var FLUSH_WAIT_MS = SDK_FLUSH_WORST_CASE_MS + FLUSH_MARGIN_MS;
-var FLUSH_STATUSES = new Set(["ok", "error", "off"]);
 // packages/appium-driver/dist/src/version.js
 import { createHash } from "node:crypto";
 import { existsSync, readFileSync, statSync } from "node:fs";
 import { dirname as dirname2, join as join11, relative as relative2, resolve as resolve4 } from "node:path";
 import { fileURLToPath } from "node:url";
 function driverVersion() {
-  const built = "0.1.0-alpha.15";
+  const built = "0.1.0-alpha.16";
   if (built)
     return built;
   let dir = dirname2(fileURLToPath(import.meta.url));
@@ -9688,8 +10140,93 @@ function journeyVersion(modulePath) {
     hash.update(key).update("\x00").update(text).update("\x00");
   return hash.digest("hex").slice(0, 12);
 }
+
+// packages/appium-driver/dist/src/session.js
+var SDK_FLUSH_WORST_CASE_MS = 315000;
+var FLUSH_MARGIN_MS = 30000;
+var FLUSH_WAIT_MS = SDK_FLUSH_WORST_CASE_MS + FLUSH_MARGIN_MS;
+var FLUSH_STATUSES = new Set(["ok", "error", "off"]);
+// packages/appium-driver/dist/src/gestures.js
+var densities = new WeakMap;
+// apps/agent/src/device-model.ts
+import { tmpdir } from "node:os";
+import { join as join12 } from "node:path";
+function parseDevicectlList(json) {
+  let data;
+  try {
+    data = JSON.parse(json);
+  } catch {
+    return [];
+  }
+  const devices = Array.isArray(data.result?.devices) ? data.result.devices : [];
+  return devices.flatMap((d) => {
+    const hw = d.hardwareProperties ?? {};
+    const conn = d.connectionProperties ?? {};
+    if (typeof hw.productType !== "string" || !hw.productType)
+      return [];
+    const text = (v) => typeof v === "string" ? v : "";
+    return [{ productType: hw.productType, udid: text(hw.udid), identifier: text(d.identifier), serial: text(hw.serialNumber), connected: conn.tunnelState === "connected" }];
+  });
+}
+var parseSimulators = (json) => {
+  try {
+    const data = JSON.parse(json);
+    return Object.values(data.devices ?? {}).flat();
+  } catch {
+    return [];
+  }
+};
+var withSimulatorWord = (name) => /simulator/i.test(name) ? name : `${name} Simulator`;
+var simulatorModel = (s) => withSimulatorWord(s.name);
+async function androidModel(deps, id) {
+  const r = await deps.spawner.run("adb", [...id ? ["-s", id] : [], "shell", "getprop", "ro.product.model"]);
+  const model = r.code === 0 ? (r.stdout.split(`
+`)[0] ?? "").trim() : "";
+  return model || null;
+}
+async function simulators(deps, id) {
+  const r = await deps.spawner.run("xcrun", ["simctl", "list", "devices", ...id ? [] : ["booted"], "-j"]);
+  if (r.code !== 0)
+    return [];
+  return parseSimulators(r.stdout).filter((s) => id ? s.udid === id : s.state === "Booted");
+}
+async function phones(deps) {
+  const out = join12(tmpdir(), `keepsnappy-devicectl-${deps.clock.now()}.json`);
+  try {
+    const r = await deps.spawner.run("xcrun", ["devicectl", "list", "devices", "--quiet", "--json-output", out]);
+    const text = r.code === 0 ? await deps.fs.readFile(out).catch(() => "") : "";
+    return parseDevicectlList(text);
+  } finally {
+    await deps.spawner.run("rm", ["-f", out]);
+  }
+}
+async function iosModel(deps, id) {
+  const sims = await simulators(deps, id);
+  if (id) {
+    if (sims.length === 1)
+      return simulatorModel(sims[0]);
+    const found = (await phones(deps)).filter((p) => [p.udid, p.identifier, p.serial].some((x) => x.toLowerCase() === id.toLowerCase()));
+    return found.length === 1 ? found[0].productType : null;
+  }
+  const connected = (await phones(deps)).filter((p) => p.connected);
+  if (sims.length + connected.length !== 1)
+    return null;
+  return sims[0] ? simulatorModel(sims[0]) : connected[0].productType;
+}
+async function detectDeviceModel(deps, q) {
+  if (q.platform === "android")
+    return androidModel(deps, q.deviceId);
+  if (q.platform === "ios")
+    return iosModel(deps, q.deviceId);
+  return null;
+}
+async function detectSimulator(deps, udid) {
+  const sims = await simulators(deps, udid);
+  return sims.length === 1 ? simulatorModel(sims[0]) : null;
+}
+
 // apps/agent/src/slack.ts
-var COLOR = { error: "#E01E5A", warn: "#ECB22E", better: "#2EB67D", none: "#9AA0A6" };
+var COLOR = { error: "#D6334A", warn: "#C47A00", better: "#238359", none: "#7C8492" };
 var MAX_ROWS = 3;
 var NAME_W = 30;
 var COLUMN_GAP = 1;
@@ -9719,7 +10256,7 @@ var isBetter = (i) => i.state === "better";
 var differs = (sc) => sc?.headline?.measured_differently ?? [];
 var scenarioBlocks = (sc) => sc?.headline?.blocking !== false;
 var isRed = (i, sc) => i.grade !== "warn" && scenarioBlocks(sc);
-var mark = (i, sc) => isBetter(i) ? "\uD83D\uDFE2" : isRed(i, sc) ? "\uD83D\uDD34" : "\uD83D\uDFE0";
+var mark = (i, sc) => isBetter(i) ? "\uD83D\uDFE2" : isRed(i, sc) ? "\uD83D\uDD34" : i.grade !== "warn" ? "⚪" : "\uD83D\uDFE1";
 var fit = (s, w) => s.length > w ? `${s.slice(0, w - 1)}…` : s.padEnd(w);
 var right = (s, w) => s.padStart(w);
 var phone = (sc) => sc?.device ? `${sc.device.model}${sc.device.os ? ` · ${sc.device.os}` : ""}` : "unknown phone";
@@ -9785,6 +10322,10 @@ function slackMessage(s, ctx) {
   const warningRows = worse.filter((i) => i.grade === "warn");
   const errors = placeCount(errorRows);
   const warns = placeCount(worse) - errors;
+  const red = errorRows.some((i) => isRed(i, scenarioOf(i)));
+  const notBlocking = errors > 0 && !red;
+  const worseMark = red ? "\uD83D\uDD34" : warns > 0 ? "\uD83D\uDFE1" : "⚪";
+  const worseColor = red ? COLOR.error : warns > 0 ? COLOR.warn : COLOR.none;
   if (isPr) {
     if (!worse.length) {
       if (!heat.length)
@@ -9793,12 +10334,10 @@ function slackMessage(s, ctx) {
       const blocks = [section(`*${head}*`), ...heat, ...commit ? [context(commit)] : [], section(`\uD83D\uDC49 <${heated[0].dashboard_url ?? s.dashboard_url}|View the comparison>`)];
       return { text: head, attachments: [{ color: COLOR.none, blocks }] };
     }
-    const red = worse.some((i) => isRed(i, scenarioOf(i)));
     const graded = worse.some((i) => i.grade);
-    const notBlocking = errors > 0 && !red;
     const places = (word, n) => `${word.toLowerCase()} in ${n} place${n > 1 ? "s" : ""}`;
-    const counts = graded ? [errors ? `${places(STATE_WORDS.worse, errors)}${notBlocking ? ` (${NOT_BLOCKING})` : ""}` : "", warns ? places(STATE_WORDS.warning, warns) : ""].filter(Boolean).join(", ") : places(STATE_WORDS.worse, placeCount(worse));
-    const head = `${red ? "\uD83D\uDD34" : "\uD83D\uDFE0"} ${ctx.branch}: ${counts}`;
+    const counts = graded ? [errors ? `${places(STATE_WORDS.worse, errors)}${notBlocking ? ` (${NOT_BLOCKING})` : ""}` : "", warns ? places(STATE_WORDS.warning, warns) : ""].filter(Boolean).join(", ") : `${places(STATE_WORDS.worse, placeCount(worse))}${notBlocking ? ` (${NOT_BLOCKING})` : ""}`;
+    const head = `${worseMark} ${ctx.branch}: ${counts}`;
     const blocks = [section(`*${head}*`)];
     const groups = new Map;
     for (const i of worse)
@@ -9814,7 +10353,8 @@ function slackMessage(s, ctx) {
       const runs = nB && nC ? ` · ${nC} PR run${nC === 1 ? "" : "s"} vs ${nB} main run${nB === 1 ? "" : "s"}` : "";
       const note = differs(sc).length ? `
 _Measured differently (${differs(sc).join(", ")})${scenarioBlocks(sc) ? "" : ` — ${NOT_BLOCKING}`}_` : "";
-      blocks.push(section(`*${sc?.scenario ?? "journey"}* · ${phone(sc)}${runs}${note}
+      const nonblocking = !scenarioBlocks(sc) && rows.some((i) => i.grade !== "warn") && !differs(sc).length ? ` · ${NOT_BLOCKING}` : "";
+      blocks.push(section(`*${sc?.scenario ?? "journey"}*${nonblocking} · ${phone(sc)}${runs}${note}
 ${prTable(rows, sc)}`));
     }
     const more = worse.length - shown;
@@ -9822,15 +10362,15 @@ ${prTable(rows, sc)}`));
     if (commit)
       blocks.push(context(commit));
     blocks.push(section(`\uD83D\uDC49 <${groups.keys().next().value?.dashboard_url ?? s.dashboard_url}|View the comparison>${more > 0 ? ` · ${more} more` : ""}`));
-    return { text: head, attachments: [{ color: red ? COLOR.error : COLOR.warn, blocks }] };
+    return { text: head, attachments: [{ color: worseColor, blocks }] };
   }
   const improved = better.length > 0 || v.state === "better";
   if (!worse.length && !improved && !ctx.always && !heat.length)
     return null;
-  const parts = [errors ? `${errors} ${STATE_WORDS.worse.toLowerCase()}` : "", warns ? `${warns} ${STATE_WORDS.warning.toLowerCase()}` : "", better.length ? `${placeCount(better)} ${STATE_WORDS.better.toLowerCase()}` : ""].filter(Boolean);
+  const parts = [errors ? `${errors} ${STATE_WORDS.worse.toLowerCase()}${notBlocking ? ` (${NOT_BLOCKING})` : ""}` : "", warns ? `${warns} ${STATE_WORDS.warning.toLowerCase()}` : "", better.length ? `${placeCount(better)} ${STATE_WORDS.better.toLowerCase()}` : ""].filter(Boolean);
   const quiet = improved ? STATE_WORDS.better.toLowerCase() : (v.state === null || v.state === "inconclusive") && v.word ? v.word : STATE_WORDS["no-change"].toLowerCase();
   const status = parts.length ? `${ctx.branch}: ${parts.join(", ")}` : !improved && heat.length && !ctx.always ? `${ctx.branch}: ${INFO_WORDS.heat}` : quiet.startsWith("Main: ") && ctx.branch === "main" ? quiet : `${ctx.branch}: ${quiet}`;
-  const head = `${worse.length ? worse.some((i) => isRed(i, scenarioOf(i))) ? "\uD83D\uDD34" : "\uD83D\uDFE0" : improved ? "\uD83D\uDFE2" : "⚪"} ${status}`;
+  const head = `${worse.length ? worseMark : improved ? "\uD83D\uDFE2" : v.state === "inconclusive" && (ctx.always || !heat.length) ? "❔" : "⚪"} ${status}`;
   const journeys = new Set(v.scenarios.map((sc) => `${sc.scenario}|${sc.device?.id}`)).size;
   const blocks = [section(`*${head}*
 ${journeys} journey${journeys === 1 ? "" : "s"} checked`)];
@@ -9841,7 +10381,7 @@ ${journeys} journey${journeys === 1 ? "" : "s"} checked`)];
         break;
       shown++;
       const sc = scenarioOf(i);
-      blocks.push(section(`*${title}* · *${sc?.scenario ?? "journey"}* · ${phone(sc)}
+      blocks.push(section(`*${title}*${i.grade !== "warn" && isWorse(i) && !scenarioBlocks(sc) ? ` (${NOT_BLOCKING})` : ""} · *${sc?.scenario ?? "journey"}* · ${phone(sc)}
 ${mainCard(i)}`));
     }
   }
@@ -9850,7 +10390,7 @@ ${mainCard(i)}`));
   if (commit)
     blocks.push(context(commit));
   blocks.push(section(`\uD83D\uDC49 <${s.dashboard_url}|Open KeepSnappy>${more > 0 ? ` · ${more} more changes` : ""}`));
-  const color = worse.length ? worse.some((i) => isRed(i, scenarioOf(i))) ? COLOR.error : COLOR.warn : improved ? COLOR.better : COLOR.none;
+  const color = worse.length ? worseColor : improved ? COLOR.better : COLOR.none;
   return { text: head, attachments: [{ color, blocks }] };
 }
 async function postToSlack(url, payload, fetchImpl = fetch) {
@@ -9997,9 +10537,20 @@ async function farmOpen(deps, f, rt) {
   const git = gitContext({ ...f.branch ? { branch: f.branch } : {}, ...f.commit ? { commit: f.commit } : {} }, rt.env);
   if (!git.branch)
     problems.push("--branch is required outside GitHub Actions");
-  const model = f["device-model"];
+  let provider = f["device-provider"] ?? "browserstack";
+  let model = f["device-model"]?.trim();
+  const simulator = f.platform === "ios" && provider !== "browserstack" && f["device-id"]?.trim() ? await detectSimulator(deps, f["device-id"].trim()) : null;
+  if (simulator) {
+    provider = "simulator";
+    model = model ? withSimulatorWord(model) : simulator;
+  }
+  if (!model && ["local", "usb", "customer", "simulator", "emulator"].includes(provider)) {
+    model = await detectDeviceModel(deps, { platform: f.platform, deviceId: f["device-id"]?.trim() }) ?? undefined;
+    if (model)
+      rt.print(`device model read from the device: ${model}`);
+  }
   if (!model)
-    problems.push('--device-model is required: the journey history is keyed by the run set’s device (e.g. "iPhone 15 Pro")');
+    problems.push('--device-model is required unless it can be read from a local device (--device-provider local|usb|customer|simulator|emulator, with --platform android|ios, adb or xcrun, and --device-id when more than one device is attached): the journey history is keyed by the run set’s device (e.g. "SM-S911B", "iPhone17,1")');
   if (f.platform !== undefined && !["ios", "android", "web"].includes(f.platform))
     problems.push("--platform must be ios, android or web");
   const journeys = (f.journeys ?? "").split(",").map((j) => j.trim()).filter(Boolean);
@@ -10029,7 +10580,7 @@ async function farmOpen(deps, f, rt) {
   }
   const api = apiTarget(url, f, rt);
   const now = rt.now ?? Date.now;
-  const device = { model, os: f["device-os"] ?? null, provider: f["device-provider"] ?? "browserstack" };
+  const device = { model, os: f["device-os"] ?? null, provider };
   const journeyInfo = await farmJourneys(deps, f, rt, journeys);
   const withInstrument = { ...f, ...instrumentFlags(f) };
   const setup = Object.fromEntries(SETUP_FLAGS.flatMap(([flag, key]) => withInstrument[flag]?.trim() ? [[key, withInstrument[flag].trim().slice(0, 200)]] : []));
@@ -10287,7 +10838,7 @@ async function closeRunSet(deps, f, rt, state, statePath) {
   await deps.fs.writeFile(statePath, `${JSON.stringify(state2, null, 2)}
 `);
   await deps.fs.mkdir(out);
-  await deps.fs.writeFile(join12(out, "keepsnappy-result.json"), `${JSON.stringify({ run_set_id: state.run_set_id, dashboard_url: summary.dashboard_url, state: state2.result.state, session: { status: session.status, message: session.message }, summary }, null, 2)}
+  await deps.fs.writeFile(join13(out, "keepsnappy-result.json"), `${JSON.stringify({ run_set_id: state.run_set_id, dashboard_url: summary.dashboard_url, state: state2.result.state, session: { status: session.status, message: session.message }, summary }, null, 2)}
 `);
   await githubOutputs(deps, rt, { state: state2.result.state ?? "none", dashboard_url: summary.dashboard_url, run_set_id: state.run_set_id });
   const step = rt.env.GITHUB_STEP_SUMMARY;
@@ -10333,11 +10884,11 @@ ${tail.join(" ")}
 // apps/agent/src/farm-run.ts
 import { existsSync as existsSync2 } from "node:fs";
 import { createRequire } from "node:module";
-import { dirname as dirname4, join as join15, resolve as resolve6 } from "node:path";
+import { dirname as dirname4, join as join16, resolve as resolve6 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
 // apps/agent/src/app-source.ts
-import { join as join13 } from "node:path";
+import { join as join14 } from "node:path";
 var EAS_CLI_VERSION = "24.6.0";
 var isEas = (spec) => spec.startsWith("eas:");
 
@@ -10349,7 +10900,7 @@ class DefaultAppResolver {
     this.env = env;
   }
   async resolve(spec, o) {
-    if (spec.startsWith("bs://"))
+    if (spec.startsWith("bs://") || spec.startsWith("custom_id:"))
       return { app: spec, commit: null };
     if (!isEas(spec)) {
       if (!await this.deps.fs.exists(spec))
@@ -10373,7 +10924,7 @@ class DefaultAppResolver {
     const url = build.artifacts?.buildUrl ?? build.artifacts?.applicationArchiveUrl;
     if (!url)
       throw new Error(`EAS build ${id} has no downloadable artifact (is it finished?)`);
-    const file = join13(o.outDir, `app-${id.slice(0, 8)}${build.platform === "ANDROID" ? ".apk" : ".ipa"}`);
+    const file = join14(o.outDir, `app-${id.slice(0, 8)}${build.platform === "ANDROID" ? ".apk" : ".ipa"}`);
     await this.deps.fs.mkdir(o.outDir);
     const dl = await this.deps.spawner.run("curl", ["-fsSL", "-o", file, url]);
     if (dl.code !== 0)
@@ -10384,7 +10935,7 @@ class DefaultAppResolver {
 
 // apps/agent/src/browserstack.ts
 import { randomUUID } from "node:crypto";
-import { basename as basename2, join as join14 } from "node:path";
+import { basename as basename2, join as join15 } from "node:path";
 import { readFile as readFile3 } from "node:fs/promises";
 var BASE = "https://api-cloud.browserstack.com/app-automate/maestro/v2";
 var TERMINAL = new Set(["passed", "failed", "error", "timedout", "skipped", "stopped"]);
@@ -10455,7 +11006,7 @@ class BrowserStack {
     }
   }
   async uploadApp(app, customId) {
-    if (app.startsWith("bs://"))
+    if (app.startsWith("bs://") || app.startsWith("custom_id:"))
       return app;
     const form = new FormData;
     form.append("file", new Blob([await this.bytes(app)]), basename2(app));
@@ -10468,7 +11019,7 @@ class BrowserStack {
   }
   async runMaestro(b) {
     const appUrl = await this.uploadApp(b.app, b.customId);
-    const work = join14(this.o.tmpDir ?? "/tmp", `keepsnappy-suite-${(this.o.uniqueId ?? randomUUID)()}`);
+    const work = join15(this.o.tmpDir ?? "/tmp", `keepsnappy-suite-${(this.o.uniqueId ?? randomUUID)()}`);
     let suiteUrl;
     try {
       const zip = await this.zipSuite(b, work);
@@ -10501,17 +11052,17 @@ class BrowserStack {
     return this.poll(buildId, b);
   }
   async zipSuite(b, work) {
-    const zipPath = join14(work, "suite.zip");
-    const stage = join14(work, "stage");
+    const zipPath = join15(work, "suite.zip");
+    const stage = join15(work, "stage");
     await this.deps.fs.mkdir(stage);
     const cp = await this.deps.spawner.run("cp", ["-R", b.suiteDir.replace(/\/$/, ""), stage]);
     if (cp.code !== 0)
       throw new FarmApiError(`cannot copy the suite ${b.suiteDir}: ${cp.stderr || cp.error}`);
     const folder = basename2(b.suiteDir.replace(/\/$/, ""));
-    if (!await this.deps.fs.exists(join14(stage, folder, "config.yaml")))
+    if (!await this.deps.fs.exists(join15(stage, folder, "config.yaml")))
       throw new FarmApiError(`${b.suiteDir} has no config.yaml: is that the Maestro workspace?`);
-    const target = join14(stage, folder, b.tokensPath);
-    await this.deps.fs.mkdir(join14(target, ".."));
+    const target = join15(stage, folder, b.tokensPath);
+    await this.deps.fs.mkdir(join15(target, ".."));
     await this.deps.fs.writeFile(target, await this.deps.fs.readFile(b.tokensJs));
     const include = SUITE_EXTENSIONS.flatMap((e) => ["-i", `${folder}/*${e}`, "-i", `${folder}/**/*${e}`]);
     const z = await this.deps.spawner.run("sh", ["-c", 'cd "$1" && shift && zip -qr "$@"', "sh", stage, zipPath, folder, ...include, "-x", `${folder}/runs/*`, "-x", "*/node_modules/*"]);
@@ -10570,9 +11121,9 @@ class BrowserStackLocal {
     const url = TUNNEL_ZIP[this.o.platform ?? process.platform];
     if (!url)
       throw new FarmApiError(`no BrowserStackLocal binary known for ${this.o.platform ?? process.platform}`);
-    const dir = join14(this.o.dir, identifier);
-    const bin = join14(dir, "BrowserStackLocal");
-    const zip = join14(dir, "bs-local.zip");
+    const dir = join15(this.o.dir, identifier);
+    const bin = join15(dir, "BrowserStackLocal");
+    const zip = join15(dir, "bs-local.zip");
     await this.deps.fs.mkdir(dir);
     for (const [cmd, args] of [
       ["curl", ["-fsSL", "-o", zip, url]],
@@ -10606,12 +11157,12 @@ ${r.stderr}`;
 // apps/agent/src/farm-run.ts
 function appiumDriverEntry(o = {}) {
   const exists = o.exists ?? existsSync2;
-  const bundled = join15(o.selfDir ?? dirname4(fileURLToPath2(import.meta.url)), "appium-driver.js");
+  const bundled = join16(o.selfDir ?? dirname4(fileURLToPath2(import.meta.url)), "appium-driver.js");
   if (exists(bundled))
     return bundled;
   const pkgDir = dirname4(o.packageJson ? o.packageJson() : createRequire(import.meta.url).resolve("@keepsnappy/appium-driver/package.json"));
-  const built = join15(pkgDir, "dist", "src", "cli.js");
-  return exists(built) ? built : join15(pkgDir, "src", "cli.ts");
+  const built = join16(pkgDir, "dist", "src", "cli.js");
+  return exists(built) ? built : join16(pkgDir, "src", "cli.ts");
 }
 var driverRuntime = (entry) => entry.endsWith(".ts") ? process.execPath : "node";
 function nodeFarmRunPorts(deps, rt) {
@@ -10620,7 +11171,7 @@ function nodeFarmRunPorts(deps, rt) {
   if (!user || !key)
     throw new ConfigError(["BROWSERSTACK_USERNAME and BROWSERSTACK_ACCESS_KEY must be set"]);
   const tmp = rt.env.RUNNER_TEMP ?? rt.env.TMPDIR ?? "/tmp";
-  const dir = join15(tmp, "keepsnappy-bs-local");
+  const dir = join16(tmp, "keepsnappy-bs-local");
   return {
     apps: new DefaultAppResolver(deps, rt.env),
     provider: new BrowserStack(deps, { credentials: { user, key }, tmpDir: tmp, ...rt.fetch ? { fetch: rt.fetch } : {}, ...rt.sleep ? { sleep: rt.sleep } : {}, ...rt.now ? { now: rt.now } : {} }),
@@ -10636,7 +11187,7 @@ var RUN_ID = /^[A-Za-z0-9][A-Za-z0-9._-]{0,99}$/;
 function planFarmRun(f) {
   const problems = [];
   if (!f.app)
-    problems.push("--app <eas:<build id>|path to .ipa/.apk|bs://id> is required");
+    problems.push("--app <eas:<build id>|path to .ipa/.apk|bs://id|custom_id:id> is required");
   const platform = f.platform ?? "ios";
   if (platform !== "ios" && platform !== "android")
     problems.push("--platform must be ios or android");
@@ -10682,14 +11233,15 @@ function planFarmRun(f) {
     problems.push("--driver-script and --journey-module are two ways to run Appium; pass one");
   } else if (!f["driver-script"] && !f["journey-module"]) {
     problems.push("--driver appium needs --journey-module <file> (the built-in driver) or --driver-script <file> (your own driver)");
-  } else if (f["journey-module"] && platform !== "ios") {
-    problems.push("--journey-module: the built-in Appium driver drives iOS only");
   }
   if (f["run-id"] !== undefined && !RUN_ID.test(f["run-id"]))
     problems.push("--run-id: letters, digits, . _ - only (it names the tunnel and its folder)");
   if (f["fail-on-worse"] && !f.wait)
     problems.push("--fail-on-worse needs --wait");
   const timeoutMinutes = Number(f["timeout-minutes"] ?? 80);
+  const killAfterSeconds = Number(f["kill-after-seconds"] ?? 120);
+  if (!Number.isFinite(killAfterSeconds) || killAfterSeconds <= 0)
+    problems.push("--kill-after-seconds must be finite and > 0");
   const pollSeconds = Number(f["poll-seconds"] ?? 20);
   if (!(timeoutMinutes > 0))
     problems.push("--timeout-minutes must be > 0");
@@ -10709,6 +11261,7 @@ function planFarmRun(f) {
     driverArgs: f["driver-arg"] ?? [],
     out: resolve6(f.out ?? "farm-run"),
     timeoutMinutes,
+    killAfterSeconds,
     pollSeconds
   };
 }
@@ -10732,8 +11285,8 @@ function printPlan(p, f, rt) {
   const line = (l) => rt.print(redact(l, secrets));
   line("keepsnappy farm run: dry run, no request is made and nothing is written");
   line(`  1. validate: ${p.journeys.join(", ")} x ${p.repeat} on ${p.device} (${p.platform}), driver ${p.driver}`);
-  line(`  2. resolve the app: ${p.app.startsWith("eas:") ? `eas-cli build:view ${p.app.slice(4)}, download into ${p.out}` : p.app.startsWith("bs://") ? "bs:// passes through" : `${p.app} (local file)`}`);
-  line(`  3. farm open -> ${join15(p.out, "keepsnappy-tokens.js")}, ${join15(p.out, "keepsnappy-farm.json")} (POST /v1/run-sets, then POST /v1/runs x ${p.journeys.length * p.repeat})`);
+  line(`  2. resolve the app: ${p.app.startsWith("eas:") ? `eas-cli build:view ${p.app.slice(4)}, download into ${p.out}` : p.app.startsWith("bs://") || p.app.startsWith("custom_id:") ? `${p.app} passes through` : `${p.app} (local file)`}`);
+  line(`  3. farm open -> ${join16(p.out, "keepsnappy-tokens.js")}, ${join16(p.out, "keepsnappy-farm.json")} (POST /v1/run-sets, then POST /v1/runs x ${p.journeys.length * p.repeat})`);
   line(`  4. tunnel: ${p.ports.length ? `BrowserStackLocal for bs-local.com ports ${p.ports.join(", ")}, identifier = run id` : "none (no --tunnel-for)"}`);
   if (p.driver === "maestro") {
     line(`  5. maestro on BrowserStack: upload app, zip ${f["suite-dir"]} with the tokens at ${f["tokens-path"] ?? "flows/keepsnappy/tokens.js"}, upload suite, POST build (execute ${f.execute}), poll`);
@@ -10742,7 +11295,7 @@ function printPlan(p, f, rt) {
   }
   for (const [k, v] of p.env)
     line(`     env ${k}=${substitute(v, {})}`);
-  line(`  6. farm close${f.wait ? " --wait" : ""}${f["fail-on-worse"] ? " --fail-on-worse" : ""} with ${join15(p.out, `browserstack.${p.platform}.json`)}`);
+  line(`  6. farm close${f.wait ? " --wait" : ""}${f["fail-on-worse"] ? " --fail-on-worse" : ""} with ${join16(p.out, `browserstack.${p.platform}.json`)}`);
   line("  7. always: stop the tunnel, put the empty stub back over the tokens file");
   line("  exit: 0 any verdict, 1 infrastructure / driver failed / Blocked, 2 configuration, 3 --fail-on-worse");
 }
@@ -10766,13 +11319,13 @@ async function runDriver2(deps, rt, f, p, ports, ctx) {
       timeoutMinutes: p.timeoutMinutes,
       pollSeconds: p.pollSeconds,
       onStarted: async (buildId) => {
-        await deps.fs.writeFile(join15(ctx.out, `browserstack.${p.platform}.json`), `${JSON.stringify({ buildId, dashboard: `https://app-automate.browserstack.com/dashboard/v2/builds/${buildId}`, note: "written at submit; replaced by the full detail once the build ends", status: "unknown" }, null, 2)}
+        await deps.fs.writeFile(join16(ctx.out, `browserstack.${p.platform}.json`), `${JSON.stringify({ buildId, dashboard: `https://app-automate.browserstack.com/dashboard/v2/builds/${buildId}`, note: "written at submit; replaced by the full detail once the build ends", status: "unknown" }, null, 2)}
 `);
         rt.print(`build ${buildId} started: https://app-automate.browserstack.com/dashboard/v2/builds/${buildId}`);
       },
       onStatus: (buildId, status) => rt.print(`build ${buildId}: ${status}`)
     });
-    await deps.fs.writeFile(join15(ctx.out, `browserstack.${p.platform}.json`), `${redact(JSON.stringify(detail.detail, null, 2), secretsOf(p, f, rt.env))}
+    await deps.fs.writeFile(join16(ctx.out, `browserstack.${p.platform}.json`), `${redact(JSON.stringify(detail.detail, null, 2), secretsOf(p, f, rt.env))}
 `);
     return detail.status === "passed" ? { ok: true, message: null } : { ok: false, message: `the device build ${detail.buildId} ended ${detail.status}` };
   }
@@ -10809,6 +11362,7 @@ async function runDriver2(deps, rt, f, p, ports, ctx) {
   const r = await deps.spawner.run(f["driver-script"] ? "node" : driverRuntime(entry), args, {
     env,
     timeoutMs: p.timeoutMinutes * 60000,
+    killAfterMs: p.killAfterSeconds * 1000,
     onOutput: (chunk) => {
       streamed = true;
       const lines = (pending + chunk).split(`
@@ -10823,11 +11377,11 @@ async function runDriver2(deps, rt, f, p, ports, ctx) {
     for (const l of `${r.stdout}${r.stderr}`.split(`
 `))
       emit(l);
-  return r.code === 0 ? { ok: true, message: null } : { ok: false, message: `the driver script exited ${r.code ?? r.error ?? "abnormally"}` };
+  return r.code === 0 && !r.error ? { ok: true, message: null } : { ok: false, message: `the driver script exited ${r.error ?? r.code ?? "abnormally"}` };
 }
 async function farmRun(deps, f, rt, ports) {
   const p = planFarmRun(f);
-  const statePath = join15(p.out, "keepsnappy-farm.json");
+  const statePath = join16(p.out, "keepsnappy-farm.json");
   if (await deps.fs.exists(statePath))
     throw new ConfigError([`${statePath} exists: a run set was opened here before; use another --out or remove ${p.out} (close it first with keepsnappy farm close)`]);
   if (f["dry-run"]) {
@@ -10835,7 +11389,7 @@ async function farmRun(deps, f, rt, ports) {
     return EXIT.ok;
   }
   const farm = ports ?? nodeFarmRunPorts(deps, rt);
-  const tokensJs = join15(p.out, "keepsnappy-tokens.js");
+  const tokensJs = join16(p.out, "keepsnappy-tokens.js");
   await deps.fs.mkdir(p.out);
   const resolved = await farm.apps.resolve(p.app, { outDir: p.out });
   const commit = f.commit ?? resolved.commit ?? undefined;
@@ -10866,9 +11420,9 @@ async function farmRun(deps, f, rt, ports) {
     const runId = f["run-id"] ?? `keepsnappy-${p.platform}-${state.run_set_id.slice(0, 8)}`;
     const ctx = { runId, out: p.out, tokensJs, runSetId: state.run_set_id, app: resolved.app };
     try {
-      await deps.spawner.run("rm", ["-f", join15(p.out, `browserstack.${p.platform}.json`)]);
+      await deps.spawner.run("rm", ["-f", join16(p.out, `browserstack.${p.platform}.json`)]);
       if (p.ports.length) {
-        tunnel = await farm.tunnel.open({ identifier: runId, ports: p.ports, logFile: join15(p.out, "browserstack-local.log") });
+        tunnel = await farm.tunnel.open({ identifier: runId, ports: p.ports, logFile: join16(p.out, "browserstack-local.log") });
         rt.print(`tunnel ${runId}: bs-local.com ports ${p.ports.join(", ")}`);
       }
       driver = await runDriver2(deps, rt, f, p, farm, { ...ctx, tunnelId: tunnel?.identifier ?? null });
@@ -10879,7 +11433,7 @@ async function farmRun(deps, f, rt, ports) {
       rt.print(`device run failed: ${driver.message}; closing the run set with what arrived`);
     closeCode = await farmClose(deps, {
       state: statePath,
-      "bs-build": join15(p.out, `browserstack.${p.platform}.json`),
+      "bs-build": join16(p.out, `browserstack.${p.platform}.json`),
       out: p.out,
       ...f.wait ? { wait: true } : {},
       ...f["fail-on-worse"] ? { "fail-on-worse": true } : {},
@@ -10900,13 +11454,82 @@ async function farmRun(deps, f, rt, ports) {
 }
 
 // apps/agent/src/sourcemaps.ts
-import { createHash as createHash2 } from "node:crypto";
-import { readFile as readFile4 } from "node:fs/promises";
-import { basename as basename3 } from "node:path";
+import { createHash as createHash2, randomUUID as randomUUID2 } from "node:crypto";
+import { access, readFile as readFile4, readdir as readdir2, rename, rm, writeFile as writeFile2 } from "node:fs/promises";
+import { basename as basename3, join as join17, resolve as resolve7 } from "node:path";
 import { parseArgs as parseArgs2 } from "node:util";
 import { gzipSync } from "node:zlib";
 var MAX_COMPLETE_ROUNDS = 20;
 var isObject = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
+async function prepareComponents(projectRoot, options = {}) {
+  const root = resolve7(projectRoot);
+  const directory = join17(root, ".keepsnappy", "components");
+  const configurations = await readdir2(directory, { withFileTypes: true }).catch((error) => {
+    if (error.code === "ENOENT")
+      return [];
+    throw error;
+  });
+  const candidates = [];
+  for (const entry of configurations) {
+    if (!entry.isDirectory() || !/^[a-zA-Z0-9-]+$/.test(entry.name))
+      continue;
+    try {
+      await access(join17(directory, entry.name, ".config.json"));
+      candidates.push(entry.name);
+    } catch (error) {
+      if (error.code !== "ENOENT")
+        throw error;
+    }
+  }
+  candidates.sort();
+  if (candidates.length === 0)
+    return null;
+  const selectedConfiguration = options.configuration ?? (candidates.length === 1 ? candidates[0] : undefined);
+  if (!selectedConfiguration || !candidates.includes(selectedConfiguration)) {
+    throw new ConfigError([`choose a component configuration with --components-config (${candidates.join(", ")})`]);
+  }
+  const selected = join17(directory, selectedConfiguration);
+  const config = JSON.parse(await readFile4(join17(selected, ".config.json"), "utf8"));
+  if (!isComponentConfiguration(config) || config.directory !== selectedConfiguration) {
+    throw new ConfigError(["invalid KeepSnappy component fragment configuration"]);
+  }
+  const files = (await readdir2(selected)).filter((file) => file.endsWith(".json") && !file.startsWith(".")).sort();
+  const components = [];
+  const hashes = new Map;
+  let matched = 0;
+  for (const file of files) {
+    const fragment = JSON.parse(await readFile4(join17(selected, file), "utf8"));
+    if (!isComponentFragment(fragment))
+      throw new ConfigError([`invalid KeepSnappy component fragment ${file}`]);
+    if (!hashes.has(fragment.source)) {
+      try {
+        hashes.set(fragment.source, createHash2("sha256").update(await readFile4(resolve7(root, fragment.source))).digest("hex"));
+      } catch (error) {
+        if (error.code !== "ENOENT")
+          throw error;
+        hashes.set(fragment.source, null);
+      }
+    }
+    if (hashes.get(fragment.source) !== fragment.hash)
+      continue;
+    matched++;
+    components.push(...fragment.components);
+  }
+  if (files.length > 0 && matched === 0)
+    options.warn?.("component fragments exist but none match the current sources");
+  components.sort((a, b) => a.key < b.key ? -1 : a.key > b.key ? 1 : a.line - b.line);
+  const file = join17(directory, "..", "components.json");
+  const text = JSON.stringify(components);
+  const temporary = `${file}.${process.pid}.${randomUUID2()}.tmp`;
+  try {
+    await writeFile2(temporary, text);
+    await rename(temporary, file);
+  } finally {
+    await rm(temporary, { force: true });
+  }
+  const gzip = gzipSync(text);
+  return { file, count: components.length, bytes: Buffer.byteLength(text), gzip, sha256: createHash2("sha256").update(gzip).digest("hex") };
+}
 function stripSourcesContent(map) {
   if (!isObject(map))
     throw new ConfigError(["not a source map: the file is not a JSON object"]);
@@ -10982,21 +11605,35 @@ async function uploadSourcemaps(opts) {
   }
   return out;
 }
-var SOURCEMAPS_USAGE = "keepsnappy sourcemaps upload --build <full commit sha|build id> --platform ios|android [--kind hermes|packager] [--flavour NAME] [--api URL] [--key-env KEEPSNAPPY_KEY] <map files...>";
+var SOURCEMAPS_USAGE = `keepsnappy sourcemaps upload --build <full commit sha|build id> --platform ios|android [--kind hermes|packager] [--flavour NAME] [--api URL] [--key-env KEEPSNAPPY_KEY] [--project-root PATH] [--components-config ID] <map files...>
+  keepsnappy sourcemaps upload --eas (e2e EAS build: infer build, platform, map and kind; skips missing inputs and never fails the build)`;
 async function sourcemapsCommand(args, rt) {
+  try {
+    return await uploadCommand(args, rt);
+  } catch (error) {
+    if (!args.includes("--eas"))
+      throw error;
+    rt.print("keepsnappy: source map upload failed (build not affected)");
+    return 0;
+  }
+}
+async function uploadCommand(args, rt) {
   let parsed;
   try {
     parsed = parseArgs2({
       args: [...args],
       allowPositionals: true,
       options: {
+        eas: { type: "boolean" },
         build: { type: "string" },
         platform: { type: "string" },
         kind: { type: "string" },
         flavour: { type: "string" },
         api: { type: "string" },
         "ingest-url": { type: "string" },
-        "key-env": { type: "string" }
+        "key-env": { type: "string" },
+        "project-root": { type: "string" },
+        "components-config": { type: "string" }
       }
     });
   } catch (e) {
@@ -11006,6 +11643,40 @@ async function sourcemapsCommand(args, rt) {
   const [sub, ...files] = positionals;
   if (sub !== "upload")
     throw new ConfigError([SOURCEMAPS_USAGE]);
+  const keyEnv = f["key-env"] ?? "KEEPSNAPPY_KEY";
+  const key = projectKey(rt.env, keyEnv) || (f.eas && !f["key-env"] ? rt.env.KEEPSNAPPY_CI_KEY : undefined);
+  const url = f.api ?? f["ingest-url"] ?? envValue(rt.env, "API") ?? (f.eas ? rt.env.EXPO_PUBLIC_KEEPSNAPPY_INGEST_URL ?? "" : DEFAULT_API_URL);
+  let preparedFiles;
+  if (f.eas) {
+    const skip = (reason) => {
+      rt.print(`keepsnappy: no source map upload (${reason})`);
+      return 0;
+    };
+    if (rt.env.EAS_BUILD_PROFILE !== "e2e")
+      return skip("profile is not e2e");
+    f.platform ??= rt.env.EAS_BUILD_PLATFORM;
+    if (f.platform !== "ios" && f.platform !== "android")
+      return skip("platform must be ios or android");
+    f.build ??= rt.env.EAS_BUILD_GIT_COMMIT_HASH;
+    if (!key)
+      return skip("key missing");
+    if (!url)
+      return skip("API URL missing");
+    if (!f.build)
+      return skip("commit missing");
+    f.kind ??= f.platform === "ios" ? "packager" : "hermes";
+    f.flavour ??= "e2e";
+    if (files.length === 0)
+      files.push(f.platform === "ios" ? "main.jsbundle.packager.map" : "android/app/build/generated/sourcemaps/react/release/index.android.bundle.map");
+    preparedFiles = new Map;
+    try {
+      const read = rt.readFile ?? ((path) => readFile4(path, "utf8"));
+      for (const file of files)
+        preparedFiles.set(file, await read(file));
+    } catch {
+      return skip("map missing or unreadable");
+    }
+  }
   const problems = [];
   if (!f.build)
     problems.push("--build <full commit sha (git rev-parse HEAD) or build id> is required");
@@ -11015,13 +11686,10 @@ async function sourcemapsCommand(args, rt) {
     problems.push("--kind must be hermes or packager");
   if (files.length === 0)
     problems.push("give at least one source map file");
-  const keyEnv = f["key-env"] ?? "KEEPSNAPPY_KEY";
-  const key = projectKey(rt.env, keyEnv);
   if (!key)
     problems.push(`the project key (run scope) is missing: set the environment variable ${keyEnv}`);
   if (problems.length)
     throw new ConfigError(problems);
-  const url = f.api ?? f["ingest-url"] ?? envValue(rt.env, "API") ?? DEFAULT_API_URL;
   const done = await uploadSourcemaps({
     url,
     key,
@@ -11031,11 +11699,18 @@ async function sourcemapsCommand(args, rt) {
     ...f.kind ? { kind: f.kind } : {},
     ...f.flavour ? { flavour: f.flavour } : {},
     ...rt.fetch ? { fetch: rt.fetch } : {},
-    ...rt.readFile ? { readFile: rt.readFile } : {}
+    ...preparedFiles ? { readFile: async (path) => preparedFiles.get(path) } : rt.readFile ? { readFile: rt.readFile } : {}
   });
   for (const d of done) {
     rt.print(`${d.file}: uploaded to build ${d.buildId} (${d.gzBytes} bytes gzip, sourcesContent removed from ${d.strippedSources} sources)`);
   }
+  try {
+    const components = await prepareComponents(f["project-root"] ?? process.cwd(), { configuration: f["components-config"], warn: (message) => rt.print(`warning: ${message}`) });
+    if (components)
+      rt.print(`${components.file}: prepared ${components.count} components; upload is not yet supported by the API`);
+  } catch (error) {
+    rt.print(`warning: component map preparation skipped: ${error.message}`);
+  }
   return 0;
 }
 
@@ -11043,36 +11718,94 @@ async function sourcemapsCommand(args, rt) {
 import { parseArgs as parseArgs3 } from "node:util";
 
 // packages/mcp/dist/src/answer.js
+var SHORT_SESSIONS = 3;
+var SHORT_POINTS = 5;
+var SHORT_PLACES = 5;
+var SHORT_FORM_NOTES = {
+  list_findings: "the how-sure lines, the place lines of findings that are not Worse and the lanes that were judged",
+  get_finding: "the why, seen and layer lines, the component lines, the memory evidence lines other than the judged measure and the prompt",
+  session_places: "the component lines",
+  main_sessions: `the sessions older than the newest ${SHORT_SESSIONS}, the main changes of all but the newest session and, for one run_set, the places in norm`,
+  main_vs_previous: `the movers after the first ${SHORT_PLACES} (every new, gone or multi-device place stays)`,
+  place_trend: `the sessions older than the newest ${SHORT_SESSIONS} and the history restarts among them (unknown restarts always stay)`,
+  window_history: `the runs older than the newest ${SHORT_POINTS}`,
+  pr_status: "the per-journey dashboard links and the heat note"
+};
+var andList = (xs) => xs.length < 2 ? xs[0] ?? "" : `${xs.slice(0, -1).join(", ")} and ${xs[xs.length - 1]}`;
+
+class Rows {
+  rows = [];
+  add(short, ...texts) {
+    for (const t of texts)
+      for (const l of t.split(`
+`))
+        this.rows.push({ text: l, short });
+    return this;
+  }
+  both(...texts) {
+    return this.add(true, ...texts);
+  }
+  full(...texts) {
+    return this.add(false, ...texts);
+  }
+  render(form, left = []) {
+    if (form !== "short")
+      return this.rows.map((r) => r.text).join(`
+`);
+    const kept = [];
+    for (const r of this.rows) {
+      if (!r.short)
+        continue;
+      if (r.text === "" && (!kept.length || kept[kept.length - 1] === ""))
+        continue;
+      kept.push(r.text);
+    }
+    if (kept[kept.length - 1] === "")
+      kept.pop();
+    if (this.rows.some((r) => !r.short && r.text.trim() !== ""))
+      kept.push(`Short form: ${andList(left.length ? left : ["other lines"])} left out; the full form shows them.`);
+    return kept.join(`
+`);
+  }
+}
 var LABEL_W = 14;
 var line = (label, text) => `  ${label.padEnd(LABEL_W)}${text}`;
 var plural = (n, w) => `${n} ${w}${n === 1 ? "" : "s"}`;
+var promptText = (f) => f.what_to_do.prompt ?? "No prompt: this finding is an improvement.";
 function formatFinding(f, opts = {}) {
-  const out = [
-    f.answer.headline,
-    line("What changed", f.answer.what_changed),
-    line("Where", f.answer.where),
-    line("How sure", f.answer.how_sure),
-    line("Why", f.answer.why),
-    line("What to do", f.answer.what_to_do),
-    line("Seen", f.answer.lifecycle),
-    line("Layer", `${f.layer.id} · ${f.layer.name} (${f.certificate ? "certified" : "uncertified"})${f.limits.length ? `; limits: ${f.limits.join("; ")}` : ""}`),
-    line("Id", f.id)
-  ];
+  const r = new Rows;
+  r.both(f.answer.headline, line("What changed", f.answer.what_changed), line("Where", f.answer.where), line("How sure", f.answer.how_sure));
+  r.full(line("Why", f.answer.why));
+  r.both(line("What to do", f.answer.what_to_do));
+  r.full(line("Seen", f.answer.lifecycle), line("Layer", `${f.layer.id} · ${f.layer.name} (${f.certificate ? "certified" : "uncertified"})${f.limits.length ? `; limits: ${f.limits.join("; ")}` : ""}`));
+  r.both(line("Id", f.id));
   if (f.why.components.length) {
-    out.push(line("Components", ""));
+    r.full(line("Components", ""));
     for (const c of f.why.components) {
-      out.push(`    ${c.component}: ${c.self_ms_before ?? "–"} → ${c.self_ms_after} ms own time, renders ${c.renders_before ?? "–"} → ${c.renders_after ?? "–"}${c.cause ? `; ${c.cause}` : ""}${c.flagged ? "" : " (not certain)"}`);
+      r.full(`    ${c.component}: ${c.self_ms_before ?? "–"} → ${c.self_ms_after} ms own time, renders ${c.renders_before ?? "–"} → ${c.renders_after ?? "–"}${c.cause ? `; ${c.cause}` : ""}${c.flagged ? "" : " (not certain)"}`);
+    }
+  }
+  const memory = f.why.memory ?? [];
+  if (memory.length) {
+    r.both(`  Memory evidence: ${f.where.on === "main" ? "earlier → latest" : "main → PR"} (values are not a verdict)`);
+    for (const m of memory) {
+      const value = (n) => n === null ? "not stored" : fieldValueText(m.metric, n);
+      r.add(m.metric === f.what.metric, `    ${m.label}: ${value(m.before)} → ${value(m.after)}${m.word ? ` (${m.word})` : ""}`);
     }
   }
   if (opts.prompt)
-    out.push("", f.what_to_do.prompt ?? "No prompt: this finding is an improvement.");
-  return out.join(`
-`);
+    r.full("", promptText(f));
+  return r.render(opts.form, [
+    "the why, seen and layer lines",
+    ...f.why.components.length ? [plural(f.why.components.length, "component line")] : [],
+    ...memory.some((m) => m.metric !== f.what.metric) ? [plural(memory.filter((m) => m.metric !== f.what.metric).length, "memory evidence line")] : [],
+    ...opts.prompt ? ["the prompt"] : []
+  ]);
 }
 var when = (iso) => iso.slice(0, 16).replace("T", " ");
 var LANES_SHOWN = 8;
 var STATE_WORDS2 = { present: "still present", resolved: "resolved", "not-judged": "not judged in the newest run set" };
-function measuredLine(l) {
+function measuredLines(l, r) {
   const f = l.filters;
   const scope = [f.branch ?? "all branches", f.journey, f.phone].filter(Boolean).join(" · ");
   const m = l.measured;
@@ -11080,21 +11813,25 @@ function measuredLine(l) {
   if (!n) {
     const on = f.branch ? f.branch === l.baseline_branch ? f.branch : `branch ${f.branch}` : "any branch";
     const narrow = [f.journey, f.phone ? `phone “${f.phone}”` : null].filter(Boolean).join(", ");
-    return m.run_sets ? `${scope}: ${plural(m.run_sets, "run set")} measured, but no verdict yet: nothing is known about its performance.` : `No KeepSnappy measurement on ${on}${narrow ? ` for ${narrow}` : ""}: nothing is known about its performance.`;
+    r.both(m.run_sets ? `${scope}: ${plural(m.run_sets, "run set")} measured, but no verdict yet: nothing is known about its performance.` : `No KeepSnappy measurement on ${on}${narrow ? ` for ${narrow}` : ""}: nothing is known about its performance.`);
+    return [];
   }
   const lane = (x) => {
     const runs = x.runs.after !== null && x.runs.before !== null ? x.branch === l.baseline_branch ? `, ${x.runs.after} latest runs vs ${x.runs.before} earlier` : `, ${x.runs.after} branch runs vs ${x.runs.before} on ${l.baseline_branch}` : "";
-    return `${x.commit?.sha ? `commit ${x.commit.sha.slice(0, 7)}` : "commit not recorded"} (${when(x.at)}): ${x.word}${runs}`;
+    return `${x.commit?.sha ? `commit ${x.commit.sha.slice(0, 7)}` : "commit not recorded"} (${when(x.at)}): ${x.word}${runs}${x.waiting_for_reprocess ? `; ${waitingWords(x.waiting_for_reprocess)}` : ""}`;
   };
-  if (m.lanes.length === 1)
-    return `${scope}: newest measured ${f.branch ? "" : `on ${n.branch}, `}${lane(n)}; ${plural(m.run_sets, "run set")} measured.`;
+  if (m.lanes.length === 1) {
+    r.both(`${scope}: newest measured ${f.branch ? "" : `on ${n.branch}, `}${lane(n)}; ${plural(m.run_sets, "run set")} measured.`);
+    return [];
+  }
   const shown = m.lanes.slice(0, LANES_SHOWN);
-  return [
-    `${scope}: ${plural(m.run_sets, "run set")} measured; the newest of each journey × phone:`,
-    ...shown.map((x) => `  ${x.journey} on ${x.phone_name}${f.branch ? "" : ` (${x.branch})`}: ${lane(x)}`),
-    ...m.lanes.length > shown.length ? [`  … ${m.lanes.length - shown.length} more (--journey / --phone narrow it)`] : []
-  ].join(`
-`);
+  const unjudged = shown.filter((x) => !x.judged);
+  r.add(unjudged.length > 0, `${scope}: ${plural(m.run_sets, "run set")} measured; the newest of each journey × phone:`);
+  for (const x of shown)
+    r.add(!x.judged, `  ${x.journey} on ${x.phone_name}${f.branch ? "" : ` (${x.branch})`}: ${lane(x)}`);
+  if (m.lanes.length > shown.length)
+    r.full(`  … ${m.lanes.length - shown.length} more (--journey / --phone narrow it)`);
+  return [...shown.length > unjudged.length ? [plural(shown.length - unjudged.length, "judged lane")] : [], ...m.lanes.length > shown.length ? [plural(m.lanes.length - shown.length, "lane") + " beyond the eighth"] : []];
 }
 function countsLine2(l) {
   const c = l.counts;
@@ -11114,22 +11851,69 @@ function countsLine2(l) {
   const line = `${head}${more.length ? `; ${more.join("; ")}` : ""}.`;
   return line.charAt(0).toUpperCase() + line.slice(1);
 }
-function formatFindingList(l) {
-  const out = [measuredLine(l)];
+function formatFindingList(l, opts = {}) {
+  const r = new Rows;
+  const lanesLeft = measuredLines(l, r);
   if (l.measured.newest || l.total)
-    out.push(countsLine2(l));
+    r.both(countsLine2(l));
   l.findings.forEach((f, i) => {
-    out.push("", `${l.offset + i + 1}. ${f.answer.headline}`, `   ${f.answer.where}`, `   ${f.answer.how_sure}`, `   ${f.answer.lifecycle} Id ${f.id}`);
+    r.both("", `${l.offset + i + 1}. ${f.answer.headline}`);
+    r.add(isWorseState(f.state), `   ${f.answer.where}`);
+    r.full(`   ${f.answer.how_sure}`);
+    r.both(`   ${f.answer.lifecycle} Id ${f.id}`);
   });
   const shown = l.findings.length ? `Showing ${l.offset + 1}–${l.offset + l.findings.length} of ${l.total}` : "";
   if (l.next_offset !== null)
-    out.push("", `${shown || `Showing none of ${l.total}`}; the rest from offset ${l.next_offset} (--offset ${l.next_offset}).`);
+    r.both("", `${shown || `Showing none of ${l.total}`}; the rest from offset ${l.next_offset} (--offset ${l.next_offset}).`);
   else if (l.offset > 0)
-    out.push("", shown ? `${shown}.` : `Offset ${l.offset} is past the last of ${l.total}.`);
+    r.both("", shown ? `${shown}.` : `Offset ${l.offset} is past the last of ${l.total}.`);
   if (l.findings.length)
-    out.push("", "One finding with its evidence and a prompt: keepsnappy finding <id> --prompt");
-  return out.join(`
-`);
+    r.both("", "One finding with its evidence and a prompt: keepsnappy finding <id> --prompt");
+  const notWorse = l.findings.filter((f) => !isWorseState(f.state)).length;
+  return r.render(opts.form, [
+    ...l.findings.length ? [plural(l.findings.length, "how-sure line")] : [],
+    ...notWorse ? [plural(notWorse, "place line")] : [],
+    ...lanesLeft
+  ]);
+}
+var STATUS_LEAD = {
+  ok: "ok",
+  warns: "nothing blocks, results to look at",
+  blocks: "blocked",
+  "cant-tell": "not ok yet, nothing was compared",
+  "not-judged": "not ok yet, the newest run set was not judged",
+  "never-measured": "not ok yet, never measured"
+};
+function formatBranchStatus(s, opts = {}) {
+  const r = new Rows;
+  r.both(`${s.branch}: ${STATUS_LEAD[s.result]}`, s.reason);
+  if (s.lanes.length)
+    r.both("");
+  for (const l of s.lanes) {
+    const badge = l.result === "blocks" ? " (blocks)" : l.word === STATE_WORDS.worse ? ` (${NOT_BLOCKING})` : "";
+    const sha = l.commit?.sha?.slice(0, 7);
+    r.both(`  ${l.journey_title ?? l.journey} on ${l.phone_name}: ${l.word}${badge} · ${sha ? `commit ${sha}` : "commit not recorded"} (${when(l.at)})${l.in_newest_run_set ? "" : " · older run set"}${l.waiting_for_reprocess ? `; ${waitingWords(l.waiting_for_reprocess)}` : ""}`);
+    for (const f of l.worst)
+      r.both(`    ${f.id}  ${f.headline}`);
+    if (l.present_findings > l.worst.length)
+      r.both(`    … ${l.present_findings - l.worst.length} more: keepsnappy findings --branch ${s.branch}`);
+    if (l.link)
+      r.full(`    ${l.link}`);
+  }
+  const links = s.lanes.filter((l) => l.link).length;
+  const heated = s.counts.heat_runs ?? 0;
+  const more = [
+    [false, heated ? `${INFO_WORDS.heat.toLowerCase()} in ${plural(heated, "run")} (information, never blocks)` : ""],
+    [true, s.not_judged_findings ? `${plural(s.not_judged_findings, "finding")} not judged in the newest run set; they may still be there: keepsnappy findings --branch ${s.branch} --state not-judged` : ""],
+    [true, s.links.overview ? `Dashboard: ${s.links.overview}` : ""],
+    [true, s.worst.length ? "One finding with its evidence and a prompt: keepsnappy finding <id> --prompt" : ""]
+  ];
+  const shownMore = more.filter(([, text]) => text);
+  if (shownMore.length)
+    r.both("");
+  for (const [short, text] of shownMore)
+    r.add(short, text);
+  return r.render(opts.form, [...links ? [plural(links, "dashboard link")] : [], ...heated ? ["the heat note"] : []]);
 }
 var commitText = (c) => !c ? "commit not recorded" : c.title ? `“${c.title}”${c.author ? ` by ${c.author}` : ""}${c.sha ? ` (${c.sha.slice(0, 7)})` : ""}` : c.sha ? c.sha.slice(0, 7) : "commit not recorded";
 function formatCompare(r) {
@@ -11151,19 +11935,20 @@ function formatCompare(r) {
   return out.join(`
 `);
 }
-function formatHistory(h) {
-  const out = [`${h.window_name} in ${h.journey_title ?? h.journey} on ${h.branch}: ${h.points.length ? `${plural(h.points.length, "run")}, oldest first` : h.note ?? "no runs"}`];
+function formatHistory(h, opts = {}) {
+  const r = new Rows;
+  r.both(`${h.window_name} in ${h.journey_title ?? h.journey} on ${h.branch}: ${h.points.length ? `${plural(h.points.length, "run")}, oldest first` : h.note ?? "no runs"}`);
   const ms = h.measures.slice(0, 4);
   if (h.points.length) {
-    out.push(`  ${"when".padEnd(17)}${ms.map((m) => (m.label.length > 22 ? `${m.label.slice(0, 21)}…` : m.label).padStart(24)).join("")}  commit`);
-    for (const p of h.points) {
-      out.push(`  ${(p.at ?? "").slice(0, 16).replace("T", " ").padEnd(17)}${ms.map((m) => fieldValueText(m.metric, p.values[m.metric]).padStart(24)).join("")}  ${commitText(p.commit)}`);
-    }
+    r.both(`  ${"when".padEnd(17)}${ms.map((m) => (m.label.length > 22 ? `${m.label.slice(0, 21)}…` : m.label).padStart(24)).join("")}  commit`);
+    h.points.forEach((p, i) => {
+      r.add(i >= h.points.length - SHORT_POINTS, `  ${(p.at ?? "").slice(0, 16).replace("T", " ").padEnd(17)}${ms.map((m) => fieldValueText(m.metric, p.values[m.metric]).padStart(24)).join("")}  ${commitText(p.commit)}`);
+    });
   }
   if (h.findings.length)
-    out.push("", "Findings on this window:", ...h.findings.map((f) => `  ${f.answer.headline} — ${f.where.branch} (${f.id})`));
-  return out.join(`
-`);
+    r.both("", "Findings on this window:", ...h.findings.map((f) => `  ${f.answer.headline} — ${f.where.branch} (${f.id})`));
+  const older = Math.max(0, h.points.length - SHORT_POINTS);
+  return r.render(opts.form, older ? [plural(older, "older run")] : []);
 }
 function formatCommits(c) {
   return [
@@ -11173,6 +11958,55 @@ function formatCommits(c) {
   ].join(`
 `);
 }
+var list = (xs) => xs.join(", ");
+function versionText(label, counts) {
+  const values = Object.keys(counts).sort((a, b) => a === "unknown" ? -1 : b === "unknown" ? 1 : a < b ? -1 : a > b ? 1 : 0);
+  const name = (k) => k === "unknown" ? "not recorded" : k;
+  if (values.length === 0)
+    return "";
+  if (values.length === 1)
+    return `${label} ${name(values[0])}`;
+  return `${label} mixed: ${values.map((k) => `${name(k)} ×${counts[k]}`).join(", ")}`;
+}
+function formatSessionPlaces(p, opts = {}) {
+  const s = p.session;
+  const sha = s.commit?.sha?.slice(0, 7);
+  const commit = s.commit ? `${s.commit.title ? `“${s.commit.title}”${s.commit.author ? ` by ${s.commit.author}` : ""}` : sha ?? "commit not recorded"}${s.commit.title && sha ? ` (${sha})` : ""}` : "commit not recorded";
+  const v = s.versions;
+  const codes = Object.keys(s.runs.invalid_codes);
+  const r = new Rows().both(`Session ${s.completed_at ? `${when(s.completed_at)} ` : ""}on ${s.branch}: ${commit}${s.pull_request?.number ? `, PR #${s.pull_request.number}` : ""}; ${s.journey.title ?? s.journey.key} on ${s.phone.model}${s.phone.os ? ` · ${s.phone.os}` : ""}${s.status === "processed" ? "" : ` (run set ${s.status})`}.`, `Runs: ${s.runs.valid} valid${s.runs.invalid ? `, ${s.runs.invalid} invalid${codes.length ? ` (${list(codes)})` : ""}` : ""}. ${[
+    versionText("SDK", v.sdk),
+    versionText("driver", v.driver),
+    versionText("driver version", v.driver_version),
+    versionText("app", v.app_build),
+    versionText("journey version", v.journey_version),
+    `derivation ${v.derivation}`,
+    `stats ${v.stats}`
+  ].filter(Boolean).join(", ")}.`);
+  if (s.not_computed)
+    return r.both("Not computed: this session has no stored statistics yet; nothing is known about its places (not zero).").render(opts.form);
+  if (s.stale)
+    return r.both("Stale: its statistics are of another derivation or stats version and are not served until the next recompute rewrites them; nothing is known about its places (not zero).").render(opts.form);
+  const by = p.filters.measure;
+  const byLabel = p.places.flatMap((x) => x.measures).find((m) => m.measure === by)?.label ?? by;
+  r.both(`Stored per-session statistics: no verdict, no comparison. Places by ${byLabel} (${p.filters.sort}), highest first${p.filters.window ? `, matching “${p.filters.window}”` : ""}${p.without_measure ? `; ${p.without_measure} of ${p.total} places ${p.without_measure === 1 ? "has" : "have"} no value for it` : ""}.`, "");
+  let componentLines = 0;
+  p.places.forEach((place, i) => {
+    const m = place.measures.find((x) => x.measure === by);
+    const value = m ? `${fieldValueText(by, m.median)} (p90 ${fieldValueText(by, m.p90)}, n ${m.n})` : `no ${by}`;
+    const comps = place.components.map((c) => `${c.name} ${valueText("self_ms", c.self_ms.median)} (p90 ${valueText("self_ms", c.self_ms.p90)}${c.renders_median !== null ? `, ${plural(c.renders_median, "render")}` : ""})`);
+    r.both(`${p.offset + i + 1}. ${place.window_name}: ${value}`);
+    if (comps.length) {
+      r.full(`   Components: ${list(comps)}`);
+      componentLines++;
+    }
+  });
+  if (!p.places.length)
+    r.both(p.total ? `Offset ${p.offset} is past the last of ${p.total} places.` : "No place with stored statistics in this session matches.");
+  else if (p.next_offset !== null)
+    r.both("", `Showing ${p.offset + 1}–${p.offset + p.places.length} of ${p.total}; the rest from offset ${p.next_offset} (--offset ${p.next_offset}).`);
+  return r.render(opts.form, componentLines ? [plural(componentLines, "component line")] : []);
+}
 function formatLayers(l) {
   return [
     l.note,
@@ -11182,6 +12016,100 @@ function formatLayers(l) {
   ].join(`
 `);
 }
+var MAIN_TIERS_WORST_FIRST = Object.keys(MAIN_TIER_RANK).sort((a, b) => MAIN_TIER_RANK[a] - MAIN_TIER_RANK[b]);
+function formatMainSessions(h, opts = {}) {
+  const baseline = { baseline: { sessions: h.baseline_sessions } };
+  const r = new Rows().both(`Main sessions: tiers are verdicts vs ${h.baseline_sessions === undefined ? "earlier sessions" : `the ${h.baseline_sessions} sessions before`}.`);
+  if (!h.sessions.length)
+    r.both("No main sessions measured for this journey and phone.");
+  const recent = new Set(h.sessions.slice(-SHORT_SESSIONS));
+  const latest = h.sessions[h.sessions.length - 1];
+  let otherChanges = 0;
+  for (const s of h.sessions) {
+    const k = recent.has(s);
+    r.add(k, `${when(s.at)}  ${s.run_set_id}  ${commitText(s.commit ? { ...s.commit, author: null } : null)} (${plural(s.runs, "run")})`);
+    if (!s.places)
+      r.add(k, `  ${MAIN_SUMMARY_PENDING}${s.summary_reason ? ` (${s.summary_reason})` : ""}`);
+    else
+      r.add(k, `  ${MAIN_TIERS_WORST_FIRST.map((tier) => `${MAIN_TIER_WORDS[tier]}: ${s.places[tier]}`).join("; ")}${s.cant_reason ? `; ${mainSessionCantWords(s.places.cant, s.cant_reason, baseline)}` : ""}`);
+    if (s.waiting_sessions)
+      r.add(k, `  ${waitingSessionsWords(s.waiting_sessions)}`);
+    if (s.memory)
+      r.add(k, `  Memory: ${MAIN_TIER_WORDS[s.memory.tier]}, ${s.memory.median} MB (n ${s.memory.n})${s.memory.cant_reason ? `; ${mainCantWords(s.memory.cant_reason, baseline)}` : ""}`);
+    for (const v of h.versions.filter((v) => v.from_run_set_id === s.run_set_id))
+      r.add(k, `  Version: ${v.label}; ${mainCutWords(v)}`);
+    for (const c of h.changes.filter((c) => c.from_run_set_id === s.run_set_id)) {
+      r.add(s === latest, `  Main change: ${c.place} ${c.ref}, ${c.before_median ?? "–"} → ${c.after_median ?? "–"}`);
+      if (k && s !== latest)
+        otherChanges++;
+    }
+  }
+  const older = h.sessions.length - recent.size;
+  return r.render(opts.form, [...older ? [plural(older, "older session")] : [], ...otherChanges ? [plural(otherChanges, "main change") + " of the other recent sessions"] : []]);
+}
+function formatMainSessionPlaces(p, opts = {}) {
+  const r = new Rows;
+  if (p.status !== "ok")
+    return r.both(`${MAIN_SUMMARY_PENDING}${p.summary_reason ? ` (${p.summary_reason})` : ""}`).render(opts.form);
+  const baselineSessions = p.baseline_sessions;
+  r.both(`Main session places: tiers are verdicts vs ${p.baseline_sessions === undefined ? "earlier sessions" : `the ${p.baseline_sessions} sessions before`}.`);
+  for (const x of p.places)
+    r.add(x.tier !== "same", `  ${x.place} ${x.ref}: ${MAIN_TIER_WORDS[x.tier]}${x.reason ? `; ${mainPlaceReasonWords(x.reason, { baseline: { sessions: baselineSessions } })}` : ""}`);
+  const inNorm = p.places.filter((x) => x.tier === "same").length;
+  return r.render(opts.form, inNorm ? [plural(inNorm, "place") + " in norm"] : []);
+}
+var signed = (n) => `${n > 0 ? "+" : ""}${Number(n.toFixed(3))}`;
+var previousLine = (p) => `  ${p.place} ${p.ref}${p.devices ? ` [devices ${p.devices.before.join(", ") || "–"} → ${p.devices.after.join(", ") || "–"}]` : ""}: ${p.status === "compared" ? "" : `${p.status}; `}${p.before ?? "–"} → ${p.after ?? "–"}; delta ${p.delta === null ? "–" : signed(p.delta)}; ${p.percent_change === null ? "change undefined" : `${signed(p.percent_change)}%`}; n ${p.n.before ?? "–"} → ${p.n.after ?? "–"}`;
+function formatMainVsPrevious(m, opts = {}) {
+  const r = new Rows().both(`Information only: main session ${m.run_set_id} vs ${m.previous_run_set_id ?? "no previous session"}.`, `Measure: ${m.measure}; ${m.status}.`);
+  if (m.cut === "unknown")
+    r.both("History restart: unknown; current summaries unavailable.");
+  else if (m.cut)
+    r.both(`History restart: ${m.cut.label}; ${m.cut.cuts.join(", ")}. Numbers cross this restart.`);
+  if (m.not_computed.length)
+    r.both(`not_computed: ${m.not_computed.join(", ")}`);
+  if (m.stale.length)
+    r.both(`stale: ${m.stale.join(", ")}`);
+  if (m.journey)
+    r.both("Whole journey:", previousLine(m.journey));
+  m.places.forEach((p, i) => r.add(i < SHORT_PLACES || p.status !== "compared", previousLine(p)));
+  if (m.next_offset !== null)
+    r.both(`Showing ${m.offset + 1}–${m.offset + m.places.length} of ${m.total}; next offset ${m.next_offset}.`);
+  const smaller = m.places.filter((p, i) => i >= SHORT_PLACES && p.status === "compared").length;
+  return r.render(opts.form, smaller ? [plural(smaller, "smaller mover")] : []);
+}
+function formatPlaceTrend(t, opts = {}) {
+  const r = new Rows().both(`${t.journey} · ${t.phone.model} · ${t.baseline_branch}: stored per-session statistics`);
+  const newest = new Set(t.sessions.slice(-SHORT_SESSIONS).map((s) => s.run_set_id));
+  const olderSessions = new Set;
+  let olderRestarts = 0;
+  for (const session of t.sessions) {
+    const k = newest.has(session.run_set_id);
+    if (session.restarts_known === false)
+      r.both(`History restarts unknown: ${session.run_set_id} (no current main summary in the history window)`);
+    for (const restart of t.restarts.filter((x) => x.from_run_set_id === session.run_set_id)) {
+      r.add(k, `History restarts: ${restart.label} (${restart.cuts.join(", ")})`);
+      if (!k)
+        olderRestarts++;
+    }
+    for (const place of t.places) {
+      const value = place.sessions.find((s) => s.run_set_id === session.run_set_id);
+      if (!value)
+        continue;
+      const unit = place.unit ? ` ${place.unit}` : "";
+      if (!k)
+        olderSessions.add(session.run_set_id);
+      r.add(k, `${session.completed_at?.slice(0, 10) ?? "date unknown"} ${session.commit.sha?.slice(0, 7) ?? "commit unknown"} · ${place.window} · ${place.label} (${place.ref}): median ${value.median}${unit}, MAD ${value.mad}${unit}, n=${value.n}`);
+    }
+  }
+  if (!t.sessions.length)
+    r.both("No main sessions.");
+  if (t.not_computed.length)
+    r.both(`Not computed: ${t.not_computed.join(", ")}`);
+  if (t.stale.length)
+    r.both(`Stale: ${t.stale.join(", ")}`);
+  return r.render(opts.form, [...olderSessions.size ? [plural(olderSessions.size, "older session")] : [], ...olderRestarts ? [plural(olderRestarts, "older restart marker")] : []]);
+}
 
 // packages/mcp/dist/src/client.js
 class ApiError extends Error {
@@ -11196,9 +12124,13 @@ class ApiError extends Error {
 }
 async function get(t, path, query = {}) {
   const u = new URL(path, t.url.endsWith("/") ? t.url : `${t.url}/`);
-  for (const [k, v] of Object.entries(query))
-    if (v !== undefined && v !== "")
+  for (const [k, v] of Object.entries(query)) {
+    if (Array.isArray(v))
+      for (const value of v)
+        u.searchParams.append(k, value);
+    else if (v !== undefined && v !== "")
       u.searchParams.set(k, String(v));
+  }
   const r = await (t.fetch ?? fetch)(u, { headers: { "x-keepsnappy-key": t.key, accept: "application/json" } });
   const text = await r.text();
   const body = text ? JSON.parse(text) : {};
@@ -11211,19 +12143,47 @@ async function get(t, path, query = {}) {
   return body;
 }
 var listFindings = (t, f = {}) => get(t, "v1/findings", { branch: f.branch, main: f.main ? "true" : undefined, journey: f.journey, phone: f.phone, state: f.state, limit: f.limit, offset: f.offset || undefined });
+var branchStatus = (t, branch) => get(t, "v1/branches/status", { branch });
 var getFinding = (t, id) => get(t, `v1/findings/${encodeURIComponent(id)}`);
 var compareRuns = (t, a, b) => get(t, "v1/compare", { a, b });
 var windowHistory = (t, q) => get(t, "v1/history", q);
 var commitsBetween = (t, q) => get(t, "v1/commits", q);
 var layers = (t) => get(t, "v1/layers");
+var sessionPlaces = (t, f) => get(t, "v1/sessions/places", {
+  run_set: f.run_set,
+  journey: f.journey,
+  phone: f.phone,
+  branch: f.branch,
+  measure: f.measure,
+  sort: f.sort,
+  window: f.window,
+  limit: f.limit,
+  offset: f.offset || undefined,
+  top_components: f.top_components
+});
+var SESSION_SORTS = ["median", "p90", "mad"];
+var mainSessions = (t, q) => get(t, "v1/main/sessions", { ...q });
+var mainSessionPlaces = (t, runSetId, q) => get(t, `v1/main/sessions/${encodeURIComponent(runSetId)}/places`, { ...q });
+var mainVsPrevious = (t, q) => {
+  const { run_set, ...query } = q;
+  return get(t, `v1/main/sessions/${encodeURIComponent(run_set ?? "latest")}/vs-previous`, query);
+};
+var placeTrend = (t, q) => get(t, "v1/places/trend", { ...q });
 
 // apps/agent/src/findings.ts
-var FINDINGS_USAGE = `keepsnappy findings [--branch NAME | --main] [--journey KEY] [--phone MODEL] [--state present|not-judged|resolved|all] [--limit N] [--offset N] [--json]
-  finding  <id> [--prompt] [--json]                  (--prompt: only the hand-off for a coding agent; with --json the whole finding)
-  compare  <runA> <runB> [--json]                  (run ids or external ids; one run against one, no statistics)
-  history  <journey> <window> [--phone MODEL] [--json]   (window id or its name, e.g. "Tap · “live chat send”")
-  commits  <from> [<to>] [--branch NAME] [--json]        (measured commits between two run sets or commit hashes)
+var FINDINGS_USAGE = `keepsnappy findings [--branch NAME | --main] [--journey KEY] [--phone MODEL] [--state present|not-judged|resolved|all] [--limit N] [--offset N] [--short] [--json]
+  status   --branch NAME [--short] [--json]                        (is my PR ok? one answer: blocked / nothing blocks / ok, per journey × phone the word, the ids of the worst findings, dashboard links; never measured and not judged are not ok)
+  finding  <id> [--prompt] [--short] [--json]                      (--prompt: only the hand-off for a coding agent; with --json the whole finding)
+  compare  <runA> <runB> [--json]                                  (run ids or external ids; one run against one, no statistics)
+  history  <journey> <window> [--phone MODEL] [--short] [--json]   (exact window id, e.g. "press:live.chat.send")
+  commits  <from> [<to>] [--branch NAME] [--json]                  (measured commits between two run sets or commit hashes)
+  places   [--run-set ID | --journey KEY [--phone MODEL] [--branch NAME]] [--measure ID] [--sort median|p90|mad] [--window TEXT] [--limit N] [--offset N] [--top-components N] [--short] [--json]
+           (every place of one session from its stored statistics: no verdict; the newest closed run set of the journey when --run-set is not given)
+  main     --journey KEY --phone MODEL [--sessions N | --session ID] [--vs-previous] [--measure REF] [--limit N] [--offset N] [--short] [--json]
   layers   [--json]
+  trend    <journey> <window words...> --phone MODEL [--window PLACE ...] [--ref REF ...] [--sessions N] [--short] [--json]
+           (the words after the journey are one window name; more windows with repeated --window)
+  --short  (findings, status, finding, history, places, main, trend: what decides, without the evidence detail; the same as the MCP tools' form short; --json is unchanged)
   (key: KEEPSNAPPY_KEY or --key-env NAME; API: --api URL or KEEPSNAPPY_API)`;
 
 class UsageError extends ConfigError {
@@ -11235,7 +12195,8 @@ class UsageError extends ConfigError {
   }
 }
 var STATES = ["present", "not-judged", "resolved", "all"];
-var FINDINGS_COMMANDS = new Set(["findings", "finding", "compare", "history", "commits", "layers"]);
+var SHORT_COMMANDS = new Set(["findings", "status", "finding", "history", "places", "main", "trend"]);
+var FINDINGS_COMMANDS = new Set(["findings", "status", "finding", "compare", "history", "commits", "places", "layers", "main", "trend"]);
 async function findingsCommand(cmd, argv, rt) {
   const args = (() => {
     try {
@@ -11248,12 +12209,22 @@ async function findingsCommand(cmd, argv, rt) {
           journey: { type: "string" },
           phone: { type: "string" },
           state: { type: "string" },
+          session: { type: "string" },
+          "vs-previous": { type: "boolean" },
           limit: { type: "string" },
           offset: { type: "string" },
+          "run-set": { type: "string" },
+          measure: { type: "string" },
+          sort: { type: "string" },
+          "top-components": { type: "string" },
           json: { type: "boolean" },
+          short: { type: "boolean" },
           prompt: { type: "boolean" },
           api: { type: "string" },
-          "key-env": { type: "string" }
+          "key-env": { type: "string" },
+          window: { type: "string", multiple: true },
+          ref: { type: "string", multiple: true },
+          sessions: { type: "string" }
         }
       });
     } catch (e) {
@@ -11266,8 +12237,9 @@ async function findingsCommand(cmd, argv, rt) {
   if (!key)
     throw new ConfigError([`a project key with read scope is needed: set the environment variable ${keyEnv}`]);
   const t = { url: o.api ?? envValue(rt.env, "API") ?? DEFAULT_API_URL, key, ...rt.fetch ? { fetch: rt.fetch } : {} };
+  const answerForm = { form: o.short ? "short" : "full" };
   const out = (v, text) => {
-    rt.print(o.json ? JSON.stringify(v, null, 2) : text(v));
+    rt.print(o.json ? JSON.stringify(v, null, 2) : text(v, answerForm));
     return 0;
   };
   const need = (n, what) => {
@@ -11277,10 +12249,29 @@ async function findingsCommand(cmd, argv, rt) {
   const limit = o.limit === undefined ? undefined : Number(o.limit);
   if (limit !== undefined && (!Number.isInteger(limit) || limit < 1 || limit > 200))
     throw new UsageError(["--limit must be a whole number from 1 to 200 (page with --offset)"]);
+  if (o.short && !SHORT_COMMANDS.has(cmd))
+    throw new UsageError([`--short is for ${[...SHORT_COMMANDS].join(", ")}; keepsnappy ${cmd} has only one form`]);
   const offset = o.offset === undefined ? undefined : Number(o.offset);
   if (offset !== undefined && (!Number.isInteger(offset) || offset < 0))
     throw new UsageError(["--offset must be a whole number >= 0"]);
   switch (cmd) {
+    case "main": {
+      if (!o.journey)
+        throw new UsageError(["keepsnappy main needs --journey KEY"]);
+      if (!o.phone)
+        throw new UsageError(["keepsnappy main needs --phone MODEL (exact device model)"]);
+      const sessions = o.sessions === undefined ? undefined : Number(o.sessions);
+      if (sessions !== undefined && (!Number.isInteger(sessions) || sessions < 1 || sessions > 20))
+        throw new UsageError(["--sessions must be a whole number from 1 to 20"]);
+      if (sessions !== undefined && (o.session || o["vs-previous"]))
+        throw new UsageError(["--sessions is for the session list"]);
+      const lane = { journey: o.journey, phone: o.phone };
+      if (o["vs-previous"])
+        return out(await mainVsPrevious(t, { ...lane, run_set: o.session, measure: o.measure, limit, offset }), formatMainVsPrevious);
+      if (o.session)
+        return out(await mainSessionPlaces(t, o.session, lane), formatMainSessionPlaces);
+      return out(await mainSessions(t, { ...lane, sessions }), formatMainSessions);
+    }
     case "findings": {
       if (o.branch && o.main)
         throw new UsageError(["give --branch or --main, not both"]);
@@ -11297,14 +12288,18 @@ async function findingsCommand(cmd, argv, rt) {
         ...offset ? { offset } : {}
       }), formatFindingList);
     }
+    case "status":
+      if (!o.branch)
+        throw new UsageError(["keepsnappy status needs --branch NAME", FINDINGS_USAGE]);
+      return out(await branchStatus(t, o.branch), formatBranchStatus);
     case "finding": {
       need(1, "<id>");
       const f = await getFinding(t, p[0]);
       if (o.prompt && !o.json) {
-        rt.print(f.what_to_do.prompt ?? "No prompt: this finding is an improvement.");
+        rt.print(promptText(f));
         return 0;
       }
-      return out(f, (x) => formatFinding(x));
+      return out(f, formatFinding);
     }
     case "compare":
       need(2, "<runA> <runB>");
@@ -11315,8 +12310,39 @@ async function findingsCommand(cmd, argv, rt) {
     case "commits":
       need(1, "<from>");
       return out(await commitsBetween(t, { from: p[0], ...p[1] ? { to: p[1] } : {}, ...o.branch ? { branch: o.branch } : {} }), formatCommits);
+    case "places": {
+      const sort = o.sort;
+      if (sort && !SESSION_SORTS.includes(sort))
+        throw new UsageError([`--sort is ${SESSION_SORTS.join(", ")}`]);
+      const top = o["top-components"] === undefined ? undefined : Number(o["top-components"]);
+      if (top !== undefined && (!Number.isInteger(top) || top < 0 || top > 20))
+        throw new UsageError(["--top-components must be a whole number from 0 to 20"]);
+      return out(await sessionPlaces(t, {
+        ...o["run-set"] ? { run_set: o["run-set"] } : {},
+        ...o.journey ? { journey: o.journey } : {},
+        ...o.phone ? { phone: o.phone } : {},
+        ...o.branch ? { branch: o.branch } : {},
+        ...o.measure ? { measure: o.measure } : {},
+        ...sort ? { sort } : {},
+        ...o.window?.length ? { window: o.window[0] } : {},
+        ...limit ? { limit } : {},
+        ...offset ? { offset } : {},
+        ...top !== undefined ? { top_components: top } : {}
+      }), formatSessionPlaces);
+    }
     case "layers":
       return out(await layers(t), formatLayers);
+    case "trend": {
+      const journey = o.journey ?? p[0];
+      const words = p.slice(o.journey ? 0 : 1).join(" ");
+      const windows = [...words ? [words] : [], ...o.window ?? []];
+      if (!journey || !windows.length || !o.phone)
+        throw new UsageError(["keepsnappy trend needs <journey> <window> --phone MODEL", FINDINGS_USAGE]);
+      const sessions = o.sessions === undefined ? undefined : Number(o.sessions);
+      if (sessions !== undefined && (!Number.isInteger(sessions) || sessions < 1 || sessions > 30))
+        throw new UsageError(["--sessions must be a whole number from 1 to 30"]);
+      return out(await placeTrend(t, { journey, phone: o.phone, window: windows, ref: o.ref, sessions }), formatPlaceTrend);
+    }
     default:
       throw new UsageError([FINDINGS_USAGE]);
   }
@@ -11332,17 +12358,19 @@ var USAGE = `keepsnappy <command>
           [--device UDID] [--out DIR] [--timeout SEC] [--ri-capture observations.ndjson] [--mem-window NAME]
           [--clock-offset-ms N] [--no-markers]
           -- <test command...>
-  farm open  --api URL --device-model NAME [--device-os V] [--device-id SERIAL|UDID] [--device-provider browserstack] [--platform ios|android] --journeys a,b [--repeat 5]
+  farm open  --api URL [--device-model CODE] [--device-os V] [--device-id SERIAL|UDID] [--device-provider browserstack] [--platform ios|android] --journeys a,b [--repeat 5]
+             (--device-model is read from the device with --platform and a local --device-provider: adb ro.product.model, devicectl machine id, simctl name; never for browserstack)
              --tokens-js <file> --state <file> [--branch NAME --commit SHA --base-commit SHA] [--ttl-seconds 21600] [--key-env KEEPSNAPPY_KEY]
              [--config keepsnappy.yml] [--flows <files|dirs|globs,...>]   (journey titles: keepsnappy.yml flows.paths, else the flow's name: / top comment)
              [--completion-marker] (the flow posts step run:complete at the end of each iteration; runs without it are invalid)
              [--driver appium --journey-module FILE] [--driver-version V] [--app-build-id ID] [--harness-version V] [--journey-version V] [--flag-set LABEL]   (setup fingerprint, plan 51)
              [--sdk-args k=v&...]   (over the run defaults profile=1 diag=1; tokens.js carries them to the flows' activation link)
   farm close --state <file> [--wait [--fail-on-worse]] [--bs-build browserstack.ios.json] [--settle-seconds 60] [--max-wait-seconds 300] [--out DIR]
-  farm run   --app <eas:ID|file.ipa|bs://ID> --journeys a,b [--repeat 5] --device "iPhone 15 Pro-17" [--platform ios|android] [--driver maestro|appium]
+  farm run   --app <eas:ID|file.ipa|file.apk|bs://ID|custom_id:ID> --journeys a,b [--repeat 5] --device "iPhone 15 Pro-17" [--platform ios|android] [--driver maestro|appium]
              [--tunnel-for localhost:PORT ...] [--env KEY=VALUE ...] (values may use {tunnel:PORT} {run_id} {out} {tokens_js} {run_set_id})
              maestro: --suite-dir DIR --execute FLOW [--tokens-path flows/keepsnappy/tokens.js] [--maestro-version V]
-             appium:  --journey-module FILE | --driver-script FILE [--driver-arg ARG ...]
+             appium:  --journey-module FILE | --driver-script FILE [--driver-arg ARG ...] (iOS and Android)
+             [--timeout-minutes 80] [--kill-after-seconds 120] (Appium: SIGTERM at timeout, then SIGKILL after grace)
              [--branch NAME --commit SHA] [--wait [--fail-on-worse]] [--out DIR] [--dry-run]   (open + tunnel + device + close; docs/plans/54a)
   extract <out-dir> --ri-capture observations.ndjson [--mem-window NAME]
   aa      <out-dir> [--reps N] [--boot N]
@@ -11440,6 +12468,7 @@ async function main2(argv) {
       "tokens-path": { type: "string" },
       "maestro-version": { type: "string" },
       "timeout-minutes": { type: "string" },
+      "kill-after-seconds": { type: "string" },
       "poll-seconds": { type: "string" },
       "custom-id": { type: "string" },
       "run-id": { type: "string" },
@@ -11473,9 +12502,9 @@ async function main2(argv) {
     if (platform === "ios-device" && !o.device)
       throw new Error("--device <udid> is required for ios-device");
     const arms = parseArmEnv(o["arm-env"], parseArms(o.arms));
-    const out = resolve7(o.out ?? `keepsnappy-${new Date().toISOString().replace(/[:.]/g, "-")}`);
+    const out = resolve8(o.out ?? `keepsnappy-${new Date().toISOString().replace(/[:.]/g, "-")}`);
     const udid = o.device ?? "booted";
-    const source = platform === "ios-sim" ? new IosSimulatorDataSource(deps, udid) : new IosDeviceDataSource(deps, udid, resolve7(out, ".scratch"));
+    const source = platform === "ios-sim" ? new IosSimulatorDataSource(deps, udid) : new IosDeviceDataSource(deps, udid, resolve8(out, ".scratch"));
     const installer = platform === "ios-sim" ? new IosSimulatorInstaller(deps, udid) : new IosDeviceInstaller(deps, udid);
     const bundleId = await bundleIdOf(deps, arms[0]?.target, o["bundle-id"]);
     let markers;
@@ -11494,7 +12523,7 @@ async function main2(argv) {
       outDir: out,
       testCommand: positionals,
       bundleId,
-      ...o["ri-capture"] ? { ri: new FileRiSource(deps, resolve7(o["ri-capture"])) } : {},
+      ...o["ri-capture"] ? { ri: new FileRiSource(deps, resolve8(o["ri-capture"])) } : {},
       ...o["mem-window"] ? { memWindow: o["mem-window"] } : {},
       ...o.timeout ? { testTimeoutMs: Number(o.timeout) * 1000 } : {}
     });
@@ -11506,9 +12535,9 @@ async function main2(argv) {
     const dir = positionals[0];
     if (!dir)
       throw new Error("extract needs <out-dir>");
-    const ri = o["ri-capture"] ? new FileRiSource(deps, resolve7(o["ri-capture"])) : undefined;
-    const rows = await extract(deps, resolve7(dir), ri, o["mem-window"], o["clock-offset-ms"] ? Number(o["clock-offset-ms"]) : undefined);
-    console.log(`${rows.length} rows -> ${resolve7(dir, "metrics.csv")}`);
+    const ri = o["ri-capture"] ? new FileRiSource(deps, resolve8(o["ri-capture"])) : undefined;
+    const rows = await extract(deps, resolve8(dir), ri, o["mem-window"], o["clock-offset-ms"] ? Number(o["clock-offset-ms"]) : undefined);
+    console.log(`${rows.length} rows -> ${resolve8(dir, "metrics.csv")}`);
     return 0;
   }
   if (cmd === "aa") {
@@ -11516,7 +12545,7 @@ async function main2(argv) {
     if (!dir)
       throw new Error("aa needs <out-dir>");
     const config = { ...o.reps ? { reps: Number(o.reps) } : {}, ...o.boot ? { nBoot: Number(o.boot) } : {} };
-    console.log((await aa(deps, resolve7(dir), { config })).table);
+    console.log((await aa(deps, resolve8(dir), { config })).table);
     return 0;
   }
   console.error(USAGE);