@keepsnappy/agent 0.1.0-alpha.24 → 0.1.0-alpha.25

package/dist/keepsnappy.js

@@ -560,10 +560,144 @@ async function readProjectConfig(read, explicit, cwd = process.cwd()) {
 
 // apps/agent/src/run-command.ts
 import { readFile } from "node:fs/promises";
-import { join as join9, resolve as resolve3 } from "node:path";
+import { join as join10, resolve as resolve3 } from "node:path";
 
-// apps/agent/src/data-source.ts
+// apps/agent/src/device-select.ts
+import { basename } from "node:path";
+
+// apps/agent/src/device-model.ts
+import { tmpdir } from "node:os";
 import { join as join2 } 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 = join2(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/device-select.ts
+var CHOOSE = "name one with --device <UDID>, or `device: <UDID>` in keepsnappy.yml";
+var label = (d) => `${d.name} (${d.udid})`;
+var list = (ds) => ds.map(label).join(", ");
+async function simulators2(deps) {
+  const r = await deps.spawner.run("xcrun", ["simctl", "list", "devices", "-j"]);
+  if (r.code !== 0)
+    throw new ConfigError([`cannot list simulators: ${(r.stderr || r.error || `xcrun simctl exited ${r.code}`).trim()}`]);
+  return parseSimulators(r.stdout);
+}
+async function resolveRunDevice(deps, platform, named) {
+  if (platform === "ios-device") {
+    if (!named)
+      throw new ConfigError([`no device named: ${CHOOSE}`]);
+    const phone = (await phones(deps)).find((p) => [p.udid, p.identifier, p.serial].some((x) => x.toLowerCase() === named.toLowerCase()));
+    if (!phone)
+      throw new ConfigError([`device ${named} not found: no connected iPhone has that id (xcrun devicectl list devices)`]);
+    if (!phone.connected)
+      throw new ConfigError([`device ${named} is not connected: plug it in and unlock it`]);
+    return named;
+  }
+  const all = await simulators2(deps);
+  const booted = all.filter((s) => s.state === "Booted");
+  if (named) {
+    const sim = all.find((s) => s.udid.toLowerCase() === named.toLowerCase());
+    if (!sim)
+      throw new ConfigError([`simulator ${named} not found${booted.length ? ` (booted: ${list(booted)})` : " (none is booted)"}`]);
+    if (sim.state !== "Booted")
+      throw new ConfigError([`simulator ${label(sim)} is not booted: xcrun simctl boot ${sim.udid}${booted.length ? `, or ${CHOOSE} (booted: ${list(booted)})` : ""}`]);
+    return sim.udid;
+  }
+  if (booted.length === 0)
+    throw new ConfigError([`no simulator is booted: boot one (xcrun simctl boot <UDID>) and ${CHOOSE}`]);
+  if (booted.length > 1)
+    throw new ConfigError([`several simulators are booted and none is named: ${list(booted)}. Maestro would take the first, so ${CHOOSE}`]);
+  return booted[0].udid;
+}
+var DEVICE_FLAG = /^--(?:device|udid)(?:=(.*))?$/;
+function withDevice(flow, udid) {
+  const [cmd, ...args] = flow.command;
+  if (!cmd || basename(cmd) !== "maestro")
+    return flow;
+  for (const [i, a] of args.entries()) {
+    const m = DEVICE_FLAG.exec(a);
+    if (!m)
+      continue;
+    const given = m[1] ?? args[i + 1];
+    if (given === udid)
+      return flow;
+    throw new ConfigError([`the command names device ${given ?? "(none)"} but this run uses ${udid}: drop --device from the command, it is passed for you`]);
+  }
+  return { ...flow, command: [cmd, "--device", udid, ...args] };
+}
+
+// apps/agent/src/data-source.ts
+import { join as join3 } from "node:path";
 var KEEPSNAPPY_LOG = "Documents/keepsnappy/log.txt";
 var SAFE_FILE = /^[\w.+:-]+$/;
 var profilePath = (fileName) => {
@@ -603,10 +737,10 @@ class IosSimulatorDataSource {
     return dir;
   }
   async fetchProfile(bundleId, fileName) {
-    return this.deps.fs.readFile(join2(await this.dataDir(bundleId), profilePath(fileName)));
+    return this.deps.fs.readFile(join3(await this.dataDir(bundleId), profilePath(fileName)));
   }
   async fetchLog(bundleId) {
-    return this.deps.fs.readFile(join2(await this.dataDir(bundleId), KEEPSNAPPY_LOG));
+    return this.deps.fs.readFile(join3(await this.dataDir(bundleId), KEEPSNAPPY_LOG));
   }
   async describeDevice() {
     const r = await this.deps.spawner.run("xcrun", ["simctl", "list", "devices", this.udid === "booted" ? "booted" : "", "-j"].filter(Boolean));
@@ -625,7 +759,7 @@ class IosDeviceDataSource {
   }
   async fetchLog(bundleId) {
     await this.deps.fs.mkdir(this.scratchDir);
-    const dest = join2(this.scratchDir, "keepsnappy.log");
+    const dest = join3(this.scratchDir, "keepsnappy.log");
     const r = await this.deps.spawner.run("xcrun", [
       "devicectl",
       "device",
@@ -670,7 +804,7 @@ class IosDeviceDataSource {
   }
   async fetchProfile(bundleId, fileName) {
     await this.deps.fs.mkdir(this.scratchDir);
-    const dest = join2(this.scratchDir, fileName);
+    const dest = join3(this.scratchDir, fileName);
     const r = await this.deps.spawner.run("xcrun", [
       "devicectl",
       "device",
@@ -694,10 +828,10 @@ class IosDeviceDataSource {
 }
 
 // apps/agent/src/flows.ts
-import { basename, dirname, join as join3 } from "node:path";
+import { basename as basename2, dirname, join as join4 } from "node:path";
 var FLOW_FILE = /\.ya?ml$/i;
 var NOT_FLOWS = new Set(["config.yaml", "config.yml", "keepsnappy.yml", "keepsnappy.yaml", "keepsnappy.yml", "keepsnappy.yaml"]);
-var flowStem = (path) => basename(path).replace(FLOW_FILE, "");
+var flowStem = (path) => basename2(path).replace(FLOW_FILE, "");
 function flowTags(text) {
   const head = text.split(/^---\s*$/m)[0] ?? "";
   const inline = /^tags:\s*\[([^\]]*)\]/m.exec(head);
@@ -713,11 +847,11 @@ async function isDirectory(path, listDir) {
   if (path === "." || path === ".." || path.endsWith("/"))
     return true;
   const entries = await listDir(dirname(path) || ".").catch(() => []);
-  return entries.some((e) => e.name === basename(path) && e.isDir);
+  return entries.some((e) => e.name === basename2(path) && e.isDir);
 }
 function uniqueNames(files) {
   const stems = files.map(flowStem);
-  return files.map((f, i) => stems.filter((s) => s === stems[i]).length > 1 ? `${basename(dirname(f))}-${stems[i]}` : stems[i]);
+  return files.map((f, i) => stems.filter((s) => s === stems[i]).length > 1 ? `${basename2(dirname(f))}-${stems[i]}` : stems[i]);
 }
 async function findFlowFiles(paths, info, listDir) {
   const out = new Map;
@@ -733,7 +867,7 @@ async function findFlowFiles(paths, info, listDir) {
       }
       const dir = p.replace(/\/+$/, "") || ".";
       const entries = await listDir(dir).catch(() => []);
-      files.push(...entries.filter((e) => !e.isDir && FLOW_FILE.test(e.name) && !NOT_FLOWS.has(e.name)).map((e) => dir === "." ? e.name : join3(dir, e.name)).sort());
+      files.push(...entries.filter((e) => !e.isDir && FLOW_FILE.test(e.name) && !NOT_FLOWS.has(e.name)).map((e) => dir === "." ? e.name : join4(dir, e.name)).sort());
     }
     const meta = info[pat];
     if (meta && (meta.title || meta.description) && files.length !== 1) {
@@ -2379,7 +2513,7 @@ function withLaunchNames(windows) {
 }
 
 // packages/derive/dist/src/model.js
-var DERIVATION_VERSION = 30;
+var DERIVATION_VERSION = 31;
 // packages/stats/dist/src/core/rng.js
 function splitmix32(seed) {
   let s = seed >>> 0;
@@ -4722,10 +4856,11 @@ function footprintAdded(windows) {
   return first && last ? footprintEnd(last) - footprintStart(first) : undefined;
 }
 var RECORD_EDGE_MS = 1;
+var isEndGcRead = (s) => typeof s.raw.reason === "string" && s.raw.reason.startsWith("endgc-read:");
 var SAME_PROCESS_MS = 1000;
-function windowEndFootprints(placed, records) {
+function windowEndFootprints(placed, records, version) {
   const out = new Map;
-  const recs = (records ?? []).map((s) => ({ t: num7(s.raw.t), offset: num7(s.raw.t) === undefined ? undefined : s.wall - num7(s.raw.t), mb: num7(obj7(s.raw.mem).footprintMb) })).filter((r) => r.t !== undefined).sort((a, b) => a.t - b.t);
+  const recs = (records ?? []).filter((s) => version < 31 || !isEndGcRead(s)).map((s) => ({ t: num7(s.raw.t), offset: num7(s.raw.t) === undefined ? undefined : s.wall - num7(s.raw.t), mb: num7(obj7(s.raw.mem).footprintMb) })).filter((r) => r.t !== undefined).sort((a, b) => a.t - b.t);
   for (const w of placed) {
     const own = footprintEnd(w);
     if (own !== undefined) {
@@ -4754,7 +4889,7 @@ function v7Metrics(windows, steps, records, version) {
   for (const [name, v] of added)
     out.set(`step:${name}.sampler_footprint_delta_mb`, median(v));
   const placed = onAppClock(windows, version).filter((w) => w.raw.endReason !== "timeout");
-  const ends = windowEndFootprints(placed, records);
+  const ends = windowEndFootprints(placed, records, version);
   const withEnd = [...ends.keys()];
   const launchWindow = [...withEnd].sort((a, b) => a.startWall - b.startWall || a.endWall - b.endWall)[0];
   const lastWindow = [...withEnd].sort((a, b) => b.endWall - a.endWall)[0];
@@ -5134,7 +5269,7 @@ function keyFirstOpens(windows) {
 }
 
 // packages/derive/dist/src/derive.js
-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, 28, 29, 30];
+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, 28, 29, 30, 31];
 var windowsForVersion = (windows, version = DERIVATION_VERSION, nav) => version >= 22 ? keyFirstOpens(navKeyed(windows, nav, version)) : windows;
 function stepWindowsFor(windows, version = DERIVATION_VERSION, nav) {
   return windowsForVersion(version >= 16 ? withLaunchNames(windows).filter((w) => !isBackgroundWindow(w)) : windows, version, nav);
@@ -5983,23 +6118,18 @@ function tip(headline, rows = [], foot) {
   return foot ? { headline, rows: made, foot } : { headline, rows: made };
 }
 
-// packages/present/dist/src/slowerScreens.js
-var SLOWER_CHART_WORDS = {
-  title: (dir) => dir === "faster" ? "Faster by" : "Slower by",
-  sub: "ms vs main, by screen · biggest first",
-  key: (dir) => `${dir === "faster" ? "Faster by" : "Slower by"} key`,
-  noChange: stateWordInSentence("no-change"),
-  moved: "moved in some runs",
-  cantTell: stateWordInSentence("cant-tell"),
-  cut: (ms) => `Bar cut at ${ms} to keep the other rows readable.`
+// packages/present/dist/src/not-compared.js
+var NOT_COMPARED_KIND_WORDS = {
+  "new-place": "New place",
+  "no-baseline": "No history",
+  "measured-differently": "Measured differently",
+  "too-few-runs": "Too few valid runs",
+  overheated: "Phone started overheated",
+  "main-unstable": "Not judged",
+  other: "Not compared"
 };
-var SLOWER_LEGEND = [
-  { look: "band", word: "normal range" },
-  { look: "slower", word: "slower" },
-  { look: "faster", word: "faster" },
-  { look: "cant", word: stateWordInSentence("cant-tell") }
-];
-var PLACES_OF = { slower: `${STATE_WORDS.worse} places`, faster: `${STATE_WORDS.better} places` };
+var NEW_PLACE_WORDS = { branch: "main has no history for it yet", journey: "no earlier session has it yet" };
+
 // packages/present/dist/src/verdict-section.js
 var places2 = (n) => `${n.toLocaleString("en-US")} ${n === 1 ? "place" : "places"}`;
 var of = (n, total) => `${n.toLocaleString("en-US")} of ${places2(total)}`;
@@ -6087,10 +6217,15 @@ var MAIN_TIER_RESULT_WORDS = {
   slight: STATE_WORDS.warning,
   worse: STATE_WORDS.worse
 };
+var STACK_AT = { same: 0, slight: 1, worse: 2, better: 3, cant: 4 };
+var MAIN_TIER_STACK = Object.keys(STACK_AT).sort((p, q) => STACK_AT[p] - STACK_AT[q]);
+var HAS_VERDICT = { same: false, slight: true, worse: true, better: true, cant: false };
+var MAIN_VERDICT_TIERS = Object.keys(HAS_VERDICT).filter((t) => HAS_VERDICT[t]);
 var MAIN_TIER_RANK = { worse: 0, slight: 1, cant: 2, better: 3, same: 4 };
 var earlierWords = (sessions, since, config) => `main has ${sessions}${config.baseline.sessions === undefined ? "" : ` of ${config.baseline.sessions}`} earlier sessions${since ? ` on ${since}` : ""}`;
 var UNRELIABLE_WORDS = {
   "overheated-start": "the phone started overheated; this session does not count",
+  "overheated-slow": "the phone was overheated; left out of this comparison",
   "few-valid-runs": "too few valid runs; this session does not count"
 };
 function mainCantWords(reason, config) {
@@ -6160,29 +6295,67 @@ function mainCutWords(v) {
   return parts.length ? parts.join(" ") : "Measures alike; no baseline cut.";
 }
 var BY_RANK = Object.keys(MAIN_TIER_RANK).sort((a, b) => MAIN_TIER_RANK[a] - MAIN_TIER_RANK[b]);
-var MEMORY_HELD_WORDS = { head: "Memory", rest: "still held after the journey", text: "Memory still held after the journey" };
-var MAIN_CHART_TITLES = {
-  renders: "Places vs their normal range",
-  rendersTip: (baseline) => tip("Places vs their normal range", [
-    ["Bar", "The journey’s places in one session"],
-    ["Colour", `Result against main’s ${baseline} sessions before it`],
-    ["Dashed", `Not judged yet: main is collecting ${baseline} sessions on this setup`]
-  ], "Main collects them after its start or a change"),
-  memory: `${MEMORY_HELD_WORDS.text} · MB`,
-  memoryTip: tip(MEASURES["mem.retained_growth_mb"].label, [
-    ["Shows", "What it still holds after the clean-up at its end"],
-    ["Line", "The median of a session"],
-    ["Band", "The spread inside the session"]
-  ])
+
+// packages/present/dist/src/app-cpu.js
+var APP_CPU_WORDS = {
+  title: "App CPU · cores",
+  titleTip: tip("App CPU", [
+    ["Shows", "the app’s process, not the whole phone"],
+    ["Line", "The median of a session’s runs"],
+    ["Band", "From its lowest to its highest run"],
+    ["1 core", "One CPU core fully busy; above 1 is usual on a multi-core phone"]
+  ]),
+  none: "No CPU reading yet",
+  sessionNone: "No CPU reading for this session yet.",
+  runTitle: "App CPU over the run · cores",
+  runTip: tip("App CPU over the run", [
+    ["Shows", "the app’s process, not the whole phone"],
+    ["Block", "One step of the journey, in run order"],
+    ["Width", "How long the step took"],
+    ["Height", "The app’s average cores while it ran"],
+    ["Time", "Steps laid end to end; launch and time between steps are not shown."]
+  ]),
+  noSteps: "No App CPU for this run: it has no declared steps with a CPU reading.",
+  axisEnd: "s of steps",
+  mean: "mean",
+  loading: "Loading the run…",
+  failed: "Couldn’t load the run.",
+  medianRun: (k, n) => `Median run: Run ${k} of the ${n} runs with a CPU reading`,
+  otherRuns: "Other runs",
+  runChip: (run, median) => `Run ${run}${median ? " · median" : ""}`,
+  runAria: (steps, seconds) => `App CPU over the run in cores: ${steps} steps in run order over ${seconds} seconds. Use left and right arrows for each step.`
 };
+var NOT_STORED_WORD = "not stored";
+
+// packages/present/dist/src/tips.js
+var LEAD_TIP = tip("A lead, not a confirmed cause", [], "Read from what the app did");
+
+// packages/present/dist/src/placeStrip.js
+var PLACE_STRIP_WORDS = {
+  strip: "vs main",
+  value: "This session",
+  change: "Change",
+  noRange: `${NOT_COMPARED_KIND_WORDS["new-place"]}: ${NEW_PLACE_WORDS.journey}`
+};
+// packages/present/dist/src/slowerScreens.js
+var SLOWER_CHART_WORDS = {
+  title: (dir) => dir === "faster" ? "Faster by" : "Slower by",
+  sub: "ms vs main, by screen · biggest first",
+  noChange: stateWordInSentence("no-change"),
+  moved: "moved in some runs",
+  cantTell: stateWordInSentence("cant-tell")
+};
+var PLACES_OF = { slower: `${STATE_WORDS.worse} places`, faster: `${STATE_WORDS.better} places` };
 // packages/present/dist/src/rules-lines.js
 var RULES_WORDS = {
   action: "Recompute",
   older: "Computed with older rules",
   marker: "new rules",
+  markerShort: "rules",
   blocksUnderPrevious: "blocks under the previous rules",
   bannerText: "New rules: pull requests wait for a recompute",
   bannerAction: "Recompute",
+  bannerSeparator: "·",
   engine: "engine",
   engineUpdate: "engine update"
 };
@@ -6190,7 +6363,7 @@ var sameRulesRef = (a, b) => a.configId === b.configId && a.coreVersion === b.co
 var rulesChangeText = (computed, live) => sameRulesRef(computed, live) ? null : RULES_WORDS.older;
 var staleRulesText = (rules) => rules ? rulesChangeText(rules.computed, rules.live) : null;
 var blocksUnderPreviousRulesText = (r) => r.blocking && r.stale ? RULES_WORDS.blocksUnderPrevious : null;
-var waitingForRecomputeBanner = (r) => r.waiting > 0 ? `${RULES_WORDS.bannerText} · ${RULES_WORDS.bannerAction}` : null;
+var waitingForRecomputeBanner = (r) => r.waiting > 0 ? `${RULES_WORDS.bannerText} ${RULES_WORDS.bannerSeparator} ${RULES_WORDS.bannerAction}` : null;
 
 // packages/present/dist/src/summary-message.js
 var SUMMARY_WORDS = {
@@ -6232,6 +6405,7 @@ var ORDER = [...STATE_ORDER.slice(0, 3), "not-computed", ...STATE_ORDER.slice(3)
 var rank = (l) => ORDER.indexOf(l.state);
 var WORD = { ...STATE_WORDS, "not-computed": SUMMARY_WORDS.notComputed };
 var shownLane = (lanes) => [...lanes].sort((a, b) => rank(a) - rank(b) || b.places - a.places)[0];
+var outcomeOf = (lanes) => new Set(lanes.map((x) => x.phone ?? "-")).size === 1 ? shownLane(lanes)?.outcome ?? null : null;
 var clip = (s, n) => s.length > n ? `${s.slice(0, n - 1)}…` : s;
 var NAME = { name: 32, button: 30 };
 var TOP2 = 3;
@@ -6323,8 +6497,9 @@ function summaryMessage(input) {
   const phones = new Set(input.lanes.map((x) => x.phone ?? "-")).size;
   const single = input.lanes.length === 1;
   const newestSlower = !input.pr && (l.state === "worse" || l.state === "warning");
+  const said = outcomeOf(input.lanes);
   const lead = [
-    laneWord(l),
+    said?.word ?? laneWord(l),
     ...input.app ? [input.app] : [],
     journeys === 1 ? l.journey ?? "journey" : SUMMARY_WORDS.journeys(journeys),
     input.pr && input.prNumber ? `${input.branch} (#${input.prNumber})` : input.branch,
@@ -6333,7 +6508,7 @@ function summaryMessage(input) {
   const label = input.pr ? SUMMARY_WORDS.link.comparison : SUMMARY_WORDS.link.session;
   const link = { label, url: (single ? l.url : null) ?? input.url };
   if (!input.slack)
-    return { state: l.state, newestSlower, lead, ...withLines(changeLines(l, input.pr, newestSlower)), link };
+    return { state: l.state, newestSlower, lead, ...withLines(changeLines(l, input.pr, newestSlower, said)), link };
   const lines = [];
   if (l.state === "worse" || l.state === "warning") {
     const n = l.places || l.changes.length;
@@ -6356,10 +6531,12 @@ function summaryMessage(input) {
   if (context)
     lines.push(basis ? context : upper(context));
   lines.push(...rulesLines(l));
+  if (said)
+    lines[0] = `${said.line} · ${lines[0]}`;
   return { state: l.state, newestSlower, lead, ...withLines(lines), link };
 }
-function changeLines(l, pr, newestSlower) {
-  const lines = [];
+function changeLines(l, pr, newestSlower, said) {
+  const lines = said ? [said.line] : [];
   const basis = compared(l, pr, newestSlower);
   const extra = conditions(l, pr).join(", ");
   const heat = l.heatedRuns ? upper(SUMMARY_WORDS.heated(l.heatedRuns, l.runs)) : null;
@@ -6372,7 +6549,7 @@ function changeLines(l, pr, newestSlower) {
       const key = c.key ?? c.place ?? c.measure;
       return seen.has(key) ? false : (seen.add(key), true);
     });
-    const room = MAX_LINES - tail.length;
+    const room = MAX_LINES - lines.length - tail.length;
     const top = places.length > room ? places.slice(0, Math.min(TOP2, room - 1)) : places.slice(0, TOP2);
     lines.push(...top.map((c) => changeLine(c, l.state)));
     if (!top.length)
@@ -6396,6 +6573,43 @@ function noResultMessage(branch, reason, url) {
   return { state: "not-computed", newestSlower: false, lead: `${SUMMARY_WORDS.noResult} · ${clip(branch, NAME.name)}`, ...withLines([reason.replace(/\.$/, "")]), link: url ? { label: SUMMARY_WORDS.link.runSet, url } : null };
 }
 
+// packages/present/dist/src/fix-words.js
+var FIX_VERDICT_WORDS = {
+  fixed: "Fixed",
+  "no-change": STATE_WORDS["no-change"],
+  worse: STATE_WORDS.worse,
+  waiting: "Waiting for the fix branch"
+};
+var ORDER2 = Object.keys(FIX_VERDICT_WORDS);
+var FIX_OUTCOME_WORDS = {
+  fixed: FIX_VERDICT_WORDS.fixed,
+  "partly-fixed": "Partly fixed",
+  "no-change": FIX_VERDICT_WORDS["no-change"],
+  worse: FIX_VERDICT_WORDS.worse,
+  waiting: FIX_VERDICT_WORDS.waiting
+};
+var fixCardText = (c) => [`${c.outcome_word}: ${c.headline}`, ...c.lines.map((l) => `  ${l.text}`), ...c.notes.map((n) => `  ${n}`)].join(`
+`);
+
+// packages/present/dist/src/branch-outcome.js
+var BRANCH_OUTCOME_WORDS = {
+  title: "Since the first session",
+  fixed: FIX_VERDICT_WORDS.fixed,
+  "still-worse": "Still worse",
+  "got-worse": "Got worse",
+  reRun: "re-run",
+  first: "First session",
+  judging: "Judging",
+  empty: ["No session of this branch yet.", "Sessions come from your CI or the perf: measure label."]
+};
+function saidOutcome(o) {
+  return o && (o.id === "fixed" || o.id === "still-worse" || o.id === "got-worse") && o.word && o.line && o.state ? o : null;
+}
+function outcomeLines(o) {
+  const said = saidOutcome(o);
+  return [...said ? [`${said.word}: ${said.line}`] : [], ...o?.pending ? [o.pending] : []];
+}
+
 // packages/present/dist/src/run-set-message.js
 var midLine = (label, metric) => !metric.startsWith("component:") && /^[A-Z][a-z]*(\s|$)/.test(label) ? `${label[0].toLowerCase()}${label.slice(1)}` : label;
 function movedItems(v, sc) {
@@ -6491,7 +6705,8 @@ function laneOf(v, sc, set) {
     fasterByMs: sc.headline?.faster_by_ms ?? null,
     toCheckCount: sc.headline?.to_check_count ?? null,
     rules: sc.headline?.rules ?? null,
-    waiting: sc.headline?.waiting_for_reprocess ?? 0
+    waiting: sc.headline?.waiting_for_reprocess ?? 0,
+    outcome: saidOutcome(sc.branch_outcome)
   };
 }
 var isPending = (s) => lanesOf(s).every((l) => l.state === "not-computed" && !l.word?.startsWith(`${NOT_JUDGED_WORD}: `));
@@ -6506,7 +6721,7 @@ function messageTone(s) {
     return { mark: "\uD83D\uDD34", color: MESSAGE_COLORS.error };
   if (lanes.some((l) => l.state === "warning"))
     return { mark: "\uD83D\uDFE1", color: MESSAGE_COLORS.warn };
-  switch (shownLane(lanes)?.state) {
+  switch (outcomeOf(lanes)?.state ?? shownLane(lanes)?.state) {
     case "better":
       return { mark: "\uD83D\uDFE2", color: MESSAGE_COLORS.better };
     case "cant-tell":
@@ -6594,32 +6809,51 @@ function notificationBody(e) {
     return `${e.word}, ${e.headline.component} ${e.headline.change}`;
   return [e.word, e.journey, e.phone ? phoneModelName(e.phone) : e.phone].filter(Boolean).join(" · ");
 }
+var shellWord = (s) => /^[A-Za-z0-9_@%+=:,./-]+$/.test(s) ? s : `'${s.replace(/'/g, `'\\''`)}'`;
 var FIX_END_WORDS = {
   "dry-run": (n) => `Dry run: ${n} ${n === 1 ? "commit" : "commits"} on a local branch; nothing was pushed or opened.`,
   opened: (n) => `Draft PR opened with ${n} ${n === 1 ? "commit" : "commits"}.`,
-  none: () => "Nothing to fix: the agent found nothing it could edit safely.",
-  refused: () => "The change was refused by the checks; nothing was committed.",
-  main: () => "Main has no branch to fix.",
-  fork: () => "A pull request from a fork is not supported here.",
-  closed: () => "The pull request is closed.",
-  exists: () => "A fix branch for this pull request already exists.",
-  "unsafe-checkout": () => "The checkout has a link that points outside it; nothing was started.",
-  timeout: () => "It ran out of time; nothing was committed.",
-  failed: () => "The fix did not complete.",
-  "not-json": () => "The agent’s answer was not the list of changes it made.",
-  schema: () => "The agent’s list of changes did not match what it changed.",
+  none: () => "Nothing to fix: the agent found nothing it could edit safely — investigate again, then Propose fixes.",
+  "no-findings": () => "Nothing to fix on this branch now — its findings were resolved or are no longer slower; nothing was started.",
+  refused: () => "The change was refused by the checks; nothing was committed — the refused files are listed below.",
+  main: () => "Main has no branch to fix — propose fixes on a pull request instead.",
+  fork: () => "The pull request comes from a fork — push its branch to the repo itself, then Propose fixes.",
+  closed: () => "The pull request is closed — reopen it, then Propose fixes.",
+  exists: (_n, o = {}) => o.fixBranch && o.repo ? `The fix branch ${o.fixBranch} is left from an earlier run — delete it with \`git -C ${shellWord(o.repo)} branch -D ${shellWord(o.fixBranch)}\`, then Propose fixes.` : "A fix branch for this pull request already exists — review or delete it, then Propose fixes.",
+  "unsafe-checkout": () => "The checkout has a link that points outside it; nothing was started — remove the link from the branch, then Propose fixes.",
+  timeout: () => "It ran out of time; nothing was committed — pick fewer findings, then Propose fixes.",
+  failed: () => "The fix did not complete — the log in KeepSnappy’s state folder says why; try again.",
+  "not-json": () => "The agent’s answer was not the list of changes it made — try again.",
+  schema: () => "The agent’s list of changes did not match what it changed — try again.",
   stopped: () => "It was stopped.",
-  push: () => "The branch could not be pushed.",
-  gh: () => "GitHub (gh) refused or failed.",
-  api: () => "The KeepSnappy API did not answer."
+  push: () => "The branch could not be pushed — check that you can push to the repo, then try again.",
+  gh: () => "GitHub (gh) could not read or open the pull request — check `gh pr view` in the repo folder, then try again.",
+  "gh-auth": () => "GitHub CLI (gh) is not signed in — run `gh auth login`, then Propose fixes.",
+  "no-pr": () => "No pull request on GitHub for this branch — open one, then Propose fixes.",
+  "no-repo": () => "No local checkout of this app — set its folder in Settings › Apps & code, then Propose fixes.",
+  api: () => "The KeepSnappy API did not answer — try again in a minute."
 };
-var fixEndText = (status, commits) => Object.hasOwn(FIX_END_WORDS, status) ? FIX_END_WORDS[status](commits) : null;
+var fixEndText = (status, commits, o = {}) => Object.hasOwn(FIX_END_WORDS, status) ? FIX_END_WORDS[status](commits, o) : null;
 var FIX_WHY_NOT = {
   main: "Main has no branch to fix.",
   notWorse: "Only Worse and Slightly worse findings are fixed.",
-  notMeasured: "Not a measured change."
+  notMeasured: "Not a measured change.",
+  noPr: FIX_END_WORDS["no-pr"](),
+  ghAuth: FIX_END_WORDS["gh-auth"](),
+  gh: "GitHub didn’t answer — check the network, then try again.",
+  fork: FIX_END_WORDS.fork(),
+  closed: FIX_END_WORDS.closed()
+};
+var fixNoRepoText = (app) => `No local checkout of ${app} — set its folder in Settings › Apps & code.`;
+var FIX_REJECT_REASONS = ["too-many", "bad-command", "unknown-app", "duplicate"];
+var FIX_REJECT_WORDS = {
+  "too-many": (o) => `Up to ${o.max} findings per fix, and this asked for ${o.count} — uncheck some, then Propose fixes.`,
+  "bad-command": () => "The watcher could not read this fix command — update KeepSnappy, then try again.",
+  "unknown-app": () => "The watcher has not loaded this app’s results yet — wait a moment, then Retry.",
+  duplicate: () => "A fix of these findings is already running or queued — its result shows here when it ends."
 };
-var FIX_NOTIFY_STATUSES = ["opened", "refused", "failed", "timeout", "not-json", "schema", "unsafe-checkout", "push", "gh", "api"];
+var fixRejectText = (reason, o = { count: 0, max: 0 }) => FIX_REJECT_REASONS.includes(reason) ? FIX_REJECT_WORDS[reason](o) : null;
+var FIX_NOTIFY_STATUSES = ["opened", "refused", "failed", "timeout", "not-json", "schema", "unsafe-checkout", "push", "gh", "gh-auth", "no-pr", "no-repo", "api"];
 // packages/present/dist/src/hypothesis-words.js
 var HYPOTHESIS_OUTCOME_WORDS = {
   open: "Open",
@@ -6627,10 +6861,10 @@ var HYPOTHESIS_OUTCOME_WORDS = {
   rejected: "Rejected",
   dismissed: "Dismissed"
 };
-var ORDER2 = ["open", "confirmed", "rejected", "dismissed"];
+var ORDER3 = ["open", "confirmed", "rejected", "dismissed"];
 var HYPOTHESIS_NOTE = "Predictions from a coding agent: only a later measured session confirms or rejects one.";
 function hypothesesSummaryText(counts) {
-  const present = ORDER2.map((id) => [id, counts[id] ?? 0]).filter(([, n]) => n > 0);
+  const present = ORDER3.map((id) => [id, counts[id] ?? 0]).filter(([, n]) => n > 0);
   const total = present.reduce((sum, [, n]) => sum + n, 0);
   if (total === 0)
     return "No hypotheses";
@@ -6687,48 +6921,8 @@ function runDurationText(ms) {
     return `${m}m ${s % 60}s`;
   return `${Math.floor(m / 60)}h ${m % 60}m`;
 }
-// packages/present/dist/src/fix-words.js
-var FIX_VERDICT_WORDS = {
-  fixed: "Fixed",
-  "no-change": STATE_WORDS["no-change"],
-  worse: STATE_WORDS.worse,
-  waiting: "Waiting for the fix branch"
-};
-var ORDER3 = Object.keys(FIX_VERDICT_WORDS);
-// packages/present/dist/src/app-cpu.js
-var APP_CPU_WORDS = {
-  title: "App CPU · cores",
-  titleTip: tip("App CPU", [
-    ["Shows", "the app’s process, not the whole phone"],
-    ["Line", "The median of a session’s runs"],
-    ["Band", "From its lowest to its highest run"],
-    ["1 core", "One CPU core fully busy; above 1 is usual on a multi-core phone"]
-  ]),
-  none: "No CPU reading yet",
-  sessionNone: "No CPU reading for this session yet.",
-  runTitle: "App CPU over the run · cores",
-  runTip: tip("App CPU over the run", [
-    ["Shows", "the app’s process, not the whole phone"],
-    ["Block", "One step of the journey, in run order"],
-    ["Width", "How long the step took"],
-    ["Height", "The app’s average cores while it ran"],
-    ["Time", "Steps laid end to end; launch and time between steps are not shown."]
-  ]),
-  noSteps: "No App CPU for this run: it has no declared steps with a CPU reading.",
-  axisEnd: "s of steps",
-  mean: "mean",
-  loading: "Loading the run…",
-  failed: "Couldn’t load the run.",
-  medianRun: (k, n) => `Median run: Run ${k} of the ${n} runs with a CPU reading`,
-  otherRuns: "Other runs",
-  runChip: (run, median) => `Run ${run}${median ? " · median" : ""}`,
-  runAria: (steps, seconds) => `App CPU over the run in cores: ${steps} steps in run order over ${seconds} seconds. Use left and right arrows for each step.`
-};
-
-// packages/present/dist/src/tips.js
-var LEAD_TIP = tip("A lead, not a confirmed cause", [], "Read from what the app did");
 // apps/agent/src/upload.ts
-import { join as join4 } from "node:path";
+import { join as join5 } from "node:path";
 var MAX_RATE_RETRIES = 5;
 var sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 var pause = (ms) => sleep(ms);
@@ -6777,7 +6971,7 @@ async function uploadRuns(deps, outDir, runs, opts) {
       skipped.push({ run_id: r.run_id, why: r.invalid_reason || "invalid" });
       continue;
     }
-    const log = await deps.fs.readFile(join4(outDir, r.run_id, "keepsnappy.log"));
+    const log = await deps.fs.readFile(join5(outDir, r.run_id, "keepsnappy.log"));
     const windows = windowsInRun(parseWindows(log), r.t0, r.t1);
     if (windows.length === 0) {
       skipped.push({ run_id: r.run_id, why: "no-windows" });
@@ -6817,7 +7011,7 @@ async function uploadRuns(deps, outDir, runs, opts) {
     }
     let markers = [];
     try {
-      markers = parseMarkersNdjson(await deps.fs.readFile(join4(outDir, r.run_id, "markers.ndjson")));
+      markers = parseMarkersNdjson(await deps.fs.readFile(join5(outDir, r.run_id, "markers.ndjson")));
     } catch {}
     for (const m of markers) {
       await call(f, opts.ingestUrl, "/v1/markers", { authorization: `Bearer ${token}` }, { step: m.step, phase: m.phase, t_host: m.t_host });
@@ -6865,17 +7059,17 @@ function summarize(input) {
 }
 
 // packages/verdict-core/dist/src/version.generated.js
-var CORE_FINGERPRINT = "c1100da930fca9df";
+var CORE_FINGERPRINT = "ae0b19d47d41bbfe";
 
 // packages/verdict-core/dist/src/version.js
 var CORE_VERSION = parseInt(CORE_FINGERPRINT.slice(0, 7), 16);
-// packages/verdict-core/dist/src/reliable.js
-var prRunsNeeded = (config) => config.reliable?.minValidRuns ?? config.minRuns;
-
 // packages/verdict-core/dist/src/window-count.js
 var WINDOW_DEPENDENT_JOURNEY_MEASURES = ["sampler.cpu_ms", "sampler.frames.longest_gap_ms"];
 var OFF = new WeakSet;
 
+// packages/verdict-core/dist/src/reliable.js
+var prRunsNeeded = (config) => config.reliable.minValidRuns;
+
 // packages/verdict-core/dist/src/clauses.js
 var row = (id, what, unit, cmp, ruling, uncalibrated, value) => ({ id, what, unit, cmp, ruling, uncalibrated, value });
 var NO_RULING = "no ruling: a starting value of the deciding config (L2 audit F-13)";
@@ -6888,7 +7082,7 @@ var CLAUSES = {
   "S-UNCERTAIN": row("S-UNCERTAIN", "A worse result is uncertain and does not block while main has fewer sessions than this.", "sessions", "≥", 'REQ-VER-38, Arek 2026-10-16 "Nie blokuj przy małej bazie"', false, { belowMainSessions: 3 }),
   "G-JUDGE-FROM": row("G-JUDGE-FROM", "A phone or simulator is judged only with at least this many main sessions.", "sessions", "≥", "REQ-VER-41, Arek 2026-10-18", false, { mainSessions: 3 }),
   "W-WORKKIND": row("W-WORKKIND", "The share of render time spent mounting from which a place is an in-screen mount, not an update.", "share", "≥", "REQ-MET-25; TraceSift MOUNT_DOMINANT_SHARE", true, { mountShareAtLeast: 0.8 }),
-  "W-WINDOW-COUNT": row("W-WINDOW-COUNT", "A PR run that opened fewer windows on a screen than this share of main's median there leaves that screen (its taps, scrolls and steps) and the journey's window-dependent totals out of its comparisons.", "share", "≥", "plan 51 D2 floor (90 % of the usual window count), Arek 2026-10-22 ~07:20, per screen (plan 79 S8)", false, { below: 0.9 }),
+  "W-WINDOW-COUNT": row("W-WINDOW-COUNT", "A PR run that opened fewer windows on a screen than this share of main's median there leaves that screen (its taps, scrolls and steps) and the journey's window-dependent totals out of its comparisons. Its scroll gestures count as main's median of them ([ctl-arek-gesture-bug]).", "share", "≥", "plan 51 D2 floor (90 % of the usual window count), Arek 2026-10-22 ~07:20, per screen (plan 79 S8); scrolls at main's median (Arek 2026-10-26, [ctl-arek-gesture-bug])", false, { below: 0.9 }),
   "T-FRAME": row("T-FRAME", "One frame, the unit of every frame limit, the same on every screen (a 120 Hz phone is not held to 8.3 ms).", "ms", ">", "REQ-MET-23, Arek 2026-10-16", false, { ms: LIMIT_FRAME_MS }),
   "C-DETAIL-MS": row("C-DETAIL-MS", "A component below this keeps key and ms only and is not listed as New or Removed.", "ms", "≥", "plan 79 S9 r2, Arek 2026-10-23 13:20; half the lowest component rule floor (judged and evidence)", false, { ms: Math.min(FLOOR.abs, COMPONENT_WARN_MS.update, COMPONENT_WARN_MS.work) / 2 }),
   "T-WARN-MS": row("T-WARN-MS", "A judged change counts as Slightly worse past at least this many ms (an update, or an entry / in-screen mount).", "ms", ">", "REQ-MET-26 (Arek 2026-10-16 ~14:30, ~17:30); followups [RULED 2026-10-18 ~09:40]", false, COMPONENT_WARN_MS),
@@ -7110,6 +7304,13 @@ var SDK_RELEASES = [
     renamed: { places: ["screen", "press", "drag"] },
     uncalibrated: false,
     source: "#277 (plan 74 step 4 SDK review): screen windows end at every touch delivered while open; late-mounting screens keep their component key (3-commit cap gone), so screen keys and the press/drag keys on them change; the run commit stream is cut at the flush, not inside a window (window times of long journeys and journey CPU change); a gesture whose touchEnd never reached JS moves press → drag; a late press takes its own open sample (press sampler measures). Flush answers lost data as error (validity only, no measure). Launch and journey memory stay compared."
+  },
+  {
+    version: "0.1.0-alpha.18",
+    previous: "0.1.0-alpha.17",
+    declares: "nothing",
+    uncalibrated: false,
+    source: "packages/react-native since bb71e4ec (alpha.17 as published: its js/, ios/ and android/ equal that commit's). #578: the flush uploads 8 profile files at a time on native upload pools (Android: ThreadPoolExecutor, iOS: OperationQueue, both created at the first upload) and iOS streams the gzip to a temp file. All of it runs after the flush link, which ends every window first (core.ts flushOnce endAll('flush')), and the driver sends that link after the end GC and its memory read have been answered (session.ts endRun); the next run relaunches the app, so no pool, gzip or PUT lands in a measured window, the end GC or its memory read. Same files and lines go up; only the time from the flush link to its ack changes, which no measure reads. #615: EXPO_PUBLIC_KEEPSNAPPY_TAP_TEXT=0 (opt-in, default unchanged) drops visible text from the legacy tap name only (legacyName, touched); press and drag place keys are component keys (fiber.ts placeName) and stay the same. Were a key to change, it would be a new place with its own history (as with alpha.12 and alpha.16 `renamed`), not a measure change; here the only effect is that placeAliases (an information-only join of renamed places) finds fewer one-to-one legacy names. The rest is test-only (resetRunStateForTest, resetCurrentScreenForTest, @keepsnappy/test-support). REQ-FARM-35."
   }
 ];
 var DRIVER_RELEASES = [
@@ -7222,13 +7423,73 @@ var DRIVER_RELEASES = [
     declares: [
       { affects: MEASURES_AT("drag"), places: ["drag"] },
       { affects: MEASURES_AT("step"), places: ["step"] },
-      { affects: MEASURES_AT("journey"), places: ["journey"] }
+      { affects: MEASURES_AT("journey"), places: ["journey"] },
+      { affects: MEASURES_AT("screen"), places: ["screen"] },
+      { affects: MEASURES_AT("press"), places: ["press"] }
+    ],
+    uncalibrated: false,
+    source: "appium-driver CHANGELOG \"0.1.0-alpha.24\", 2026-10-30 (ctl 09:15, Arek: alpha.24 = the audience helpers with TapIn's 3-page audience, the freeze starts from it; D1 counts per [ctl-arek-p84] and [ctl-arek-nav-scroll]): pagedToEnd and topMeasured give lists a journey pages itself a fixed count of controlled gestures per measured step (per page exactly `gestures`, the top 2, fewer only when the first row already shows after the 1st), the way to the page's marker and back to the top being a navigation pass outside the step; before, TapIn's own audience loops sent a count that depended on where the list rested (Android to-end 10/10/8, iOS to-top 6/6/5). New audience step names are new step places; the audience drag places hold only the controlled gestures; the top step returns right after its gestures and navigation passes read rests faster, so step and journey places move too. Also #596/#606 (CHANGELOG `beginRun`): every iteration launches the app to home, sends the activation link, waits 2 s and relaunches to home, where alpha.23 sent the link into the process the journey had left running and the journey launched the app itself; the process each run measures starts later and from home, so the first screen windows after launch and the taps on them move (A24 gate, same app build c500cef as main: Pixel set a7ae0d0a Worse at screen HomeScreen#1, CommunityFeedScreen#1, JoinRoomScreen#1 and press HeroLiveContent›Touchable#1; iPhone set 16e7dbc5 only at an audience drag place, declared already; ctl 2026-10-31). Drag, step, journey, screen and press places are declared, on both platforms (REQ-FARM-35)."
+  },
+  {
+    version: "0.1.0-alpha.25",
+    previous: "0.1.0-alpha.24",
+    declares: [
+      { affects: MEASURES_AT("screen"), places: ["screen"] },
+      { affects: MEASURES_AT("press"), places: ["press"] },
+      { affects: MEASURES_AT("drag"), places: ["drag"] },
+      { affects: MEASURES_AT("step"), places: ["step"] },
+      { affects: MEASURES_AT("journey"), places: ["journey"] },
+      { affects: MEASURES_AT("nav"), places: ["nav"] }
     ],
     uncalibrated: false,
-    source: "appium-driver CHANGELOG \"0.1.0-alpha.24\", 2026-10-30 (ctl 09:15, Arek: alpha.24 = the audience helpers with TapIn's 3-page audience, the freeze starts from it; D1 counts per [ctl-arek-p84] and [ctl-arek-nav-scroll]): pagedToEnd and topMeasured give lists a journey pages itself a fixed count of controlled gestures per measured step (per page exactly `gestures`, the top 2, fewer only when the first row already shows after the 1st), the way to the page's marker and back to the top being a navigation pass outside the step; before, TapIn's own audience loops sent a count that depended on where the list rested (Android to-end 10/10/8, iOS to-top 6/6/5). New audience step names are new step places; the audience drag places hold only the controlled gestures; the top step returns right after its gestures and navigation passes read rests faster, so step and journey places move too. Drag, step and journey places are declared, on both platforms (REQ-FARM-35)."
+    source: "The instrument bundle of 2026-10-31 (ctl 13:30, Arek YES 10:30), both candidates of the scroll lab A/B. (1) #675 (L1a+N1, L2, L3): a tap is one request, with no DELETE /actions after its pointerUp, so the span from a tap to the next touch is one farm round trip shorter (press windows, the screen windows a tap opens, the steps holding taps, the run); a navigation pass reads its rests by cost (Android: the page source on a light tree, one held row on a heavy one, timed on the list's first read) and a held-row read is one command (the frame, no label), so the reads before a pass's first stroke, inside the touch window before it (a drag after a measured step, a press or screen before a pass), and the nav windows between strokes move. (2) L1b, included only if the A/B keeps it: on Android the end/top steps read the coast inside the measured step (drag and step, covered above). (3) #607 beforeLaunch: a per-iteration journey hook that runs after the activation link and before the measured launch, in the process the launch replaces; nothing measured. (4) The default Android device is the farm Pixel 9 Pro (Google Pixel 9 Pro-15.0, was the retired Pixel 7): a default only, a run naming its device sends the same session; nothing measured. Launch and background places are not declared: no change reaches the launch window or a backgrounded app (REQ-FARM-35)."
   }
 ];
-var JOURNEY_RELEASES = {};
+var JOURNEY_RELEASES = {
+  tapin: [
+    {
+      version: "01c42817b31f",
+      previous: "9dc9b234b811",
+      declares: [
+        { affects: MEASURES_AT("journey"), places: ["journey"] },
+        { affects: MEASURES_AT("launch"), places: ["launch"] },
+        { affects: MEASURES_AT("screen"), places: ["screen"] },
+        { affects: MEASURES_AT("press"), places: ["press"] },
+        { affects: MEASURES_AT("drag"), places: ["drag"] },
+        { affects: MEASURES_AT("step"), places: ["step"] }
+      ],
+      uncalibrated: false,
+      source: "TapIn instrument bundle gate test/keepsnappy-bundle-gate @ca3e1fde2 (ctl 2026-10-31 13:30), three journey changes over 9dc9b234b811, both platforms. (1) #3873 (ff729dfd5): the waits between steps in profile, chat and front-row and the home check after the first join's launch are gone; they sat in the touch window before the next touch, so press, drag (the profile close swipe), screen and launch windows (the home check came before the first action) end sooner, and the run is shorter. (2) B5 (2ca5adac3, 499aed4e5): every launch starts in the reset mock world (#607 beforeLaunch, before the measured launch) and the fake room is filled at home before the community link, so the launch and home windows, the community and room screens, the taps and steps on them move. (3) Quick checks (6e0a0f56a, ca3e1fde2): after reactions.close the journey opens and closes 27 new places (live widgets, the viewer summary, community post/events/event/about/feed, home mine/settings) and ends on home; the new places are new keys with no baseline, not declared. Existing places that move: the reactions.close press and the live screen window it leaves open end at the next touch, not at the journey end; reactions.close is no longer the last step, so the end GC's step rows go to home.tab-home; the end GC and memory read now see home with the live left, so the journey's end, peak and kept memory (mem.end_mb, mem.end_after_gc_mb, mem.retained_growth_mb, mem.js_heap_end_mb, all at the journey place) and whole-run CPU change; sdk.journey_ends_home goes 0 -> 1, a setup fact (facts NOT_FACTS) that no verdict compares, so it has nothing to declare. nav and background places are not declared: no change reaches a navigation pass or a backgrounded app. A part the gate drops narrows this entry (REQ-FARM-35)."
+    },
+    {
+      version: "9dc9b234b811",
+      previous: "a02a95ce2c8d",
+      declares: [
+        { affects: MEASURES_AT("journey"), places: ["journey"] },
+        { affects: MEASURES_AT("screen"), places: ["screen"] },
+        { affects: MEASURES_AT("launch"), places: ["launch"] },
+        { affects: MEASURES_AT("press"), places: ["press"] },
+        { affects: MEASURES_AT("drag"), places: ["drag"] },
+        { affects: MEASURES_AT("nav"), places: ["nav"] },
+        { affects: MEASURES_AT("step"), places: ["step"] },
+        { affects: MEASURES_AT("background"), places: ["background"] }
+      ],
+      uncalibrated: false,
+      source: 'TapIn e2e/keepsnappy/live-ui-appium.mjs (the only file of the hash that changed), gigaverse-mobile bfd33ebb8 (main since #3852, a02a95ce2c8d) -> 0ac3879db "pin KeepSnappy to alpha.24" (TapIn PR #3872, 9dc9b234b811; ctl 2026-10-31). (1) The audience: one `audience.scroll-to-end` step over 5 pages, each a loop of long scrolls until "Show more" shows and its tap inside the step, and a `audience.scroll-to-top` loop capped by the way down, become driver alpha.24 `pagedToEnd` over 3 pages (steps `audience.scroll-to-more-<p>` with a fixed gesture count, the tap in its own step `audience.show-more-<p>`, the way to the marker a navigation pass) and `topMeasured` (`audience.scroll-to-top`, 2 gestures): step places are renamed and reshaped, the audience drag places hold other gestures, "Show more" is tapped 3 times, not 5, after other scrolls, navigation passes are new nav places, and two fewer pages load (step, drag, press, nav, journey). (2) `enterLive` no longer relaunches the app on its first join, as alpha.24 `beginRun` launches it (the setup changes of TapIn #3853, folded into the pin): the process each run measures, its launch and the first screens and taps after it come from `beginRun`, followed by its activation check, not from the journey (launch, screen, press, background, journey). (3) The waits for the newest chat row (30 s) and the event pill (10 s) before the first step are gone, so the first steps start from a less settled room (screen, press, step). The whole run changes, on both platforms: every place kind of a run is declared except `other` (REQ-FARM-35).'
+    },
+    {
+      version: "a02a95ce2c8d",
+      previous: "031769c140fd",
+      declares: [
+        { affects: MEASURES_AT("drag"), places: ["drag"] },
+        { affects: MEASURES_AT("step"), places: ["step"] },
+        { affects: MEASURES_AT("journey"), places: ["journey"] }
+      ],
+      uncalibrated: false,
+      source: "TapIn gigaverse-mobile #3852 (6efd02c4bc, 2026-10-30 08:56 UTC), the driver alpha.23 pin: the only edit to the journey module since journey 031769c140fd (#3807, driver alpha.21) deletes the Android-only `scrolls` cap of the History scroll cycles (LONG_SCROLL_CAP + 2), so a History scroll step sends the driver's own count. That moves drag places, the step places holding them and the whole run; screens and taps send the same commands. Declared like the driver release it ships with: drag, step and journey places, on both platforms (REQ-FARM-35, [ctl-arek-p84] D2). Production: every TapIn main session from 5f8fae52 (iPhone 15 Pro) and d79ea5be (Pixel 9 Pro) on read Can't tell at all 46 places for 3 sessions while this change was undeclared."
+    }
+  ]
+};
 var CAPTURE_MEASURED_WITH = { aspect: "capture", affects: LOADED_MEMORY, marks: true };
 var UNSTABLE_NOISY = {
   reason: "noisy",
@@ -7282,8 +7543,6 @@ var noiseJudged = (id, on) => {
 var part = (b) => ({ ...b.rel !== undefined ? { rel: b.rel } : {}, ...b.abs !== undefined ? { abs: b.abs } : {} });
 var EVIDENCE_BARS = new Map(Object.values(CLAUSES).filter((c) => c.id.startsWith("E-")).flatMap((c) => Object.entries(c.value).map(([rule, bar]) => [rule, { bar, uncalibrated: c.uncalibrated }])));
 function withClauseValues(base) {
-  if (!base.better)
-    throw new ConfigError2(["better: missing from base config"]);
   const warnMs = CLAUSES["T-WARN-MS"].value;
   const errorMs = CLAUSES["TIER-ERROR"].value;
   const memory = CLAUSES["J-MEMORY-RETAINED"];
@@ -7328,7 +7587,7 @@ function withClauseValues(base) {
     uncertain: { ...base.uncertain, belowMainSessions: c("S-UNCERTAIN").value.belowMainSessions, uncalibrated: c("S-UNCERTAIN").uncalibrated },
     judgeFrom: { ...base.judgeFrom, mainSessions: c("G-JUDGE-FROM").value.mainSessions, uncalibrated: c("G-JUDGE-FROM").uncalibrated },
     work: { ...base.work, mountShareAtLeast: c("W-WORKKIND").value.mountShareAtLeast, uncalibrated: c("W-WORKKIND").uncalibrated },
-    ...base.windowCount ? { windowCount: { ...base.windowCount, below: c("W-WINDOW-COUNT").value.below, uncalibrated: c("W-WINDOW-COUNT").uncalibrated } } : {},
+    windowCount: { ...base.windowCount, below: c("W-WINDOW-COUNT").value.below, uncalibrated: c("W-WINDOW-COUNT").uncalibrated },
     frame: { ...base.frame, ms: c("T-FRAME").value.ms, uncalibrated: c("T-FRAME").uncalibrated },
     tiers: {
       ...base.tiers,
@@ -7399,7 +7658,7 @@ var RELIABLE = {
   source: 'Arek via ctl 2026-10-28 ~11:40, corrected ~11:55 ("fair and moderate are not an overheated phone") [ctl-arek-thermal-unreliable]: a run that started at Android SEVERE (3) or above, or iOS serious (2) or above, makes its session unreliable; the SDK maps SEVERE to serious, so both scales read alike. NONE / LIGHT / MODERATE and nominal / fair are normal: listed as started warm, never unreliable. [ctl-arek-three-runs]: a session counts only with 3 valid runs, on main and on the PR (no earlier ruling on partial PR sessions: G-MINRUNS had none). Background: giga2-scratch/noise-p9p-g71/findings.md (P9P false Worse from LIGHT starts stay; the G71 1-run main session no longer counts)'
 };
 var SHAPE = {
-  id: "simple-4.30+noise95-99",
+  id: "simple-4.31+noise95-99",
   minRuns: 2,
   baseline: { sessions: 3, ...GUESS("Q4 / REQ-VER-33: main's newest 3 sessions against one PR session (the quieter setting of the plan 58 simulation)") },
   repeats: { kind: "every-pr-beyond-every-main" },
@@ -7513,6 +7772,7 @@ var SHAPE = {
   noisy: NOISY_WIDEN,
   compConfirm: COMP_CONFIRM,
   reliable: RELIABLE,
+  commitGrouping: { uncalibrated: true, source: "plan 81 P3; Arek 2026-10-26 [ctl-arek-p81-p3p4]: two windows that share one proven commit (the same slowest commit in every PR run) may be one finding; never merged without it; deciding since simple-4.31, Arek 2026-10-30 [ctl-arek-1030-per-rec] and [ctl-arek-1030-p4-back]" },
   judgeFrom: { mainSessions: 3, uncalibrated: false, source: 'Arek 2026-10-18 (REQ-VER-41): a phone is judged only when main has at least 3 sessions on that phone and journey; with fewer the result is "not enough main yet", not judged, not blocking, values shown. Replay (agents/release/replay, d22): 1 PR vs 2 main on the S23 night pool gave 13 z 60 false worse+warning, 1 vs 3 gave 0' },
   measuredWith: [
     { aspect: "renderer", affects: REACT_MEASURES },
@@ -7549,13 +7809,8 @@ var CONFIG = withClauseValues(SHAPE);
 var P4_EVEN = {
   ...CONFIG,
   id: `${CONFIG.id}+p4-even`,
-  evenSlowdown: { maxExcess: 0.3, renders: 0.1, commits: 0.25, uncalibrated: true, source: "plan 81 P4 (Opus O2 guesses); Arek 2026-10-23 ~12:45 direction (4); Arek 2026-10-26 ctl-arek-p81-p3p4: render and commit counts may block a downgrade as a guard, never colour a verdict alone" }
+  evenSlowdown: { maxExcess: 0.3, renders: 0.1, commits: 0.25, uncalibrated: true, source: "plan 81 P4 (Opus O2 guesses); Arek 2026-10-23 ~12:45 direction (4); Arek 2026-10-26 ctl-arek-p81-p3p4: render and commit counts may block a downgrade as a guard, never colour a verdict alone; Arek 2026-10-30 [ctl-arek-1030-p4-back]: a candidate until the blind spot is closed" }
 };
-var P3_COMMIT = withClauseValues({
-  ...CONFIG,
-  id: `${CONFIG.id}+p3-commit`,
-  commitGrouping: { uncalibrated: true, source: "plan 81 P3; Arek 2026-10-26 [ctl-arek-p81-p3p4]: two windows that share one proven commit (the same slowest commit in every PR run) may be one finding; never merged without it" }
-});
 // apps/agent/src/remote.ts
 var isBlocking = (s) => !!s?.verdicts && (s.verdicts.blocking ?? s.verdicts.state === "worse");
 function heatNote(sc) {
@@ -7736,12 +7991,12 @@ Runs uploaded for \`${fallback.branch}\`. The result appears on the dashboard: [
 }
 
 // apps/agent/src/run.ts
-import { join as join8 } from "node:path";
+import { join as join9 } from "node:path";
 // apps/agent/src/extract.ts
-import { join as join6 } from "node:path";
+import { join as join7 } from "node:path";
 
 // apps/agent/src/profiles.ts
-import { join as join5 } from "node:path";
+import { join as join6 } from "node:path";
 
 // packages/profile-analysis/dist/src/tracesift/lib/format.js
 function formatMs(ms) {
@@ -7958,7 +8213,7 @@ var dispatchNames = new Set(["processTicksAndRejections", "runMicrotasks", "proc
 function identity(frame) {
   return JSON.stringify([frame.functionName, frame.scriptId, frame.url, frame.lineNumber, frame.columnNumber]);
 }
-function label(frame) {
+function label2(frame) {
   return `${frame.functionName || "(anonymous)"} (${frame.url || "(anonymous)"}:${frame.lineNumber + 1}:${frame.columnNumber + 1})`;
 }
 function groupBottlenecks(profile, durationMs) {
@@ -8025,7 +8280,7 @@ function groupBottlenecks(profile, durationMs) {
       continue;
     let group = groups.get(key);
     if (!group) {
-      group = { id: `b${groups.size + 1}`, title: owner.callFrame.functionName || "(anonymous)", combinedTimeMs: 0, percentOfTotal: 0, occurrences: 0, longestRunMs: 0, stack: meaningful.slice(meaningful.indexOf(owner)).map((node) => label(node.callFrame)), functions: [], members: new Map };
+      group = { id: `b${groups.size + 1}`, title: owner.callFrame.functionName || "(anonymous)", combinedTimeMs: 0, percentOfTotal: 0, occurrences: 0, longestRunMs: 0, stack: meaningful.slice(meaningful.indexOf(owner)).map((node) => label2(node.callFrame)), functions: [], members: new Map };
       groups.set(key, group);
     }
     if (!runGroup) {
@@ -8037,7 +8292,7 @@ function groupBottlenecks(profile, durationMs) {
     const leafKey = identity(leaf.callFrame);
     let member = group.members.get(leafKey);
     if (!member) {
-      member = { id: `${group.id}-f${group.members.size + 1}`, title: leaf.callFrame.functionName || "(anonymous)", selfTimeMs: 0, percentOfGroup: 0, location: frameSourceLocation(leaf.callFrame), stack: meaningful.map((node) => label(node.callFrame)), frameworkInternal: isFrameworkInternalFrame(leaf.callFrame) };
+      member = { id: `${group.id}-f${group.members.size + 1}`, title: leaf.callFrame.functionName || "(anonymous)", selfTimeMs: 0, percentOfGroup: 0, location: frameSourceLocation(leaf.callFrame), stack: meaningful.map((node) => label2(node.callFrame)), frameworkInternal: isFrameworkInternalFrame(leaf.callFrame) };
       group.members.set(leafKey, member);
     }
     member.selfTimeMs += sampleMs;
@@ -11023,20 +11278,20 @@ function deriveLocal(input) {
 async function writeProfiles(deps, runDir, derived) {
   if (!derived.profiles.length)
     return;
-  await deps.fs.writeFile(join5(runDir, "profiles.json"), `${JSON.stringify({ derivationVersion: derived.derivationVersion, profiles: derived.profiles }, null, 2)}
+  await deps.fs.writeFile(join6(runDir, "profiles.json"), `${JSON.stringify({ derivationVersion: derived.derivationVersion, profiles: derived.profiles }, null, 2)}
 `);
 }
 async function saveCpuProfiles(deps, runDir, texts) {
   if (!texts.size)
     return;
-  await deps.fs.mkdir(join5(runDir, CPU_DIR));
+  await deps.fs.mkdir(join6(runDir, CPU_DIR));
   for (const [name, text] of texts)
-    await deps.fs.writeFile(join5(runDir, CPU_DIR, name), text).catch(() => {});
+    await deps.fs.writeFile(join6(runDir, CPU_DIR, name), text).catch(() => {});
 }
 async function readCpuProfiles(deps, runDir, logText) {
   const out = new Map;
   for (const name of cpuFileNames(logText)) {
-    const text = await deps.fs.readFile(join5(runDir, CPU_DIR, name)).catch(() => {
+    const text = await deps.fs.readFile(join6(runDir, CPU_DIR, name)).catch(() => {
       return;
     });
     if (text !== undefined)
@@ -11059,7 +11314,7 @@ async function pullCpuProfiles(source, bundleId, logText, known = new Set) {
 }
 // apps/agent/src/extract.ts
 async function extract(deps, outDir, ri, memWindow, clockOffsetMs) {
-  const runs = (await deps.fs.readFile(join6(outDir, "runs.ndjson"))).split(`
+  const runs = (await deps.fs.readFile(join7(outDir, "runs.ndjson"))).split(`
 `).filter((l) => l.trim()).map((l) => JSON.parse(l));
   const samples = ri ? await ri.load() : undefined;
   const rows = [];
@@ -11069,26 +11324,26 @@ async function extract(deps, outDir, ri, memWindow, clockOffsetMs) {
     let logText = "";
     let cpuProfiles = new Map;
     try {
-      const log = await deps.fs.readFile(join6(outDir, r.run_id, "keepsnappy.log"));
+      const log = await deps.fs.readFile(join7(outDir, r.run_id, "keepsnappy.log"));
       logText = log;
-      cpuProfiles = await readCpuProfiles(deps, join6(outDir, r.run_id), log);
+      cpuProfiles = await readCpuProfiles(deps, join7(outDir, r.run_id), log);
       windows = windowsInRun(parseWindows(log), r.t0, r.t1);
       runSamples = samplesInRun(parseSamples(log), r.t0, r.t1);
     } catch {}
     let markers = [];
     try {
-      markers = parseMarkersNdjson(await deps.fs.readFile(join6(outDir, r.run_id, "markers.ndjson")));
+      markers = parseMarkersNdjson(await deps.fs.readFile(join7(outDir, r.run_id, "markers.ndjson")));
     } catch {}
     const derived = deriveLocal({ run: r, windows, markers, samples: runSamples, ...memWindow ? { memWindow } : {}, ...samples ? { ri: { samples, ...memWindow ? { memWindow } : {} } } : {}, ...clockOffsetMs === undefined ? {} : { clockOffsetMs }, cpuProfiles, logText });
     rows.push(...derived.rows);
-    await writeProfiles(deps, join6(outDir, r.run_id), derived);
+    await writeProfiles(deps, join7(outDir, r.run_id), derived);
   }
-  await deps.fs.writeFile(join6(outDir, "metrics.csv"), toCsv(rows));
+  await deps.fs.writeFile(join7(outDir, "metrics.csv"), toCsv(rows));
   return rows;
 }
 
 // apps/agent/src/runner.ts
-import { join as join7 } from "node:path";
+import { join as join8 } from "node:path";
 
 // apps/agent/src/schedule.ts
 function schedule(arms, repeat) {
@@ -11142,9 +11397,9 @@ async function measure(deps, source, installer, opts) {
   if (flows.some((f) => !f.command[0]))
     throw new ConfigError(["no test command given (put it after `--`)"]);
   await fs.mkdir(opts.outDir);
-  const runsPath = join7(opts.outDir, "runs.ndjson");
+  const runsPath = join8(opts.outDir, "runs.ndjson");
   await fs.writeFile(runsPath, "");
-  await fs.writeFile(join7(opts.outDir, "arms.json"), `${JSON.stringify(opts.arms, null, 2)}
+  await fs.writeFile(join8(opts.outDir, "arms.json"), `${JSON.stringify(opts.arms, null, 2)}
 `);
   const targets = new Map(opts.arms.map((a) => [a.name, a.target]));
   const armEnv = new Map(opts.arms.map((a) => [a.name, a.env ?? {}]));
@@ -11155,7 +11410,7 @@ async function measure(deps, source, installer, opts) {
   const plan = schedule(opts.arms, opts.repeat).flatMap((p) => flows.map((f) => ({ ...p, runId: (opts.flows?.length ?? 0) > 1 ? `${p.runId}-${f.name}` : p.runId, flow: f })));
   for (const p of plan) {
     const [cmd, ...args] = p.flow.command;
-    const dir = join7(opts.outDir, p.runId);
+    const dir = join8(opts.outDir, p.runId);
     await fs.mkdir(dir);
     let reason = "";
     const target = targets.get(p.arm);
@@ -11177,7 +11432,7 @@ async function measure(deps, source, installer, opts) {
         ...opts.testTimeoutMs ? { timeoutMs: opts.testTimeoutMs } : {}
       });
       exit = r.code;
-      await fs.writeFile(join7(dir, "test.log"), `${r.stdout}${r.stderr ? `
+      await fs.writeFile(join8(dir, "test.log"), `${r.stdout}${r.stderr ? `
 --- stderr ---
 ${r.stderr}` : ""}`);
       if (r.error)
@@ -11193,7 +11448,7 @@ ${r.stderr}` : ""}`);
     try {
       const text = await source.fetchLog(opts.bundleId);
       logText = text;
-      await fs.writeFile(join7(dir, "keepsnappy.log"), text);
+      await fs.writeFile(join8(dir, "keepsnappy.log"), text);
       windows = windowsInRun(parseWindows(text), t0, t1);
       samples = samplesInRun(parseSamples(text), t0, t1);
       cpuProfiles = await pullCpuProfiles(source, opts.bundleId, text, pulled);
@@ -11206,7 +11461,7 @@ ${r.stderr}` : ""}`);
     }
     const markers = opts.markers?.forRun(p.runId) ?? [];
     if (markers.length)
-      await fs.writeFile(join7(dir, "markers.ndjson"), markersToNdjson(markers));
+      await fs.writeFile(join8(dir, "markers.ndjson"), markersToNdjson(markers));
     let riInput;
     if (opts.ri) {
       try {
@@ -11237,7 +11492,7 @@ ${r.stderr}` : ""}`);
 `);
     log(`${p.runId} ${final.valid ? "valid" : `INVALID (${final.invalid_reason})`} windows=${windows.length}${markers.length ? ` markers=${markers.length} steps=${steps.length}` : ""}`);
   }
-  await fs.writeFile(join7(opts.outDir, "metrics.csv"), toCsv(rows));
+  await fs.writeFile(join8(opts.outDir, "metrics.csv"), toCsv(rows));
   return { runs, rows };
 }
 
@@ -11272,7 +11527,7 @@ async function keepsnappyRun(deps, source, opts) {
     ...opts.clockOffsetMs === undefined ? {} : { clockOffsetMs: opts.clockOffsetMs }
   });
   const rows = renameMetrics(raw, opts.config.steps.rename, deps.log);
-  await deps.fs.writeFile(join8(opts.outDir, "metrics.csv"), toCsv(rows));
+  await deps.fs.writeFile(join9(opts.outDir, "metrics.csv"), toCsv(rows));
   const summary = summarize({ runs, outDir: opts.outDir });
   return { runs, rows, summary };
 }
@@ -11280,7 +11535,7 @@ async function replayRuns(deps, sources, outDir, scenario) {
   await deps.fs.mkdir(outDir);
   const runs = [];
   for (const src of sources) {
-    const text = await deps.fs.readFile(join8(src.dir, "runs.ndjson")).catch(() => {
+    const text = await deps.fs.readFile(join9(src.dir, "runs.ndjson")).catch(() => {
       throw new ConfigError([`--replay ${src.dir}: no runs.ndjson (not a keepsnappy out dir)`]);
     });
     for (const line of text.split(`
@@ -11291,18 +11546,18 @@ async function replayRuns(deps, sources, outDir, scenario) {
       if (!r.valid || src.arm && r.arm !== src.arm)
         continue;
       const id = `${String(runs.length + 1).padStart(3, "0")}-A`;
-      await deps.fs.mkdir(join8(outDir, id));
+      await deps.fs.mkdir(join9(outDir, id));
       for (const f of ["keepsnappy.log", "markers.ndjson", "test.log"]) {
-        const body = await deps.fs.readFile(join8(src.dir, r.run_id, f)).catch(() => null);
+        const body = await deps.fs.readFile(join9(src.dir, r.run_id, f)).catch(() => null);
         if (body !== null)
-          await deps.fs.writeFile(join8(outDir, id, f), body);
+          await deps.fs.writeFile(join9(outDir, id, f), body);
       }
       runs.push({ ...r, run_id: id, arm: "A", block: runs.length, scenario });
     }
   }
   if (runs.length === 0)
     throw new ConfigError([`--replay: no valid runs in ${sources.map((x) => x.dir + (x.arm ? `:${x.arm}` : "")).join(", ")}`]);
-  await deps.fs.writeFile(join8(outDir, "runs.ndjson"), runs.map((r) => JSON.stringify(r)).join(`
+  await deps.fs.writeFile(join9(outDir, "runs.ndjson"), runs.map((r) => JSON.stringify(r)).join(`
 `) + `
 `);
   await extract(deps, outDir, undefined);
@@ -11526,8 +11781,11 @@ async function runCommand(deps, o, positionals, rt = { env: process.env, print:
   if (o["fail-on-worse"] && !o.wait)
     throw new ConfigError(["--fail-on-worse needs --wait"]);
   const replay = o.replay?.length ? parseReplay(o.replay) : null;
-  const flows = replay ? [await replayFlow(config, o.scenario)] : await resolveFlows(config, positionals, { ...o.scenario ? { scenario: o.scenario } : {}, readFile: (p) => deps.fs.readFile(p) });
-  const platformSource = () => config.platform === "ios-sim" ? new IosSimulatorDataSource(deps, config.device) : new IosDeviceDataSource(deps, config.device, resolve3(out, ".scratch"));
+  const resolved = replay ? [await replayFlow(config, o.scenario)] : await resolveFlows(config, positionals, { ...o.scenario ? { scenario: o.scenario } : {}, readFile: (p) => deps.fs.readFile(p) });
+  const named = o.device ?? (config.device === "booted" ? undefined : config.device);
+  const udid = replay ? undefined : await resolveRunDevice(deps, config.platform, named);
+  const flows = udid ? resolved.map((f) => withDevice(f, udid)) : resolved;
+  const platformSource = () => config.platform === "ios-sim" ? new IosSimulatorDataSource(deps, udid) : new IosDeviceDataSource(deps, udid, resolve3(out, ".scratch"));
   const source = rt.source ?? (replay ? null : platformSource());
   const described = o["device-model"] ? null : await source?.describeDevice?.().catch(() => null);
   const device = {
@@ -11588,7 +11846,7 @@ async function runCommand(deps, o, positionals, rt = { env: process.env, print:
 ${outcome.summary}`);
   }
   const info = { device, ...git.branch ? { branch: git.branch } : {}, ...git.commit ? { commit: git.commit } : {} };
-  await deps.fs.writeFile(join9(out, RUN_INFO), `${JSON.stringify({ ...info, ...runSet ? { run_set_id: runSet.run_set_id } : {} }, null, 2)}
+  await deps.fs.writeFile(join10(out, RUN_INFO), `${JSON.stringify({ ...info, ...runSet ? { run_set_id: runSet.run_set_id } : {} }, null, 2)}
 `);
   if (!api) {
     if (!runs.some((run) => run.valid)) {
@@ -11602,7 +11860,7 @@ ${outcome.summary}`);
     ingestUrl: api.url,
     key: api.key,
     externalPrefix: `${git.commit ? git.commit.slice(0, 12) : "local"}-${runSet ? runSet.run_set_id.slice(0, 8) : String(Date.now())}`,
-    device: { ...device, ...config.device && config.device !== "booted" ? { id: config.device } : {} },
+    device: { ...device, ...named ? { id: named } : {} },
     meta: { device_provider: provider, ...git.commit ? { commit_sha: git.commit } : {}, ...git.branch ? { branch: git.branch } : {} },
     ...runSet ? { runSetId: runSet.run_set_id } : {},
     driver: config.flows.runner === "maestro" && positionals.length === 0 ? "maestro" : "keepsnappy-run",
@@ -11656,7 +11914,7 @@ var infra = (what) => (e) => {
 };
 async function writeResult(deps, out, rt, runSet, summary, branch, blocked = false) {
   const url = summary?.dashboard_url ?? runSet.dashboard_url;
-  await deps.fs.writeFile(join9(out, "keepsnappy-result.json"), `${JSON.stringify({ run_set_id: runSet.run_set_id, dashboard_url: url, state: blocked ? "blocked" : summary?.verdicts?.state ?? null, summary }, null, 2)}
+  await deps.fs.writeFile(join10(out, "keepsnappy-result.json"), `${JSON.stringify({ run_set_id: runSet.run_set_id, dashboard_url: url, state: blocked ? "blocked" : summary?.verdicts?.state ?? null, summary }, null, 2)}
 `);
   const step = rt.env.GITHUB_STEP_SUMMARY;
   if (step)
@@ -11669,20 +11927,20 @@ import { parseArgs as parseArgs6 } from "node:util";
 // apps/agent/src/user-config.ts
 import { mkdir, readFile as readFile2, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
-import { dirname as dirname2, join as join11, resolve as resolve5 } from "node:path";
+import { dirname as dirname2, join as join12, resolve as resolve5 } from "node:path";
 import { parseArgs } from "node:util";
 
 // apps/agent/src/agent-path.ts
 import { constants } from "node:fs";
 import { access, stat } from "node:fs/promises";
-import { join as join10, resolve as resolve4 } from "node:path";
+import { join as join11, resolve as resolve4 } from "node:path";
 var AGENTS = ["claude", "codex"];
 var PATH_KEYS = { claude: "claudePath", codex: "codexPath" };
 var DIR_KEYS = { claude: "claudeConfigDir", codex: "codexHome" };
 var DIR_FLAGS = { claude: "claude-config-dir", codex: "codex-home" };
 var DIR_ENV = { claude: "CLAUDE_CONFIG_DIR", codex: "CODEX_HOME" };
 var isAgent = (v) => AGENTS.includes(v);
-var expandHome = (p, home) => home && (p === "~" || p.startsWith("~/")) ? join10(home, p.slice(1)) : p;
+var expandHome = (p, home) => home && (p === "~" || p.startsWith("~/")) ? join11(home, p.slice(1)) : p;
 async function checkAgentFile(given, o) {
   const path = resolve4(o.cwd, expandHome(given, o.home));
   let info;
@@ -11711,7 +11969,7 @@ async function checkFolder(given, o) {
 var agentEnv = (env, agent, folder) => folder === undefined ? env : { ...env, [DIR_ENV[agent]]: folder };
 
 // apps/agent/src/user-config.ts
-var userConfigPath = (env) => join11(env.XDG_CONFIG_HOME?.trim() || join11(env.HOME?.trim() || homedir(), ".config"), "keepsnappy", "config.yml");
+var userConfigPath = (env) => join12(env.XDG_CONFIG_HOME?.trim() || join12(env.HOME?.trim() || homedir(), ".config"), "keepsnappy", "config.yml");
 var isObj2 = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
 function parseDoc(text, label) {
   try {
@@ -12086,9 +12344,10 @@ var listFindings = (t, f = {}) => get(t, "v1/findings", { branch: f.branch, main
 var branchStatus = (t, branch) => get(t, "v1/branches/status", { branch });
 var listProblems = (t, f = {}) => get(t, "v1/problems", { branch: f.branch, main: f.main ? "true" : undefined, journey: f.journey, phone: f.phone, limit: f.limit, offset: f.offset || undefined });
 var getFinding = (t, id) => get(t, `v1/findings/${encodeURIComponent(id)}`);
-var getInvestigation = (t, id) => get(t, `v1/findings/${encodeURIComponent(id)}/investigation`);
+var getInvestigation = (t, id, q = {}) => get(t, `v1/findings/${encodeURIComponent(id)}/investigation`, q);
 var listEvents = (t, q = {}) => get(t, "v1/events", q);
 var listBranches = (t, q = {}) => get(t, "v1/branches", q);
+var listFixProposals = (t, q = {}) => get(t, "v1/fix-proposals", q);
 var postFixProposal = (t, submission) => get(t, "v1/fix-proposals", {}, { method: "POST", body: submission });
 var submitHypotheses = (t, id, submission) => get(t, `v1/findings/${encodeURIComponent(id)}/hypotheses`, {}, { method: "POST", body: submission });
 var postInvestigationRun = (t, id, run, opts = {}) => get(t, `v1/findings/${encodeURIComponent(id)}/investigation-runs`, {}, { method: "POST", body: run, ...opts.timeoutMs !== undefined ? { timeoutMs: opts.timeoutMs } : {} });
@@ -16333,12 +16592,14 @@ class Rows {
 var LABEL_W = 14;
 var line = (label, text) => `  ${label.padEnd(LABEL_W)}${text}`;
 var plural2 = (n, w) => `${n} ${w}${n === 1 ? "" : "s"}`;
+var notComparedLines = (places, indent) => (places ?? []).map((p) => `${indent}${p.text}`);
 var promptText = (f) => f.what_to_do.prompt ?? "No prompt: this finding is an improvement.";
 function formatFinding(f, opts = {}) {
   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));
   if (f.lane)
     r.both(...laneContextLines(f.lane.context, f.lane.journey, f.lane.phone_name, opts.verbose, opts.form === "short"));
+  r.both(...notComparedLines(f.not_compared, "  "));
   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), ...f.lifecycle.unstable_note ? [line("", f.lifecycle.unstable_note)] : [], line("Layer", `${f.layer.id} · ${f.layer.name} (${f.certificate ? "certified" : "uncertified"})${f.limits.length ? `; limits: ${f.limits.join("; ")}` : ""}`));
@@ -16354,10 +16615,14 @@ function formatFinding(f, opts = {}) {
   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);
+      const value = (n) => n === null ? NOT_STORED_WORD : fieldValueText(m.metric, n);
       r.add(m.metric === f.what.metric, `    ${m.label}: ${value(m.before)} → ${value(m.after)}${m.word ? ` (${m.word})` : ""}`);
     }
   }
+  if (f.why.cpu?.place)
+    r.both(`  ${f.why.cpu.place.text}`);
+  if (f.why.cpu?.session)
+    r.both(`  ${f.why.cpu.session.text}`);
   if (opts.prompt)
     r.full("", promptText(f));
   return r.render(opts.form, [
@@ -16387,7 +16652,7 @@ function measuredLines(l, r, opts) {
   };
   if (m.lanes.length === 1) {
     r.both(`${scope}: newest measured ${f.branch ? "" : `on ${n.branch}, `}${lane(n)}; ${plural2(m.run_sets, "run set")} measured.`);
-    r.both(...(n.comparison_notes ?? []).map((line) => `  ${line}`));
+    r.both(...(n.comparison_notes ?? []).map((line) => `  ${line}`), ...notComparedLines(n.not_compared, "  "));
     r.full(...(n.session_speed ?? []).map((line) => `  ${line}`));
     r.both(...laneContextLines(n.context, n.journey, n.phone_name, opts.verbose, opts.form === "short"));
     return [];
@@ -16395,10 +16660,10 @@ function measuredLines(l, r, opts) {
   const shown = m.lanes.slice(0, LANES_SHOWN);
   r.add(shown.some((x) => !x.judged || !!x.context), `${scope}: ${plural2(m.run_sets, "run set")} measured; the newest of each journey × phone:`);
   for (const x of shown) {
-    const keep = !x.judged || !!x.context || !!x.comparison_notes;
+    const keep = !x.judged || !!x.context || !!x.comparison_notes || !!x.not_compared?.length;
     r.add(keep, `  ${x.journey} on ${x.phone_name}${f.branch ? "" : ` (${x.branch})`}: ${lane(x)}`);
     r.add(keep, ...resultContextLines(x.context, opts.verbose, opts.form === "short").map((line) => `    ${line}`));
-    r.add(keep, ...(x.comparison_notes ?? []).map((line) => `    ${line}`));
+    r.add(keep, ...(x.comparison_notes ?? []).map((line) => `    ${line}`), ...notComparedLines(x.not_compared, "    "));
     r.full(...(x.session_speed ?? []).map((line) => `    ${line}`));
   }
   if (m.lanes.length > shown.length)
@@ -16467,11 +16732,12 @@ function formatBranchStatus(s, opts = {}) {
     const shown = `${l.result === "blocks" ? `${l.word} (${blocks})` : badgedWord(l.word, l.blocking)}${l.stale && !l.rules ? ` (${STALE_FLAG})` : ""}`;
     const sha = l.commit?.sha?.slice(0, 7);
     r.both(`  ${l.journey_title ?? l.journey} on ${l.phone_name}: ${shown}${feltWords(l)} · ${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)}` : ""}`);
+    r.both(...outcomeLines(l.branch_outcome).map((line) => `    ${line}`));
     r.both(...resultContextLines(l.context, opts.verbose, opts.form === "short"));
     const rulesLine = staleRulesText(l.rules);
     if (rulesLine)
       r.both(`    ${rulesLine}`);
-    r.both(...(l.comparison_notes ?? []).map((line) => `    ${line}`));
+    r.both(...(l.comparison_notes ?? []).map((line) => `    ${line}`), ...notComparedLines(l.not_compared, "    "));
     r.full(...(l.session_speed ?? []).map((line) => `    ${line}`));
     for (const f of l.worst)
       r.both(`    ${f.id}  ${f.headline}`);
@@ -16653,7 +16919,7 @@ function formatCommits(c) {
   ].join(`
 `);
 }
-var list = (xs) => xs.join(", ");
+var list2 = (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;
@@ -16669,7 +16935,7 @@ function formatSessionPlaces(p, opts = {}) {
   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)})` : ""}` : ""}. ${[
+  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 ? ` (${list2(codes)})` : ""}` : ""}. ${[
     versionText("SDK", v.sdk),
     versionText("driver", v.driver),
     versionText("driver version", v.driver_version),
@@ -16723,7 +16989,7 @@ function formatSessionPlaces(p, opts = {}) {
         }
     }
     if (comps.length) {
-      r.full(`   Components: ${list(comps)}`);
+      r.full(`   Components: ${list2(comps)}`);
       componentLines++;
     }
   });
@@ -16758,6 +17024,7 @@ function formatMainSessions(h, opts = {}) {
       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)}` : s.cant_range ? `; ${mainSessionCantRangeWords(s.places.cant, s.cant_range, baseline)}` : ""}`);
+    r.add(k, ...notComparedLines(s.not_compared, "  "));
     if (s.waiting_sessions)
       r.add(k, `  ${waitingSessionsWords(s.waiting_sessions)}`);
     if (s.memory)
@@ -16897,9 +17164,13 @@ function formatInvestigation(p, opts = {}) {
     const sha = v.lane.commit?.sha?.slice(0, 7);
     r.both(`${v.lane.journey_title ?? v.lane.journey} on ${v.lane.phone_name}, branch ${v.lane.branch} (${v.lane.on === "main" ? "main" : "PR"}) · ${sha ? `commit ${sha}` : "commit not recorded"} (${when(v.lane.at)})`);
     r.both(`Verdict: ${v.stale ? `${v.word} (${STALE_FLAG})` : badgedWord(v.word, v.blocking)}${feltWords({ felt_cost: v.felt_cost ?? undefined, to_check: v.to_check_count ?? undefined })}${v.reason ? ` · ${v.reason}` : ""}`);
-    r.both(...v.comparison_notes.map((n) => `  ${n}`));
+    r.both(...v.comparison_notes.map((n) => `  ${n}`), ...notComparedLines(v.not_compared, "  "));
     if (v.waiting_for_reprocess)
       r.both(`  ${waitingWords(v.waiting_for_reprocess)}`);
+    if (f.why?.cpu?.place)
+      r.both(`  ${f.why.cpu.place.text}`);
+    if (f.why?.cpu?.session)
+      r.both(`  ${f.why.cpu.session.text}`);
   } else
     r.both(`No stored verdict for this finding (${f.kind} finding): ${f.answer.headline}`);
   r.both(`Places with a worse result: ${heldWords(p.places)}`);
@@ -16954,6 +17225,14 @@ function formatInvestigation(p, opts = {}) {
     ...c.available && c.commits.items.length ? [plural2(c.commits.items.length, "commit line")] : []
   ]);
 }
+function formatFixProposals(a) {
+  if (a.proposals.length === 0)
+    return `No fix was proposed${a.branch ? ` for ${a.branch}` : ""} yet: \`keepsnappy fix <pr|branch>\` makes one.`;
+  return a.proposals.map((p) => [`Fix for ${p.source_pr === null ? p.source_branch : `#${p.source_pr} (${p.source_branch})`}: ${p.fix_branch}${p.fix_pr_number === null ? "" : `, draft PR #${p.fix_pr_number}`}${p.fix_pr_url ? ` ${p.fix_pr_url}` : ""}`, fixCardText(p.card)].join(`
+`)).join(`
+
+`);
+}
 function runLine(r) {
   return [
     r.created_at.slice(0, 16).replace("T", " "),
@@ -16999,6 +17278,7 @@ var FINDINGS_USAGE = `keepsnappy findings [--branch NAME | --main] [--journey KE
   main     --journey KEY --phone MODEL [--sessions N | --session ID] [--vs-previous] [--measure REF] [--limit N] [--offset N] [--short] [--json]
   main     --journey KEY --phone MODEL --changes [--limit N] [--json]   (main's confirmed changes, newest first: commit range from the session before to the first session at the new level, and the PRs merged in it)
   hypotheses <finding-id> [--json]                                 (the hypotheses stored about a finding by keepsnappy investigate, with their outcome, and the investigation runs that made them or did not, each with the tokens it used and what that would cost on an API key; predictions and cost, never a verdict.)
+  fixes    [--branch NAME | --pr N] [--json]                       (the fix PRs keepsnappy fix opened: the card of each, what it did to every finding it was for: Fixed, No change, Worse, or Waiting for the fix branch; --branch is the PR branch or the fix branch, --pr the PR or the draft PR)
   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)
@@ -17010,7 +17290,7 @@ ${READ_USAGE.detailFlag}
 var STATES = ["present", "not-judged", "resolved", "all"];
 var FINDING_ID = /^f_[0-9a-f]{16}$/;
 var SHORT_COMMANDS = new Set(["findings", "status", "problems", "finding", "compare", "history", "places", "main", "trend"]);
-var FINDINGS_COMMANDS = new Set(["findings", "status", "problems", "finding", "compare", "history", "commits", "places", "layers", "main", "trend", "hypotheses"]);
+var FINDINGS_COMMANDS = new Set(["findings", "status", "problems", "finding", "compare", "history", "commits", "places", "layers", "main", "trend", "hypotheses", "fixes"]);
 function resolveReadTarget(o, rt) {
   const keyEnv = o["key-env"] ?? "KEEPSNAPPY_KEY";
   const key = projectKey(rt.env, keyEnv);
@@ -17032,6 +17312,7 @@ async function findingsCommand(cmd, argv, rt) {
           branch: { type: "string" },
           main: { type: "boolean" },
           journey: { type: "string" },
+          pr: { type: "string" },
           phone: { type: "string" },
           state: { type: "string" },
           session: { type: "string" },
@@ -17171,6 +17452,14 @@ async function findingsCommand(cmd, argv, rt) {
    ${h.outcome_word}`), ...formatInvestigationRuns(v), v.note].join(`
 `));
     }
+    case "fixes": {
+      const pr = o.pr === undefined ? undefined : Number(o.pr);
+      if (pr !== undefined && (!Number.isInteger(pr) || pr < 1))
+        throw new UsageError(["--pr must be a PR number"]);
+      if (o.branch && pr !== undefined)
+        throw new UsageError(["give --branch or --pr, not both"]);
+      return out(await listFixProposals(t, { ...o.branch ? { branch: o.branch } : {}, ...pr !== undefined ? { pr } : {} }), formatFixProposals);
+    }
     case "history":
       need(2, "<journey> <window>");
       return out(await windowHistory(t, { journey: p[0], window: p.slice(1).join(" "), ...o.phone ? { phone: o.phone } : {}, ...limit ? { limit } : {} }), formatHistory);
@@ -17498,8 +17787,8 @@ import { StringDecoder } from "node:string_decoder";
 import { randomBytes } from "node:crypto";
 import { createRequire } from "node:module";
 import { chmod, mkdir as mkdir3, mkdtemp, readFile as readFile4, realpath, rm, writeFile as writeFile3 } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { dirname as dirname3, join as join12, resolve as resolve6 } from "node:path";
+import { tmpdir as tmpdir2 } from "node:os";
+import { dirname as dirname3, join as join13, resolve as resolve6 } from "node:path";
 import { parseArgs as parseArgs3 } from "node:util";
 
 // apps/agent/src/agent-usage.ts
@@ -17804,7 +18093,7 @@ async function falseAlarmFacts(pkg, reads) {
     `   Unstable or noisy marks of the lane:
 ${lines(pkg.verdict?.unstable.items.map((u) => `${u.place_name}: ${u.note}`))}`,
     `   Comparison notes:
-${lines(pkg.verdict?.comparison_notes)}`,
+${lines([...pkg.verdict?.comparison_notes ?? [], ...(pkg.verdict?.not_compared ?? []).map((p) => p.text)])}`,
     "   A/A results: not stored (no read exposes them)."
   ];
   const read = async (tool, run) => {
@@ -18078,7 +18367,7 @@ var usageLine = (v) => `${USAGE_PREFIX} ${JSON.stringify(usageJson(v))}`;
 var USAGE_LINE = /^KEEPSNAPPY-USAGE (\{[^\r\n]{2,12000}\})$/gm;
 var count2 = (v, max) => v === null || typeof v === "number" && Number.isInteger(v) && v >= 0 && v <= max;
 var cost2 = (v) => v === null || typeof v === "number" && Number.isFinite(v) && v >= 0 && v <= INVESTIGATION_RUN_LIMITS.costUsd;
-var label2 = (v, max) => typeof v === "string" && v.length >= 1 && v.length <= max && !/[\u0000-\u001f]/.test(v);
+var label3 = (v, max) => typeof v === "string" && v.length >= 1 && v.length <= max && !/[\u0000-\u001f]/.test(v);
 var TOKEN_KEYS = ["input_tokens", "output_tokens", "cache_read_tokens", "cache_creation_tokens", "cache_creation_5m_tokens", "cache_creation_1h_tokens"];
 var sameKeys2 = (o, keys) => Object.keys(o).length === keys.length && keys.every((k) => (k in o));
 function readUsageLine(log) {
@@ -18093,14 +18382,15 @@ function readUsageLine(log) {
   }
   if (!isObj3(v) || !sameKeys2(v, KEYS))
     return null;
-  const ok = typeof v.run_id === "string" && /^[A-Za-z0-9._:-]{8,64}$/.test(v.run_id) && INVESTIGATION_RUN_OUTCOMES.includes(v.outcome) && label2(v.agent, INVESTIGATION_RUN_LIMITS.label) && (v.model === null || label2(v.model, INVESTIGATION_RUN_LIMITS.label)) && (v.by_model === null || Array.isArray(v.by_model) && v.by_model.length >= 1 && v.by_model.length <= INVESTIGATION_RUN_LIMITS.models && v.by_model.every((m) => isObj3(m) && sameKeys2(m, ["model", ...TOKEN_KEYS]) && label2(m.model, INVESTIGATION_RUN_LIMITS.label) && TOKEN_KEYS.every((k) => count2(m[k], INVESTIGATION_RUN_LIMITS.tokens)))) && TOKEN_KEYS.every((k) => count2(v[k], INVESTIGATION_RUN_LIMITS.tokens)) && count2(v.total_tokens, 6 * INVESTIGATION_RUN_LIMITS.tokens) && count2(v.turns, INVESTIGATION_RUN_LIMITS.turns) && count2(v.duration_ms, INVESTIGATION_RUN_LIMITS.durationMs) && cost2(v.reported_cost_usd) && cost2(v.estimated_cost_usd) && label2(v.price_table_version, 40) && typeof v.stored === "boolean";
+  const ok = typeof v.run_id === "string" && /^[A-Za-z0-9._:-]{8,64}$/.test(v.run_id) && INVESTIGATION_RUN_OUTCOMES.includes(v.outcome) && label3(v.agent, INVESTIGATION_RUN_LIMITS.label) && (v.model === null || label3(v.model, INVESTIGATION_RUN_LIMITS.label)) && (v.by_model === null || Array.isArray(v.by_model) && v.by_model.length >= 1 && v.by_model.length <= INVESTIGATION_RUN_LIMITS.models && v.by_model.every((m) => isObj3(m) && sameKeys2(m, ["model", ...TOKEN_KEYS]) && label3(m.model, INVESTIGATION_RUN_LIMITS.label) && TOKEN_KEYS.every((k) => count2(m[k], INVESTIGATION_RUN_LIMITS.tokens)))) && TOKEN_KEYS.every((k) => count2(v[k], INVESTIGATION_RUN_LIMITS.tokens)) && count2(v.total_tokens, 6 * INVESTIGATION_RUN_LIMITS.tokens) && count2(v.turns, INVESTIGATION_RUN_LIMITS.turns) && count2(v.duration_ms, INVESTIGATION_RUN_LIMITS.durationMs) && cost2(v.reported_cost_usd) && cost2(v.estimated_cost_usd) && label3(v.price_table_version, 40) && typeof v.stored === "boolean";
   return ok ? v : null;
 }
 
 // apps/agent/src/investigate.ts
-var INVESTIGATE_USAGE = `keepsnappy investigate <finding-id> [--repo PATH] [--agent claude|codex] [--claude-path FILE] [--codex-path FILE] [--claude-config-dir DIR] [--codex-home DIR] [--codex-model NAME] [--max-turns N] [--max-minutes N] [--save] [--dry-run] [--preflight] [--json] [--config keepsnappy.yml]
+var INVESTIGATE_USAGE = `keepsnappy investigate <finding-id> [--branch NAME] [--repo PATH] [--agent claude|codex] [--claude-path FILE] [--codex-path FILE] [--claude-config-dir DIR] [--codex-home DIR] [--codex-model NAME] [--max-turns N] [--max-minutes N] [--save] [--dry-run] [--preflight] [--json] [--config keepsnappy.yml]
   Reads the finding's investigation package, checks out the measured commit in a separate worktree of your app repo, runs your own claude or codex
   there read-only, validates its hypotheses against the schema and stores them. --dry-run does everything except the last step.
+  --branch NAME: the package of that PR (its lane, its measured commit): one finding is one place, which can be worse on several PRs; without it, the PR it was seen on last.
   --preflight does everything before the agent starts and calls no model: reads the package, checks the commit is in your repo, adds and removes the worktree, runs
   the agent with --version. It ends with KEEPSNAPPY-STATUS preflight-ok, or fails the way a real run would.
   --repo defaults to investigate.repos.<app> in keepsnappy.yml; --agent, --claude-path, --codex-path, --max-turns and --max-minutes to investigate.agent,
@@ -18267,6 +18557,10 @@ async function readInvestigateSettings(explicit, env = process.env, cwd = proces
   const outDir = isObj4(output) && typeof output.dir === "string" && output.dir.trim() !== "" ? { outDir: output.dir } : {};
   return { ...user, ...project, ...outDir, repos: { ...user.repos, ...project.repos }, paths: { ...user.paths, ...project.paths }, dirs: { ...user.dirs, ...project.dirs } };
 }
+var realTimer = (ms, fire) => {
+  const t = setTimeout(fire, ms);
+  return () => clearTimeout(t);
+};
 var MAX_STDERR_CHARS = 64 * 1024;
 var MAX_STDOUT_HEAD_CHARS = 4096;
 function runAgentProcess(o) {
@@ -18291,7 +18585,7 @@ function runAgentProcess(o) {
       killTree("SIGTERM");
       hard = setTimeout(() => killTree("SIGKILL"), o.killGraceMs);
     };
-    const timer = setTimeout(() => halt("timeout"), o.timeoutMs);
+    const cancelTimer = (o.timer ?? realTimer)(o.timeoutMs, () => halt("timeout"));
     const onAbort = () => halt("aborted");
     if (o.signal.aborted)
       onAbort();
@@ -18318,7 +18612,7 @@ function runAgentProcess(o) {
     });
     child.on("exit", () => killTree("SIGKILL"));
     child.on("close", (code) => {
-      clearTimeout(timer);
+      cancelTimer();
       clearTimeout(hard);
       o.signal.removeEventListener("abort", onAbort);
       killTree("SIGKILL");
@@ -18381,7 +18675,7 @@ var rangeStart = (p) => p.main_change ? p.main_change.commits[0] : p.commits.ava
 function mcpServerCommand() {
   try {
     const entry = createRequire(import.meta.url).resolve("@keepsnappy/mcp");
-    return { command: process.execPath, args: [join12(dirname3(entry), "bin.js")] };
+    return { command: process.execPath, args: [join13(dirname3(entry), "bin.js")] };
   } catch {
     return { command: "keepsnappy-mcp", args: [] };
   }
@@ -18427,6 +18721,7 @@ async function investigateRun(argv, rt, end, step) {
         allowPositionals: true,
         options: {
           finding: { type: "string" },
+          branch: { type: "string" },
           repo: { type: "string" },
           agent: { type: "string" },
           "claude-path": { type: "string" },
@@ -18454,6 +18749,8 @@ async function investigateRun(argv, rt, end, step) {
     throw new UsageError(["keepsnappy investigate needs one <finding-id>", INVESTIGATE_USAGE]);
   if (o.preflight && o.save)
     throw new UsageError(["--preflight changes nothing: it cannot be combined with --save", INVESTIGATE_USAGE]);
+  if (o.branch !== undefined && o.branch.trim() === "")
+    throw new UsageError(["--branch needs a branch name", INVESTIGATE_USAGE]);
   const cwd = rt.cwd ?? process.cwd();
   const home = rt.env.HOME;
   const saved = await readInvestigateSettings(o.config, rt.env, cwd);
@@ -18517,7 +18814,7 @@ async function investigateRun(argv, rt, end, step) {
   }
   const target = resolveReadTarget(o, rt);
   step(1);
-  const pkg = await getInvestigation(target, id);
+  const pkg = await getInvestigation(target, id, o.branch ? { branch: o.branch } : {});
   const sha = measuredCommit(pkg);
   const base = rangeStart(pkg);
   for (const c of [sha, base])
@@ -18571,8 +18868,8 @@ async function investigateRun(argv, rt, end, step) {
     process.once("SIGINT", stopped);
     process.once("SIGTERM", stopped);
     step(2);
-    scratchDir = await mkdtemp(join12(rt.tmpdir ?? tmpdir(), "keepsnappy-investigate-"));
-    worktree = join12(scratchDir, "code");
+    scratchDir = await mkdtemp(join13(rt.tmpdir ?? tmpdir2(), "keepsnappy-investigate-"));
+    worktree = join13(scratchDir, "code");
     const add = await git(["worktree", "add", "--detach", worktree, sha]);
     if (add.code !== 0)
       throw new Error(`git worktree add failed in ${root}: ${add.stderr.trim()}`);
@@ -18590,18 +18887,18 @@ async function investigateRun(argv, rt, end, step) {
     let lastMessage;
     let mcpConfig = "";
     if (agent === "claude") {
-      mcpConfig = join12(scratchDir, "mcp.json");
+      mcpConfig = join13(scratchDir, "mcp.json");
       const server = rt.mcpServer ?? mcpServerCommand();
       await writeFile3(mcpConfig, JSON.stringify({ mcpServers: { keepsnappy: { ...server, env: { KEEPSNAPPY_KEY: target.key, KEEPSNAPPY_API: target.url } } } }), { mode: 384 });
       await chmod(mcpConfig, 384);
       args = claudeArgs({ maxTurns, mcpConfig });
     } else {
-      lastMessage = join12(scratchDir, "last-message.txt");
+      lastMessage = join13(scratchDir, "last-message.txt");
       args = codexArgs({ lastMessage, worktree: await realpath(worktree), model: codexModel });
     }
     step(3);
     const startedAt = Date.now();
-    const run = await runAgentProcess({ agent, cmd: command, args, cwd: worktree, env: childEnv, stdin: prompt, timeoutMs: maxMinutes * 60000, killGraceMs: rt.killGraceMs ?? 5000, signal: abort.signal });
+    const run = await runAgentProcess({ agent, cmd: command, args, cwd: worktree, env: childEnv, stdin: prompt, timeoutMs: maxMinutes * 60000, killGraceMs: rt.killGraceMs ?? 5000, signal: abort.signal, ...rt.runTimer ? { timer: rt.runTimer } : {} });
     let measuredMs = Date.now() - startedAt;
     if (run.stop === "not-found")
       throw new Error(given === undefined ? `${agent} not found on PATH: install it and log in once with \`${agent} login\`` : `${command} could not be started (not found)`);
@@ -18704,9 +19001,9 @@ async function investigateRun(argv, rt, end, step) {
       }
       const keep = async (attempts) => {
         try {
-          const dir = join12(resolve6(cwd, expandHome(saved.outDir ?? DEFAULT_OUT_DIR, home)), "investigate");
+          const dir = join13(resolve6(cwd, expandHome(saved.outDir ?? DEFAULT_OUT_DIR, home)), "investigate");
           await mkdir3(dir, { recursive: true });
-          const file = join12(dir, `${id.replace(/[^A-Za-z0-9._-]/g, "_")}-${Date.now()}.json`);
+          const file = join13(dir, `${id.replace(/[^A-Za-z0-9._-]/g, "_")}-${Date.now()}.json`);
           await writeFile3(file, `${JSON.stringify({ finding_id: id, prompt_version: INVESTIGATE_PROMPT_VERSION, attempts }, null, 2)}
 `, { mode: 384 });
           log(`The refused answer is kept in ${file} (local only, never uploaded).`);
@@ -18744,18 +19041,19 @@ async function investigateRun(argv, rt, end, step) {
         if (agent === "claude")
           secondArgs = claudeArgs({ maxTurns: REPAIR_TURNS, mcpConfig });
         else {
-          secondLast = join12(scratchDir, "last-message-repair.txt");
+          secondLast = join13(scratchDir, "last-message-repair.txt");
           secondArgs = codexArgs({ lastMessage: secondLast, worktree: await realpath(worktree), model: codexModel });
         }
+        const repairMinutes = rt.repairMs === undefined ? Math.min(maxMinutes, REPAIR_MINUTES) : rt.repairMs / 60000;
         const secondStart = Date.now();
-        const second = await runAgentProcess({ agent, cmd: command, args: secondArgs, cwd: worktree, env: childEnv, stdin: repairPrompt({ answerText: answer.text, errors: attempts[0].errors }), timeoutMs: Math.min(maxMinutes, REPAIR_MINUTES) * 60000, killGraceMs: rt.killGraceMs ?? 5000, signal: abort.signal });
+        const second = await runAgentProcess({ agent, cmd: command, args: secondArgs, cwd: worktree, env: childEnv, stdin: repairPrompt({ answerText: answer.text, errors: attempts[0].errors }), timeoutMs: repairMinutes * 60000, killGraceMs: rt.killGraceMs ?? 5000, signal: abort.signal });
         measuredMs += Date.now() - secondStart;
         usage = addUsage(usage, second.stream.usage());
         if (second.stop === "aborted") {
           log("Stopped: the agent and the worktree are removed.");
           return endsWith("stopped", "stopped", SIGINT_EXIT);
         }
-        const again = second.stop === "timeout" ? { text: "", failed: `no result within ${Math.min(maxMinutes, REPAIR_MINUTES)} min` } : second.stop === "oversize" ? { text: "", failed: "it printed too much" } : await answerOf(second, secondLast);
+        const again = second.stop === "timeout" ? { text: "", failed: `no result within ${repairMinutes} min` } : second.stop === "oversize" ? { text: "", failed: "it printed too much" } : await answerOf(second, secondLast);
         if (again.failed)
           notes.push(`The repair turn gave no answer: ${again.failed}.`);
         else {
@@ -18927,7 +19225,7 @@ function jsonNotifier(emit) {
       else if (a?.kind === "burst")
         emit({ type: "burst", app: a.app, count: a.count, body: a.body });
       else if (a?.kind === "ended")
-        emit({ type: "investigation", finding_id: a.findingId, state: "ended", status: a.status, count: a.count, text: a.text, ...a.usage ? { usage: a.usage } : {} });
+        emit({ type: "investigation", finding_id: a.findingId, branch: a.branch, state: "ended", status: a.status, count: a.count, text: a.text, ...a.usage ? { usage: a.usage } : {} });
       return null;
     }
   };
@@ -18955,16 +19253,16 @@ async function detectNotifier(spawner, platform, print, preferred) {
 
 // apps/agent/src/setup-detect.ts
 import { readdir as readdir2, stat as stat3 } from "node:fs/promises";
-import { join as join13 } from "node:path";
+import { join as join14 } from "node:path";
 function agentSearchDirs(home) {
-  return [...home ? [join13(home, ".local", "bin")] : [], "/opt/homebrew/bin"];
+  return [...home ? [join14(home, ".local", "bin")] : [], "/opt/homebrew/bin"];
 }
 async function detectAgentPath(agent, o) {
   const shell = o.env.SHELL?.trim() || "/bin/zsh";
   const r = await o.spawner.run(shell, ["-lc", `command -v ${agent}`], { timeoutMs: 5000, env: stringEnv(o.env) });
   const fromShell = !r.error && r.code === 0 ? r.stdout.trim().split(`
 `).at(-1)?.trim() : undefined;
-  const candidates = [...fromShell && fromShell.startsWith("/") ? [fromShell] : [], ...(o.dirs ?? agentSearchDirs(o.home)).map((d) => join13(d, agent))];
+  const candidates = [...fromShell && fromShell.startsWith("/") ? [fromShell] : [], ...(o.dirs ?? agentSearchDirs(o.home)).map((d) => join14(d, agent))];
   for (const c of candidates) {
     const checked = await checkAgentFile(c, { home: o.home, cwd: "/" });
     if ("path" in checked)
@@ -19004,7 +19302,7 @@ async function scanForRepos(o) {
     if (seen.has(dir) || o.now() - start > budget)
       return;
     seen.add(dir);
-    if (self && await isDir(join13(dir, ".git"))) {
+    if (self && await isDir(join14(dir, ".git"))) {
       found.add(dir);
       return;
     }
@@ -19019,11 +19317,11 @@ async function scanForRepos(o) {
     for (const n of names) {
       if (!n.isDirectory() || n.name.startsWith(".") || n.name === "node_modules" || skip?.has(n.name))
         continue;
-      await walk(join13(dir, n.name), depth - 1);
+      await walk(join14(dir, n.name), depth - 1);
     }
   };
   for (const r of ROOTS)
-    await walk(join13(o.home, r), ROOT_DEPTH);
+    await walk(join14(o.home, r), ROOT_DEPTH);
   await walk(o.home, HOME_DEPTH, false, PROTECTED);
   return [...found].sort();
 }
@@ -19050,10 +19348,10 @@ async function findRepoCandidates(o) {
 
 // apps/agent/src/watch.ts
 import { createHash as createHash2 } from "node:crypto";
-import { closeSync, openSync, realpathSync } from "node:fs";
-import { mkdir as mkdir6, readFile as readFile8, rename as rename2, writeFile as writeFile6 } from "node:fs/promises";
-import { homedir as homedir2 } from "node:os";
-import { join as join18 } from "node:path";
+import { closeSync, openSync, realpathSync, writeSync } from "node:fs";
+import { mkdir as mkdir6, readdir as readdir5, readFile as readFile8, rename as rename2, writeFile as writeFile6 } from "node:fs/promises";
+import { homedir as homedir2, uptime } from "node:os";
+import { basename as basename4, join as join19 } from "node:path";
 import { spawn as spawn6 } from "node:child_process";
 import { createInterface } from "node:readline";
 import { parseArgs as parseArgs5 } from "node:util";
@@ -19280,7 +19578,7 @@ var NO_WAIT_MS = 0;
 var NEW_COMMAND_TIMEOUT_S = 300;
 var ANDROID = {
   name: "android",
-  defaultDevice: "Google Pixel 7-13.0",
+  defaultDevice: "Google Pixel 9 Pro-15.0",
   caps: (device) => ({
     platformName: "Android",
     "appium:automationName": "UiAutomator2",
@@ -19357,15 +19655,15 @@ class WdError extends Error {
 // packages/appium-driver/dist/src/version.js
 import { createHash } from "node:crypto";
 import { existsSync, readFileSync, statSync } from "node:fs";
-import { dirname as dirname4, join as join14, relative as relative2, resolve as resolve7 } from "node:path";
+import { dirname as dirname4, join as join15, relative as relative2, resolve as resolve7 } from "node:path";
 import { fileURLToPath } from "node:url";
 function driverVersion() {
-  const built = "0.1.0-alpha.24";
+  const built = "0.1.0-alpha.25";
   if (built)
     return built;
   let dir = dirname4(fileURLToPath(import.meta.url));
   for (let i = 0;i < 3; i++, dir = dirname4(dir)) {
-    const file = join14(dir, "package.json");
+    const file = join15(dir, "package.json");
     if (!existsSync(file))
       continue;
     try {
@@ -19662,8 +19960,11 @@ function fixableItem(f, lane, hypotheses) {
   return { finding_id: f.id, title: f.what.window_name, word: f.word, state: f.state, ms: lane?.felt_cost_ms ?? 0, felt_cost: lane?.felt_cost ?? null, hypotheses, fixable: why === undefined, ...why ? { why_not: why } : {} };
 }
 var byFeltCost = (a, b) => Number(b.fixable) - Number(a.fixable) || b.ms - a.ms || (a.finding_id < b.finding_id ? -1 : 1);
-function formatFixable(l) {
+function formatFixable(l, o = {}) {
   const where = l.branch === null ? l.pr === null ? "the app" : `PR #${l.pr}` : `${l.branch}${l.pr === null ? "" : ` (PR #${l.pr})`}`;
+  if (o.blocked && l.findings.length)
+    return [`Nothing on ${where} can be fixed now: ${o.blocked}`, ...l.findings.map((f) => `  ${f.finding_id}  ${f.word}  ${f.title}  ${f.felt_cost ?? "—"}  not fixable: ${f.why_not}`)].join(`
+`);
   if (!l.findings.some((f) => f.fixable))
     return `No Worse or Slightly worse finding is present on ${where} now; nothing to fix.`;
   return [`Findings of ${where}, what can be fixed first and the biggest felt cost first:`, ...l.findings.map((f) => `  ${f.finding_id}  ${f.word}  ${f.title}  ${f.felt_cost ?? "—"}  ${f.fixable ? `${f.hypotheses} ${f.hypotheses === 1 ? "hypothesis" : "hypotheses"}` : `not fixable: ${f.why_not}`}`)].join(`
@@ -19674,14 +19975,14 @@ function formatFixable(l) {
 import { execFile as execFile2 } from "node:child_process";
 import { randomBytes as randomBytes2 } from "node:crypto";
 import { chmod as chmod2, mkdir as mkdir5, mkdtemp as mkdtemp3, readFile as readFile7, readdir as readdir4, realpath as realpath4, rm as rm3, writeFile as writeFile5 } from "node:fs/promises";
-import { tmpdir as tmpdir2 } from "node:os";
-import { basename as basename2, join as join17, resolve as resolve9 } from "node:path";
+import { tmpdir as tmpdir3 } from "node:os";
+import { basename as basename3, join as join18, resolve as resolve9 } from "node:path";
 import { parseArgs as parseArgs4 } from "node:util";
 
 // apps/agent/src/fix-agent.ts
 import { execFile } from "node:child_process";
 import { mkdir as mkdir4, mkdtemp as mkdtemp2, readFile as readFile5, realpath as realpath2, rm as rm2, stat as stat4, writeFile as writeFile4 } from "node:fs/promises";
-import { join as join15 } from "node:path";
+import { join as join16 } from "node:path";
 
 // apps/agent/src/fix-env.ts
 var NEVER = /^(GH_|GITHUB_|GITLAB_|SSH_|GPG_|AWS_|AZURE_|GOOGLE_|GCLOUD_|NPM_|YARN_|KEEPSNAPPY_|VERCEL_|EXPO_|EAS_)|(_TOKEN|_SECRET|_PASSWORD)$/;
@@ -19800,17 +20101,17 @@ async function codexFixGate(o) {
     else if (on)
       problems.push(`${name} is still on after --disable ${name}: codex may give the model a shell`);
   }
-  const dir = await realpath2(await mkdtemp2(join15(await realpath2(o.tmpdir), "keepsnappy-codex-gate-")));
+  const dir = await realpath2(await mkdtemp2(join16(await realpath2(o.tmpdir), "keepsnappy-codex-gate-")));
   try {
-    const wt = join15(dir, "code");
+    const wt = join16(dir, "code");
     await mkdir4(wt);
-    await writeFile4(join15(wt, ".git"), `gitdir: /nonexistent
+    await writeFile4(join16(wt, ".git"), `gitdir: /nonexistent
 `);
-    await mkdir4(join15(dir, "home"));
-    const decoy = join15(dir, "home", ".zshrc");
+    await mkdir4(join16(dir, "home"));
+    const decoy = join16(dir, "home", ".zshrc");
     await writeFile4(decoy, `HOME-SECRET-decoy
 `);
-    const outside = join15(dir, "outside.txt");
+    const outside = join16(dir, "outside.txt");
     const sh = (s) => `'${s.replace(/'/g, `'\\''`)}'`;
     const script = [
       '( echo x > in.txt ) 2>/dev/null; echo "in:$?"',
@@ -19849,12 +20150,12 @@ async function codexFixGate(o) {
     const outsideExists = await stat4(outside).then(() => true, () => false);
     if (outsideExists)
       problems.push("a file was written outside the worktree by the sandbox probe");
-    if (await stat4(join15(wt, "hardlink.txt")).then(() => true, () => false))
+    if (await stat4(join16(wt, "hardlink.txt")).then(() => true, () => false))
       problems.push("a hard link to a home file stand-in exists in the worktree after the sandbox probe");
     if (await readFile5(decoy, "utf8") !== `HOME-SECRET-decoy
 `)
       problems.push("a home file stand-in was changed by the sandbox probe");
-    if (await readFile5(join15(wt, ".git"), "utf8") !== `gitdir: /nonexistent
+    if (await readFile5(join16(wt, ".git"), "utf8") !== `gitdir: /nonexistent
 `)
       problems.push("the worktree’s .git file was changed by the sandbox probe");
   } finally {
@@ -19977,7 +20278,7 @@ function packageScriptsChanged(before, after) {
 // apps/agent/src/fix-git.ts
 import { spawn as spawn4 } from "node:child_process";
 import { lstat, readFile as readFile6, readdir as readdir3, readlink, realpath as realpath3 } from "node:fs/promises";
-import { dirname as dirname5, join as join16, resolve as resolve8, sep as sep2 } from "node:path";
+import { dirname as dirname5, join as join17, resolve as resolve8, sep as sep2 } from "node:path";
 var SAFE = ["-c", "core.hooksPath=/dev/null", "-c", "core.fsmonitor=false"];
 var CAP = 16 * 1024 * 1024;
 function makeFixGit(prefix, env) {
@@ -20003,10 +20304,10 @@ function makeFixGit(prefix, env) {
   });
 }
 async function worktreeGitDir(worktree) {
-  const gitFile = await readFile6(join16(worktree, ".git"), "utf8");
+  const gitFile = await readFile6(join17(worktree, ".git"), "utf8");
   const m = /^gitdir: (.+)\n?$/.exec(gitFile);
   if (!m)
-    throw new Error(`${join16(worktree, ".git")} is not a worktree file`);
+    throw new Error(`${join17(worktree, ".git")} is not a worktree file`);
   return { gitDir: resolve8(worktree, m[1]), gitFile };
 }
 var MAX_ENTRIES = 500000;
@@ -20015,7 +20316,7 @@ async function resolveLoose(path) {
   let at = path;
   for (;; ) {
     try {
-      return join16(await realpath3(at), ...rest.reverse());
+      return join17(await realpath3(at), ...rest.reverse());
     } catch (e) {
       const code = e.code;
       if (code === "ELOOP")
@@ -20038,7 +20339,7 @@ async function scanSymlinks(worktree) {
         continue;
       if (++seen > MAX_ENTRIES)
         throw new Error("the checkout has too many files to scan");
-      const full = join16(dir, e.name);
+      const full = join17(dir, e.name);
       const rel = full.slice(root.length + 1);
       if (e.isSymbolicLink()) {
         const target = await readlink(full);
@@ -20089,7 +20390,7 @@ async function collectChanges(git, worktree) {
   const sizes = new Map;
   for (const rec of raw.stdout.split("\x00"))
     if (rec && !rec.startsWith(":"))
-      sizes.set(rec, (await lstat(join16(worktree, rec)).catch(() => {
+      sizes.set(rec, (await lstat(join17(worktree, rec)).catch(() => {
         return;
       }))?.size ?? 0);
   return parseChanges(raw.stdout, num.stdout, (path) => sizes.get(path) ?? 0);
@@ -20292,21 +20593,22 @@ var FIX_USAGE = `keepsnappy fix <pr-number|branch>              all present Wors
   a binary or more than ${DEFAULT_CAPS.files} files / ${DEFAULT_CAPS.lines} lines (fix.max_files, fix.max_lines), and commits one commit per fix, then checks the committed tree again.
   A workflow file, .gitattributes, .npmrc, a hook or the config of an AI tool is refused even with --allow-path; a build or install script is allowed and flagged in the PR.
   Then, with your own git and gh login, it pushes the branch and opens a draft PR into the PR's branch (never the default branch; a fork is refused) and records it.
-  --dry-run keeps the branch local: nothing is pushed, opened or recorded. --list prints the fixable findings, biggest felt cost first, and exits (no git, no agent).
+  --dry-run keeps the branch local: nothing is pushed, opened or recorded. --list prints the fixable findings, biggest felt cost first, and exits
+  (no agent, no git write: it reads git rev-parse and one gh pr view, so a finding the run would refuse shows as not fixable and why).
   --json prints one event per line, each with the run's fix_id (started, commit, skipped_finding, flagged, refused, ended with status, text, pr_url, proposal_id and notify); the steps are the
   KEEPSNAPPY-STEP lines on stderr. --fix-id ID names the run (fix-<ms>-<6 hex>); watch gives each run one. --branch B names the PR branch (the same as the positional).
   Budget: ${FIX_BUDGET.toolCalls + 1} turns, ${FIX_BUDGET.minutes} minutes (fix.max_turns, fix.max_minutes). Claude must be ${MIN_CLAUDE_VERSION} or newer. Codex is used only when its sandbox probe passes.
   (key: KEEPSNAPPY_KEY or --key-env NAME; API: --api URL or KEEPSNAPPY_API; gh must be logged in)`;
 var FIX_STEP_LABELS = ["reading the findings", "checking out", "editing", "checking the diff", "committing", "opening the draft PR"];
 var STEPS2 = FIX_STEP_LABELS.length;
-var FIX_END_STATUSES = ["dry-run", "opened", "none", "refused", "main", "fork", "closed", "exists", "unsafe-checkout", "timeout", "failed", "not-json", "schema", "stopped", "push", "gh", "api"];
+var FIX_END_STATUSES = ["dry-run", "opened", "none", "refused", "main", "fork", "closed", "exists", "unsafe-checkout", "timeout", "failed", "not-json", "schema", "stopped", "push", "gh", "gh-auth", "no-pr", "no-repo", "no-findings", "api"];
 var FINDING_ID2 = /^f_[0-9a-f]{16}$/;
 var REF = /^[A-Za-z0-9_][A-Za-z0-9_./-]{0,254}$/;
 var REMOTE2 = /^[A-Za-z0-9_][A-Za-z0-9_.-]{0,99}$/;
 var MAX_TURNS_LIMIT2 = 200;
 var MAX_MINUTES_LIMIT2 = 120;
 var SIGINT_EXIT2 = 130;
-var MAX_FINDINGS = 20;
+var MAX_FIX_FINDINGS = 20;
 var SECTION_KEYS = ["max_turns", "max_minutes", "max_files", "max_lines"];
 async function readFixSettings(explicit, env, cwd) {
   const layers = await readConfigLayers({ explicit, env, cwd });
@@ -20353,7 +20655,7 @@ async function readFixSettings(explicit, env, cwd) {
 var runTool = (cmd, args, o) => new Promise((done) => {
   execFile2(cmd, args, { cwd: o.cwd, env: o.env, timeout: o.timeoutMs ?? 60000, maxBuffer: 4 << 20 }, (err, stdout, stderr) => {
     const code = err ? typeof err.code === "number" ? err.code : null : 0;
-    done({ code, stdout: String(stdout ?? ""), stderr: String(stderr ?? err?.message ?? "") });
+    done({ code, stdout: String(stdout ?? ""), stderr: String(stderr ?? err?.message ?? ""), timedOut: err?.killed === true });
   });
 });
 function parsePr(text) {
@@ -20370,6 +20672,28 @@ function parsePr(text) {
     return;
   return { headRefName, isCrossRepository, state, url, number };
 }
+var GH_AUTH_REQUIRED = 4;
+async function describePr(ref, o) {
+  const view = await runTool("gh", ["pr", "view", ref, "--json", "headRefName,isCrossRepository,state,url,number"], o);
+  const pr = view.code === 0 ? parsePr(view.stdout) : undefined;
+  if (pr)
+    return { pr };
+  if (view.timedOut)
+    return { status: "gh", text: `gh did not describe the pull request ${ref} in ${Math.round((o.timeoutMs ?? 60000) / 1000)} s` };
+  const text = `gh could not describe the pull request ${ref}${view.stderr.trim() ? `: ${oneLine(view.stderr.trim().slice(0, 200))}` : ""}`;
+  if (view.code === GH_AUTH_REQUIRED)
+    return { status: "gh-auth", text };
+  return { status: view.code !== 0 && /no pull requests found|could not resolve to a pullrequest/i.test(view.stderr) ? "no-pr" : "gh", text };
+}
+function prBlock(pr) {
+  if (pr.isCrossRepository)
+    return { status: "fork", text: `PR #${pr.number} comes from a fork: the fix branch could not be pushed to it` };
+  if (pr.state !== "OPEN")
+    return { status: "closed", text: `PR #${pr.number} is ${pr.state.toLowerCase()}` };
+  return;
+}
+var LIST_WHY_NOT = { "gh-auth": FIX_WHY_NOT.ghAuth, "no-pr": FIX_WHY_NOT.noPr, gh: FIX_WHY_NOT.gh, fork: FIX_WHY_NOT.fork, closed: FIX_WHY_NOT.closed };
+var LIST_GH_TIMEOUT_MS = 1e4;
 function expectedText(e) {
   if (!isObj4(e) || typeof e.metric !== "string")
     return "";
@@ -20388,7 +20712,7 @@ var sanitizeComponent = (c, files) => {
   const clean = c.replace(/[^A-Za-z0-9_.$-]/g, "").slice(0, 40);
   if (clean)
     return clean;
-  const fromFile = basename2(files[0] ?? "").replace(/\.[^.]*$/, "").replace(/[^A-Za-z0-9_.$-]/g, "").slice(0, 40);
+  const fromFile = basename3(files[0] ?? "").replace(/\.[^.]*$/, "").replace(/[^A-Za-z0-9_.$-]/g, "").slice(0, 40);
   return fromFile || "app";
 };
 var oneLineText = plainLine;
@@ -20543,42 +20867,54 @@ async function fixCommand(argv, rt) {
     list = await listFindings(target, { limit: 1 });
     app = list.app;
   }
-  let repoPath = o.repo;
-  const needsRepo = !o.list || sourceBranch === undefined;
-  if (needsRepo && !repoPath) {
-    repoPath = saved.repos?.[app];
-    if (!repoPath)
-      throw new ConfigError([`no repo for the app ${app}: give --repo PATH, or add investigate.repos.${app}: <path> to keepsnappy.yml`]);
-  }
+  const listing = o.list === true && sourceBranch !== undefined;
+  let blocked;
+  const repoPath = o.repo ?? saved.repos?.[app];
   let root = "";
   let userGit;
-  if (repoPath) {
-    const repo = resolve9(cwd, expandHome(repoPath, home));
-    if (o.list)
-      root = repo;
-    else {
-      const top = await makeFixGit(["-C", repo], rt.env)(["rev-parse", "--show-toplevel"]);
-      if (top.code !== 0)
-        throw new ConfigError([`${repo} is not a git repository (--repo, or investigate.repos in keepsnappy.yml)`]);
-      root = top.stdout.trim();
-      userGit = makeFixGit(["-C", root], rt.env);
-    }
+  const top = repoPath ? await makeFixGit(["-C", resolve9(cwd, expandHome(repoPath, home))], rt.env)(["rev-parse", "--show-toplevel"]) : undefined;
+  if (!top || top.code !== 0) {
+    const text = repoPath ? `${resolve9(cwd, expandHome(repoPath, home))} is not a git repository (--repo, or investigate.repos in keepsnappy.yml)` : `no repo for the app ${app}: give --repo PATH, or add investigate.repos.${app}: <path> to keepsnappy.yml`;
+    if (!listing)
+      return finishEarly("no-repo", [{ path: app, rule: "no-repo" }], text);
+    blocked = fixNoRepoText(app);
+  } else {
+    root = top.stdout.trim();
+    userGit = makeFixGit(["-C", root], rt.env);
   }
   let pr;
-  if (!o.list || sourceBranch === undefined) {
-    const view = await runTool("gh", ["pr", "view", String(sourcePr ?? sourceBranch), "--json", "headRefName,isCrossRepository,state,url,number"], { cwd: root, env: rt.env });
-    pr = view.code === 0 ? parsePr(view.stdout) : undefined;
-    if (!pr)
-      return finishEarly("gh", [{ path: String(sourcePr ?? sourceBranch), rule: "no-pull-request" }], `gh could not describe the pull request ${sourcePr ?? sourceBranch}${view.stderr.trim() ? `: ${oneLine(view.stderr.trim().slice(0, 200))}` : ""}`);
-    if (sourceBranch !== undefined && sourceBranch !== pr.headRefName)
-      return finishEarly("gh", [{ path: sourceBranch, rule: "not-the-pr-branch" }], `the pull request ${pr.number} is on ${pr.headRefName}, not ${sourceBranch}`);
+  if (!blocked) {
+    const ref = String(sourcePr ?? sourceBranch);
+    const described = await describePr(ref, { cwd: root, env: rt.env, ...o.list ? { timeoutMs: rt.listGhTimeoutMs ?? LIST_GH_TIMEOUT_MS } : {} });
+    if ("pr" in described)
+      pr = described.pr;
+    else if (listing)
+      blocked = LIST_WHY_NOT[described.status];
+    else
+      return finishEarly(described.status, [{ path: ref, rule: "no-pull-request" }], described.text);
+  }
+  if (pr) {
+    if (sourceBranch !== undefined && sourceBranch !== pr.headRefName) {
+      if (!listing)
+        return finishEarly("gh", [{ path: sourceBranch, rule: "not-the-pr-branch" }], `the pull request ${pr.number} is on ${pr.headRefName}, not ${sourceBranch}`);
+      blocked = FIX_WHY_NOT.noPr;
+    }
     if (sourceBranch === undefined) {
       sourceBranch = pr.headRefName;
       list = await listOf(sourceBranch);
       if (sourceBranch === list.baseline_branch || list.findings.some((f) => f.where.on === "main"))
         return finishEarly("main", [{ path: sourceBranch, rule: "main" }], `${sourceBranch} is the baseline branch: there is no branch off main to fix`);
     }
-    sourcePr = pr.number;
+    const refused = prBlock(pr);
+    if (o.list && !blocked && refused)
+      blocked = LIST_WHY_NOT[refused.status];
+    if (sourceBranch === pr.headRefName)
+      sourcePr = pr.number;
+    if (o.list && !blocked && userGit) {
+      const left = `${FIX_BRANCH_PREFIX}${pr.number}`;
+      if ((await userGit(["rev-parse", "--verify", "--quiet", `refs/heads/${left}`])).code === 0)
+        blocked = fixEndText("exists", 0, { fixBranch: left, repo: root }) ?? undefined;
+    }
   }
   const branch = sourceBranch;
   if (auto && branch.startsWith(FIX_BRANCH_PREFIX))
@@ -20597,10 +20933,14 @@ async function fixCommand(argv, rt) {
   }
   picks.sort((a, b) => b.feltMs - a.feltMs || (a.finding.id < b.finding.id ? -1 : 1));
   const hypothesesOfFinding = new Map(picks.map((p) => [p.finding.id, p.hypotheses.length]));
-  const dropped = picks.length > MAX_FINDINGS ? picks.splice(MAX_FINDINGS) : [];
+  const dropped = picks.length > MAX_FIX_FINDINGS ? picks.splice(MAX_FIX_FINDINGS) : [];
   if (o.list) {
-    const shown = { version: 1, app: appName, pr: prNumber, branch, findings: list.findings.map((f) => fixableItem(f, laneOf2(list, f), hypothesesOfFinding.get(f.id) ?? 0)).sort(byFeltCost) };
-    rt.print(json ? JSON.stringify(shown) : formatFixable(shown));
+    const item = (f) => {
+      const one = fixableItem(f, laneOf2(list, f), hypothesesOfFinding.get(f.id) ?? 0);
+      return blocked && one.fixable ? { ...one, fixable: false, why_not: blocked } : one;
+    };
+    const shown = { version: 1, app: appName, pr: prNumber, branch, findings: list.findings.map(item).sort(byFeltCost) };
+    rt.print(json ? JSON.stringify({ ...shown, max_findings: MAX_FIX_FINDINGS }) : formatFixable(shown, { blocked }));
     return 0;
   }
   const findingIds = picks.map((p) => p.finding.id);
@@ -20609,18 +20949,17 @@ async function fixCommand(argv, rt) {
     for (const id of notFixable)
       emit("skipped_finding", { finding_id: id, reason: "not present on the branch now (resolved, not Worse, or not on this PR)" });
     log(picks.length === 0 ? `Nothing to fix: no Worse or Slightly worse finding is present on ${branch} now.` : `${notFixable.join(", ")}: not fixable now; nothing was started.`);
-    return finishDone("none", { commits: 0, fixBranch: "", text: "nothing to fix" }, notFixable.length ? 1 : 0);
+    return finishDone("no-findings", { commits: 0, fixBranch: "", text: "nothing to fix" }, notFixable.length ? 1 : 0);
   }
   for (const d of dropped)
-    emit("skipped_finding", { finding_id: d.finding.id, reason: `more than ${MAX_FINDINGS} findings: the smaller ones were left out` });
+    emit("skipped_finding", { finding_id: d.finding.id, reason: `more than ${MAX_FIX_FINDINGS} findings: the smaller ones were left out` });
   const git = userGit;
   const info = pr;
-  if (info.isCrossRepository)
-    return finishEarly("fork", [{ path: info.url, rule: "fork" }], `PR #${info.number} comes from a fork: the fix branch could not be pushed to it`);
-  if (info.state !== "OPEN")
-    return finishEarly("closed", [{ path: info.url, rule: "closed" }], `PR #${info.number} is ${info.state.toLowerCase()}`);
+  const refused = prBlock(info);
+  if (refused)
+    return finishEarly(refused.status, [{ path: info.url, rule: refused.status }], refused.text);
   if (agent === "codex") {
-    const gate = await (rt.codexGate ?? ((g) => codexFixGate({ command: g.command, env: rt.env, tmpdir: rt.tmpdir ?? tmpdir2() })))({ command });
+    const gate = await (rt.codexGate ?? ((g) => codexFixGate({ command: g.command, env: rt.env, tmpdir: rt.tmpdir ?? tmpdir3() })))({ command });
     if (!gate.ok) {
       log(["codex is not used for fix: its sandbox probe did not pass.", ...gate.problems.map((p) => `  ${p}`)].join(`
 `));
@@ -20628,7 +20967,7 @@ async function fixCommand(argv, rt) {
     }
   }
   if (agent === "claude") {
-    const seen = await checkClaudeVersion({ command, env: fixAgentEnv("claude", rt.env, { scratch: rt.tmpdir ?? tmpdir2(), extra: rt.agentEnvExtra ?? [] }) });
+    const seen = await checkClaudeVersion({ command, env: fixAgentEnv("claude", rt.env, { scratch: rt.tmpdir ?? tmpdir3(), extra: rt.agentEnvExtra ?? [] }) });
     if (!seen.ok)
       return finishEarly("refused", [{ path: "claude", rule: "agent-version" }], seen.problem);
   }
@@ -20640,10 +20979,10 @@ async function fixCommand(argv, rt) {
   const taken = async (name) => {
     const local = await git(["rev-parse", "--verify", "--quiet", `refs/heads/${name}`]);
     if (local.code === 0)
-      return true;
+      return "local";
     const far = await git(["ls-remote", "--exit-code", "--heads", remote, `refs/heads/${name}`]);
     if (far.code === 0)
-      return true;
+      return "remote";
     return far.code === 2 ? false : undefined;
   };
   let fixBranch = `${FIX_BRANCH_PREFIX}${info.number}`;
@@ -20654,7 +20993,7 @@ async function fixCommand(argv, rt) {
     if (!t)
       break;
     if (!o.new || n > 20)
-      return finishEarly("exists", [{ path: fixBranch, rule: "exists" }], `${fixBranch} already exists${o.new ? " (and so do the next suffixes)" : "; --new takes a fresh suffix"}`);
+      return finishEarly("exists", [{ path: fixBranch, rule: "exists" }], `${fixBranch} already exists${o.new ? " (and so do the next suffixes)" : "; --new takes a fresh suffix"}`, { fixBranch, ...t === "local" ? { repo: root } : {} });
     fixBranch = `${FIX_BRANCH_PREFIX}${info.number}-${n}`;
   }
   const abort = new AbortController;
@@ -20669,8 +21008,8 @@ async function fixCommand(argv, rt) {
     process.once("SIGINT", stopped);
     process.once("SIGTERM", stopped);
     step(2);
-    scratch = await mkdtemp3(join17(await realpath4(rt.tmpdir ?? tmpdir2()), "keepsnappy-fix-"));
-    worktree = join17(scratch, "code");
+    scratch = await mkdtemp3(join18(await realpath4(rt.tmpdir ?? tmpdir3()), "keepsnappy-fix-"));
+    worktree = join18(scratch, "code");
     const add = await git(["worktree", "add", "-b", fixBranch, worktree, baseSha]);
     if (add.code !== 0)
       throw new Error(`git worktree add failed: ${add.stderr.trim()}`);
@@ -20682,26 +21021,26 @@ async function fixCommand(argv, rt) {
     if (links.length) {
       return await refuse("unsafe-checkout", links, "the checkout has a symlink that points outside the worktree: nothing was started");
     }
-    await mkdir5(join17(scratch, "tmp"));
+    await mkdir5(join18(scratch, "tmp"));
     const expected = new Set(["code", "tmp", "mcp.json", "last-message.txt"]);
     let mcpConfig = "";
     let mcpBefore = "";
     let args;
     let lastMessage;
     if (agent === "claude") {
-      mcpConfig = join17(scratch, "mcp.json");
+      mcpConfig = join18(scratch, "mcp.json");
       const server = rt.mcpServer ?? mcpServerCommand();
       await writeFile5(mcpConfig, JSON.stringify({ mcpServers: { keepsnappy: { ...server, env: { KEEPSNAPPY_KEY: target.key, KEEPSNAPPY_API: target.url } } } }), { mode: 384 });
       await chmod2(mcpConfig, 384);
       mcpBefore = await readFile7(mcpConfig, "utf8");
       args = claudeFixArgs({ maxTurns, mcpConfig });
     } else {
-      lastMessage = join17(scratch, "last-message.txt");
+      lastMessage = join18(scratch, "last-message.txt");
       args = codexFixArgs({ lastMessage, worktree: await realpath4(worktree), model: codexModel });
     }
     const packages = [];
     for (const p of picks)
-      packages.push({ id: p.finding.id, pkg: await getInvestigation(target, p.finding.id) });
+      packages.push({ id: p.finding.id, pkg: await getInvestigation(target, p.finding.id, { branch }) });
     const prompt = fixPrompt({
       agent,
       budget: { toolCalls: maxTurns - 1, minutes: maxMinutes },
@@ -20709,7 +21048,7 @@ async function fixCommand(argv, rt) {
     });
     step(3);
     log(`Fixing with ${agent}: ${baseSha.slice(0, 7)} checked out as ${fixBranch} in a separate worktree (your working copy is not touched).`);
-    const env = fixAgentEnv(agent, rt.env, { scratch: join17(scratch, "tmp"), extra: rt.agentEnvExtra ?? [], accountDir });
+    const env = fixAgentEnv(agent, rt.env, { scratch: join18(scratch, "tmp"), extra: rt.agentEnvExtra ?? [], accountDir });
     const startedAt = Date.now();
     const run = await runAgentProcess({ agent, cmd: command, args, cwd: worktree, env, stdin: prompt, timeoutMs: maxMinutes * 60000, killGraceMs: rt.killGraceMs ?? 5000, signal: abort.signal });
     const measuredMs = Date.now() - startedAt;
@@ -20743,7 +21082,7 @@ async function fixCommand(argv, rt) {
       return ended("failed", "error", "The agent printed more than it may and was stopped; nothing was committed.");
     step(4);
     const problems = [];
-    if (await readFile7(join17(worktree, ".git"), "utf8").catch(() => "") !== gitFile)
+    if (await readFile7(join18(worktree, ".git"), "utf8").catch(() => "") !== gitFile)
       problems.push({ path: ".git", rule: "git-dir-changed" });
     for (const name of await readdir4(scratch))
       if (!expected.has(name))
@@ -20867,7 +21206,7 @@ async function fixCommand(argv, rt) {
     }
     const flagged = [];
     for (const c of committed) {
-      const rule = flagPath(c.path) ?? (basename2(c.path) === "package.json" && packageScriptsChanged(await showBlob(wt, baseSha, c.path, worktree), await showBlob(wt, headSha, c.path, worktree)) ? "package-scripts" : undefined);
+      const rule = flagPath(c.path) ?? (basename3(c.path) === "package.json" && packageScriptsChanged(await showBlob(wt, baseSha, c.path, worktree), await showBlob(wt, headSha, c.path, worktree)) ? "package-scripts" : undefined);
       if (rule) {
         flagged.push({ path: c.path, rule });
         emit("flagged", { path: plainLine(c.path, 300), rule }, `Note: ${plainLine(c.path, 300)} is a build script (${rule}); the draft PR says so.`);
@@ -20984,19 +21323,19 @@ ${shown.map((p) => `  ${p.path}: ${p.rule}`).join(`
 `)}`);
     return finishDone(status, { commits: 0, fixBranch: "", text, ...usage ? { usage } : {} }, 1);
   }
-  function finishEarly(status, problems, text) {
+  function finishEarly(status, problems, text, at = {}) {
     if (status === "main") {
       emit("skipped", { app: app ?? null, pr: sourcePr ?? null, branch: sourceBranch ?? problems[0]?.path ?? null, finding_id: ids[0] ?? null, reason: "main" }, text);
     } else
       emit("refused", { problems: plainProblems(problems) }, text);
     log(plainLine(text, 600));
-    return finishDone(status, { commits: 0, fixBranch: "", text }, 1);
+    return finishDone(status, { commits: 0, fixBranch: at.fixBranch ?? "", text, ...at.repo ? { repo: at.repo } : {} }, 1);
   }
   function finishDone(status, d, code, errorText) {
     if (errorText)
       log(plainLine(errorText, 600));
     const detail = plainLine(d.text, 300);
-    emit("ended", { status, text: fixEndText(status, d.commits), detail, pr_url: d.prUrl ?? null, proposal_id: d.proposalId ?? null, fix_branch: d.fixBranch, commits: d.commits, usage: d.usage ?? null, notify: auto && FIX_NOTIFY_STATUSES.includes(status) }, d.text);
+    emit("ended", { status, text: fixEndText(status, d.commits, { fixBranch: d.fixBranch, ...d.repo ? { repo: d.repo } : {} }), detail, repo: d.repo ?? null, pr_url: d.prUrl ?? null, proposal_id: d.proposalId ?? null, fix_branch: d.fixBranch, commits: d.commits, usage: d.usage ?? null, notify: auto && FIX_NOTIFY_STATUSES.includes(status) }, d.text);
     end(status, d.commits || undefined);
     return code;
   }
@@ -21023,8 +21362,10 @@ var WATCH_USAGE = `keepsnappy watch [--app NAME ...] [--branch GLOB] [--mine] [-
   --once      poll once and exit
   --json      for the macOS menu bar app: no notifications are shown; one JSON object per line on stdout (hello, connected, key_rejected, history, poll, event, burst,
               investigation, fix, log; a poll line says when a poll worked, or why it did not, and how long until the next), {"cmd":"investigate","finding_id":"f_…"} lines on stdin start an
-              investigation like a click, {"cmd":"refresh"} polls now (at most one extra poll per 5 s), and {"cmd":"fix","finding_ids":["f_…"]}, {"cmd":"fix","branch":"feat/x"} or {"cmd":"fix","pr":N} runs
-              \`keepsnappy fix\` and streams its lines (started, progress, commit, skipped_finding, flagged, refused, ended); the end of stdin stops watching (docs/plans/82a)
+              investigation like a click (with "branch":"<PR branch>": that PR's result, as investigate --branch), {"cmd":"refresh"} polls now (at most one extra poll per 5 s), and
+              {"cmd":"fix","finding_ids":["f_…"]}, {"cmd":"fix","branch":"feat/x"} or {"cmd":"fix","pr":N} runs \`keepsnappy fix\` and streams its lines (started, progress, commit,
+              skipped_finding, flagged, refused, ended); the end of stdin stops watching (docs/plans/82a); an investigation still running from a watcher before this one (same app,
+              since the last boot) is announced again at the start ("resumed":true on its started line) and followed to its end
   --agent, --claude-path, --codex-path, --claude-config-dir, --codex-home   which agent an [Investigate] click runs, where its executable is and which account folder it runs on: handed to \`keepsnappy investigate\`, which reads
               the same keys (investigate.agent, investigate.claudePath, investigate.codexPath, investigate.claudeConfigDir, investigate.codexHome) from keepsnappy.yml and from your own config file
               (keepsnappy config set investigate.claudePath ~/.local/bin/claude); --auto-on-worse runs claude whatever the agent is
@@ -21064,6 +21405,23 @@ var isStep = (m) => {
 };
 var FIX_STEP_LINE = /^KEEPSNAPPY-STEP (\d{1,2})\/(\d{1,2}) ([^\r\n]{1,60})$/;
 var PROGRESS_POLL_MS = 1000;
+var PID_PREFIX = "KEEPSNAPPY-PID";
+var PID_LINE = /^KEEPSNAPPY-PID (\d+)$/m;
+var APP_PREFIX = "KEEPSNAPPY-APP";
+var APP_LINE = /^KEEPSNAPPY-APP (\S+)$/m;
+var BRANCH_PREFIX = "KEEPSNAPPY-BRANCH";
+var BRANCH_LINE = /^KEEPSNAPPY-BRANCH ([^\r\n]+)$/m;
+var INVESTIGATE_LOG = /^investigate-(f_[0-9a-f]{16})(?:-([0-9a-f]{8}))?-(\d+)\.log$/;
+var branchHash = (branch) => createHash2("sha256").update(branch).digest("hex").slice(0, 8);
+var RESUME_WINDOW_MS = (MAX_MINUTES_LIMIT + 10) * 60000;
+var processAlive = (pid) => {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+};
 var REFRESH_MIN_GAP_MS = 5000;
 var SHOWN_KEPT = 200;
 var AUTO_FIXED_KEPT = 200;
@@ -21245,7 +21603,7 @@ function selfCommand(env, proc = process, real = realpathSync) {
   }
 }
 function fileStore(dir, apiUrl) {
-  const file = join18(dir, `watch-${createHash2("sha256").update(apiUrl.replace(/\/+$/, "")).digest("hex").slice(0, 12)}.json`);
+  const file = join19(dir, `watch-${createHash2("sha256").update(apiUrl.replace(/\/+$/, "")).digest("hex").slice(0, 12)}.json`);
   return {
     async load() {
       try {
@@ -21273,13 +21631,14 @@ function fileStore(dir, apiUrl) {
       await writeFile6(tmp, JSON.stringify({ cursor: s.cursor, seen: s.seen.slice(-SEEN_KEPT), ...s.savedAt !== undefined ? { saved_at: s.savedAt } : {}, ...s.shown ? { shown: Object.fromEntries(Object.entries(s.shown).slice(-SHOWN_KEPT)) } : {}, ...s.autoFixed ? { auto_fixed: s.autoFixed.slice(-AUTO_FIXED_KEPT) } : {} }), { mode: 384 });
       await rename2(tmp, file);
     },
-    logPath: (name) => join18(dir, `${name}.log`),
-    readLog: (p) => readFile8(p, "utf8").catch(() => "")
+    logPath: (name) => join19(dir, `${name}.log`),
+    readLog: (p) => readFile8(p, "utf8").catch(() => ""),
+    investigationLogs: async () => (await readdir5(dir).catch(() => [])).filter((n) => INVESTIGATE_LOG.test(n)).map((n) => join19(dir, n))
   };
 }
-var stateDir = (env) => env.KEEPSNAPPY_STATE_DIR?.trim() || join18(env.XDG_STATE_HOME?.trim() || join18(env.HOME ?? homedir2(), ".local", "state"), "keepsnappy");
+var stateDir = (env) => env.KEEPSNAPPY_STATE_DIR?.trim() || join19(env.XDG_STATE_HOME?.trim() || join19(env.HOME ?? homedir2(), ".local", "state"), "keepsnappy");
 var nodeBackground = {
-  start(cmd, args, logFile, env) {
+  start(cmd, args, logFile, env, header = []) {
     const exits = [];
     let done = null;
     const finish = (code, error) => {
@@ -21293,6 +21652,9 @@ var nodeBackground = {
     try {
       fd = openSync(logFile, "a", 384);
       const child = spawn6(cmd, [...args], { detached: true, stdio: ["ignore", fd, fd], env: { ...process.env, ...env } });
+      if (child.pid !== undefined)
+        writeSync(fd, [`${PID_PREFIX} ${child.pid}`, ...header.map((l) => l.replace(/[\r\n]+/g, " "))].map((l) => `${l}
+`).join(""));
       child.on("error", (e) => finish(null, e.message));
       child.on("exit", (code) => finish(code));
       child.unref();
@@ -21305,7 +21667,8 @@ var nodeBackground = {
     return { onExit: (cb) => done ? cb(done.code, done.error) : void exits.push(cb) };
   }
 };
-var MAX_FIX_FINDINGS = 20;
+var CLIENT_ID = /^[A-Za-z0-9_-]{1,64}$/;
+var MAX_ECHOED_IDS = 200;
 var GITHUB_PR_URL = /^https:\/\/github\.com\/[\w.-]+\/[\w.-]+\/pull\/\d+$/;
 var BRANCH_REF = /^[A-Za-z0-9_][A-Za-z0-9_./-]{0,254}$/;
 var CONTROL4 = /[\u0000-\u001f\u007f]/g;
@@ -21372,7 +21735,8 @@ function relayedFixLine(line, run) {
       const used = v.usage === null || v.usage === undefined ? null : readUsageLine(`${USAGE_PREFIX} ${JSON.stringify(v.usage)}`);
       if (!status || prUrl === undefined || proposalId === undefined || branch === null || commits === null)
         return null;
-      return endedLine(run, { status, commits, prUrl, proposalId, fixBranch: branch, usage: used ? usageJson(used) : null });
+      const repo = typeof v.repo === "string" && v.repo.startsWith("/") && !v.repo.split("/").includes("..") ? plainText(v.repo, 1000) ?? undefined : undefined;
+      return endedLine(run, { status, commits, prUrl, proposalId, fixBranch: branch, usage: used ? usageJson(used) : null, ...repo && branch ? { repo } : {} });
     }
     default:
       return null;
@@ -21384,7 +21748,7 @@ function endedLine(run, e) {
     fix_id: run.fixId,
     state: "ended",
     status: e.status,
-    text: fixEndText(e.status, e.commits),
+    text: fixEndText(e.status, e.commits, { fixBranch: e.fixBranch, ...e.repo ? { repo: e.repo } : {} }),
     pr_url: e.status === "dry-run" ? null : e.prUrl,
     proposal_id: e.proposalId,
     fix_branch: e.fixBranch,
@@ -21393,7 +21757,8 @@ function endedLine(run, e) {
     notify: run.auto && FIX_NOTIFY_STATUSES.includes(e.status)
   };
 }
-var jobOf = (ev, findingId, title) => ({ findingId, app: ev.app, branch: ev.branch, url: ev.url, title });
+var jobOf = (ev, findingId, title) => ({ findingId, app: ev.app, branch: ev.branch, url: ev.url, title, about: ev.on === "main" ? "main" : ev.branch });
+var jobKey = (j) => `${j.findingId}\x00${j.about ?? ""}`;
 async function readEventPages(events, each, o = {}) {
   let next = null;
   let more = true;
@@ -21477,6 +21842,7 @@ async function runWatch(s, d, outer) {
   const appNameOf = (ev) => ev.app === pageApp ? pageAppName : null;
   const titleOf = (ev) => notificationTitle({ app: appNameOf(ev) ?? ev.app, branch: ev.branch });
   const investigating = (app) => [...running.values()].some((j) => j.app === app);
+  const busy = (job) => [...running.values(), ...queue].some((q) => q.findingId === job.findingId && (q.about === null || job.about === null || q.about === job.about));
   const fixRunning = new Map;
   const fixQueue = [];
   const autoFixed = new Set;
@@ -21505,16 +21871,23 @@ async function runWatch(s, d, outer) {
         await d.open(ev.url).catch((e) => log(`keepsnappy watch: cannot open ${ev.url}: ${e.message}`));
     }, (e) => log(`keepsnappy watch: the notification failed: ${e.message}`));
   };
-  const later = (job, o) => track(d.notifier.notify({ title: job.title, body: o.text, url: job.url, findingId: null, about: { kind: "ended", findingId: o.findingId, status: o.status, count: o.count, text: o.text, ...o.usage ? { usage: usageJson(o.usage) } : {} } }).then(() => {
+  const later = (job, o) => track(d.notifier.notify({ title: job.title, body: o.text, url: job.url, findingId: null, about: { kind: "ended", findingId: o.findingId, branch: job.about, status: o.status, count: o.count, text: o.text, ...o.usage ? { usage: usageJson(o.usage) } : {} } }).then(() => {
     return;
   }, (e) => log(`keepsnappy watch: the notification failed: ${e.message}`)));
   function start(job, auto) {
-    if (running.has(job.findingId) || queue.some((q) => q.findingId === job.findingId))
+    if (busy(job))
       return;
-    const logFile = d.store.logPath(`investigate-${job.findingId}-${d.now()}`);
-    running.set(job.findingId, job);
+    const on = job.onBranch ? `-${branchHash(job.onBranch)}` : "";
+    const logFile = d.store.logPath(`investigate-${job.findingId}${on}-${d.now()}`);
     log(`keepsnappy watch: investigating ${job.findingId} (${job.app} · ${job.branch})${auto ? " [auto]" : ""}`);
-    d.json?.emit({ type: "investigation", finding_id: job.findingId, state: "started", auto, log: logFile });
+    const header = [`${APP_PREFIX} ${job.app}`, ...job.about ? [`${BRANCH_PREFIX} ${job.about}`] : []];
+    const args = [...d.binArgs ?? [], "investigate", ...d.forward, ...auto ? ["--agent", "claude"] : [], ...job.onBranch ? [`--branch=${job.onBranch}`] : [], job.findingId];
+    follow(job, logFile, { auto, resumed: false }, (exited) => d.background.start(d.bin, args, logFile, undefined, header).onExit(exited));
+  }
+  function follow(job, logFile, o, run) {
+    const branch = job.about;
+    running.set(jobKey(job), job);
+    d.json?.emit({ type: "investigation", finding_id: job.findingId, branch, state: "started", auto: o.auto, log: logFile, ...o.resumed ? { resumed: true } : {} });
     let steps = 0;
     let over = false;
     const drain = async () => {
@@ -21522,7 +21895,7 @@ async function runWatch(s, d, outer) {
         return;
       const found = [...(await d.store.readLog(logFile)).matchAll(STEP_LINE)].filter(isStep);
       for (const m of found.slice(steps))
-        d.json.emit({ type: "investigation", finding_id: job.findingId, state: "progress", step: Number(m[1]), of: Number(m[2]), label: m[3] });
+        d.json.emit({ type: "investigation", finding_id: job.findingId, branch, state: "progress", step: Number(m[1]), of: Number(m[2]), label: m[3] });
       steps = Math.max(steps, found.length);
     };
     if (d.json) {
@@ -21537,10 +21910,10 @@ async function runWatch(s, d, outer) {
         }
       })();
     }
-    d.background.start(d.bin, [...d.binArgs ?? [], "investigate", ...d.forward, ...auto ? ["--agent", "claude"] : [], job.findingId], logFile).onExit((code, error) => {
+    run((code, error) => {
       track((async () => {
         over = true;
-        running.delete(job.findingId);
+        running.delete(jobKey(job));
         await drain().catch(() => {
           return;
         });
@@ -21555,6 +21928,62 @@ async function runWatch(s, d, outer) {
       })());
     });
   }
+  async function resume(watches) {
+    if (!d.json || !d.store.investigationLogs)
+      return;
+    const json = d.json;
+    const alive = d.alive ?? processAlive;
+    const bootedAt = d.bootedAt?.() ?? Date.now() - uptime() * 1000;
+    const newest = new Map;
+    for (const logFile of await d.store.investigationLogs()) {
+      const m = INVESTIGATE_LOG.exec(basename4(logFile));
+      if (!m)
+        continue;
+      const at = Number(m[3]);
+      if (at < bootedAt || d.now() - at > RESUME_WINDOW_MS)
+        continue;
+      const key = `${m[1]}-${m[2] ?? ""}`;
+      const seen = newest.get(key);
+      if (!seen || seen.at < at)
+        newest.set(key, { findingId: m[1], hash: m[2], logFile, at });
+    }
+    for (const { findingId, hash, logFile, at } of newest.values()) {
+      const text = await d.store.readLog(logFile);
+      const pid = Number(PID_LINE.exec(text)?.[1] ?? 0);
+      const app = APP_LINE.exec(text)?.[1];
+      if (!pid || !app || !watches(app) || [...text.matchAll(STATUS_LINE)].length > 0 || !alive(pid))
+        continue;
+      const about = BRANCH_LINE.exec(text)?.[1]?.trim() || null;
+      if (hash !== undefined && (about === null || branchHash(about) !== hash))
+        continue;
+      const known = shown.get(findingId);
+      const branch = about ?? known?.branch ?? "";
+      const job = {
+        findingId,
+        app,
+        branch,
+        url: known?.url ?? null,
+        title: known?.title ?? notificationTitle({ app: appNameOf({ app }) ?? app, branch }),
+        about,
+        ...hash !== undefined && about !== null ? { onBranch: about } : {}
+      };
+      if (busy(job))
+        continue;
+      follow(job, logFile, { auto: false, resumed: true }, (exited) => void (async () => {
+        while (!signal.aborted) {
+          await json.wait(PROGRESS_POLL_MS, signal);
+          if (signal.aborted)
+            return;
+          if (!alive(pid) || d.now() > at + RESUME_WINDOW_MS)
+            return exited(null);
+        }
+      })());
+    }
+  }
+  const resumeFor = (watches) => {
+    if (!s.once)
+      track(resume(watches).catch((e) => log(`keepsnappy watch: running investigations could not be read: ${e.message}`)));
+  };
   let wakeNow = null;
   let lastRefreshAt = -Infinity;
   let refreshDue = null;
@@ -21587,49 +22016,65 @@ async function runWatch(s, d, outer) {
     const id = c.finding_id;
     if (typeof id !== "string" || !FINDING_ID.test(id))
       return log("keepsnappy watch: investigate needs a finding_id (f_ and 16 hex characters); nothing started");
-    let known = shown.get(id);
-    if (!known) {
-      let found;
-      try {
-        found = await d.api.finding(id);
-      } catch (e) {
-        return log(`keepsnappy watch: cannot look up ${id}: ${e.message}; nothing started`);
-      }
-      if (!found)
-        return log(`keepsnappy watch: ${id} is not a finding the API knows; nothing started`);
-      const app = pageApp ?? s.apps[0];
-      if (!app)
-        return log(`keepsnappy watch: ${id} is not a result shown by this watcher and the app it belongs to is not known yet; nothing started`);
-      known = { app, branch: found.branch, url: found.url, title: notificationTitle({ app: appNameOf({ app }) ?? app, branch: found.branch }) };
+    const onBranch = c.branch;
+    if (onBranch !== undefined && (typeof onBranch !== "string" || onBranch.trim() === ""))
+      return log(`keepsnappy watch: investigate needs a branch name in branch, or no branch; ${id} not started`);
+    const job = await jobOfFinding(id);
+    if (typeof job === "string")
+      return log(job);
+    start(onBranch ? { ...job, branch: onBranch, onBranch, about: onBranch } : job, false);
+  }
+  async function jobOfFinding(id) {
+    const known = shown.get(id);
+    if (known)
+      return { findingId: id, ...known, about: null };
+    let found;
+    try {
+      found = await d.api.finding(id);
+    } catch (e) {
+      return `keepsnappy watch: cannot look up ${id}: ${e.message}; nothing started`;
     }
-    start({ findingId: id, ...known }, false);
+    if (!found)
+      return `keepsnappy watch: ${id} is not a finding the API knows; nothing started`;
+    const app = pageApp ?? s.apps[0];
+    if (!app)
+      return `keepsnappy watch: ${id} is not a result shown by this watcher and the app it belongs to is not known yet; nothing started`;
+    return { findingId: id, app, branch: found.branch, url: found.url, title: notificationTitle({ app: appNameOf({ app }) ?? app, branch: found.branch }), about: null };
   }
   function fixClick(c) {
-    const none = (why) => log(`keepsnappy watch: fix ${why}; nothing started`);
-    if ([c.pr, c.branch, c.finding_ids].filter((x) => x !== undefined).length !== 1)
-      return none("needs exactly one of pr (a whole number), branch or finding_ids");
+    const clientId = typeof c.client_id === "string" && CLIENT_ID.test(c.client_id) ? c.client_id : null;
+    const sentIds = Array.isArray(c.finding_ids) && c.finding_ids.length <= MAX_ECHOED_IDS && c.finding_ids.every((x) => typeof x === "string" && FINDING_ID.test(x)) ? c.finding_ids : null;
     const appOf = (id) => (id ? shown.get(id)?.app : undefined) ?? pageApp ?? s.apps[0] ?? null;
+    const asked = { client_id: clientId, app: appOf(sentIds?.[0]), pr: wholeNumber(c.pr, 1, 2000000000), branch: typeof c.branch === "string" && BRANCH_REF.test(c.branch) && !c.branch.includes("..") ? c.branch : null, finding_ids: sentIds };
+    const none = (reason, why) => {
+      log(`keepsnappy watch: fix ${why}; nothing started`);
+      d.json?.emit({ type: "fix", fix_id: newFixId(`rejected|${clientId}|${reason}`), state: "rejected", ...asked, reason, text: fixRejectText(reason, { count: sentIds?.length ?? 0, max: MAX_FIX_FINDINGS }) });
+    };
+    if ([c.pr, c.branch, c.finding_ids].filter((x) => x !== undefined).length !== 1)
+      return none("bad-command", "needs exactly one of pr (a whole number), branch or finding_ids");
     const make = (o) => ({ ...o, fixId: newFixId(o.key), auto: false });
+    const duplicate = () => none("duplicate", "is already running or queued for these findings");
     if (c.pr !== undefined || c.branch !== undefined) {
-      const pr = c.pr !== undefined ? wholeNumber(c.pr, 1, 2000000000) : null;
-      const branch = c.branch !== undefined ? typeof c.branch === "string" && BRANCH_REF.test(c.branch) && !c.branch.includes("..") ? c.branch : null : null;
+      const { pr, branch } = asked;
       if (c.pr !== undefined && pr === null)
-        return none("needs a pr that is a whole number of 1 or more");
+        return none("bad-command", "needs a pr that is a whole number of 1 or more");
       if (c.branch !== undefined && branch === null)
-        return none("needs a branch name (letters, digits and ._/-, not starting with a dash)");
+        return none("bad-command", "needs a branch name (letters, digits and ._/-, not starting with a dash)");
       const owner = appOf();
       if (!owner)
-        return none("does not know the app yet");
-      return requestFix(make({ key: pr !== null ? `pr:${pr}` : `branch:${branch}`, app: owner, branch, pr, findingId: null, target: [pr !== null ? String(pr) : branch] }));
+        return none("unknown-app", "does not know the app yet");
+      return requestFix(make({ key: pr !== null ? `pr:${pr}` : `branch:${branch}`, app: owner, branch, pr, findingId: null, target: [pr !== null ? String(pr) : branch] }), duplicate);
     }
+    if (sentIds && sentIds.length > MAX_FIX_FINDINGS)
+      return none("too-many", `takes at most ${MAX_FIX_FINDINGS} finding ids, and got ${sentIds.length}`);
     const ids = findingIdList(c.finding_ids);
     if (!ids)
-      return none(`needs 1 to ${MAX_FIX_FINDINGS} finding ids (f_ and 16 hex characters)`);
+      return none("bad-command", `needs 1 to ${MAX_FIX_FINDINGS} finding ids (f_ and 16 hex characters)`);
     const unique = [...new Set(ids)];
     const owner = appOf(unique[0]);
     if (!owner)
-      return none("does not know the app yet");
-    requestFix(make({ key: `ids:${[...unique].sort().join(",")}`, app: owner, branch: shown.get(unique[0])?.branch ?? null, pr: null, findingId: unique[0], target: unique.flatMap((id) => ["--finding", id]) }));
+      return none("unknown-app", "does not know the app yet");
+    requestFix(make({ key: `ids:${[...unique].sort().join(",")}`, app: owner, branch: shown.get(unique[0])?.branch ?? null, pr: null, findingId: unique[0], target: unique.flatMap((id) => ["--finding", id]) }), duplicate);
   }
   let fixSeq = 0;
   const newFixId = (tag) => `fix-${d.now()}-${createHash2("sha256").update(`${tag}|${d.now()}|${fixSeq++}`).digest("hex").slice(0, 6)}`;
@@ -21637,9 +22082,9 @@ async function runWatch(s, d, outer) {
     log(`keepsnappy watch: fix of ${j.pr !== null ? `PR #${j.pr}` : j.branch ?? j.findingId ?? "the findings"} (${j.app}) skipped: ${reason}`);
     d.json?.emit({ type: "fix", fix_id: j.fixId ?? newFixId(`skip|${j.app}|${j.pr ?? j.branch}|${reason}`), state: "skipped", app: j.app, pr: j.pr, branch: j.branch, finding_id: j.findingId, reason });
   };
-  function requestFix(job) {
+  function requestFix(job, onDuplicate = () => {}) {
     if ([...fixRunning.values()].some((j) => j.key === job.key) || fixQueue.some((q) => q.key === job.key))
-      return;
+      return onDuplicate();
     if (fixRunning.has(job.app)) {
       fixQueue.push(job);
       return skipLine(job, "busy");
@@ -21780,7 +22225,16 @@ async function runWatch(s, d, outer) {
     }
     if (!found || found.state !== "worse" || found.on !== "pr" && found.on !== "main")
       return;
-    await autoFix({ app: job.app, branch: found.branch, pr: found.pr ?? null, on: found.on, findingId: job.findingId, sha: found.sha ?? null, open: o.status === "stored" && o.count !== null ? o.count : null });
+    const other = job.onBranch !== undefined && job.onBranch !== found.branch;
+    await autoFix({
+      app: job.app,
+      branch: other ? job.onBranch : found.branch,
+      pr: other ? null : found.pr ?? null,
+      on: other ? "pr" : found.on,
+      findingId: job.findingId,
+      sha: other ? null : found.sha ?? null,
+      open: o.status === "stored" && o.count !== null ? o.count : null
+    });
   }
   async function outcome(findingId, logFile, code, error, branch) {
     if (error)
@@ -21805,7 +22259,7 @@ async function runWatch(s, d, outer) {
       return [WATCH_WORDS.autoNotWithCodex];
     }
     const job = jobOf(ev, ev.finding_id, titleOf(ev));
-    if (running.has(job.findingId) || queue.some((q) => q.findingId === job.findingId))
+    if (busy(job))
       return [];
     if (investigating(ev.app)) {
       queue.push(job);
@@ -21866,6 +22320,8 @@ async function runWatch(s, d, outer) {
     if (connected)
       return;
     connected = true;
+    if (s.apps.length === 0)
+      resumeFor((app) => app === page.app);
     d.json?.emit({ type: "connected", app: page.app, app_name: page.app_name ?? null, org: page.org_name ?? null });
   }
   async function fromNow() {
@@ -21911,6 +22367,8 @@ async function runWatch(s, d, outer) {
     seen.add(id);
   for (const [id, f] of Object.entries(prior?.shown ?? {}))
     shown.set(id, f);
+  if (s.apps.length > 0)
+    resumeFor((app) => s.apps.includes(app));
   for (const head of prior?.autoFixed ?? [])
     autoFixed.add(head);
   const header = () => log(`keepsnappy watch: ${s.apps.length ? `apps ${s.apps.join(", ")}` : "every app"}${s.branch ? `, branches ${s.branch}` : ""}${s.mine ? ", my PRs + main" : ", all PRs + main"}, every ${s.intervalSeconds} s, notifications by ${d.notifier.name}${s.autoOnWorse ? ", auto-investigating Worse" : ""}${s.autoFix ? ", auto-fixing PRs" : ""}`);
@@ -22503,7 +22961,7 @@ class FileRiSource {
 }
 
 // apps/agent/src/aa.ts
-import { join as join19 } from "node:path";
+import { join as join20 } from "node:path";
 var g = (x, d = 4) => x === undefined || !Number.isFinite(x) ? "-" : Number(x.toPrecision(d)).toString();
 var pad = (rows) => {
   const w = rows[0]?.map((_, i) => Math.max(...rows.map((r) => (r[i] ?? "").length))) ?? [];
@@ -22511,7 +22969,7 @@ var pad = (rows) => {
 `);
 };
 async function load(deps, outDir) {
-  return readRunDataset(await deps.fs.readFile(join19(outDir, "metrics.csv")));
+  return readRunDataset(await deps.fs.readFile(join20(outDir, "metrics.csv")));
 }
 async function aa(deps, outDir, opts = {}) {
   const dataset = await load(deps, outDir);
@@ -22524,14 +22982,14 @@ async function aa(deps, outDir, opts = {}) {
       rows.push([r.metric, String(r.pool.n), g(r.pool.median), g(r.pool.robustCv, 3), r.rows.map((x) => `${x.n}:${x.mde === null ? ">max" : g(x.mde, 2)}`).join(" "), r.suggestedMargin.reason]);
   }
   const table = pad(rows);
-  await deps.fs.writeFile(join19(outDir, "aa.json"), `${JSON.stringify({ kind: "aa", results }, null, 2)}
+  await deps.fs.writeFile(join20(outDir, "aa.json"), `${JSON.stringify({ kind: "aa", results }, null, 2)}
 `);
   return { results, table };
 }
 
 // apps/agent/src/browserstack.ts
 import { randomUUID } from "node:crypto";
-import { basename as basename3, join as join20 } from "node:path";
+import { basename as basename5, join as join21 } from "node:path";
 import { readFile as readFile9 } from "node:fs/promises";
 var BASE2 = "https://api-cloud.browserstack.com/app-automate/maestro/v2";
 var TERMINAL = new Set(["passed", "failed", "error", "timedout", "skipped", "stopped"]);
@@ -22662,22 +23120,22 @@ class BrowserStack {
     if (app.startsWith("bs://") || app.startsWith("custom_id:"))
       return app;
     const form = new FormData;
-    form.append("file", new Blob([await this.bytes(app)]), basename3(app));
+    form.append("file", new Blob([await this.bytes(app)]), basename5(app));
     if (customId)
       form.append("custom_id", customId);
     const r = await this.call("/app", { method: "POST", form });
     if (typeof r.app_url !== "string")
-      throw new FarmApiError(`app upload of ${basename3(app)} returned no app_url`);
+      throw new FarmApiError(`app upload of ${basename5(app)} returned no app_url`);
     return r.app_url;
   }
   async runMaestro(b) {
     const appUrl = await this.uploadApp(b.app, b.customId);
-    const work = join20(this.o.tmpDir ?? "/tmp", `keepsnappy-suite-${(this.o.uniqueId ?? randomUUID)()}`);
+    const work = join21(this.o.tmpDir ?? "/tmp", `keepsnappy-suite-${(this.o.uniqueId ?? randomUUID)()}`);
     let suiteUrl;
     try {
       const zip = await this.zipSuite(b, work);
       const form = new FormData;
-      form.append("file", new Blob([await this.bytes(zip)]), basename3(zip));
+      form.append("file", new Blob([await this.bytes(zip)]), basename5(zip));
       const r = await this.call("/test-suite", { method: "POST", form });
       if (typeof r.test_suite_url !== "string")
         throw new FarmApiError("suite upload returned no test_suite_url");
@@ -22705,17 +23163,17 @@ class BrowserStack {
     return this.poll(buildId, b);
   }
   async zipSuite(b, work) {
-    const zipPath = join20(work, "suite.zip");
-    const stage = join20(work, "stage");
+    const zipPath = join21(work, "suite.zip");
+    const stage = join21(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 = basename3(b.suiteDir.replace(/\/$/, ""));
-    if (!await this.deps.fs.exists(join20(stage, folder, "config.yaml")))
+    const folder = basename5(b.suiteDir.replace(/\/$/, ""));
+    if (!await this.deps.fs.exists(join21(stage, folder, "config.yaml")))
       throw new FarmApiError(`${b.suiteDir} has no config.yaml: is that the Maestro workspace?`);
-    const target = join20(stage, folder, b.tokensPath);
-    await this.deps.fs.mkdir(join20(target, ".."));
+    const target = join21(stage, folder, b.tokensPath);
+    await this.deps.fs.mkdir(join21(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/*"]);
@@ -22774,9 +23232,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 = join20(this.o.dir, identifier);
-    const bin = join20(dir, "BrowserStackLocal");
-    const zip = join20(dir, "bs-local.zip");
+    const dir = join21(this.o.dir, identifier);
+    const bin = join21(dir, "BrowserStackLocal");
+    const zip = join21(dir, "bs-local.zip");
     await this.deps.fs.mkdir(dir);
     for (const [cmd, args] of [
       ["curl", ["-fsSL", "-o", zip, url]],
@@ -22855,83 +23313,6 @@ async function maestroCliVersion(deps) {
   return /^\s*v?(\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?)\s*$/m.exec(r.stdout)?.[1];
 }
 
-// apps/agent/src/device-model.ts
-import { tmpdir as tmpdir3 } from "node:os";
-import { join as join21 } 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 = join21(tmpdir3(), `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/links.ts
 import { parseArgs as parseArgs7 } from "node:util";
 var LINK_COMMANDS = new Set(["activation-link", "flush-link", "gc-link"]);
@@ -23845,8 +24226,8 @@ async function farmRun(deps, f, rt, ports) {
 
 // apps/agent/src/sourcemaps.ts
 import { createHash as createHash4, randomUUID as randomUUID2 } from "node:crypto";
-import { access as access2, readFile as readFile10, readdir as readdir5, rename as rename3, rm as rm4, writeFile as writeFile7 } from "node:fs/promises";
-import { basename as basename4, join as join25, resolve as resolve13 } from "node:path";
+import { access as access2, readFile as readFile10, readdir as readdir6, rename as rename3, rm as rm4, writeFile as writeFile7 } from "node:fs/promises";
+import { basename as basename6, join as join25, resolve as resolve13 } from "node:path";
 import { parseArgs as parseArgs8 } from "node:util";
 import { gzipSync } from "node:zlib";
 var MAX_COMPLETE_ROUNDS = 20;
@@ -23854,7 +24235,7 @@ var isObject = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
 async function prepareComponents(projectRoot, options = {}) {
   const root = resolve13(projectRoot);
   const directory = join25(root, ".keepsnappy", "components");
-  const configurations = await readdir5(directory, { withFileTypes: true }).catch((error) => {
+  const configurations = await readdir6(directory, { withFileTypes: true }).catch((error) => {
     if (error.code === "ENOENT")
       return [];
     throw error;
@@ -23883,7 +24264,7 @@ async function prepareComponents(projectRoot, options = {}) {
   if (!isComponentConfiguration(config) || config.directory !== selectedConfiguration) {
     throw new ConfigError(["invalid KeepSnappy component fragment configuration"]);
   }
-  const files = (await readdir5(selected)).filter((file) => file.endsWith(".json") && !file.startsWith(".")).sort();
+  const files = (await readdir6(selected)).filter((file) => file.endsWith(".json") && !file.startsWith(".")).sort();
   const components = [];
   const hashes = new Map;
   let matched = 0;
@@ -23973,7 +24354,7 @@ async function uploadSourcemaps(opts) {
     const text = Buffer.from(JSON.stringify(map));
     const gz = gzipSync(text);
     const sha256 = createHash4("sha256").update(gz).digest("hex");
-    const name = basename4(file);
+    const name = basename6(file);
     const announced = await call(f, opts.url, `/v1/builds/${encodeURIComponent(opts.build)}/sourcemaps`, headers, {
       platform: opts.platform,
       name,
@@ -24354,10 +24735,12 @@ var BRANCHES_USAGE = `keepsnappy branches [--days N] [--sort needs-look|newest]
   current result and its phones; branches still running or waiting for main last.
   --sort   needs-look (default: the worst result first) or newest (the newest result first)
   --app    the app the key must be for (a key reads one app); another app is an error
-  --json   one JSON object: {"version":1,"app","app_name","days","sort","generated_at","more","branches":[…]} in the order asked for (the Mac app reads it);
+  --json   one JSON object: {"version":1,"app","app_name","days","sort","generated_at","more","branches":[…],"main":[…]} in the order asked for (the Mac app reads it);
            more: the window held more pushes than one answer reads, the oldest are left out
            each phone: "finding_id" (the finding its result is about, or null) and "hypotheses" ({count, latest_submission_id, latest_at}: what the
            ledger holds about that finding, from any runner, or null)
+           main: one row per phone that ran main in the window, its newest session, newest first (the sort does not change it):
+           phone, phone_name, scenario_name, word, state, last_run_at, url, run_set_id, finding_id, hypotheses
   --config accepted for the Mac app, which passes it to every command; nothing in it changes the list
   (key: KEEPSNAPPY_KEY or --key-env NAME, read or run scope; API: --api URL or KEEPSNAPPY_API)`;
 var BRANCHES_COMMANDS = new Set(["branches"]);
@@ -24383,7 +24766,7 @@ function settingsOf(argv) {
   return { days, sort, app: o.app?.trim().toLowerCase() || null, json: o.json ?? false, api: o.api ?? null, keyEnv: o["key-env"] ?? "KEEPSNAPPY_KEY", help: o.help ?? false };
 }
 function branchesJson(page, generatedAt) {
-  return { version: BRANCHES_JSON_VERSION, app: page.app, app_name: page.app_name, days: page.days, sort: page.sort, generated_at: new Date(generatedAt).toISOString(), more: page.more, branches: page.branches };
+  return { version: BRANCHES_JSON_VERSION, app: page.app, app_name: page.app_name, days: page.days, sort: page.sort, generated_at: new Date(generatedAt).toISOString(), more: page.more, branches: page.branches, main: page.main ?? [] };
 }
 function branchesText(page) {
   const n = page.branches.length;
@@ -24417,7 +24800,7 @@ async function branchesCommand(argv, rt) {
 var USAGE = `keepsnappy <command>
   run     [--config keepsnappy.yml] [--repeat N] [--out DIR]
           [--upload [--wait] [--fail-on-worse] [--no-notify] [--ingest-url URL] [--commit SHA] [--branch NAME] [--base-commit SHA]]
-          [--device-model NAME --device-os VERSION] [--scenario NAME] [--replay <out dir>[:ARM] ...]
+          [--device UDID] [--device-model NAME --device-os VERSION] [--scenario NAME] [--replay <out dir>[:ARM] ...]
           [--no-markers] [-- <e2e command...>]
           (--fail-on-worse: exit 3 only when the verdict computed on that run set is Worse and blocking; closing never computes one,
            so with no computed verdict it checks nothing: "${UNCHECKED_GATE}", exit 0)