@broberg/lens-daemon 0.1.39 → 0.1.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@broberg/lens-daemon",
-  "version": "0.1.39",
+  "version": "0.1.41",
   "description": "The Lens module of the cardmem daemon (flows, critic, coverage, capture sessions, the /lens/* routes and the cardmem-lens MCP) as a package. The daemon mounts createLensRouter(deps) + createLensMcpRouter(deps). Bun runtime.",
   "type": "module",
   "license": "MIT",

package/src/browser.ts

@@ -12,7 +12,7 @@
 
 import { bindProfileChannel, claimProfile, killOwnBrowsersOn, profileDir, type ProfileChannel } from './profiles.ts';
 import { sweepChromeClones, trackChromeLaunch } from './chrome-clones.ts';
-import { launchWithRepair, type BrowserRepair } from './ensure-chromium.ts';
+import { launchWithRepair, repairInFlight, type BrowserRepair } from './ensure-chromium.ts';
 import {
   chromium,
   webkit,
@@ -119,6 +119,20 @@ export async function getBrowser(engine: LensEngine = 'chromium'): Promise<Brows
 // deadline; on timeout, discard the wedged browser and retry once fresh.
 const WEDGE_TIMEOUT_MS = 20_000;
 
+/** F010.1 — the wedge deadline on a warm launch, except while that engine's
+ *  browser is being reinstalled: then the repair is waited for (it has its own
+ *  bound) and the deadline applies again after it. Exported for test. */
+export async function launchDeadline<T>(p: Promise<T>, engine: LensEngine, ms: number): Promise<T> {
+  try {
+    return await withDeadline(p, ms, 'browser launch');
+  } catch (err) {
+    const repair = repairInFlight(engine);
+    if (!repair || !(err instanceof Error && err.message.includes('lens browser wedged'))) throw err;
+    await repair;
+    return withDeadline(p, ms, 'browser launch');
+  }
+}
+
 function withDeadline<T>(p: Promise<T>, ms: number, what: string): Promise<T> {
   return new Promise<T>((resolve, reject) => {
     const t = setTimeout(
@@ -546,7 +560,7 @@ export async function withPage<T>(
   }
 
   const makeContext = async (): Promise<BrowserContext> => {
-    const browser = await withDeadline(getBrowser(engine), WEDGE_TIMEOUT_MS, 'browser launch');
+    const browser = await launchDeadline(getBrowser(engine), engine, WEDGE_TIMEOUT_MS);
     return withDeadline(
       browser.newContext(contextOptions(opts)),
       WEDGE_TIMEOUT_MS,

package/src/ensure-chromium.ts

@@ -148,6 +148,8 @@ export function isMissingBrowserError(err: unknown): boolean {
 
 type Installer = (names: string[]) => Promise<{ ok: boolean; error?: string }>;
 
+const INSTALL_TIMEOUT_MS = 10 * 60_000;
+
 const spawnInstaller: Installer = (names) =>
   new Promise((resolve) => {
     let cliPath: string;
@@ -159,8 +161,13 @@ const spawnInstaller: Installer = (names) =>
     }
     console.log(`[lens] browser missing — installing ${names.join(', ')} via ${cliPath} …`);
     const child = spawn(process.execPath, [cliPath, 'install', ...names], { stdio: 'inherit', env: process.env });
-    child.on('error', (err) => resolve({ ok: false, error: err.message }));
-    child.on('exit', (code) => resolve(code === 0 ? { ok: true } : { ok: false, error: `playwright install exited ${code}` }));
+    // A download that stalls must not hold every run waiting on it forever.
+    const timer = setTimeout(() => {
+      child.kill('SIGKILL');
+      resolve({ ok: false, error: `playwright install did not finish within ${INSTALL_TIMEOUT_MS / 60_000} min` });
+    }, INSTALL_TIMEOUT_MS);
+    child.on('error', (err) => { clearTimeout(timer); resolve({ ok: false, error: err.message }); });
+    child.on('exit', (code) => { clearTimeout(timer); resolve(code === 0 ? { ok: true } : { ok: false, error: `playwright install exited ${code}` }); });
   });
 
 let installer: Installer = spawnInstaller;
@@ -198,16 +205,31 @@ export async function launchWithRepair<T>(
   } catch (err) {
     if (!isMissingBrowserError(err)) throw err;
     const t0 = Date.now();
-    const inst = await installBrowsers(engine);
-    if (!inst.ok) {
-      throw new Error(`${engine} browser is missing and could not be installed: ${inst.error ?? 'unknown'} — original: ${(err as Error).message.split('\n')[0]}`);
-    }
-    const out = await launch();
-    onRepaired?.({ engine, ms: Date.now() - t0 });
-    return out;
+    const repair = (async () => {
+      const inst = await installBrowsers(engine);
+      if (!inst.ok) {
+        throw new Error(`${engine} browser is missing and could not be installed: ${inst.error ?? 'unknown'} — original: ${(err as Error).message.split('\n')[0]}`);
+      }
+      const out = await launch();
+      onRepaired?.({ engine, ms: Date.now() - t0 });
+      return out;
+    })();
+    const settled = repair.then(() => {}, () => {});
+    repairsInFlight.set(engine, settled);
+    void settled.then(() => { if (repairsInFlight.get(engine) === settled) repairsInFlight.delete(engine); });
+    return repair;
   }
 }
 
+// F010.1 — measured live 25 Oct: the warm launch sits under a 20 s "wedged"
+// deadline, and a firefox download takes longer, so the run failed while the
+// repair was still installing. A caller's deadline asks this first: a repair in
+// flight (install, bounded by INSTALL_TIMEOUT_MS, then one relaunch) is waited for.
+const repairsInFlight = new Map<BrowserEngine, Promise<void>>();
+export function repairInFlight(engine: BrowserEngine): Promise<void> | undefined {
+  return repairsInFlight.get(engine);
+}
+
 /** For /health: does each engine's browser binary exist where this daemon looks?
  *  chromium is reported for both the full build and the headless shell, because
  *  the warm headless launch needs the shell (the 25 Oct gap boot never checked). */

package/src/flow-store.ts

@@ -183,6 +183,12 @@ export async function recordFlowRun(
       // F009.128 — always written when the run reported it, empty included.
       ...(result.downloads ? { downloads: storedDownloads } : {}),
       ...(networkShapes ? { network_shapes: networkShapes } : {}),
+      // F009.137 / F010.1 / F010.7 — produced in flow.ts and, until measured live on
+      // 25 Oct (run 1a337c03: a mail was consumed, the report said nothing), written
+      // nowhere. Counts and engines only; never a code or a mail.
+      ...(result.mail ? { mail: result.mail } : {}),
+      ...(result.browser_repaired ? { browser_repaired: result.browser_repaired } : {}),
+      ...(result.chrome_clones_removed ? { chrome_clones_removed: result.chrome_clones_removed } : {}),
     }),
   };