@astrosheep/keiyaku 4.5.29 → 4.6.2

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

@@ -1,32 +1,11 @@
-import { outcomeLines, receiptPayload } from "./receipt.js";
-import { DEFAULT_CLI_COLUMNS, displayColumns, renderTextBlock, safeText } from "./terminal.js";
+import { taskMark } from "./marks.js";
+import { outcomeLines, receiptPayload, receiptRow, refusalLines } from "./receipt.js";
+import { DEFAULT_CLI_COLUMNS, displayColumns, emptyCatalogue, safeText } from "./terminal.js";
+export { taskMark } from "./marks.js";
 const DEFAULT_CONTEXT = { columns: DEFAULT_CLI_COLUMNS, color: false };
-function isWorldObservation(result) {
-    return (typeof result === "object" &&
-        result !== null &&
-        "kind" in result &&
-        (result.kind === "present" || result.kind === "absent" || result.kind === "failed"));
-}
-export function taskMark(word) {
-    if (word === "in_progress")
-        return "●";
-    if (word === "ready" || word === "open")
-        return "○";
-    if (word === "blocked")
-        return "‖";
-    if (word === "missing")
-        return "!";
-    if (word === "on_hold")
-        return "⧗";
-    if (word === "done")
-        return "✓";
-    if (word === "drop")
-        return "×";
-    return "?";
-}
 /** Task dispositions and relation states are snake_case facts; people read them as words. */
 export function dispositionText(word) {
-    return word.replaceAll("_", " ");
+    return word === "drop" ? "dropped" : word.replaceAll("_", " ");
 }
 function priorityText(priority) {
     return priority === null ? "P?" : `P${priority}`;
@@ -44,7 +23,28 @@ function entityLines(entity, columns, indent = "") {
     const inline = `${scan} — ${title}`;
     if (displayColumns(inline) <= columns)
         return [inline];
-    return [`${scan} —`, ...renderTextBlock(title, `${indent}  `, columns)];
+    return [scan, ...dashTitleLines(title, `${indent}  `, columns)];
+}
+/** Wrap `— <title>` as one unit: the dash never dangles alone at a line end. */
+function dashTitleLines(title, indent, columns) {
+    const words = title
+        .trim()
+        .split(/\s+/u)
+        .filter((word) => word.length > 0);
+    const unit = words.length === 0 ? [`—`] : [`— ${words[0]}`, ...words.slice(1)];
+    const lines = [];
+    let current = indent;
+    for (const word of unit) {
+        const candidate = current === indent ? `${indent}${word}` : `${current} ${word}`;
+        if (current !== indent && displayColumns(candidate) > columns) {
+            lines.push(current);
+            current = `${indent}${word}`;
+        }
+        else
+            current = candidate;
+    }
+    lines.push(current);
+    return lines;
 }
 function stateEntity(task) {
     return {
@@ -54,45 +54,49 @@ function stateEntity(task) {
         title: task.title,
     };
 }
+const TASK_REFUSAL_WORDS = {
+    "task-missing": "task missing",
+    "invalid-lifecycle-transition": "invalid lifecycle transition",
+    "invalid-namespace-context": "invalid namespace context",
+    "relation-owned-by-other": "relation owned by other",
+    "invalid-composition": "invalid composition",
+};
 function projectRefusal(refusal) {
+    const diagnostic = TASK_REFUSAL_WORDS[refusal.kind] ?? refusal.kind.replaceAll("-", " ");
     if (refusal.kind === "task-missing")
-        return { line: `task-missing ${refusal.taskId}` };
+        return { diagnostic, facts: [`task  ${refusal.taskId}`] };
     if (refusal.kind === "invalid-lifecycle-transition") {
-        return { line: `invalid-lifecycle-transition ${refusal.taskId} ${refusal.state} ${refusal.verb}` };
+        return { diagnostic, facts: [`task  ${refusal.taskId}`, `state  ${refusal.state} · verb  ${refusal.verb}`] };
     }
     if (refusal.kind === "invalid-namespace-context")
-        return { line: `invalid-namespace-context ${refusal.path}` };
+        return { diagnostic, facts: [`path  ${refusal.path}`] };
     if (refusal.kind === "relation-owned-by-other") {
-        return { line: `relation-owned-by-other ${refusal.taskId} ${refusal.related} ${refusal.declaringTask}` };
-    }
-    if (refusal.kind === "invalid-composition") {
-        return { line: refusal.kind, compositionDiagnostics: refusal.diagnostics };
+        return {
+            diagnostic,
+            facts: [
+                `task  ${refusal.taskId}`,
+                `related task  ${refusal.related}`,
+                `declaring task  ${refusal.declaringTask}`,
+            ],
+        };
     }
-    return { line: refusal.kind, diagnostic: refusal.diagnostic };
-}
-function appendDiagnostic(lines, diagnostic) {
-    if (diagnostic !== undefined)
-        receiptPayload(lines, "diagnostic", diagnostic);
+    if (refusal.kind === "invalid-composition")
+        return { diagnostic, compositionDiagnostics: refusal.diagnostics };
+    return refusal.diagnostic === undefined ? { diagnostic } : { diagnostic, facts: [`detail  ${refusal.diagnostic}`] };
 }
 function renderFailure(verb, result, columns) {
     if (result.kind === "retry") {
         return [...outcomeLines("?", verb, "retry", undefined, columns), result.reason].join("\n");
     }
-    const lines = [...outcomeLines("×", verb, "refused", undefined, columns)];
     const facts = projectRefusal(result.refusal);
-    lines.push(facts.line);
-    appendDiagnostic(lines, facts.diagnostic);
-    for (const item of facts.compositionDiagnostics ?? []) {
-        lines.push(`line ${item.line} · ${safeText(item.reason)} · ${safeText(item.token)}`);
-    }
-    return lines.join("\n");
+    return refusalLines(verb, [`reason  ${facts.diagnostic}`, ...(facts.facts ?? [])], columns, (facts.compositionDiagnostics ?? []).map((item) => `line ${item.line} · ${safeText(item.reason)} · ${safeText(item.token)}`)).join("\n");
 }
 function edge(label, ref, mark) {
     const prefix = mark === undefined ? `  ${label}` : `  ${mark} ${label}`;
     return `${prefix} ${ref.id} · ${dispositionText(ref.state)}`;
 }
-function pageHeading(view) {
-    return view;
+export function taskFrameHead(view, scope) {
+    return `${view.toUpperCase()} // ${scope}`;
 }
 function updatedAge(updatedAt) {
     const elapsed = Math.max(0, performance.timeOrigin + performance.now() - Date.parse(updatedAt));
@@ -107,7 +111,6 @@ function updatedAge(updatedAt) {
 function compactFacts(item) {
     return [
         `updated ${updatedAge(item.updatedAt)}`,
-        ...(item.bodyPresent ? [] : ["no body"]),
         ...(item.children === undefined ? [] : [`children ${item.children.live} live · ${item.children.total} total`]),
     ].join(" · ");
 }
@@ -128,31 +131,34 @@ function renderListRow(item, columns, omitDisposition) {
     }
     return lines;
 }
-function renderRows(command, result, columns) {
+function renderRows(action, scope, result, columns) {
     if (result.kind !== "accepted")
-        return renderFailure(command.action, result, columns);
-    const view = command.action === "ls" ? "tasks" : command.action;
+        return renderFailure(action, result, columns);
+    const view = action === "ls" ? "tasks" : action;
     const footer = result.value.hasMore ? ["…"] : [];
-    const scope = command.action === "ls"
-        ? command.flags.world === true
-            ? "world"
-            : command.positionals.length > 0
-                ? `namespace ${command.positionals[0].replace(/^task\//u, "").replace(/\/$/u, "") || "root"}`
-                : "current namespace"
-        : undefined;
-    const heading = scope === undefined ? pageHeading(view) : `${pageHeading(view)} · ${scope}`;
+    const scopeText = scope === "world"
+        ? "world"
+        : scope === "current"
+            ? "current namespace"
+            : `namespace ${scope.namespace.replace(/^task\//u, "").replace(/\/$/u, "") || "root"}`;
+    const heading = taskFrameHead(view, scopeText);
+    if (result.value.rows.length === 0)
+        return emptyCatalogue(view);
     return [
         heading,
-        ...result.value.rows.flatMap((item) => renderListRow(item, columns, command.action === "ready")),
+        ...result.value.rows.flatMap((item) => renderListRow(item, columns, action === "ready")),
         ...footer,
     ].join("\n");
 }
+function textTimestamp(timestamp) {
+    return timestamp.replace(/\.\d+(?=Z$)/u, "");
+}
 function renderShowDetail(result, columns) {
     const task = result.task;
     const lines = [
         ...entityLines(stateEntity(task), columns),
-        `  created  ${task.createdAt}`,
-        `  updated  ${task.updatedAt}`,
+        `  created  ${textTimestamp(task.createdAt)}`,
+        `  updated  ${textTimestamp(task.updatedAt)}`,
         ...(task.createdBy === undefined ? [] : [`  created by  ${task.createdBy}`]),
     ];
     for (const need of result.needs.filter((item) => !item.released))
@@ -206,57 +212,68 @@ function renderDoctor(report) {
     const noun = report.issues.length === 1 ? "issue" : "issues";
     return [`! doctor  ${report.issues.length} ${noun}`, ...report.issues.map(doctorIssue)].join("\n");
 }
-function renderAcceptedMutation(verb, task, columns, documentDiff) {
-    const lines = [...outcomeLines("✓", verb, "accepted", task.id, columns), ...entityLines(stateEntity(task), columns)];
-    if (documentDiff !== undefined)
-        receiptPayload(lines, "diff", documentDiff);
+const PAST_VERBS = {
+    add: "added",
+    start: "started",
+    stop: "stopped",
+    hold: "held",
+    resume: "resumed",
+    done: "done",
+    drop: "dropped",
+    update: "updated",
+};
+function renderAcceptedMutation(verb, task, columns, changes = []) {
+    const lines = [];
+    receiptRow(lines, "✓", PAST_VERBS[verb] ?? verb, [{ text: task.id, opaque: true }], columns);
+    lines.push(...entityLines(stateEntity(task), columns));
+    for (const change of changes)
+        lines.push(`  ${change.field}  ${change.action}`);
     return lines.join("\n");
 }
-function renderMutation(command, result, columns) {
+function renderMutation(action, result, columns) {
     if (result.kind !== "accepted")
-        return renderFailure(command.action, result, columns);
-    if (command.action !== "update") {
-        return renderAcceptedMutation(command.action, result.value, columns);
-    }
-    const value = result.value;
-    return renderAcceptedMutation(command.action, value.task, columns, value.documentDiff);
+        return renderFailure(action, result, columns);
+    return renderAcceptedMutation(action, result.value, columns);
 }
-function renderBatchItem(verb, item) {
+function renderUpdate(result, columns) {
+    if (result.kind !== "accepted")
+        return renderFailure("update", result, columns);
+    return renderAcceptedMutation("update", result.value.task, columns, result.value.changedFields);
+}
+function renderBatchItem(verb, item, columns) {
     if (item.outcome.kind === "accepted")
-        return `✓ ${verb}  ${item.id}`;
+        return `✓ ${PAST_VERBS[verb] ?? verb}  ${item.id}`;
     if (item.outcome.kind === "retry")
         return `? ${verb}  ${item.id}  ${item.outcome.reason}`;
     const facts = projectRefusal(item.outcome.refusal);
-    const lines = [`× ${verb}  ${item.id}  ${facts.line}`];
-    appendDiagnostic(lines, facts.diagnostic);
-    return lines.join("\n");
+    return refusalLines(verb, [`task  ${item.id}`, `reason  ${facts.diagnostic}`, ...(facts.facts ?? [])], columns).join("\n");
 }
-function renderBatch(verb, batch) {
-    return batch.items.map((item) => renderBatchItem(verb, item)).join("\n");
+function renderBatch(verb, batch, columns) {
+    return batch.items.map((item) => renderBatchItem(verb, item, columns)).join("\n");
 }
-function composeDiffs(lines, changes) {
-    for (const change of changes)
-        receiptPayload(lines, `diff ${change.taskId}`, change.documentDiff);
+function admissionLines(admissions) {
+    return admissions.map((admission) => `admit ${admission.position}  ${admission.kind === "new" ? "+" : `@${admission.taskId}`} ${safeText(admission.title)}${admission.kind === "new" && admission.alias !== undefined ? `  as ^${admission.alias}` : ""}`);
 }
 function stoppedLines(stopped) {
     if (stopped.kind === "retry")
         return [`? stopped ${stopped.reason}`];
     const facts = projectRefusal(stopped);
-    const lines = [`× stopped  ${facts.line}`];
-    appendDiagnostic(lines, facts.diagnostic);
-    return lines;
+    return refusalLines("stopped", [`reason  ${facts.diagnostic}`, ...(facts.facts ?? [])], DEFAULT_CLI_COLUMNS);
 }
 function aliasLines(aliases) {
     return aliases.map((binding) => `alias ^${binding.alias} ${binding.taskId}`);
 }
+function planAliasLines(aliases) {
+    return aliases.map((binding) => `alias ^${binding.alias} ${binding.position}`);
+}
 function renderPlan(result) {
     const lines = [
         `compose plan · ${result.admissionOrder.length} documents`,
-        ...aliasLines(result.aliases),
-        ...result.admissionOrder.map((id, index) => `admit ${index + 1} ${id}`),
+        ...planAliasLines(result.aliases),
+        ...admissionLines(result.admissions),
     ];
     for (const body of result.bodies) {
-        lines.push(`body ${body.taskId} · ${body.bytes} bytes`);
+        lines.push(`body ${body.position}  + ${safeText(body.title)} · ${body.bytes} bytes`);
         lines.push(`  first ${safeText(body.firstLine)}`);
         lines.push(`  last ${safeText(body.lastLine)}`);
     }
@@ -269,85 +286,72 @@ function renderCompose(result, columns) {
         return renderPlan(result);
     if (result.kind !== "accepted")
         return renderFailure("compose", result, columns);
-    const lines = [`✓ compose accepted · ${result.documentChanges.length} changed`, ...aliasLines(result.aliases)];
-    composeDiffs(lines, result.documentChanges);
-    return lines.join("\n");
+    return [
+        `✓ composed · ${result.documentChanges.length} changed`,
+        ...aliasLines(result.aliases),
+        ...admissionLines(result.admissions),
+    ].join("\n");
 }
-export function renderTaskText(command, result, context = DEFAULT_CONTEXT) {
-    if (isWorldObservation(result)) {
-        if (result.kind === "absent")
-            return "task world absent";
-        if (result.kind === "failed") {
-            const lines = ["task world failed"];
-            receiptPayload(lines, "diagnostic", result.failure.message);
-            return lines.join("\n");
-        }
-        result = result.value;
-    }
-    return renderTaskValue(command, result, context.columns);
-}
-function renderTaskValue(command, result, columns) {
-    if (command.action === "show")
-        return renderShow(result, columns);
-    if (command.action === "ls" ||
-        command.action === "ready" ||
-        command.action === "blocked" ||
-        command.action === "query") {
-        return renderRows(command, result, columns);
-    }
-    if (command.action === "tree") {
-        const tree = result;
-        return tree.kind === "accepted"
-            ? treeLines(tree.value, columns).join("\n")
-            : renderFailure(command.action, tree, columns);
-    }
-    if (command.action === "doctor")
-        return renderDoctor(result);
-    if (command.action === "context") {
-        const context = result;
-        if (context.kind !== "accepted")
-            return renderFailure(command.action, context, columns);
-        const value = context.value.namespace.length === 0 ? "root" : context.value.namespace.join("/");
-        return `context ${value} · ${context.value.source}`;
-    }
-    if (command.action === "compose")
-        return renderCompose(result, columns);
-    if (command.action === "start" ||
-        command.action === "hold" ||
-        command.action === "done" ||
-        command.action === "drop") {
-        if (!(typeof result === "object" && result !== null && "items" in result))
-            return renderMutation(command, result, columns);
-        return renderBatch(command.action, result);
-    }
-    return renderMutation(command, result, columns);
+/** One addressed show selection rendered directly from its native answer. */
+export function renderTaskShow(result, context = DEFAULT_CONTEXT) {
+    return renderShow(result, context.columns);
+}
+/** One list read rendered from its native answer and the leaf's presentation-only scope. */
+export function renderTaskList(action, scope, result, context = DEFAULT_CONTEXT) {
+    return renderRows(action, scope, result, context.columns);
+}
+export function renderTaskTree(result, context = DEFAULT_CONTEXT) {
+    return result.kind === "accepted"
+        ? treeLines(result.value, context.columns).join("\n")
+        : renderFailure("tree", result, context.columns);
+}
+export function renderTaskDoctor(result) {
+    return renderDoctor(result);
+}
+export function renderTaskContext(result, context = DEFAULT_CONTEXT) {
+    if (result.kind !== "accepted")
+        return renderFailure("context", result, context.columns);
+    const value = result.value.namespace.length === 0 ? "root" : result.value.namespace.join("/");
+    return `context ${value} · ${result.value.source}`;
+}
+export function renderTaskCompose(result, context = DEFAULT_CONTEXT) {
+    return renderCompose(result, context.columns);
+}
+/** One single-Task mutation answer; `verb` is the literal action the leaf invoked. */
+export function renderTaskMutation(verb, result, context = DEFAULT_CONTEXT) {
+    return renderMutation(verb, result, context.columns);
+}
+export function renderTaskUpdate(result, context = DEFAULT_CONTEXT) {
+    return renderUpdate(result, context.columns);
+}
+/** One lifecycle answer: a single mutation or a plural batch, both native shapes. */
+export function renderTaskLifecycle(verb, result, context = DEFAULT_CONTEXT) {
+    return "items" in result ? renderBatch(verb, result, context.columns) : renderMutation(verb, result, context.columns);
+}
+/** A native refusal the CLI edge raised for one action, through the shared refusal grammar. */
+export function renderTaskFailure(verb, result, context = DEFAULT_CONTEXT) {
+    return renderFailure(verb, result, context.columns);
 }
 export function renderTaskIncompleteDiagnostic(result) {
     if (result.kind !== "incomplete")
         return "";
-    const lines = [`! compose incomplete  ${result.documentChanges.length} admitted`, ...stoppedLines(result.stopped)];
-    composeDiffs(lines, result.documentChanges);
-    return lines.join("\n");
+    return [
+        `! compose incomplete  ${result.documentChanges.length} admitted`,
+        ...admissionLines(result.admissions.slice(0, result.documentChanges.length)),
+        ...stoppedLines(result.stopped),
+    ].join("\n");
 }
 export function taskExitCode(result) {
-    if (isWorldObservation(result)) {
-        if (result.kind === "absent")
-            return 1;
-        if (result.kind === "failed")
-            return 3;
-        result = result.value;
-    }
-    if (typeof result === "object" && result !== null && "issues" in result)
+    if ("issues" in result)
         return result.issues.length === 0 ? 0 : 1;
-    if (typeof result === "object" && result !== null && "items" in result) {
+    if ("items" in result) {
         const kinds = result.items.map((item) => item.outcome.kind);
         return kinds.includes("retry") ? 2 : kinds.includes("refused") ? 1 : 0;
     }
-    if (typeof result === "object" && result !== null && "kind" in result) {
-        const outcome = result;
-        if (outcome.kind === "retry")
+    if ("kind" in result) {
+        if (result.kind === "retry")
             return 2;
-        if (outcome.kind === "refused" || outcome.kind === "incomplete")
+        if (result.kind === "refused" || result.kind === "incomplete")
             return 1;
     }
     return 0;

package/build/src/cli/render/terminal.d.ts

@@ -1,4 +1,6 @@
 export declare const DEFAULT_CLI_COLUMNS = 100;
+export declare function emptyCatalogue(surface: string): string;
+export declare function orderRefusalFacts(facts: readonly string[]): readonly string[];
 export type TextRenderContext = Readonly<{
     columns: number;
     color: boolean;
@@ -19,6 +21,8 @@ export declare function takeDisplayColumnsFromEnd(value: string, maximum: number
     rest: string;
 }>;
 export declare function truncateDisplayText(value: string, maximum: number): string;
+/** Pad text to a terminal-column width; raw string length is never the measuring stick. */
+export declare function padToDisplay(text: string, width: number): string;
 export declare function truncateMiddleDisplayText(value: string, maximum: number): string;
 export declare function renderBoundedTextBlock(value: string, input: Readonly<{
     first: string;
@@ -27,6 +31,16 @@ export declare function renderBoundedTextBlock(value: string, input: Readonly<{
     lines?: number;
     truncated?: boolean;
 }>): readonly string[];
+export declare function renderBoundedPayload(input: Readonly<{
+    text: string;
+    first: string;
+    continuation: string;
+    columns: number;
+    maxLines: number;
+    quote: string;
+    openQuote: boolean;
+    truncated: boolean;
+}>): readonly string[];
 export declare function quotedText(value: string): string;
 export declare function safeText(value: string): string;
 type CheckoutNotFollowable = Readonly<{
@@ -41,9 +55,14 @@ export declare function renderOpaqueBlock(value: string, indent: string, columns
 export type SemanticTone = "dim" | "recent" | "attention" | "alert";
 export declare const RECENT_TONE_MS: number;
 export declare function elapsedMilliseconds(source: string | null | undefined, observedAt: string): number | null;
+/**
+ * Compact age wording shared by catalog and kanshi renderers. A source later than the
+ * observation is reported as `future`, so each surface chooses whether clock skew is
+ * ordinary ("now") or worth flagging ("future").
+ */
+export declare function ageText(source: string, observedAt: string, future?: "now" | "future"): string;
 export declare function tone(value: string, kind: SemanticTone, color: boolean): string;
 export declare function plumbFacts(facts: readonly string[], columns: number): readonly string[];
-export declare function linkedEntityLines(facts: readonly string[], _columns: number): readonly string[];
 export declare function identityLine(mark: string, identity: string, extra?: string): string;
 export declare function entityLines(entity: Readonly<{
     mark: string;

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

@@ -1,4 +1,13 @@
 export const DEFAULT_CLI_COLUMNS = 100;
+export function emptyCatalogue(surface) {
+    return `${surface}  none`;
+}
+export function orderRefusalFacts(facts) {
+    return [
+        ...facts.filter((fact) => !fact.startsWith("detail  ")),
+        ...facts.filter((fact) => fact.startsWith("detail  ")),
+    ];
+}
 export function gitShortStat(stat) {
     const files = stat.filesChanged === 1 ? "1 file changed" : `${stat.filesChanged} files changed`;
     const parts = [files];
@@ -112,6 +121,11 @@ export function truncateDisplayText(value, maximum) {
         return "…";
     return `${takeDisplayColumns(clean, maximum - 1).text.replace(/…+$/u, "")}…`;
 }
+/** Pad text to a terminal-column width; raw string length is never the measuring stick. */
+export function padToDisplay(text, width) {
+    const remaining = width - displayColumns(text);
+    return remaining > 0 ? `${text}${" ".repeat(remaining)}` : text;
+}
 export function truncateMiddleDisplayText(value, maximum) {
     const clean = safeText(value);
     if (displayColumns(clean) <= maximum)
@@ -164,6 +178,35 @@ export function renderBoundedTextBlock(value, input) {
     }
     return lines.length === 0 ? [input.first.trimEnd()] : lines;
 }
+export function renderBoundedPayload(input) {
+    let rest = safeText(input.text).replace(/\s+/gu, " ").trim();
+    const lines = [];
+    for (let index = 0; index < input.maxLines; index += 1) {
+        const prefix = index === 0 ? input.first : input.continuation;
+        if (rest.length === 0 && !input.quote && index === 0)
+            return [prefix.trimEnd()];
+        const opening = input.quote && index === 0 ? input.quote : "";
+        const closing = input.quote && !input.openQuote ? (input.quote === "“" ? "”" : input.quote) : "";
+        const budget = Math.max(0, input.columns - displayColumns(prefix + opening + closing));
+        if (budget === 0)
+            return lines.length === 0 ? [prefix.trimEnd()] : lines;
+        const fragment = payloadFragment(rest, budget, index === input.maxLines - 1, input.truncated);
+        rest = fragment.remaining;
+        lines.push(`${prefix}${opening}${fragment.body}${rest.length === 0 ? closing : ""}`);
+        if (rest.length === 0)
+            break;
+    }
+    return lines;
+}
+function payloadFragment(rest, budget, last, forced) {
+    const truncated = (forced && displayColumns(rest) <= budget) || (last && (forced || displayColumns(rest) > budget));
+    if (truncated)
+        return { body: truncateDisplayText(`${rest}…`, budget), remaining: "" };
+    const body = takeDisplayColumns(rest, budget).text;
+    if (body.length === 0 && rest.length > 0)
+        return { body: truncateDisplayText(rest, budget), remaining: "" };
+    return { body, remaining: rest.slice(body.length) };
+}
 export function quotedText(value) {
     return JSON.stringify(value).replaceAll(/[\p{Cc}\p{Cf}\p{Zl}\p{Zp}]/gu, (character) => character
         .split("")
@@ -212,37 +255,57 @@ export function renderTextBlock(value, indent, columns) {
     lines.push(current);
     return lines;
 }
+const OPAQUE_BLOCK_MAX_LINES = 100;
 export function renderOpaqueBlock(value, indent, columns) {
-    let rest = safeText(value);
-    if (rest.length === 0)
+    if (value.length === 0)
         return [indent.trimEnd()];
     const continuation = `${indent}  `;
     const lines = [];
+    const sourceLines = value.split("\n");
+    let sourceIndex = 0;
+    let rest = "";
     let prefix = indent;
-    while (rest.length > 0) {
+    let truncated = false;
+    while (sourceIndex < sourceLines.length || rest.length > 0) {
+        if (rest.length === 0) {
+            rest = safeText(sourceLines[sourceIndex++] ?? "");
+            prefix = indent;
+            if (rest.length === 0) {
+                if (lines.length === OPAQUE_BLOCK_MAX_LINES) {
+                    truncated = true;
+                    break;
+                }
+                if (lines.at(-1) === indent.trimEnd())
+                    continue;
+                lines.push(indent.trimEnd());
+                continue;
+            }
+        }
+        if (lines.length === OPAQUE_BLOCK_MAX_LINES) {
+            truncated = true;
+            break;
+        }
         const budget = columns - displayColumns(prefix);
         if (budget <= 0) {
-            if (prefix === continuation) {
-                lines.push(`${prefix}${rest}`);
-                break;
-            }
             lines.push(prefix.trimEnd());
             prefix = continuation;
             continue;
         }
-        if (displayColumns(rest) <= budget) {
-            lines.push(`${prefix}${rest}`);
-            break;
-        }
         const taken = takeDisplayColumns(rest, budget);
         if (taken.text.length === 0) {
             lines.push(`${prefix}${rest}`);
-            break;
+            rest = "";
+            continue;
         }
         lines.push(`${prefix}${taken.text}`);
         rest = taken.rest;
         prefix = continuation;
     }
+    if (truncated || sourceIndex < sourceLines.length || rest.length > 0) {
+        const omittedLines = sourceLines.length - sourceIndex + (rest.length > 0 ? 1 : 0);
+        const omitted = omittedLines > 1 ? `${omittedLines} lines` : `${Math.max(1, omittedLines)} line`;
+        lines[OPAQUE_BLOCK_MAX_LINES - 1] = `${indent}… (${omitted} omitted)`;
+    }
     return lines;
 }
 export const RECENT_TONE_MS = 5 * 60 * 1_000;
@@ -255,6 +318,23 @@ export function elapsedMilliseconds(source, observedAt) {
         return null;
     return Math.max(0, observedMs - sourceMs);
 }
+/**
+ * Compact age wording shared by catalog and kanshi renderers. A source later than the
+ * observation is reported as `future`, so each surface chooses whether clock skew is
+ * ordinary ("now") or worth flagging ("future").
+ */
+export function ageText(source, observedAt, future = "now") {
+    const seconds = Math.floor((Date.parse(observedAt) - Date.parse(source)) / 1_000);
+    if (seconds < 0)
+        return future;
+    if (seconds < 60)
+        return `${seconds}s`;
+    const minutes = Math.floor(seconds / 60);
+    if (minutes < 60)
+        return `${minutes}m`;
+    const hours = Math.floor(minutes / 60);
+    return hours < 24 ? `${hours}h` : `${Math.floor(hours / 24)}d`;
+}
 export function tone(value, kind, color) {
     if (!color)
         return value;
@@ -277,12 +357,6 @@ export function plumbFacts(facts, columns) {
         lines.push(current);
     return lines;
 }
-export function linkedEntityLines(facts, _columns) {
-    return facts
-        .map(safeText)
-        .filter((fact) => fact.length > 0)
-        .map((fact) => `  │ ${fact}`);
-}
 export function identityLine(mark, identity, extra = "") {
     return extra.length === 0 ? `${mark} ${safeText(identity)}` : `${mark} ${safeText(identity)} ${safeText(extra)}`;
 }