@astrosheep/keiyaku 4.1.0 → 4.1.2

package/build/src/cli/render/kanshi.js

@@ -1,8 +1,8 @@
-import { displayColumns, renderTextBlock, safeText, tone } from "./terminal.js";
+import { visibleFleetRows } from "../../kanshi/fleet.js";
+import { abbreviateGitIds, afterWording, candidateFact, dependentWording, displayGitId, gateFact, gitIdsInRow, mergeSummary, } from "./contract-observation.js";
+import { displayColumns, renderTextBlock, safeText, tone, truncateDisplayText, } from "./terminal.js";
 const PLUMB = "  │ ";
-const PATH_PREFIX = `${PLUMB}↳ `;
 const MAX_VISIBLE_ROWS = 10;
-const FIELD_WIDTH = 8;
 function contractMark(row) {
     if (row.phase === "claimed")
         return "✓";
@@ -41,17 +41,15 @@ function akumaMark(life) {
         return "×";
     return "?";
 }
-function gateMark(report) {
-    if (report.current.kind !== "attested")
-        return "?";
-    return report.current.verdict === "satisfied" ? "✓" : "!";
-}
-function worldGateMark(report) {
-    if (report.current.kind === "stale")
-        return "~";
-    if (report.current.kind !== "attested")
-        return " ";
-    return report.current.verdict === "satisfied" ? "✓" : "✗";
+function gitAbbreviations(report) {
+    const ids = [];
+    if (report.contracts.kind !== "present")
+        return abbreviateGitIds(ids);
+    if (report.contracts.value.state !== null)
+        ids.push(report.contracts.value.state);
+    for (const row of report.contracts.value.rows)
+        ids.push(...gitIdsInRow(row));
+    return abbreviateGitIds(ids);
 }
 function formatAge(source, observedAt) {
     if (source === null || source === undefined)
@@ -69,9 +67,6 @@ function formatAge(source, observedAt) {
     const hours = Math.floor(minutes / 60);
     return hours < 24 ? `${hours}h` : `${Math.floor(hours / 24)}d`;
 }
-function isLost(life) {
-    return life === "stranded" || life === "hung" || life === "untidy";
-}
 function branchName(target) {
     if (target === null)
         return null;
@@ -90,13 +85,16 @@ function targetFacts(row) {
         facts.push("target moved");
     return facts;
 }
+function selectedTargetFacts(row, abbreviations) {
+    return [
+        ...targetFacts(row),
+        ...(row.target !== null && row.targetObservation?.head !== null && row.targetObservation?.head !== undefined
+            ? [`target head ${displayGitId(row.targetObservation.head, abbreviations)}`]
+            : []),
+    ];
+}
 function workspaceState(row) {
     const observation = row.workspaceObservation;
-    if (row.workspace === "here" && observation.kind === "failed") {
-        return `workspace here · failed · ${observation.diagnostic}`;
-    }
-    if (row.workspace === "here")
-        return `workspace here · ${observation.kind}`;
     if (observation.kind === "failed")
         return `worktree unavailable · ${observation.diagnostic}`;
     if (observation.kind === "unappointed")
@@ -113,59 +111,63 @@ function workspaceState(row) {
     ];
     return counts.length === 0 ? "worktree dirty" : `worktree dirty · ${counts.join(" · ")}`;
 }
-function showWorkspacePath(row, hot) {
-    if (row.workspace !== "worktree")
-        return false;
-    if (row.workspaceObservation.kind === "unappointed")
-        return false;
-    if (row.workspaceObservation.kind !== "clean" && row.workspaceObservation.kind !== "failed")
-        return true;
-    return hot;
-}
-function contractHot(row) {
-    if (row.title === null)
-        return true;
-    if (row.phase === "pending-delivery")
-        return true;
-    if (row.holder.kind === "unavailable" || row.holder.kind === "held")
-        return true;
-    if (row.fleet.length > 0)
-        return true;
-    if (row.targetLag.kind === "counted" && row.targetLag.behind > 0)
-        return true;
-    if (row.workspaceObservation.kind !== "clean" && row.workspaceObservation.kind !== "unappointed") {
-        return true;
+function mergeFacts(row, selected, abbreviations) {
+    const observation = row.workspaceObservation;
+    const summary = mergeSummary(observation);
+    if (summary === undefined ||
+        (observation.kind !== "clean" && observation.kind !== "dirty") ||
+        observation.merge === null) {
+        return [];
     }
-    return row.gates.reports.some((report) => report.current.kind === "stale"
-        || (report.current.kind === "attested" && report.current.verdict === "unsatisfied"));
-}
-function taskHot(row) {
-    return row.disposition === "blocked" || row.disposition === "in_progress";
+    if (!selected)
+        return [summary];
+    const paths = observation.merge.unmergedPaths;
+    return [
+        summary,
+        `merge head ${displayGitId(observation.merge.head, abbreviations)}`,
+        ...(paths.length === 0 ? ["0 paths"] : paths),
+    ];
 }
-function akumaHot(row) {
-    if (row.life === "running" || row.life === "stillborn" || isLost(row.life))
-        return true;
-    return row.contract?.observed === "missing" || row.contract?.observed === "unavailable";
+function worldAfterFacts(row) {
+    return row.after.map(afterWording);
 }
 function activitySnapshotLine(row) {
     const snapshot = row.snapshot;
     if (snapshot === undefined)
         return undefined;
-    const entries = snapshot.entries.flatMap((entry) => entry.kind === "row" ? [entry.row] : []);
+    const entries = snapshot.entries.flatMap((entry) => (entry.kind === "row" ? [entry.row] : []));
     const latest = entries.at(-1);
     if (latest === undefined) {
         if (snapshot.kind === "idle" && snapshot.outcome !== undefined) {
-            return snapshot.outcome.outcome.kind === "answered" ? snapshot.outcome.outcome.answer : snapshot.outcome.outcome.diagnostic;
+            return snapshot.outcome.outcome.kind === "answered"
+                ? snapshot.outcome.outcome.answer
+                : snapshot.outcome.outcome.diagnostic;
         }
-        return "empty";
+        return undefined;
     }
-    if (latest.kind === "said" || latest.kind === "thought" || latest.kind === "note" || latest.kind === "call" || latest.kind === "tell") {
+    if (latest.kind === "said" ||
+        latest.kind === "thought" ||
+        latest.kind === "note" ||
+        latest.kind === "call" ||
+        latest.kind === "tell") {
         return latest.text;
     }
     if (latest.kind === "tool")
         return latest.name;
     return "activity";
 }
+function boundedActivity(value, columns, prefix) {
+    const budget = Math.max(1, columns - displayColumns(prefix));
+    return `activity "${truncateDisplayText(value, Math.max(1, budget - displayColumns('activity ""')))}"`;
+}
+function renderColdFleetLine(row, prefix, snapshot, columns) {
+    const mark = akumaMark(row.life);
+    const identity = identityLine(mark, row.id, prefix);
+    if (snapshot === undefined)
+        return [identity];
+    const activity = boundedActivity(snapshot, columns, PLUMB);
+    return [identity, ...plumbFacts([activity], columns)];
+}
 function plumbFacts(facts, columns) {
     const clean = facts.map(safeText).filter((fact) => fact.length > 0);
     if (clean.length === 0)
@@ -184,45 +186,9 @@ function plumbFacts(facts, columns) {
     lines.push(current);
     return lines;
 }
-function plumbBlock(value, columns) {
-    return renderTextBlock(value, PLUMB, columns);
-}
-function plumbPath(path) {
-    return `${PATH_PREFIX}${safeText(path)}`;
-}
 function identityLine(mark, identity, extra = "") {
     return extra.length === 0 ? `${mark} ${safeText(identity)}` : `${mark} ${safeText(identity)} ${safeText(extra)}`;
 }
-function renderGates(reports, observedAt, columns, includeSummaries) {
-    if (reports.length === 0)
-        return [];
-    const lines = [...plumbFacts([`gates: ${reports.map((report) => `${gateMark(report)} ${report.gate} ${formatAge(report.current.kind === "attested" ? report.current.at : null, observedAt)}`).join(" · ")}`], columns)];
-    if (!includeSummaries)
-        return lines;
-    for (const report of reports) {
-        if (report.current.kind !== "attested" || report.current.summary === undefined)
-            continue;
-        lines.push(...plumbBlock(`${report.gate}: ${report.current.summary}`, columns));
-    }
-    return lines;
-}
-function fieldPrefix(label) {
-    return `  ${label.padEnd(FIELD_WIDTH, " ")}`;
-}
-function fieldLine(label, value) {
-    return `${fieldPrefix(label)}${safeText(value)}`;
-}
-function fieldBlock(label, value, columns) {
-    const continuation = " ".repeat(fieldPrefix(label).length);
-    return renderTextBlock(value, continuation, columns).map((line, index) => index === 0
-        ? `${fieldPrefix(label)}${line.slice(continuation.length)}`
-        : line);
-}
-function renderWorldGates(reports) {
-    if (reports.length === 0)
-        return [];
-    return [fieldLine("GATES", reports.map((report) => `[${worldGateMark(report)}] ${report.gate}`).join("   "))];
-}
 function failure(name, section, context) {
     return [`[ ${name} ]`, "", `${tone(`! ${safeText(section.failure.message)}`, "alert", context.color)}`];
 }
@@ -236,57 +202,127 @@ function endpointFact(id, observed) {
         return `-> ${id} (unavailable)`;
     return `-> ${id}`;
 }
-function renderNamespaceTasks(row, context) {
-    if (row.namespaceTasks.kind === "absent")
-        return plumbFacts(["namespace tasks absent"], context.columns);
-    if (row.namespaceTasks.kind === "failed") {
-        return plumbFacts([`namespace tasks failed ${row.namespaceTasks.failure.message}`], context.columns);
-    }
-    const lines = [...plumbFacts([`namespace tasks ${row.namespaceTasks.value.length}`], context.columns)];
-    for (const task of row.namespaceTasks.value) {
-        const scan = `${taskMark(task)} ${task.id} · P${task.priority} ${task.disposition}`;
-        const title = safeText(task.title);
-        const inline = `${scan} — ${title}`;
-        if (displayColumns(inline) <= context.columns - displayColumns(PLUMB)) {
-            lines.push(...plumbFacts([inline], context.columns));
+function linkedTask(report, taskId) {
+    if (report.tasks.kind !== "present")
+        return `! ${taskId} · unavailable`;
+    const task = report.tasks.value.rows.find((candidate) => candidate.id === taskId);
+    return task === undefined ? `! ${taskId} · missing` : `${taskMark(task)} ${task.id} · ${task.disposition}`;
+}
+function linkedAkuma(report, id, aliases) {
+    const alias = aliases.length === 0 ? "" : ` (${aliases.join(" ")})`;
+    if (report.akuma.kind !== "present")
+        return `! ${id}${alias} · unavailable`;
+    const akuma = report.akuma.value.rows.find((candidate) => candidate.id === id);
+    return akuma === undefined ? `! ${id}${alias} · missing` : `${akumaMark(akuma.life)} ${id}${alias} · ${akuma.life}`;
+}
+function isTerminalAkuma(life) {
+    return life === "killed" || life === "stillborn";
+}
+function attachmentTimestamp(akuma) {
+    if ("lifeAt" in akuma && akuma.lifeAt !== null)
+        return akuma.lifeAt;
+    if ("lastActivityAt" in akuma && akuma.lastActivityAt !== null)
+        return akuma.lastActivityAt;
+    return null;
+}
+function worldAttachments(row, report) {
+    if (report.akuma.kind !== "present")
+        return row.fleet;
+    const byId = new Map(report.akuma.value.rows.map((akuma) => [akuma.id, akuma]));
+    const nonTerminal = new Set();
+    const unknown = new Set();
+    let latestTerminal;
+    row.fleet.forEach((attached) => {
+        const akuma = byId.get(attached.id);
+        if (akuma === undefined) {
+            unknown.add(attached.id);
+            return;
         }
-        else {
-            lines.push(...plumbFacts([`${scan} —`], context.columns));
-            lines.push(...plumbBlock(title, context.columns));
+        if (!isTerminalAkuma(akuma.life)) {
+            nonTerminal.add(attached.id);
+            return;
         }
-    }
+        const at = attachmentTimestamp(akuma);
+        if (latestTerminal === undefined || (at !== null && (latestTerminal.at === null || at > latestTerminal.at))) {
+            latestTerminal = { id: attached.id, at };
+        }
+    });
+    const retained = new Set(unknown);
+    for (const id of nonTerminal)
+        retained.add(id);
+    if (nonTerminal.size === 0 && latestTerminal !== undefined)
+        retained.add(latestTerminal.id);
+    return row.fleet.filter((attached) => retained.has(attached.id));
+}
+function linkedFacts(row, report, mode) {
+    const linked = [];
+    if (row.holder.kind === "held")
+        linked.push(linkedTask(report, row.holder.taskId));
+    if (row.holder.kind === "unavailable")
+        linked.push("! task · unavailable");
+    const attachments = mode === "world" ? worldAttachments(row, report) : row.fleet;
+    for (const attached of attachments)
+        linked.push(linkedAkuma(report, attached.id, attached.aliases));
+    return linked;
+}
+function semanticBlock(name, facts, context) {
+    const lines = [`  ${name}`];
+    const values = facts.length === 0 ? ["none"] : facts;
+    for (const fact of values)
+        lines.push(...renderTextBlock(safeText(fact), "    ", context.columns));
     return lines;
 }
-function renderContractRow(row, report, context, selection) {
-    const hot = contractHot(row);
-    const compact = !hot && selection !== "contract";
+function namespaceTaskFacts(row) {
+    if (row.namespaceTasks.kind === "absent")
+        return ["absent"];
+    if (row.namespaceTasks.kind === "failed") {
+        return [`failed ${row.namespaceTasks.failure.message}`];
+    }
+    return row.namespaceTasks.value.map((task) => `${taskMark(task)} ${task.id} · P${task.priority} ${task.disposition} — ${task.title}`);
+}
+function renderSelectedContractRow(row, report, context, abbreviations) {
     const title = row.title ?? "title unavailable";
-    const phase = `${row.phase} · ${formatAge(row.phaseAt, report.observedAt)}`;
-    const journal = `journal ${formatAge(row.lastJournalAt, report.observedAt)}`;
-    const lines = [identityLine(contractMark(row), row.id)];
-    lines.push(...plumbFacts(compact ? [title, phase, journal, ...targetFacts(row)] : [title], context.columns));
-    if (!compact)
-        lines.push(...plumbFacts([phase, journal, ...targetFacts(row)], context.columns));
-    lines.push(...plumbFacts([workspaceState(row)], context.columns));
-    if (showWorkspacePath(row, hot || selection === "contract")
-        && row.workspaceObservation.kind !== "unappointed"
-        && row.workspaceObservation.kind !== "failed"
-        && row.workspaceObservation.location.kind === "worktree") {
-        lines.push(plumbPath(row.workspaceObservation.location.path));
+    const lines = [
+        identityLine(contractMark(row), row.id, `· ${row.phase} · ${formatAge(row.phaseAt, report.observedAt)} · ${title}`),
+    ];
+    lines.push(...semanticBlock("after", worldAfterFacts(row), context));
+    lines.push(...semanticBlock("dependents", row.dependents.map(dependentWording), context));
+    const gateFacts = row.gates.reports.flatMap((gate) => [
+        `${gateFact(gate)} ${formatAge(gate.current.kind === "attested" ? gate.current.at : null, report.observedAt)}`,
+        ...(gate.current.kind === "attested" && gate.current.summary !== undefined
+            ? [`${gate.gate}: ${gate.current.summary}`]
+            : []),
+    ]);
+    lines.push(...semanticBlock("gates", gateFacts, context));
+    lines.push(...semanticBlock("candidate/integration", candidateFacts(row, abbreviations), context));
+    lines.push(...semanticBlock("target", selectedTargetFacts(row, abbreviations), context));
+    const workspaceFacts = [workspaceState(row)];
+    if (row.workspaceObservation.kind !== "unappointed" &&
+        row.workspaceObservation.kind !== "failed" &&
+        row.workspaceObservation.location.kind === "worktree") {
+        workspaceFacts.push(`path ${row.workspaceObservation.location.path}`);
     }
-    lines.push(...renderGates(row.gates.reports, report.observedAt, context.columns, selection === "contract"));
-    if (row.holder.kind === "held")
-        lines.push(...plumbFacts([`task ${row.holder.taskId}`], context.columns));
-    if (row.holder.kind === "unavailable")
-        lines.push(...plumbFacts(["holder unavailable"], context.columns));
-    for (const attached of row.fleet) {
-        const aliases = attached.aliases.length === 0 ? "" : ` (${attached.aliases.join(" ")})`;
-        lines.push(...plumbFacts([`akuma ${attached.id}${aliases}`], context.columns));
+    lines.push(...semanticBlock("workspace/merge", [...workspaceFacts, ...mergeFacts(row, true, abbreviations)], context));
+    const attachments = [...linkedFacts(row, report, "selected")];
+    if (row.issue !== undefined) {
+        const detail = row.issue.kind === "hook-failure" ? row.issue.diagnostic : `target-checkout-retained ${row.issue.target}`;
+        attachments.push(`lag (observed now): ${detail}`);
     }
-    if (selection === "contract")
-        lines.push(...renderNamespaceTasks(row, context));
+    lines.push(...semanticBlock("attachments", attachments, context));
+    lines.push(...semanticBlock("namespace tasks", namespaceTaskFacts(row), context));
     return lines;
 }
+function candidateFacts(row, abbreviations) {
+    if (row.delivery === null)
+        return [candidateFact(row.delivery)];
+    const delivery = row.delivery;
+    return [
+        `tender ${displayGitId(delivery.tenderSnapshot, abbreviations)}`,
+        `integration ${displayGitId(delivery.integration.predecessor, abbreviations)} -> ${displayGitId(delivery.integration.snapshot, abbreviations)}`,
+        `method ${delivery.method}`,
+        `change ${delivery.integration.changeId}`,
+    ];
+}
 function isTerminalContract(row) {
     return row.phase === "claimed" || row.phase === "abandoned";
 }
@@ -294,51 +330,40 @@ function isTerminalTask(row) {
     return row.disposition === "done" || row.disposition === "drop";
 }
 function renderWorldContractRow(row, report, context) {
-    const hot = contractHot(row);
     const title = row.title ?? "title unavailable";
-    const phase = `${row.phase} · ${formatAge(row.phaseAt, report.observedAt)}`;
-    if (!hot)
-        return [identityLine(contractMark(row), row.id, `· "${title}" · ${phase} · ${targetFacts(row).join(" · ")}`)];
-    const lines = [identityLine(contractMark(row), row.id)];
-    lines.push(...fieldBlock("TITLE", title, context.columns));
-    lines.push(fieldLine("STATE", phase));
-    lines.push(fieldLine("GIT", [...targetFacts(row), workspaceState(row)].join(" · ")));
-    if (showWorkspacePath(row, hot)
-        && row.workspaceObservation.kind !== "unappointed"
-        && row.workspaceObservation.kind !== "failed"
-        && row.workspaceObservation.location.kind === "worktree") {
-        lines.push(fieldLine("DIR", row.workspaceObservation.location.path));
-    }
-    lines.push(...renderWorldGates(row.gates.reports));
-    const linked = [];
-    if (row.holder.kind === "held")
-        linked.push(row.holder.taskId);
-    if (row.holder.kind === "unavailable")
-        linked.push("holder unavailable");
-    for (const attached of row.fleet) {
-        const aliases = attached.aliases.length === 0 ? "" : ` (${attached.aliases.join(" ")})`;
-        linked.push(`${attached.id}${aliases}`);
-    }
-    if (linked.length > 0) {
-        lines.push(fieldLine("LINKED", linked[0]));
-        for (const item of linked.slice(1))
-            lines.push(`  ${" ".repeat(FIELD_WIDTH)}${safeText(item)}`);
-    }
+    const facts = [
+        candidateFact(row.delivery),
+        ...targetFacts(row),
+        ...worldAfterFacts(row),
+        ...(row.dependents.length === 0 ? [] : [`dependents ${row.dependents.map(dependentWording).join(" · ")}`]),
+        ...row.gates.reports.map(gateFact),
+        ...linkedFacts(row, report, "world"),
+    ];
+    const lines = [
+        identityLine(contractMark(row), row.id, `· ${row.phase} · ${formatAge(row.lastJournalAt, report.observedAt)} · ${title}`),
+    ];
+    lines.push(...plumbFacts(facts, context.columns));
     return lines;
 }
-function selectRows(rows, isHot) {
-    return [...rows.filter(isHot), ...rows.filter((row) => !isHot(row))].slice(0, MAX_VISIBLE_ROWS);
-}
-function sectionFooter(visible, total, unit, selector) {
+function selectRecentRows(rows, timestamp) {
+    return [...rows]
+        .sort((left, right) => {
+        const leftAt = timestamp(left);
+        const rightAt = timestamp(right);
+        if (leftAt === rightAt)
+            return 0;
+        return leftAt > rightAt ? -1 : 1;
+    })
+        .slice(0, MAX_VISIBLE_ROWS);
+}
+function sectionFooter({ visible, total, unit, selector, neutral, }) {
     if (visible === total)
-        return [`  (all ${total} live ${unit} shown)`];
-    return [`  + ${total - visible} more live ${unit} not shown`, `    keiyaku ls ${selector}/`];
-}
-function sectionBlock(name, unit, selector, rows, total) {
-    const lines = [`[ ${name} ]  ${total} live`, ""];
-    for (const row of rows)
-        lines.push(...row);
-    lines.push("", ...sectionFooter(rows.length, total, unit, selector));
+        return [`  (all ${total}${neutral ? "" : " live"} ${unit} shown)`];
+    return [`  + ${total - visible} more${neutral ? "" : " live"} ${unit} not shown`, `    keiyaku ls ${selector}/`];
+}
+function sectionBlock({ name, unit, selector, rows, total, neutral = false, }) {
+    const lines = [`[ ${name} ]  ${total}${neutral ? ` ${unit}` : " live"}`, "", ...rows.flat()];
+    lines.push("", ...sectionFooter({ visible: rows.length, total, unit, selector, neutral }));
     return lines;
 }
 function renderContracts(report, context) {
@@ -348,8 +373,18 @@ function renderContracts(report, context) {
     if (section.kind === "failed")
         return failure("KEIYAKU", section, context);
     const live = section.value.rows.filter((row) => !isTerminalContract(row));
-    const rows = selectRows(live, contractHot);
-    return sectionBlock("KEIYAKU", "keiyaku", "kei", rows.map((row) => renderWorldContractRow(row, report, context)), live.length);
+    const rows = selectRecentRows(live, (row) => row.lastJournalAt);
+    const abbreviations = gitAbbreviations(report);
+    const candidates = live.filter((row) => row.delivery !== null).length;
+    const rendered = sectionBlock({
+        name: "KEIYAKU",
+        unit: "keiyaku",
+        selector: "kei",
+        rows: rows.map((row) => renderWorldContractRow(row, report, context)),
+        total: live.length,
+    });
+    const header = `[ KEIYAKU ]  contract state ${section.value.state === null ? "-" : displayGitId(section.value.state, abbreviations)} · observedAt ${report.observedAt} · ${live.length} live · candidate ${candidates}`;
+    return [header, "", ...rendered.slice(1)];
 }
 function renderSelectedContract(report, context) {
     const section = report.contracts;
@@ -358,7 +393,9 @@ function renderSelectedContract(report, context) {
     if (section.kind === "failed")
         return [tone(`! ${safeText(section.failure.message)}`, "alert", context.color)];
     const row = section.value.rows[0];
-    return row === undefined ? [`${PLUMB}keiyaku absent`] : renderContractRow(row, report, context, "contract");
+    return row === undefined
+        ? [`${PLUMB}keiyaku absent`]
+        : renderSelectedContractRow(row, report, context, gitAbbreviations(report));
 }
 function renderTasks(report, context) {
     const section = report.tasks;
@@ -367,23 +404,16 @@ function renderTasks(report, context) {
     if (section.kind === "failed")
         return failure("TASK", section, context);
     const live = section.value.rows.filter((row) => !isTerminalTask(row));
-    const rows = selectRows(live, taskHot);
+    const rows = selectRecentRows(live, (row) => row.updatedAt);
     const rowLines = rows.map((row) => {
-        const compact = !taskHot(row);
-        const relation = row.contract === undefined
-            ? ["unbound"]
-            : [endpointFact(row.contract.id, row.contract.observed)];
-        if (compact)
-            return [identityLine(taskMark(row), row.id, `· "${row.title}" · ${row.disposition} · P${row.priority} · ${relation.join(" · ")}`)];
-        const lines = [identityLine(taskMark(row), row.id)];
-        lines.push(...fieldBlock("TITLE", row.title, context.columns));
-        lines.push(fieldLine("STATE", `${row.disposition} · P${row.priority}`));
-        for (const blocker of row.blockers ?? [])
-            lines.push(fieldLine("BLOCKED", blocker.id));
-        lines.push(fieldLine("LINKED", relation.join(" · ")));
+        const relation = row.contract === undefined ? ["unbound"] : [endpointFact(row.contract.id, row.contract.observed)];
+        const lines = [
+            identityLine(taskMark(row), row.id, `· ${row.disposition} · P${row.priority} · ${row.title} · ${relation.join(" · ")}`),
+        ];
+        lines.push(...plumbFacts((row.blockers ?? []).map((blocker) => `blocked ${blocker.id}`), context.columns));
         return lines;
     });
-    return sectionBlock("TASK", "task", "task", rowLines, live.length);
+    return sectionBlock({ name: "TASK", unit: "task", selector: "task", rows: rowLines, total: live.length });
 }
 function akumaLabel(row) {
     const aliases = row.aliases ?? [];
@@ -395,14 +425,7 @@ function renderAkuma(report, context) {
         return sectionAbsent("FLEET", context.columns);
     if (section.kind === "failed")
         return failure("FLEET", section, context);
-    const live = section.value.rows
-        .filter((row) => row.life === "running")
-        .sort((left, right) => {
-        const l = "lastActivityAt" in left && left.lastActivityAt !== null ? Date.parse(left.lastActivityAt) : -Infinity;
-        const r = "lastActivityAt" in right && right.lastActivityAt !== null ? Date.parse(right.lastActivityAt) : -Infinity;
-        return r - l;
-    });
-    const rows = live.slice(0, MAX_VISIBLE_ROWS);
+    const rows = visibleFleetRows(section.value.rows);
     const rowLines = rows.map((row) => {
         const lifeAt = "lifeAt" in row ? row.lifeAt : null;
         const life = `${row.life} · ${formatAge(lifeAt, report.observedAt)}`;
@@ -412,29 +435,30 @@ function renderAkuma(report, context) {
         const key = row.life === "stranded" && "strandedReason" in row && row.strandedReason === "resume-unsupported"
             ? [life, ...activity, "resume unsupported"]
             : [life, ...activity];
-        const relation = row.contract === undefined
-            ? ["unbound"]
-            : [endpointFact(row.contract.id, row.contract.observed)];
+        const relation = row.contract === undefined ? ["unbound"] : [endpointFact(row.contract.id, row.contract.observed)];
         const snapshot = activitySnapshotLine(row);
-        if (!akumaHot(row))
-            return [identityLine(akumaMark(row.life), row.id, `${akumaLabel(row)} · ${[...key, ...relation, ...(snapshot === undefined ? [] : [snapshot])].join(" · ")}`.trim())];
-        const lines = [identityLine(akumaMark(row.life), row.id, akumaLabel(row))];
-        lines.push(fieldLine("LIFE", key.join(" · ")));
-        if (snapshot !== undefined)
-            lines.push(fieldLine("SNAPSHOT", snapshot));
-        lines.push(fieldLine("LINKED", relation.join(" · ")));
-        return lines;
+        const prefix = `${akumaLabel(row)} · ${[...key, ...relation].join(" · ")}`.trim();
+        return renderColdFleetLine(row, prefix, snapshot, context.columns);
+    });
+    return sectionBlock({
+        name: "FLEET",
+        unit: "akuma",
+        selector: "aku",
+        rows: rowLines,
+        total: section.value.rows.length,
+        neutral: true,
     });
-    return sectionBlock("FLEET", "akuma", "aku", rowLines, live.length);
 }
 export function renderKanshiText(report, context = { columns: 80, color: false }, selection = "world") {
     if (selection === "contract")
         return renderSelectedContract(report, context).join("\n");
     return [
         ...renderContracts(report, context),
-        "", "",
+        "",
+        "",
         ...renderAkuma(report, context),
-        "", "",
+        "",
+        "",
         ...renderTasks(report, context),
     ].join("\n");
 }

package/build/src/cli/render/receipt.js

@@ -64,11 +64,7 @@ function prerequisiteRows(stop, columns) {
         return [];
     const lines = [];
     for (const prerequisite of stop.refusal.unmet) {
-        receiptRow(lines, " ", "prerequisite", [
-            { text: prerequisite.contractId, opaque: true },
-            { text: "·" },
-            { text: prerequisite.state },
-        ], columns);
+        receiptRow(lines, " ", "prerequisite", [{ text: prerequisite.contractId, opaque: true }, { text: "·" }, { text: prerequisite.state }], columns);
     }
     return lines;
 }
@@ -136,10 +132,7 @@ export function cleanupLines(cleanup, columns) {
 }
 export function leakLines(leak, columns) {
     const lines = [];
-    receiptRow(lines, "!", "leak", [
-        { text: "worktree" },
-        { text: leak.path, opaque: true },
-    ], columns);
+    receiptRow(lines, "!", "leak", [{ text: "worktree" }, { text: leak.path, opaque: true }], columns);
     receiptPayload(lines, "diagnostic", leak.diagnostic);
     return lines;
 }