waterplane 0.1.6 → 0.1.11

package/packages/host/dist/prs.js

@@ -0,0 +1,328 @@
+/**
+ * The person's open pull requests, and the actions on them (the PR card, P3).
+ *
+ * EVERY forge call of this module goes through `forge/` (`forgeOrGh`), never `gh`
+ * directly. Git calls are `git()`.
+ *
+ * The list is polled ONLY while a client holds a LEASE on the repo
+ * (`localrt.ts`'s model: no socket-close hook here, so a watcher that stops
+ * renewing lapses by itself — the phone renews every ~30 s, a lease lasts 60 s,
+ * the poll stops with the last watcher). A request never runs `gh pr list`: it is
+ * answered from the cache the poll keeps. The actions (merge, auto-merge, close,
+ * failing log) are one explicit POST each, from a tap, and run `gh` once.
+ *
+ * Notifications (checks failed / changes requested / merged or closed off the
+ * phone) are raised from the poll, so they exist ONLY while somebody is looking
+ * at the card — by design: a background poller per repo is a cost nobody asked for.
+ * They go through the same `notify("git", …)` path, so the push prefs gate them.
+ */
+import { actionsRunId, prChanges, prViewsFrom } from "@waterplane/shared";
+import { branchRules, cachedBranchRules } from "./branchrules.js";
+import { env } from "./env.js";
+import { gitDeleteBranch, gitPull } from "./git.js";
+import { dueWatchers } from "./localrt.js";
+import { execFileP } from "./proc.js";
+import { forgeOrGh } from "./forge/index.js";
+const NO_PROMPT = { ...process.env, GIT_TERMINAL_PROMPT: "0", GH_PROMPT_DISABLED: "1" };
+const git = (wt, args) => execFileP("git", args, { cwd: wt, timeout: 60_000, env: NO_PROMPT, maxBuffer: 4 * 1024 * 1024 });
+const msg = (e) => String(e.stderr || e?.message || e).trim().split("\n").slice(-3).join(" ");
+// ── timing ───────────────────────────────────────────────────────────────
+export let LEASE_MS = 60_000;
+let pollMs = (() => { const n = Number(env("PRS_POLL_MS")); return Number.isFinite(n) && n > 0 ? Math.max(5_000, n) : 20_000; })();
+/** Test seam: shorten the lease / poll period (no floor). */
+export function setPrTiming(t) {
+    if (t.leaseMs !== undefined)
+        LEASE_MS = t.leaseMs;
+    if (t.pollMs !== undefined)
+        pollMs = t.pollMs;
+}
+let rulesLookup = null;
+export function setPrRules(fn) { rulesLookup = fn; }
+const rulesOf = (wt) => (rulesLookup ? rulesLookup(wt) : branchRules(wt));
+let deps = null;
+export function setPrNotify(d) { deps = d; }
+const prKey = (repoId, n) => `pr:${repoId}:${n}`;
+const watches = new Map();
+const watchOf = (wt) => {
+    let w = watches.get(wt);
+    if (!w) {
+        w = { holders: new Map(), doc: {}, ours: new Set() };
+        watches.set(wt, w);
+    }
+    return w;
+};
+/** Is anything polling this worktree right now? (tests, diagnostics) */
+export function prsPolling(wt) { return !!watches.get(wt)?.timer; }
+/** The cached reading: never runs `gh`. */
+export function cachedPrs(wt) { return watches.get(wt)?.doc ?? {}; }
+/** One `gh pr list`. Failure of any kind is ABSENT (undefined) with a sentence. */
+export async function listPrs(wt, rules) {
+    try {
+        const raw = await (await forgeOrGh(wt)).listPrs();
+        return { prs: prViewsFrom(raw, rules ?? (rulesLookup ? await rulesLookup(wt) : cachedBranchRules(wt))) };
+    }
+    catch (e) {
+        const t = msg(e);
+        return { why: /ENOENT/.test(t) ? "gh is not installed on this desktop" : `gh could not list pull requests: ${t.slice(0, 160)}` };
+    }
+}
+async function pollOnce(wt, w) {
+    // Direct or unread rules: no `gh` call at all — a direct repo's git view costs nothing new.
+    const rules = rulesLookup ? await rulesLookup(wt) : cachedBranchRules(wt);
+    if (!rules || rules.mode === "direct") {
+        w.doc = {};
+        w.prev = undefined;
+        return;
+    }
+    const r = await listPrs(wt, rules);
+    if (!r.prs) {
+        // Keep the last good list (it says when it is from); say why the refresh failed.
+        w.doc = w.doc.prs ? { ...w.doc, why: r.why } : { why: r.why };
+        return;
+    }
+    const changes = prChanges(w.prev, r.prs);
+    w.prev = r.prs;
+    w.doc = { prs: r.prs, at: Date.now() };
+    for (const c of changes) {
+        if (c.kind === "gone") {
+            if (w.ours.delete(c.number))
+                continue;
+            await goneNews(wt, w, c.number, c.title);
+            continue;
+        }
+        if (!deps || !w.ref)
+            continue;
+        const key = prKey(w.ref.id, c.number);
+        deps.notify("git", {
+            title: `${c.kind === "checks-failed" ? "Check failed" : "Changes requested"} · PR #${c.number}`,
+            body: c.kind === "checks-failed" ? `${c.detail ?? "A check"} failed on ${c.title}` : `A reviewer asked for changes on ${c.title}`,
+            outcome: "failed", key, tag: `pr-${w.ref.id}-${c.number}`, open: { to: "git", repoId: w.ref.id },
+        });
+    }
+}
+async function goneNews(wt, w, number, title) {
+    if (!deps || !w.ref)
+        return;
+    let state = "";
+    try {
+        state = await (await forgeOrGh(wt)).prState(number);
+    }
+    catch { /* worded below */ }
+    const word = state === "MERGED" ? "merged" : state === "CLOSED" ? "closed" : "no longer open";
+    const key = prKey(w.ref.id, number);
+    deps.resolveAttention(key, `PR #${number} was ${word}`);
+    deps.notify("git", {
+        title: `PR #${number} ${word} · ${w.ref.name}`, body: title,
+        outcome: "ok", tag: `pr-${w.ref.id}-${number}`, open: { to: "git", repoId: w.ref.id },
+    });
+}
+function tick(wt) {
+    const w = watches.get(wt);
+    if (!w)
+        return;
+    w.timer = undefined;
+    const { live, lapsed } = dueWatchers([...w.holders].map(([h, until]) => [h, { until, open: true }]), Date.now());
+    for (const h of lapsed)
+        w.holders.delete(h);
+    if (live.length === 0) {
+        w.prev = undefined;
+        return;
+    } // stops with its last watcher
+    w.running = pollOnce(wt, w).catch(() => undefined).finally(() => {
+        w.running = undefined;
+        if (w.holders.size > 0 && !w.timer) {
+            w.timer = setTimeout(() => tick(wt), pollMs);
+            w.timer.unref?.();
+        }
+    });
+}
+/**
+ * Take (or renew) a lease. The first lease of a worktree polls at once; the
+ * answer is whatever is cached NOW (the phone asks again, or the next frame of
+ * its renewal carries the fresh list) — a request never waits on `gh`.
+ */
+export function leasePrs(wt, holder, ref) {
+    const w = watchOf(wt);
+    if (ref)
+        w.ref = ref;
+    w.holders.set(holder, Date.now() + LEASE_MS);
+    if (!w.timer && !w.running)
+        tick(wt);
+    return w.doc;
+}
+/** Drop everything (tests). */
+export function stopAllPrs() {
+    for (const w of watches.values())
+        if (w.timer)
+            clearTimeout(w.timer);
+    watches.clear();
+}
+// ── actions ──────────────────────────────────────────────────────────────
+const isNum = (n) => typeof n === "number" && Number.isInteger(n) && n > 0;
+const METHOD_FLAG = { merge: 1, squash: 1, rebase: 1 };
+const bad = (error) => ({ ok: false, error });
+const afterAction = (wt, n, ours) => {
+    const w = watches.get(wt);
+    if (w && ours && w.holders.size > 0)
+        w.ours.add(n);
+    // Refresh now so the card is not a poll behind the tap (only while somebody watches).
+    if (w && w.holders.size > 0 && !w.running) {
+        w.running = pollOnce(wt, w).catch(() => undefined).finally(() => { w.running = undefined; });
+    }
+};
+export async function mergePr(wt, body) {
+    if (!isNum(body.number))
+        return bad("Which pull request? (number missing)");
+    const n = body.number;
+    const rules = await rulesOf(wt);
+    let method;
+    if (body.method !== undefined) {
+        if (typeof body.method !== "string" || !Object.hasOwn(METHOD_FLAG, body.method))
+            return bad("Merge method must be merge, squash or rebase.");
+        method = body.method;
+        if (rules?.allowedMerge.length && !rules.allowedMerge.includes(method))
+            return bad(`This repo does not allow a ${method} merge — it allows ${rules.allowedMerge.join(", ")}.`);
+    }
+    else
+        method = rules?.allowedMerge[0];
+    let head = "", base = "";
+    try {
+        const v = await (await forgeOrGh(wt)).prInfo(n);
+        head = String(v?.headRefName ?? "");
+        base = String(v?.baseRefName ?? "");
+        if (v?.state && v.state !== "OPEN")
+            return bad(`PR #${n} is ${String(v.state).toLowerCase()}, not open.`);
+    }
+    catch (e) {
+        return bad(`Could not read PR #${n}: ${msg(e)}`);
+    }
+    try {
+        await (await forgeOrGh(wt)).merge(n, method);
+    }
+    catch (e) {
+        return bad(`GitHub did not merge PR #${n}: ${msg(e)}`);
+    }
+    afterAction(wt, n, true);
+    return { ok: true, output: await tidyAfterMerge(wt, n, method ?? "merge", head, base) };
+}
+/** Pull the base branch if checked out, delete the head branch locally and on origin; say what was and was not done. */
+async function tidyAfterMerge(wt, n, method, head, base) {
+    const did = [`Merged PR #${n} (${method}).`];
+    const not = [];
+    let cur = "";
+    try {
+        cur = (await git(wt, ["rev-parse", "--abbrev-ref", "HEAD"])).stdout.trim();
+    }
+    catch { /* unknown */ }
+    if (!base)
+        not.push("did not pull (the base branch is unknown)");
+    else if (cur !== base)
+        not.push(`did not pull ${base} (this checkout is on ${cur || "no branch"})`);
+    else {
+        const p = await gitPull(wt);
+        if (p.ok)
+            did.push(`Pulled ${base}.`);
+        else
+            not.push(`did not pull ${base}: ${(p.error ?? "").split("\n")[0]}`);
+    }
+    const safeRef = head && head !== base && /^[A-Za-z0-9._][A-Za-z0-9._/-]*$/.test(head) && !head.includes("..");
+    if (!safeRef) {
+        not.push(head ? `kept branch ${head}` : "did not delete the branch (its name is unknown)");
+    }
+    else {
+        if (cur === head)
+            not.push(`kept local branch ${head} (it is checked out)`);
+        else {
+            const d = await gitDeleteBranch(wt, head);
+            if (d.ok)
+                did.push(`Deleted local branch ${head}.`);
+            else if (/not found|did not match/i.test(d.error ?? ""))
+                did.push(`Local branch ${head} was already gone.`);
+            else
+                not.push(`kept local branch ${head} (git says it is not fully merged here — a squash merge looks like that; delete it yourself if you are sure)`);
+        }
+        try {
+            await git(wt, ["push", "origin", "--delete", `refs/heads/${head}`]);
+            did.push(`Deleted ${head} on origin.`);
+        }
+        catch (e) {
+            if (/remote ref does not exist|unable to delete|already|not found/i.test(msg(e)))
+                did.push(`${head} was already gone on origin.`);
+            else
+                not.push(`kept ${head} on origin: ${msg(e).slice(0, 120)}`);
+        }
+    }
+    return not.length ? `${did.join(" ")} Not done: ${not.join("; ")}.` : did.join(" ");
+}
+export async function autoMergePr(wt, body) {
+    if (!isNum(body.number))
+        return bad("Which pull request? (number missing)");
+    if (typeof body.on !== "boolean")
+        return bad("Say whether auto-merge goes on or off.");
+    const n = body.number;
+    if (!body.on) {
+        try {
+            await (await forgeOrGh(wt)).autoMerge(n, false);
+        }
+        catch (e) {
+            return bad(`Could not switch auto-merge off for PR #${n}: ${msg(e)}`);
+        }
+        afterAction(wt, n, false);
+        return { ok: true, output: `Auto-merge is off for PR #${n}.` };
+    }
+    const rules = await rulesOf(wt);
+    if (rules && !rules.autoMerge)
+        return bad("This repo does not allow auto-merge. Turn on \"Allow auto-merge\" in the repo's GitHub settings, or merge by hand when the checks are green.");
+    const method = typeof body.method === "string" && body.method in METHOD_FLAG ? body.method : rules?.allowedMerge[0];
+    try {
+        await (await forgeOrGh(wt)).autoMerge(n, true, method);
+    }
+    catch (e) {
+        return bad(`Could not switch auto-merge on for PR #${n}: ${msg(e)}`);
+    }
+    afterAction(wt, n, false);
+    return { ok: true, output: `Auto-merge is on for PR #${n}: it merges once its checks and reviews allow. Nothing else changes until then.` };
+}
+export async function closePr(wt, body) {
+    if (!isNum(body.number))
+        return bad("Which pull request? (number missing)");
+    try {
+        await (await forgeOrGh(wt)).close(body.number);
+    }
+    catch (e) {
+        return bad(`Could not close PR #${body.number}: ${msg(e)}`);
+    }
+    afterAction(wt, body.number, true);
+    return { ok: true, output: `Closed PR #${body.number}. Its branch was left alone.` };
+}
+const TAIL_LINES = 80;
+const ANSI = /\u001b\[[0-9;?]*[ -/]*[@-~]/g;
+/** The tail of the failing check's Actions log, or the check's own page when it is not an Actions run. */
+export async function failingLog(wt, body) {
+    if (!isNum(body.number))
+        return bad("Which pull request? (number missing)");
+    const n = body.number;
+    let pr = (watches.get(wt)?.doc.prs ?? []).find((p) => p.number === n);
+    if (!pr)
+        pr = (await listPrs(wt)).prs?.find((p) => p.number === n);
+    if (!pr)
+        return bad(`PR #${n} is not in your open list.`);
+    const failed = pr.checks.filter((c) => c.state === "failed");
+    const check = (typeof body.check === "string" ? failed.find((c) => c.name === body.check) : undefined) ?? failed[0];
+    if (!check)
+        return bad(`No check has failed on PR #${n}.`);
+    const runId = actionsRunId(check.url);
+    if (!runId)
+        return { ok: true, url: check.url, output: `${check.name} is not a GitHub Actions run, so there is no log to show here.${check.url ? " Open its page." : ""}` };
+    try {
+        const stdout = await (await forgeOrGh(wt)).checksLog(runId);
+        const lines = stdout.replace(ANSI, "").split("\n").filter((l, i, a) => l.trim() || i < a.length - 1);
+        if (!lines.length)
+            return { ok: true, url: check.url, output: `${check.name}: the run has no failed-step log yet.` };
+        return { ok: true, url: check.url, output: lines.slice(-TAIL_LINES).join("\n") };
+    }
+    catch (e) {
+        return { ok: true, url: check.url, output: `${check.name}: gh could not fetch the log (${msg(e).slice(0, 120)}).${check.url ? " Open its page." : ""}` };
+    }
+}
+//# sourceMappingURL=prs.js.map

package/packages/host/dist/prs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"prs.js","sourceRoot":"","sources":["../src/prs.ts"],"names":[],"mappings":"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"}

package/packages/host/dist/push.d.ts

@@ -1,4 +1,5 @@
 import { type PushSubscription } from "web-push";
+import { type NotifyLevel, type NotifyOpen } from "@waterplane/shared";
 export interface PushPayload {
     title: string;
     body: string;
@@ -27,6 +28,24 @@ export interface PushPayload {
     pull?: string;
     /** Id of the plugin that posted this; a tap opens that plugin's screen. */
     plugin?: string;
+    /** The feed item's own id, kind and stamp, so the service worker can hand a
+     *  tapped alert back to the page whole (`openNotif`). */
+    id?: string;
+    kind?: string;
+    ts?: number;
+    /** A backlog cut to open (`NotificationItem.backlog`). */
+    backlog?: {
+        cwd: string;
+        ids: string[];
+    };
+    /** The screen a tap opens (`NotificationItem.open`). */
+    open?: NotifyOpen;
+    /** `attention` or `info` (`notifyLevel`), so the service worker can word or
+     *  channel the two apart. Only attention is pushed unless the person asked for
+     *  information too (`notify.prefs`' `pushInfo`) or the payload carries `pull`. */
+    level?: NotifyLevel;
+    /** The attention item's cause key (`NotificationItem.key`). */
+    key?: string;
 }
 export declare class PushManager {
     private subs;

package/packages/host/dist/push.js.map

@@ -1 +1 @@
-{"version":3,"file":"push.js","sourceRoot":"","sources":["../src/push.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"push.js","sourceRoot":"","sources":["../src/push.ts"],"names":[],"mappings":"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"}

package/packages/host/dist/render.d.ts

@@ -1,4 +1,53 @@
+/**
+ * The ONE headless VT replay: raw PTY bytes → the text that was on screen.
+ *
+ * The claude TUI positions characters with absolute cursor moves and full-screen
+ * repaints rather than printing linearly, so simply stripping ANSI leaves
+ * shuffled fragments ("· ← ···") — and, worse, fragments with the spaces GONE,
+ * because a gap drawn by a cursor jump is not a space in the byte stream.
+ * `Current session` arrives as `Currentsession`. Feeding the bytes to a real VT
+ * and reading back the buffer yields what a user would see. The width must match
+ * the live PTY or lines wrap wrong. Best-effort — a usable record of what the
+ * turn printed, not a true chat transcript.
+ *
+ * It lives here rather than in `sessions.ts` because it has two callers with no
+ * session between them: `screenText()` (a live PTY's scrollback, outside the
+ * alternate screen) and `usage.ts`
+ * (a short-lived probe's capture). The second one is why the extraction happened
+ * — `/usage` prints each window's reset instant as WORDS under its heading
+ * ("Resets Sep 10 at 7pm (Europe/Berlin)"), and a scraper reading stripped bytes
+ * could match neither the heading nor the sentence, so both resets were null on
+ * a screen that named them both.
+ *
+ * Cost is a full VT replay, so this is for rare paths, not per-frame checks.
+ *
+ * ## Two readbacks, one replay
+ *
+ * `renderCapture()` answers "what did it say"; `renderCells()` answers "what did
+ * it say, and how was it painted". They share `replay()` and differ only in what
+ * they read out of the same buffer, because the alternative was a second VT — a
+ * second opinion about what is on a screen, which is exactly the thing CLAUDE.md
+ * names this file to prevent.
+ *
+ * The attributed readback exists because of a measured fact about a second
+ * backend: opencode's permission dialog marks the ARMED option with a background
+ * colour and nothing else — no number, no `❯`, no bold. Flattening to text
+ * throws away the one bit that says which option a Return would press, so the
+ * dialog was unanswerable from the phone and `caps.promptBoxes` was false. See
+ * `ocprompt.ts` for the reader and `docs/notes/host.md` for the byte-level
+ * measurement. The colours themselves are never named here: this file reports
+ * what the VT holds, and every judgement about it is the reader's.
+ */
+import xtermHeadless from "@xterm/headless";
+declare const Terminal: typeof xtermHeadless.Terminal;
 export declare function renderCapture(raw: string, cols: number): Promise<string>;
+/**
+ * Rendered rows as `renderCapture()` hands them out: trailing spaces trimmed and
+ * 3+ blank lines squeezed to one gap. Shared with the recorder's grid read
+ * (`drive.ts`'s `screenText`), whose callers measure distance from the LAST
+ * row — an untrimmed grid's blank tail would push every echo out of reach.
+ */
+export declare function screenTextOf(lines: readonly string[]): string;
 /**
  * A run of adjacent cells that agree on every attribute this app reads back.
  *
@@ -48,3 +97,11 @@ export interface RenderRow {
  * bottom of a live screen. 0 means the whole buffer.
  */
 export declare function renderCells(raw: string, cols: number, tailRows?: number): Promise<RenderRow[]>;
+/**
+ * Rows `start` (inclusive) to `end` (exclusive) of a terminal's ACTIVE buffer,
+ * read as `RenderRow`s. The cell walk behind `renderCells()`, shared with
+ * `screenlog.ts`'s `gridCells()` so a replay and the recorder's live grid can
+ * never disagree about what a row's text, runs or dim cells are.
+ */
+export declare function cellRows(term: InstanceType<typeof Terminal>, start: number, end: number): RenderRow[];
+export {};

package/packages/host/dist/render.js

@@ -11,7 +11,8 @@
  * turn printed, not a true chat transcript.
  *
  * It lives here rather than in `sessions.ts` because it has two callers with no
- * session between them: `screenText()` (a live PTY's scrollback) and `usage.ts`
+ * session between them: `screenText()` (a live PTY's scrollback, outside the
+ * alternate screen) and `usage.ts`
  * (a short-lived probe's capture). The second one is why the extraction happened
  * — `/usage` prints each window's reset instant as WORDS under its heading
  * ("Resets Sep 10 at 7pm (Europe/Berlin)"), and a scraper reading stripped bytes
@@ -71,10 +72,18 @@ export function renderCapture(raw, cols) {
             const line = buf.getLine(i);
             lines.push(line ? line.translateToString(true) : "");
         }
-        // Trim trailing spaces and squeeze 3+ blank lines down to one gap.
-        return lines.join("\n").replace(/[ \t]+$/gm, "").replace(/\n{3,}/g, "\n\n").trim();
+        return screenTextOf(lines);
     });
 }
+/**
+ * Rendered rows as `renderCapture()` hands them out: trailing spaces trimmed and
+ * 3+ blank lines squeezed to one gap. Shared with the recorder's grid read
+ * (`drive.ts`'s `screenText`), whose callers measure distance from the LAST
+ * row — an untrimmed grid's blank tail would push every echo out of reach.
+ */
+export function screenTextOf(lines) {
+    return lines.join("\n").replace(/[ \t]+$/gm, "").replace(/\n{3,}/g, "\n\n").trim();
+}
 /** The attribute key for one cell, in the shape `RenderSpan` documents. */
 function bgKey(c) {
     return c.isBgRGB() ? `rgb:${c.getBgColor()}` : c.isBgPalette() ? `pal:${c.getBgColor()}` : "def";
@@ -95,44 +104,53 @@ export function renderCells(raw, cols, tailRows = 0) {
     if (!raw)
         return Promise.resolve([]);
     return replay(raw, cols, (term) => {
-        const buf = term.buffer.active;
-        const width = term.cols;
-        const start = tailRows > 0 ? Math.max(0, buf.length - tailRows) : 0;
-        const rows = [];
-        // One reusable cell for the whole walk: `getCell(x)` allocates a fresh
-        // object per call, and this loop makes one call per cell on screen.
-        const scratch = buf.getNullCell?.();
-        for (let i = start; i < buf.length; i++) {
-            const line = buf.getLine(i);
-            if (!line) {
-                rows.push({ text: "", spans: [], undimmed: "" });
+        const len = term.buffer.active.length;
+        return cellRows(term, tailRows > 0 ? Math.max(0, len - tailRows) : 0, len);
+    });
+}
+/**
+ * Rows `start` (inclusive) to `end` (exclusive) of a terminal's ACTIVE buffer,
+ * read as `RenderRow`s. The cell walk behind `renderCells()`, shared with
+ * `screenlog.ts`'s `gridCells()` so a replay and the recorder's live grid can
+ * never disagree about what a row's text, runs or dim cells are.
+ */
+export function cellRows(term, start, end) {
+    const buf = term.buffer.active;
+    const width = term.cols;
+    const rows = [];
+    // One reusable cell for the whole walk: `getCell(x)` allocates a fresh
+    // object per call, and this loop makes one call per cell on screen.
+    const scratch = buf.getNullCell?.();
+    for (let i = start; i < end; i++) {
+        const line = buf.getLine(i);
+        if (!line) {
+            rows.push({ text: "", spans: [], undimmed: "" });
+            continue;
+        }
+        const spans = [];
+        let lit = "";
+        let cur = null;
+        for (let x = 0; x < width; x++) {
+            const cell = line.getCell(x, scratch);
+            if (!cell)
                 continue;
+            const bg = bgKey(cell);
+            const fg = fgKey(cell);
+            if (!cur || cur.bg !== bg || cur.fg !== fg) {
+                cur = { from: x, to: x, text: "", bg, fg };
+                spans.push(cur);
             }
-            const spans = [];
-            let lit = "";
-            let cur = null;
-            for (let x = 0; x < width; x++) {
-                const cell = line.getCell(x, scratch);
-                if (!cell)
-                    continue;
-                const bg = bgKey(cell);
-                const fg = fgKey(cell);
-                if (!cur || cur.bg !== bg || cur.fg !== fg) {
-                    cur = { from: x, to: x, text: "", bg, fg };
-                    spans.push(cur);
-                }
-                cur.to = x;
-                // A cell the VT left empty reads as "", and a row of those must still
-                // occupy its columns — a span's text is one character per cell or the
-                // column arithmetic every reader does on top of it is wrong.
-                cur.text += cell.getChars() || " ";
-                // The second cell of a wide character has width 0 and no text of its own.
-                if (cell.getWidth() > 0)
-                    lit += cell.isDim() ? " " : cell.getChars() || " ";
-            }
-            rows.push({ text: line.translateToString(true), spans, undimmed: lit.trimEnd() });
+            cur.to = x;
+            // A cell the VT left empty reads as "", and a row of those must still
+            // occupy its columns — a span's text is one character per cell or the
+            // column arithmetic every reader does on top of it is wrong.
+            cur.text += cell.getChars() || " ";
+            // The second cell of a wide character has width 0 and no text of its own.
+            if (cell.getWidth() > 0)
+                lit += cell.isDim() ? " " : cell.getChars() || " ";
         }
-        return rows;
-    });
+        rows.push({ text: line.translateToString(true), spans, undimmed: lit.trimEnd() });
+    }
+    return rows;
 }
 //# sourceMappingURL=render.js.map

package/packages/host/dist/render.js.map

@@ -1 +1 @@
-{"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"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"}

package/packages/host/dist/repohealth.js

@@ -98,7 +98,10 @@
  *     is also what keeps waterplane self-hosting and every test written against that
  *     shape green. (The flag was designed as ONE argv token precisely so an
  *     old parser ignores it rather than reading it as a subcommand, so the
- *     omission is not a compatibility crutch — it is who decides.)
+ *     omission is not a compatibility crutch — it is who decides.) **Unless it
+ *     cannot load**: a bare package it imports is not installed or not built
+ *     (a fresh clone) ⇒ the bundled engine reads instead, with `ownSkipped`
+ *     saying why; the copy wins again the moment the clone is installed.
  *  2. **The bundled engine** — `WATERPLANE_REPOHEALTH_ENGINE` when set, else this
  *     checkout's own `tools/repohealth.mjs`, three hops up from this module
  *     (the rule `main.ts` uses for `.env` and `webbundle.ts` for the web
@@ -594,7 +597,7 @@ scope = null) {
         // the one where nothing ran: a phone saying how long a backfill may take
         // must not hold its own copy of a number this desktop can change.
         stepTimeoutMs: REPOHEALTH_TIMEOUT_MS,
-        engine: engine ? { kind: engine.kind, bundled: bundledEngine() } : null,
+        engine: engine ? { kind: engine.kind, bundled: bundledEngine(), ...(engine.ownSkipped ? { ownSkipped: engine.ownSkipped } : {}) } : null,
         // WHICH reading this is, and which others exist. Both ride on every answer
         // including the one where nothing ran: a client that cannot see the list
         // cannot offer the subtrees, and one that cannot see which it is holding