tickmarkr 1.84.0 → 1.85.0

package/dist/tui/cockpit/run-cockpit.js

@@ -53,33 +53,111 @@ function IdentityHeader({ data, columns, secondary = true, }) {
             {
                 title: "",
                 lines: [
-                    `${data.runId} · ${data.branch}  ${data.status} · ${data.elapsed}`,
+                    frameCaption(data),
                 ],
             },
         ];
         return (_jsxs(Box, { flexDirection: "column", children: [_jsx(NarrowHeaderBand, { columns: columns, content: primary, rightStrong: true }), secondary && (_jsx(NarrowHeaderBand, { columns: columns, content: secondaryBand }))] }));
     }
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { justifyContent: "space-between", children: [_jsx(BodyText, { emphasis: "strong", children: lockup[0] ?? "tickmarkr" }), _jsxs(BodyText, { emphasis: "strong", children: ["v", data.binaryVersion, " \u00B7 binary ", GLYPHS.pass] })] }), secondary && (_jsxs(Box, { justifyContent: "space-between", children: [_jsx(BodyText, { emphasis: "strong", children: lockup[1] ?? "tickmarkr" }), _jsxs(BodyText, { children: [data.runId, " \u00B7 ", data.branch, "  ", data.status, " \u00B7 ", data.elapsed] })] }))] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { justifyContent: "space-between", children: [_jsx(BodyText, { emphasis: "strong", children: lockup[0] ?? "tickmarkr" }), _jsxs(BodyText, { emphasis: "strong", children: ["v", data.binaryVersion, " \u00B7 binary ", GLYPHS.pass] })] }), secondary && (_jsxs(Box, { justifyContent: "space-between", children: [_jsx(BodyText, { emphasis: "strong", children: lockup[1] ?? "tickmarkr" }), _jsx(BodyText, { children: frameCaption(data) })] }))] }));
 }
 function NarrowHeaderBand({ columns, content, rightStrong = false, }) {
     const widths = allocateBandColumns(columns, content, NARROW_HEADER_ALLOCATION);
     return (_jsxs(CockpitGrid, { columns: columns, columnContents: content, allocation: NARROW_HEADER_ALLOCATION, children: [_jsx(BandLines, { columns: Math.max(1, widths[0]), lines: content[0].lines, emphasis: "strong" }), _jsx(Box, { alignItems: "flex-end", flexDirection: "column", children: _jsx(BandLines, { columns: Math.max(1, widths[1]), lines: content[1].lines, emphasis: rightStrong ? "strong" : "normal" }) })] }));
 }
 const RUN_SIDE_RAIL_WIDTH = 16;
+function runInstant(runId) {
+    const match = runId.match(/\brun-(\d{4})(\d{2})(\d{2})-(\d{2})(\d{2})(\d{2})/u);
+    return match === null
+        ? new Date()
+        : new Date(Number(match[1]), Number(match[2]) - 1, Number(match[3]), Number(match[4]), Number(match[5]), Number(match[6]));
+}
+function utcClock(value) {
+    const match = value.match(/^([01]\d|2[0-3]):([0-5]\d):([0-5]\d)$/u);
+    return match === null
+        ? undefined
+        : [Number(match[1]), Number(match[2]), Number(match[3])];
+}
+function localZoneLabel(data) {
+    const newestTimestamp = data.journalRows.find((row) => row.timestamp !== undefined)?.timestamp;
+    const recorded = newestTimestamp === undefined ? undefined : new Date(newestTimestamp);
+    const reference = recorded !== undefined && Number.isFinite(recorded.getTime())
+        ? recorded
+        : runInstant(data.runId);
+    const offset = -reference.getTimezoneOffset();
+    if (offset === 0)
+        return "UTC";
+    const sign = offset < 0 ? "-" : "+";
+    const hours = String(Math.floor(Math.abs(offset) / 60)).padStart(2, "0");
+    const minutes = Math.abs(offset) % 60;
+    return minutes === 0
+        ? `${sign}${hours}`
+        : `${sign}${hours}:${String(minutes).padStart(2, "0")}`;
+}
+function localClockTime(value, timestamp) {
+    if (utcClock(value) === undefined)
+        return value;
+    if (timestamp === undefined)
+        return value;
+    const completeInstant = new Date(timestamp);
+    if (!Number.isFinite(completeInstant.getTime()))
+        return value;
+    const hours = String(completeInstant.getHours()).padStart(2, "0");
+    const minutes = String(completeInstant.getMinutes()).padStart(2, "0");
+    const seconds = String(completeInstant.getSeconds()).padStart(2, "0");
+    return `${hours}:${minutes}:${seconds}`;
+}
+/** Name the ruler an already-built caption's bare attempt number is counted on. */
+function nameAttemptRuler(caption) {
+    return caption.replace(/(?<!engagement |run )\battempt (?=\d)/gu, "engagement attempt ");
+}
+/**
+ * The fold owns active-task identity and full event order. This surface only names the attempt
+ * ruler and fits that authoritative caption; TaskRows are never ranked into a competing answer.
+ */
+function engagementProgressCaption(data, columns = Number.POSITIVE_INFINITY) {
+    const caption = nameAttemptRuler(data.progressCaption);
+    if (cellWidth(caption) <= columns)
+        return caption;
+    const actorSeparator = caption.lastIndexOf(" · ");
+    return actorSeparator < 0
+        ? caption
+        : `${caption.slice(0, actorSeparator)} ${caption.slice(actorSeparator + 3)}`;
+}
+function runAttemptLabel(attempts) {
+    return attempts === 1
+        ? "run attempt 1"
+        : `run attempts ${fieldReading(attempts)}`;
+}
 /** The header caption: the run's identity line, planned as the header's refinable sub-region. */
 function frameCaption(data) {
-    return `${data.runId} · ${data.branch} · ${data.status} · ${data.elapsed}`;
+    return `${data.runId} · ${data.branch} · ${data.status} · ${data.elapsed} · zone ${localZoneLabel(data)}`;
 }
 /** The header's fixed left part: brand, version and the two tab labels. */
-function headerLead(data, plan) {
+function headerLead(data, plan, columns) {
     const tabs = plan.tab === "watch"
         ? `[ WATCH ]${FRAME_HEADER_GAP}${DECISIONS_TAB_TITLE}`
         : `WATCH${FRAME_HEADER_GAP}[ ${DECISIONS_TAB_TITLE} ]`;
-    return `tickmarkr ${data.binaryVersion}${FRAME_HEADER_GAP}${tabs}`;
+    if (plan.regions.some((region) => region.id === "caption")) {
+        return `tickmarkr ${data.binaryVersion}${FRAME_HEADER_GAP}${tabs}`;
+    }
+    const withVersion = `tickmarkr ${data.binaryVersion}${FRAME_HEADER_GAP}${tabs} · zone ${localZoneLabel(data)}`;
+    const compactTabs = plan.tab === "watch"
+        ? `[WATCH]${DECISIONS_TAB_TITLE}`
+        : `WATCH[${DECISIONS_TAB_TITLE}]`;
+    const compact = `tickmarkr ${data.binaryVersion}${compactTabs} zone ${localZoneLabel(data)}`;
+    if (cellWidth(withVersion) <= columns)
+        return withVersion;
+    if (cellWidth(compact) <= columns)
+        return compact;
+    const markedTabs = plan.tab === "watch"
+        ? `>WATCH${DECISIONS_TAB_TITLE}`
+        : `WATCH>${DECISIONS_TAB_TITLE}`;
+    return `tickmarkr ${data.binaryVersion}${markedTabs} zone ${localZoneLabel(data)}`;
 }
 /** The one plain header line: brand, version and the two tab labels, the active one marked. */
 function PlannedHeader({ data, plan, columns, }) {
-    return (_jsx(BodyText, { emphasis: "strong", children: fitCells(headerLead(data, plan), Math.max(1, columns)) }));
+    return (_jsx(BodyText, { emphasis: "strong", children: fitCells(headerLead(data, plan, columns), Math.max(1, columns)) }));
 }
 /** The header's caption sub-region: the run identity, right-aligned in it. */
 function PlannedCaption({ data, columns, }) {
@@ -117,7 +195,7 @@ function setupSectionLines(section, data) {
     const parked = data.taskRows.filter((row) => row.state === "human");
     if (parked.length === 0)
         return ["No parked decisions in this engagement"];
-    return parked.map((row) => `${row.taskId} · parked · attempt ${row.attempts ?? 0}`);
+    return parked.map((row) => `${row.taskId} · parked · ${runAttemptLabel(row.attempts)}`);
 }
 /**
  * The plan's item rows, and the ref the frame registers their painted node
@@ -189,20 +267,26 @@ export function deriveRunViewRows(data, viewId, filterQuery = "") {
  * drew. The overview owns no list of its own, and the journal is a tail.
  */
 function promotedViewRows(data, viewId) {
+    // Surrendered by identity, never rebuilt: the journal view shows the fold's own records, and
+    // rewriting their text here — even to name the ruler its attempt is counted on — would be this
+    // surface authoring a row. The counters the surface DOES compose (the caption, the task rows)
+    // name their rulers below.
     if (viewId === "journal")
         return data.journalRows;
     if (viewId === "tasks") {
-        return data.taskRows.map((row) => ({
+        return data.taskRows.filter(recordedTaskRow).map((row) => ({
             id: row.id,
             time: fieldReading(row.lastEventTime),
-            state: taskRowState(row.state),
-            text: `${row.taskId} · ${fieldReading(row.state)} · attempt ${fieldReading(row.attempts)} · ${fieldReading(row.actor)}${row.title === undefined ? "" : ` · ${row.title}`}`,
+            ...(row.lastEventTimestamp === undefined ? {} : { timestamp: row.lastEventTimestamp }),
+            state: taskRowState(row),
+            text: `${row.taskId} · ${fieldReading(row.state)} · ${runAttemptLabel(row.attempts)} · ${fieldReading(row.actor)}${row.title === undefined ? "" : ` · ${row.title}`}`,
         }));
     }
     if (viewId === "gates") {
         return data.gateRows.map((row) => ({
             id: row.id,
             time: row.time,
+            ...(row.timestamp === undefined ? {} : { timestamp: row.timestamp }),
             state: row.state,
             text: `${fieldReading(row.taskId)} · ${fieldReading(row.gate)} · ${row.pass === undefined ? fieldReading(undefined) : row.pass ? "pass" : "fail"}${row.details === undefined ? "" : ` · ${row.details}`}`,
         }));
@@ -211,19 +295,29 @@ function promotedViewRows(data, viewId) {
         return data.fleetRows.map((row) => ({
             id: row.id,
             time: fieldReading(row.lastEventTime),
+            ...(row.lastEventTimestamp === undefined ? {} : { timestamp: row.lastEventTimestamp }),
             state: "neutral",
             text: `${row.adapter} · ${row.model} · dispatches ${fieldReading(row.dispatches)}`,
         }));
     }
     return [];
 }
+/** A task row exists on an operator surface only when the journal fold recorded a task fact. */
+function recordedTaskRow(row) {
+    return row.state !== undefined
+        || row.lastEventTime !== undefined
+        || row.attempts !== undefined
+        || row.actor !== undefined
+        || row.merged === true
+        || row.parkKind !== undefined;
+}
 /** A task's recorded state read as the component vocabulary the rows draw in. */
-function taskRowState(state) {
-    if (state === "done")
+function taskRowState(row) {
+    if (row.state === "done" && row.merged === true)
         return "pass";
-    if (state === "failed")
+    if (row.state === "failed")
         return "fail";
-    if (state === "running" || state === "human")
+    if (row.state === "running" || row.state === "human")
         return "active";
     return "neutral";
 }
@@ -270,7 +364,10 @@ function SizedJournalPanel({ rows, bodyRows, title, selection, focused, }) {
         : window.rows.findIndex((row) => row.id === hovered);
     const emptyRows = Math.max(0, bodyRows - window.rows.length);
     const journal = JournalRowPanel({
-        rows: window.rows,
+        rows: window.rows.map((row) => ({
+            ...row,
+            time: localClockTime(row.time, row.timestamp),
+        })),
         title,
         selection: window.selection,
         focused,
@@ -294,7 +391,7 @@ function helpLines(entries) {
 }
 /** The lines the opened-event view draws for one journal row. */
 function eventLines(row) {
-    return [`${row.time} · ${row.state}`, row.text];
+    return [`${localClockTime(row.time, row.timestamp)} · ${row.state}`, row.text];
 }
 /**
  * A view drawn from the rows its own derivation produces: its detail while the
@@ -419,15 +516,15 @@ function TailBand({ data, rows, columns, pendingWrites, }) {
         ? ["PENDING WRITES · none"]
         : deriveRunViewRows(data, "journal")
             .slice(-rows)
-            .map((row) => `${row.time} ${row.text}`);
+            .map((row) => `${localClockTime(row.time, row.timestamp)} ${row.text}`);
     // A styled blank cell differs with colour on and off; these rows carry no dim style.
     return (_jsx(Box, { flexDirection: "column", height: rows, overflow: "hidden", children: Array.from({ length: rows }, (_, index) => (_jsx(Box, { height: 1, overflow: "hidden", children: _jsx(BodyText, { children: fitCells(lines[index] ?? "", columns) }) }, index))) }));
 }
-function ApprovedProgress({ data, caption, }) {
-    return (_jsxs(Panel, { title: "PROGRESS", children: [_jsx(ProgressMeter, { value: data.progress, width: 28 }), caption && _jsx(BodyText, { emphasis: "dim", children: data.progressCaption })] }));
+function ApprovedProgress({ data, caption, columns, }) {
+    return (_jsxs(Panel, { title: "PROGRESS", children: [_jsx(ProgressMeter, { value: data.progress, width: 28 }), caption && _jsx(BodyText, { emphasis: "dim", children: engagementProgressCaption(data, columns) })] }));
 }
-function CompactProgress({ data, caption, meterWidth = 28, }) {
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { flexDirection: "row", flexWrap: "nowrap", children: [_jsx(BodyText, { emphasis: "strong", children: "PROGRESS " }), _jsx(ProgressMeter, { value: data.progress, width: meterWidth })] }), caption && _jsx(BodyText, { emphasis: "dim", children: data.progressCaption })] }));
+function CompactProgress({ data, caption, meterWidth = 28, columns, }) {
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { flexDirection: "row", flexWrap: "nowrap", children: [_jsx(BodyText, { emphasis: "strong", children: "PROGRESS " }), _jsx(ProgressMeter, { value: data.progress, width: meterWidth })] }), caption && _jsx(BodyText, { emphasis: "dim", children: engagementProgressCaption(data, columns) })] }));
 }
 /** The RUN view's interior, allocated out of the planned body span, each element granted whole or not at all. */
 function resolveRunViewContent(bodySpan, bodyColumns, data) {
@@ -450,8 +547,9 @@ function resolveRunViewContent(bodySpan, bodyColumns, data) {
         : 0;
     journal += tail;
     available -= tail;
+    const progressCaptionColumns = Math.max(1, bodyColumns - RUN_PANEL_HORIZONTAL_CHROME);
     const captionRows = progressBar
-        ? wrapCells(data.progressCaption, Math.max(1, bodyColumns)).length
+        ? wrapCells(engagementProgressCaption(data, progressCaptionColumns), progressCaptionColumns).length
         : 0;
     const progressCaption = captionRows > 0 && available >= captionRows;
     if (progressCaption)
@@ -511,12 +609,12 @@ function LadderRunPanel({ data, content, compactMeterWidth, interaction, keyEntr
         return (_jsx(SizedLinesPanel, { title: "HELP", lines: helpLines(keyEntries), bodyRows: content.items.rows, wrapColumns: content.items.columns, focused: focused, flexGrow: 1 }));
     }
     return (_jsx(Panel, { title: "RUN", focused: focused, flexGrow: 1, children: _jsxs(ItemRows, { children: [_jsx(RunStats, { data: data, mode: content.stats }), content.progressBar && (content.approvedProgress
-                    ? _jsx(ApprovedProgress, { data: data, caption: content.progressCaption })
-                    : (_jsx(CompactProgress, { data: data, caption: content.progressCaption, meterWidth: compactMeterWidth }))), content.journal > 0 && (_jsx(JournalBody, { data: data, interaction: interaction, bodyRows: content.journal, keyEntries: keyEntries }))] }) }));
+                    ? (_jsx(ApprovedProgress, { data: data, caption: content.progressCaption, columns: Math.max(1, content.items.columns - RUN_PANEL_HORIZONTAL_CHROME) }))
+                    : (_jsx(CompactProgress, { data: data, caption: content.progressCaption, meterWidth: compactMeterWidth, columns: Math.max(1, content.items.columns - RUN_PANEL_HORIZONTAL_CHROME) }))), content.journal > 0 && (_jsx(JournalBody, { data: data, interaction: interaction, bodyRows: content.journal, keyEntries: keyEntries }))] }) }));
 }
 function LegacyRunPanel({ data, interaction, keyEntries, focused = true, }) {
     const rows = deriveRunViewRows(data, "journal");
-    return (_jsxs(Panel, { title: "RUN", focused: focused, flexGrow: 1, children: [_jsx(RunStats, { data: data, mode: "tiles" }), _jsxs(Panel, { title: "PROGRESS", children: [_jsx(ProgressMeter, { value: data.progress, width: 28 }), _jsx(BodyText, { emphasis: "dim", children: data.progressCaption })] }), _jsx(JournalBody, { data: data, interaction: interaction, bodyRows: rows.length, keyEntries: keyEntries })] }));
+    return (_jsxs(Panel, { title: "RUN", focused: focused, flexGrow: 1, children: [_jsx(RunStats, { data: data, mode: "tiles" }), _jsxs(Panel, { title: "PROGRESS", children: [_jsx(ProgressMeter, { value: data.progress, width: 28 }), _jsx(BodyText, { emphasis: "dim", children: engagementProgressCaption(data) })] }), _jsx(JournalBody, { data: data, interaction: interaction, bodyRows: rows.length, keyEntries: keyEntries })] }));
 }
 /**
  * One planned band, drawn at exactly the span the plan gives it. Unsized (the
@@ -528,8 +626,11 @@ function FrameBand({ rows, row = false, gap, regionRef, children, }) {
 /** A sized sub-floor plan draws the plain fallback, clipped to the measured size. */
 function PlainFallbackPaint({ data, size, }) {
     const columns = Math.max(1, size.columns);
+    // This is an operator surface, so it names its zone once like every other one.
+    // The run.ci/run.non-tty machine anchors are drawn by capture.ts's
+    // defaultPlainRenderer, not by this component, so the label does not move them.
     const lines = [
-        `tickmarkr ${data.binaryVersion}`,
+        `tickmarkr ${data.binaryVersion} · zone ${localZoneLabel(data)}`,
         `${data.runId} ${data.status} ${data.elapsed}`,
         ...data.statusItems.map((item) => item.text),
     ];
@@ -588,7 +689,7 @@ function RunCockpitPaint({ data, columns, plan, content, interaction, keyProject
                             : (_jsx(RailBand, { data: data, focused: railFocused, selection: railSelection, columns: rail.columns, rows: rail.rows, sidebar: plan.sidebar })) })), _jsx(Box, { ref: regionRef("body"), width: body.columns, height: body.rows, flexShrink: 0, flexDirection: "column", overflow: "hidden", children: _jsx(ItemRowsBand.Provider, { value: { region: content.items, regionRef: regionRef("items") }, children: setup
                                 ? (_jsx(SetupTabPanel, { data: data, selection: railSelection, focused: contentFocused, keyEntries: keyEntries, help: currentInteraction.help, bodyRows: content.items.rows, bodyColumns: content.items.columns }))
                                 : activeView === "run"
-                                    ? (_jsx(LadderRunPanel, { data: data, content: content, compactMeterWidth: content.sideRails ? undefined : 24, interaction: currentInteraction, keyEntries: keyEntries, focused: contentFocused }))
+                                    ? (_jsx(LadderRunPanel, { data: data, content: content, compactMeterWidth: 24, interaction: currentInteraction, keyEntries: keyEntries, focused: contentFocused }))
                                     : (_jsx(RunViewPanel, { data: data, viewId: activeView, interaction: currentInteraction, focused: contentFocused, keyEntries: keyEntries, bodyRows: content.items.rows, bodyColumns: content.items.columns })) }) })] }), _jsx(FrameBand, { rows: requiredRegion(plan, "rule2").rows, regionRef: regionRef("rule2"), children: _jsx(RuleBand, { columns: plan.size.columns }) }), tail !== undefined && (_jsx(FrameBand, { rows: tail.rows, regionRef: regionRef("tail"), children: _jsx(TailBand, { data: data, rows: tail.rows, columns: tail.columns, pendingWrites: plan.content.tail === "pending-writes" }) })), _jsx(FrameBand, { rows: requiredRegion(plan, "status").rows, regionRef: regionRef("status"), children: _jsx(StatusStrip, { items: reportedStatusItems, width: plan.size.columns }) }), _jsx(FrameBand, { rows: requiredRegion(plan, "keybar").rows, regionRef: regionRef("keybar"), children: _jsx(RunKeybar, { entries: keyEntries, width: plan.size.columns, help: currentInteraction.help }) })] }));
 }
 /** Resolve every draw-time input; the plan is planFrame's own return, consumed unmodified. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tickmarkr",
-  "version": "1.84.0",
+  "version": "1.85.0",
   "description": "Spec in, verified work out.",
   "type": "module",
   "license": "MIT",