tickmarkr 2.6.2 → 2.6.4

package/dist/cli/commands/status.js

@@ -12,11 +12,13 @@ import { authorsNote, doneAuthors } from "../../run/operator-state.js";
 import { projectOperatorSummary } from "../../run/operator-summary.js";
 import { trackJournalRows } from "../../run/protocol.js";
 import { newestPark, permittedDecisionVerbs } from "./approve.js";
+import { currentOwed, endToEndFirstPass, firstPassText, leadLines, leadRows, needsYouText, wallText } from "./report.js";
 import { Journal, bindingToken, effectiveEvents, formatJournalNarration, parseJournalText, physicalLine, engagementComparable, isQualityFailureParkKind, parseRunId, preservedRefsByTask, recordedTaskFailureKind, runHasEnded, upheldFeedbackByTask, } from "../../run/journal.js";
 import { isPidLive, runLockRunId, runStatusLine } from "../../run/lock.js";
 import { normalizeGateOutcome } from "../../run/outcome.js";
 import { desiredPanes } from "../../run/reconcile.js";
 import { normalizeStallSnapshot } from "../../run/stall.js";
+import { formatSpan, wallBudget, wallBudgetFacts } from "../../run/wall-budget.js";
 import { armWatchSupervision, observeNamedRun, WATCH_OWNER_ENV, readSupervision, supervisionText } from "../../run/supervision.js";
 import { deriveRunCockpitData, } from "../../tui/cockpit/derive.js";
 import { cellWidth, fitCells, wrapCells } from "../../tui/cockpit/width.js";
@@ -447,6 +449,8 @@ export const shortGoal = (goal, max) => {
 };
 /** Columns the machine row always spends on the task title, however long its machinery segment runs. */
 const MACHINE_TITLE_FLOOR = 24;
+/** The plain print's own width when none is configured: its machine rows are laid out, and parsed whole, at it. */
+const MACHINE_COLUMNS = 120;
 // The approved task board derives an area from files[] rather than adding another graph field.
 // Known tickmarkr domains keep their reviewed names; other repositories fall back to their first
 // meaningful path segment so the shipped surface never turns a foreign project into UNMAPPED rows.
@@ -1036,7 +1040,7 @@ binaryVersion, now = Date.now(), animationFrame = 0, workerLiveness = new Map(),
     // SUP-01: derived by stat() alone, from THIS frame's clock. status stays a reader — nothing here
     // creates, touches or reaps a beat file, so an absent supervision dir stays absent.
     const supervision = readSupervision(cwd, now);
-    const width = process.stdout.columns ?? 120;
+    const width = process.stdout.columns ?? MACHINE_COLUMNS;
     const done = journalRowsOnly
         ? recordedDone(renderedTasks, taskRows)
         : effective.tasks.filter((task) => task.status === "done").length;
@@ -1054,6 +1058,16 @@ binaryVersion, now = Date.now(), animationFrame = 0, workerLiveness = new Map(),
         if (!taskIds.has(taskId))
             phases.delete(taskId);
     const hotPhase = [...phases.values()].sort((a, b) => a.order - b.order).at(-1);
+    // CG1: the three lead lines — finished, wall, needs you from the CURRENT owed-check fold — open
+    // every frame, plain and terminal; the header below keeps every comparability, supersession and verify fact.
+    const lead = runId
+        ? leadLines(events, currentOwed(events, cwd), {
+            // The header's own rule: while the tip is unverified the tally never reads as a finished run.
+            tally: comparable ? tipPhase ? `${done}/${total} tasks done` : `${done}/${total} done` : NOT_COMPARABLE_CLAIM,
+            tip: verify ? `tip ${verify}` : "tip verify pending",
+            notes: supersededBy ? [`superseded by ${supersededBy}`] : [],
+        }).map(sanitizeTaskText)
+        : [];
     // OBS-738: recovery facts stay on the journal's two established reducers. The prefix fold keeps an
     // older journal equally readable by asking upheldFeedbackByTask what was active at that exact
     // restore boundary; current resume-restore rows additionally carry the same task for narration.
@@ -1150,11 +1164,20 @@ binaryVersion, now = Date.now(), animationFrame = 0, workerLiveness = new Map(),
             ? `tickmarkr status${divider}${runLine ?? `run ${runId}`}${zone}${supersededBy ? `${divider}superseded by ${supersededBy}` : ""}${!comparable ? `${divider}${NOT_COMPARABLE_NOTICE}` : ""}${divider}${liveness(events, daemon, now).replaceAll(" · ", divider)}${verify ? `${divider}${verify}` : ""}${divider}${tipPhase ? `${done}/${total} tasks done${divider}run not verified` : `${done}/${total} done`}`
             : `tickmarkr status${zone}${divider}no runs yet${divider}${done}/${total} done`;
         const legendLine = `  gates: ${GATE_NAMES.map((gate) => `${GATE_KEYS[gate]} ${gate}`).join(divider)}`;
+        // At its machine width and wider the plain print keeps each machine row whole — one row per task and
+        // its evidence line after it, which consumers parse. A configured width narrower than that holds for
+        // EVERY row: one that overflows wraps beneath its own indent, its identity kept on the first.
+        const body = [header, legendLine, `  ${supervisionText(supervision, divider)}`, ...rows];
+        const wrapRow = (line) => wrapCells(line, width, { continuationPrefix: `${/^ */u.exec(line)[0]}  ` });
         return {
-            content: [header, legendLine, `  ${supervisionText(supervision, divider)}`, ...rows].join("\n"),
+            content: [
+                ...leadRows(lead, width),
+                ...(width >= MACHINE_COLUMNS ? body : body.flatMap(wrapRow)),
+            ].join("\n"),
             ...(hotPhase ? { hotPhase } : {}),
             ...(runId ? { runId } : {}),
             workerPhases: [...phases.values()].filter((phase) => phase.phase === "worker"),
+            events,
         };
     }
     // TTY: the operator-approved task table. The daemon gives this surface a ~110-column pane first;
@@ -1347,6 +1370,7 @@ binaryVersion, now = Date.now(), animationFrame = 0, workerLiveness = new Map(),
     const effort = effortPanel(g.tasks, record && !comparable ? undefined : events, boardColumns);
     return {
         content: boardRows([
+            ...leadRows(lead, boardColumns),
             ...headerRows,
             ...nowLine,
             supervisionLegend,
@@ -1364,8 +1388,22 @@ binaryVersion, now = Date.now(), animationFrame = 0, workerLiveness = new Map(),
         ...(hotPhase ? { hotPhase } : {}),
         ...(runId ? { runId } : {}),
         workerPhases: [...phases.values()].filter((phase) => phase.phase === "worker"),
+        events,
     };
 };
+// OBS-1201: the one-shot print closes with where the run's wall went (src/run/wall-budget.ts). A
+// window of zero length measured nothing, so it prints nothing; watch frames are untouched. Rows wrap
+// to the board width, so narrowing costs rows, never columns.
+const wallBudgetLines = (events) => {
+    const budget = wallBudget(events);
+    if (!budget || budget.wallMs <= 0)
+        return [];
+    const columns = Math.max(40, process.stdout.columns ?? 120);
+    return [
+        `  wall budget ${formatSpan(budget.wallMs)} · each instant once, by priority`,
+        ...wallBudgetFacts(budget).map(([label, fact]) => `    ${label} ${fact}`),
+    ].flatMap((line) => wrapCells(line, columns, { continuationPrefix: "      " }));
+};
 /**
  * The compact form a statusline calls, so journal interpretation happens ONCE, inside the product.
  * (An operator-local bash reimplementation counted `tip-verify` events instead of reading the
@@ -1388,7 +1426,12 @@ const oneLine = (cwd, namedRunId) => {
             `verify ${recordedVerify(record.events)}`,
         ]
         : [NOT_COMPARABLE_CLAIM, "verify unavailable"];
-    return sanitizeTaskText([record.runId, ...claims].join(" · "));
+    // CG1: the lead's facts in one line — lineage first pass, the wall window, and what needs you from
+    // the CURRENT fold, so a discharge after run-end moves this line too.
+    const { events } = record;
+    return sanitizeTaskText([
+        record.runId, ...claims, firstPassText(endToEndFirstPass(events)), wallText(events), needsYouText(events, currentOwed(events, cwd)),
+    ].join(" · "));
 };
 export async function status(argv, cwd = process.cwd(), opts = {}) {
     if (argv.some((arg) => arg === "--help" || arg === "-h"))
@@ -1401,7 +1444,9 @@ export async function status(argv, cwd = process.cwd(), opts = {}) {
     // The task-table frame owns its own two-row brand lockup; the four-row global banner would
     // create the second header the approved replacement removes.
     if (!argv.includes("--watch")) {
-        return renderFrame(cwd, binaryVersion, opts.now?.() ?? Date.now(), 0, undefined, false, namedRunId).content;
+        const frame = renderFrame(cwd, binaryVersion, opts.now?.() ?? Date.now(), 0, undefined, false, namedRunId);
+        const wall = wallBudgetLines(frame.events);
+        return wall.length ? [frame.content, "", ...wall].join("\n") : frame.content;
     }
     const eventStream = argv.some((arg) => arg === "--events" || arg === "--jsonl" || arg === "--decision-events");
     const webhookUrl = opts.webhookUrl