tumwater 0.4.2 → 0.4.4

package/dist/src/ui/tui/tui-pane-history.js

@@ -3,31 +3,36 @@ import { betweenWindow } from "../../cli/cli-args.js";
 import { HISTORY_DEFAULT_RUNS, HISTORY_MAX_RUNS, historyClass, readRunRows, readRunRowsSince, summarizeRunRows, summarizeRunRowsByModel, runRowsMatchingGrep, runRowsOnModels, } from "../../history/history-data.js";
 import { renderModelSummary, renderSummary } from "../../history/history-render.js";
 import { historyPaneText } from "./tui-history.js";
+import { guardError } from "./tui-guard.js";
 import { readRunDetail } from "../../run/run-detail-data.js";
 import { renderRunDetail, runTranscriptLines } from "../../run/run-detail-render.js";
-import { revertFollowUp, runRevertSha } from "../../operator/revert.js";
+import { revertFollowUp, runRevertSha } from "../../operator/operator-revert.js";
 import { shortSha } from "../../text/format.js";
 import { plural } from "../../text/phrases.js";
 import { pageMarkdownBody } from "./tui-backlog.js";
 import { pageDir } from "./tui-keymap.js";
 import { promptLineFree } from "./tui-pane-ctx.js";
-import { nextInCycle, cycleLabel, HISTORY_WINDOWS, HISTORY_RESULTS } from "./tui-pane-session.js";
+import { flashReject } from "./tui-guard.js";
+import { paneAtHead, nextInCycle, cycleLabel, steppedWindowBounds, HISTORY_WINDOWS, HISTORY_RESULTS } from "./tui-pane-session.js";
 /** The bounds `readRunRowsSince` reads for a trailing window of `windowMs` stepped `step` window
  * lengths back: step 0 (or no window) is the trailing window, step k the window (k+1)*len to k*len
- * ago, the `history --since --until` pair. */
+ * ago, the `history --since --until` pair. The step math delegates to the panes' shared
+ * `steppedWindowBounds`, mapping its absent `undefined` upper bound back to this signature's
+ * `null` (the collectors' default either way, and what readRunRowsSince's own tests pin), so the
+ * History and Usage/Failures panes cannot drift on what a stepped window means. */
 export function historyWindowBounds(windowMs, step) {
-    if (windowMs === null || step === 0)
-        return { sinceMs: windowMs, untilMs: null };
-    return { sinceMs: (step + 1) * windowMs, untilMs: step * windowMs };
+    const b = steppedWindowBounds(windowMs, step);
+    return { sinceMs: b.sinceMs, untilMs: b.untilMs ?? null };
 }
 /** The History pane (view roleIds.length + 4) of the TUI (src/ui/tui/tui.tsx): the session
- * window (Ctrl+S), outcome filter (Ctrl+O), exact-role scope (Ctrl+G), free-text search (`/`),
- * and the Ctrl+N completed-run trail (Ctrl+P steps it to older runs, Ctrl+W shows its commit
- * patch, Ctrl+V twice reverts the shown run's merged change), each with its cache and
- * body window. With the trail off, Ctrl+P steps the window back by its own length (the
- * `history --since --until` window) and Ctrl+S returns to the trailing window. Split out of the
- * pane-navigation monolith; it owns the pane's window/result/scope/search/trail state and the
- * arms that touch them. */
+ * window (Ctrl+S), outcome filter (Ctrl+O), model filter (Ctrl+X), summary toggle (Ctrl+Y),
+ * exact-role scope (Ctrl+G), free-text search (`/`), the one-press newest-failure jump
+ * (Ctrl+L), and the Ctrl+N completed-run trail (Ctrl+P steps it to older runs, Ctrl+R cycles
+ * its agent transcript, Ctrl+W shows its commit patch, Ctrl+V twice reverts the shown run's
+ * merged change), each with its cache and body window. With the trail off, Ctrl+P steps the
+ * window back by its own length (the `history --since --until` window) and Ctrl+S returns to
+ * the trailing window. Split out of the pane-navigation monolith; it owns the pane's
+ * window/result/model/summary/scope/search/trail state and the arms that touch them. */
 export function createHistoryPane(session) {
     // The History pane's session trailing window (Ctrl+S), a HISTORY_WINDOWS length or null for
     // the default newest-N read. Session-only like the view/scroll state; the next Ctrl+T into
@@ -82,6 +87,20 @@ export function createHistoryPane(session) {
     let trailRun = null;
     let reverting = false; // a revert preview or commit is in flight; a held Ctrl+V starts no second
     let trailGen = 0; // bumped at every trail read or reset; a stat resolution applies only to its own gen
+    /** Drop the on-screen run trail and its snapshot: the shared teardown the pane's three
+     * History-only exits run — the Ctrl+N toggle-off arm, the Ctrl+L newest-failure jump, and
+     * the pane's reset on a view cycle. It bumps trailGen so an in-flight stat resolution from
+     * the closed trail cannot repaint the pane. */
+    const dropTrail = () => {
+        trailGen++;
+        trailMode = false;
+        trailCache = null;
+        trailIndex = 0;
+        trailTranscript = "off";
+        trailPatch = false;
+        trailPatchText = null;
+        trailGrep = null;
+    };
     /** The pane's row selection: scope, then window, then search, then outcome class — the order
      * `tumwater history` applies them. Returns the raw read's coverage flag, the count after the
      * search (so an empty body can blame the filter that emptied the set: `afterGrep > 0` means
@@ -179,18 +198,16 @@ export function createHistoryPane(session) {
     // or on a throw, which is flashed): the two outputs `tumwater history --transcript` prints.
     const loadTranscript = () => {
         trailTranscriptText = null;
-        if (trailTranscript === "off" || trailRun === null)
+        const run = trailRun;
+        if (run === null || trailTranscript === "off")
             return;
-        try {
-            const { found, note } = runTranscriptLines(session.root, trailRun.role, trailRun.run, trailRun.detail, {
+        guardError(session, () => {
+            const { found, note } = runTranscriptLines(session.root, run.role, run.run, run.detail, {
                 includePrompts: trailTranscript === "prompts",
                 grep: trailGrep ?? undefined,
             });
             trailTranscriptText = found.length > 0 ? found.join("\n") : note;
-        }
-        catch (err) {
-            session.flashError(err);
-        }
+        });
     };
     // Resolve one async trail part (the run commit's stat or patch) through the session, and, if
     // the trail is still current (`trailMode`, not superseded by a newer `trailGen`, and `keep`
@@ -310,7 +327,7 @@ export function createHistoryPane(session) {
             }
             const followUp = revertFollowUp(r.subject);
             session.flashMessage(`reverted ${shortSha(sha)}: main is now ${shortSha(r.headSha)}${followUp === null ? "" : `; ${followUp}`}`);
-        }, (err) => session.flashError(err)).finally(() => {
+        }, flashReject(session)).finally(() => {
             reverting = false;
             session.armedRevert = null;
             session.requestRender();
@@ -335,7 +352,7 @@ export function createHistoryPane(session) {
                 session.revertArmed = p.sha;
                 session.flashMessage(`press Ctrl+V again to revert ${shortSha(p.sha)} ${p.subject} (${plural(p.paths.length, "file")}) on ${p.primary} — any other key cancels`);
             }
-        }, (err) => session.flashError(err)).finally(() => {
+        }, flashReject(session)).finally(() => {
             reverting = false;
             session.requestRender();
         });
@@ -357,14 +374,7 @@ export function createHistoryPane(session) {
         if (trailMode) {
             // Toggle the trail off (Ctrl+N on the trail view): drop the trail snapshot. The
             // trailGen bump keeps an in-flight stat from the old trail from repainting.
-            trailGen++;
-            trailMode = false;
-            trailCache = null;
-            trailIndex = 0;
-            trailTranscript = "off";
-            trailPatch = false;
-            trailPatchText = null;
-            trailGrep = null;
+            dropTrail();
         }
         else {
             // Toggle the trail on: read the pane-scoped newest completed run. A scope holding
@@ -375,8 +385,7 @@ export function createHistoryPane(session) {
             if (loadTrail(() => session.flashMessage(empty)))
                 trailMode = true;
         }
-        session.paneScroll = 0; // either way the pane starts at its head
-        session.requestRender();
+        paneAtHead(session);
         return true;
     };
     const historyNewestFailure = (ctx) => {
@@ -405,22 +414,14 @@ export function createHistoryPane(session) {
         historySummary = null;
         // Drop any on-screen trail the way Ctrl+N's toggle-off arm does (the gen bump keeps an
         // in-flight stat from the old trail from repainting).
-        trailGen++;
-        trailMode = false;
-        trailCache = null;
-        trailIndex = 0;
-        trailTranscript = "off";
-        trailPatch = false;
-        trailPatchText = null;
-        trailGrep = null;
+        dropTrail();
         recompute();
         // historyWindow null + historyResult "problems": loadTrail reads
         // readRunRows(root, HISTORY_MAX_RUNS, null) and takes .filtered[0] — the newest failing
         // run of any role, exactly what the dashboard's Newest failure button and the CLI open.
         if (loadTrail(() => session.flashMessage("no failing run in the scanned window")))
             trailMode = true;
-        session.paneScroll = 0;
-        session.requestRender();
+        paneAtHead(session);
         return true;
     };
     const historyStepBack = (ctx) => {
@@ -504,8 +505,7 @@ export function createHistoryPane(session) {
                 loadTrailStat(trailRun.detail);
             composeTrail();
         }
-        session.paneScroll = 0;
-        session.requestRender();
+        paneAtHead(session);
         return true;
     };
     const historyRevertArm = (ctx) => {
@@ -633,29 +633,29 @@ export function createHistoryPane(session) {
         }
         return false;
     };
+    const ctrlRoutes = {
+        n: historyTrailToggle,
+        l: historyNewestFailure,
+        p: historyStepBack,
+        r: historyTranscriptCycle,
+        w: historyPatchToggle,
+        v: historyRevertArm,
+        g: historyScopeCycle,
+        s: historyWindowCycle,
+        o: historyResultCycle,
+        x: historyModelCycle,
+        y: historySummaryCycle,
+    };
+    const ctrlRoute = (key, ctx) => {
+        if (!key.ctrl || key.name === undefined)
+            return null;
+        const route = ctrlRoutes[key.name];
+        return route === undefined ? null : route(ctx);
+    };
     const handleKey = (key, ctx) => {
-        if (key.ctrl && key.name === "n")
-            return historyTrailToggle(ctx);
-        if (key.ctrl && key.name === "l")
-            return historyNewestFailure(ctx);
-        if (key.ctrl && key.name === "p")
-            return historyStepBack(ctx);
-        if (key.ctrl && key.name === "r")
-            return historyTranscriptCycle(ctx);
-        if (key.ctrl && key.name === "w")
-            return historyPatchToggle(ctx);
-        if (key.ctrl && key.name === "v")
-            return historyRevertArm(ctx);
-        if (key.ctrl && key.name === "g")
-            return historyScopeCycle(ctx);
-        if (key.ctrl && key.name === "s")
-            return historyWindowCycle(ctx);
-        if (key.ctrl && key.name === "o")
-            return historyResultCycle(ctx);
-        if (key.ctrl && key.name === "x")
-            return historyModelCycle(ctx);
-        if (key.ctrl && key.name === "y")
-            return historySummaryCycle(ctx);
+        const ctrl = ctrlRoute(key, ctx);
+        if (ctrl !== null)
+            return ctrl;
         const page = pageDir(key.name);
         if (page !== null)
             return historyTrailPage(page);
@@ -666,14 +666,7 @@ export function createHistoryPane(session) {
         enter: recompute,
         reset() {
             // A cycle away leaves the run trail (which is History-only) and drops its snapshot too.
-            trailGen++;
-            trailMode = false;
-            trailCache = null;
-            trailIndex = 0;
-            trailTranscript = "off";
-            trailPatch = false;
-            trailPatchText = null;
-            trailGrep = null;
+            dropTrail();
             session.revertArmed = null;
             session.armedRevert = null;
         },