@astrosheep/keiyaku 2.9.7 → 2.9.9

package/build/cli/render/path-prefix-compaction.js

@@ -1,88 +1,131 @@
-const MIN_COMPACTION_SAVINGS = 4;
-const SAFE_PATTERN_COMPONENT = /^[A-Za-z0-9._*?\[\]-]+$/;
-const SAFE_CONCRETE_PATH_COMPONENT = /^[A-Za-z0-9._-]+$/;
-/** Compact one displayed pattern-pair without merging distinct overlap facts. */
-export function compactPatternPair(left, right) {
-    const literal = `${left} × ${right}`;
-    const leftParts = safePatternComponents(left);
-    const rightParts = safePatternComponents(right);
-    if (!leftParts || !rightParts)
-        return literal;
-    let sharedCount = 0;
-    const maximumShared = Math.min(leftParts.length, rightParts.length) - 1;
-    while (sharedCount < maximumShared && leftParts[sharedCount] === rightParts[sharedCount]) {
-        sharedCount += 1;
-    }
-    if (sharedCount === 0)
-        return literal;
-    const prefix = leftParts.slice(0, sharedCount).join("/");
-    const compacted = `${prefix}/{${leftParts.slice(sharedCount).join("/")} × ${rightParts.slice(sharedCount).join("/")}}`;
-    return savesEnough(literal, compacted) ? compacted : literal;
+const PREFIX_MARKER = "⋯";
+const MIN_FOLDED_PREFIX_LENGTH = 8;
+export const PATH_PREVIEW_BODY_ROWS = 7;
+/** Render one exact pattern/path without giving display punctuation matcher meaning. */
+export function renderExactPath(value) {
+    if (!requiresQuoting(value))
+        return value;
+    return `"${[...value].map(escapeQuotedCharacter).join("")}"`;
 }
-/** Compact a concrete preview through a stable slash-component trie when unambiguous. */
-export function compactPathPreview(paths) {
-    const literal = paths.join(", ");
-    if (paths.length < 2)
-        return literal;
-    const components = paths.map(safeConcretePathComponents);
-    if (components.some((parts) => !parts))
-        return literal;
-    const trie = createTrie();
-    for (const parts of components)
-        insertPath(trie, parts);
-    if (hasTerminalBranch(trie))
-        return literal;
-    if (!hasSharedDirectoryPrefix(trie))
-        return literal;
-    const compacted = renderTrie(trie);
-    return savesEnough(literal, compacted) ? compacted : literal;
+/** Fold one qualifying directory prefix while retaining row order and exact suffixes. */
+export function foldPathRows(values) {
+    const rendered = values.map(renderExactPath);
+    const plainIndexes = values
+        .map((value, index) => renderExactPath(value) === value ? index : -1)
+        .filter((index) => index >= 0);
+    const prefix = bestSharedDirectoryPrefix(values, plainIndexes);
+    if (!prefix)
+        return { rows: rendered };
+    const foldedIndexes = new Set(plainIndexes.filter((index) => values[index].startsWith(prefix)));
+    return {
+        prefix,
+        rows: values.map((value, index) => foldedIndexes.has(index) ? `${PREFIX_MARKER}${value.slice(prefix.length)}` : rendered[index]),
+    };
 }
-function safePatternComponents(value) {
-    return safeSlashComponents(value, SAFE_PATTERN_COMPONENT);
+/** Render one overlap fact as two labeled exact pattern rows. */
+export function renderPatternPair(leftLabel, leftPattern, rightLabel, rightPattern) {
+    const folded = foldPathRows([leftPattern, rightPattern]);
+    const labelWidth = Math.max(leftLabel.length, rightLabel.length) + 2;
+    return [
+        ...(folded.prefix ? [`${PREFIX_MARKER} = ${folded.prefix}`] : []),
+        `${leftLabel.padEnd(labelWidth)}${folded.rows[0]}`,
+        `${rightLabel.padEnd(labelWidth)}${folded.rows[1]}`,
+    ];
 }
-function safeConcretePathComponents(value) {
-    return safeSlashComponents(value, SAFE_CONCRETE_PATH_COMPONENT);
+/** Render a bounded path snapshot; declarations consume the same row budget as paths. */
+export function renderPathPreview(snapshot, bodyRows = PATH_PREVIEW_BODY_ROWS) {
+    const plan = planPathPreview(snapshot.preview, Math.max(0, bodyRows));
+    const omitted = Math.max(0, snapshot.count - plan.visibleCount);
+    return [
+        `scope · ${snapshot.count} pattern${snapshot.count === 1 ? "" : "s"}`,
+        ...(plan.prefix ? [`${PREFIX_MARKER} = ${plan.prefix}`] : []),
+        ...plan.rows,
+        ...(omitted > 0 ? [`+${omitted} more patterns`] : []),
+    ];
 }
-function safeSlashComponents(value, safeComponent) {
-    const parts = value.split("/");
-    if (parts.length === 0 || parts.some((part) => part === "." || part === ".." || !safeComponent.test(part))) {
-        return null;
+function planPathPreview(preview, bodyRows) {
+    const fullValues = preview.slice(0, bodyRows);
+    if (fullValues.length < bodyRows) {
+        return { ...foldPathRows(fullValues), visibleCount: fullValues.length };
     }
-    return parts;
-}
-function createTrie() {
-    return { terminal: false, children: new Map() };
-}
-function insertPath(node, parts) {
-    let current = node;
-    for (const part of parts) {
-        let child = current.children.get(part);
-        if (!child) {
-            child = createTrie();
-            current.children.set(part, child);
-        }
-        current = child;
+    const chargedValues = preview.slice(0, Math.max(0, bodyRows - 1));
+    const chargedFold = foldPathRows(chargedValues);
+    if (chargedFold.prefix) {
+        return { ...chargedFold, visibleCount: chargedValues.length };
     }
-    current.terminal = true;
+    return { rows: fullValues.map(renderExactPath), visibleCount: fullValues.length };
 }
-function hasTerminalBranch(node) {
-    if (node.terminal && node.children.size > 0)
+function requiresQuoting(value) {
+    if (value.length === 0 || /^\s|\s$/u.test(value))
         return true;
-    return [...node.children.values()].some(hasTerminalBranch);
+    return value.includes("\\")
+        || value.includes('"')
+        || value.includes(PREFIX_MARKER)
+        || [...value].some(isControlCharacter);
 }
-function hasSharedDirectoryPrefix(node, isRoot = true) {
-    if (!isRoot && node.children.size > 1)
-        return true;
-    return [...node.children.values()].some((child) => hasSharedDirectoryPrefix(child, false));
+function isControlCharacter(character) {
+    const codePoint = character.codePointAt(0);
+    return codePoint <= 0x1f || (codePoint >= 0x7f && codePoint <= 0x9f);
+}
+function escapeQuotedCharacter(character) {
+    if (character === "\\")
+        return "\\\\";
+    if (character === '"')
+        return '\\"';
+    const codePoint = character.codePointAt(0);
+    const named = new Map([
+        [0x07, "\\a"],
+        [0x08, "\\b"],
+        [0x09, "\\t"],
+        [0x0a, "\\n"],
+        [0x0b, "\\v"],
+        [0x0c, "\\f"],
+        [0x0d, "\\r"],
+    ]).get(codePoint);
+    if (named)
+        return named;
+    if (!isControlCharacter(character))
+        return character;
+    return [...Buffer.from(character, "utf8")]
+        .map((byte) => `\\${byte.toString(8).padStart(3, "0")}`)
+        .join("");
 }
-function renderTrie(node) {
-    const entries = [...node.children.entries()].map(([part, child]) => {
-        if (child.children.size === 0)
-            return part;
-        return `${part}/${renderTrie(child)}`;
-    });
-    return entries.length === 1 ? entries[0] : `{${entries.join(",")}}`;
+function bestSharedDirectoryPrefix(values, plainIndexes) {
+    let best;
+    for (let left = 0; left < plainIndexes.length; left += 1) {
+        for (let right = left + 1; right < plainIndexes.length; right += 1) {
+            const prefix = sharedDirectoryPrefix(values[plainIndexes[left]], values[plainIndexes[right]]);
+            if (!prefix || prefix.length < MIN_FOLDED_PREFIX_LENGTH)
+                continue;
+            const members = plainIndexes.filter((index) => values[index].startsWith(prefix));
+            const common = members
+                .slice(1)
+                .reduce((current, index) => sharedDirectoryPrefix(current, values[index]) ?? "", values[members[0]]);
+            if (common.length < MIN_FOLDED_PREFIX_LENGTH)
+                continue;
+            const candidate = {
+                prefix: common,
+                count: members.length,
+                first: members[0],
+                score: common.length * (members.length - 1),
+            };
+            if (!best
+                || candidate.score > best.score
+                || (candidate.score === best.score && candidate.count > best.count)
+                || (candidate.score === best.score && candidate.count === best.count && candidate.first < best.first)
+                || (candidate.score === best.score && candidate.count === best.count && candidate.first === best.first
+                    && candidate.prefix < best.prefix)) {
+                best = candidate;
+            }
+        }
+    }
+    return best?.prefix;
 }
-function savesEnough(literal, compacted) {
-    return literal.length - compacted.length >= MIN_COMPACTION_SAVINGS;
+function sharedDirectoryPrefix(left, right) {
+    let sharedLength = 0;
+    const maximum = Math.min(left.length, right.length);
+    while (sharedLength < maximum && left[sharedLength] === right[sharedLength])
+        sharedLength += 1;
+    const slash = left.lastIndexOf("/", sharedLength - 1);
+    return slash >= 0 ? left.slice(0, slash + 1) : undefined;
 }

package/build/cli/render/projection-activity.js

@@ -1,10 +1,31 @@
 import { compactText } from "./compact-text.js";
-import { displayColumns, fitVariableLine, resolveLineColumns, truncateMiddleColumns } from "./line-width.js";
+import { displayColumns, fitVariableLine, resolveLineColumns, truncateMiddleColumns, truncateColumns } from "./line-width.js";
 import { presentFoldedToolActivity, } from "./tool-presentation.js";
 import { presentLedgerPath, summarizeToolLedger } from "./tool-ledger-rollup.js";
-const TIME_GUTTER_WIDTH = 6;
+const TIME_GUTTER_WIDTH = 5;
 const VERB_WIDTH = 7;
 const SILENCE_THRESHOLD_MS = 60_000;
+const TIMELINE_GAP_MARKER = "⋮";
+/** Keep the renderer and its gap grammar while giving Kanshi its smaller live window. */
+export function selectProjectionActivityWindow(activity, ordinaryRows) {
+    // A Kanshi flow narrows only the settled history window. Unfinished activity
+    // remains pinned in its timeline position; it is not another history row.
+    const selected = activity.window.slice(-ordinaryRows);
+    const selectedOrders = new Set([
+        ...selected.map((row) => row.order),
+        ...activity.pinned.map((row) => row.order),
+    ]);
+    return {
+        activity: {
+            ...activity,
+            window: selected,
+            // Turn seals are a wait concern. Kanshi's narrow operational flow contains
+            // only ordinary activity plus durable tells.
+            timeline: activity.timeline.filter((row) => selectedOrders.has(row.order)),
+        },
+        leadingOmittedCount: activity.omittedSettledCount + activity.window.length - selected.length,
+    };
+}
 export function formatTimelineDuration(ms) {
     const totalSeconds = Math.max(0, Math.floor(ms / 1_000));
     if (totalSeconds < 60)
@@ -39,6 +60,14 @@ export function formatWallClock(at) {
         return "  :  │";
     return `${String(value.getHours()).padStart(2, "0")}:${String(value.getMinutes()).padStart(2, "0")}│`;
 }
+/** One durable-tell line dialect shared by wait and the embedded Kanshi flow. */
+export function renderPendingProjectionTell(tell, input) {
+    const createdAtMs = Date.parse(tell.createdAt);
+    const age = Math.max(0, input.anchorMs - (Number.isFinite(createdAtMs) ? createdAtMs : input.anchorMs));
+    const fixed = `${formatWallClock(tell.createdAt)} ${"told".padEnd(VERB_WIDTH)} `;
+    const tail = ` — ${formatTimelineDuration(age)}…`;
+    return `${fixed}${truncateColumns(`“${tell.text}”`, Math.max(0, input.maxColumns - displayColumns(fixed) - displayColumns(tail)))}${input.renderUnconsumedTail?.(tail) ?? tail}`;
+}
 function commonPrefix(left, right) {
     const a = [...left];
     const b = [...right];
@@ -72,6 +101,9 @@ function compressedPrefix(prefix) {
 function timelineGutter(label, spine) {
     return label || `${"".padStart(TIME_GUTTER_WIDTH)}${spine}`;
 }
+function renderTimelineGap(omittedRowCount, maxColumns) {
+    return fitVariableLine(`${timelineGutter("", TIMELINE_GAP_MARKER)} `, `${omittedRowCount} more`, maxColumns);
+}
 function compactTokens(value) {
     if (value < 1_000)
         return String(value);
@@ -144,13 +176,15 @@ function renderTerminalRollup(activity, input) {
             ? fitVariableLine(`${endPrefix} `, segments.join(" · "), input.maxColumns)
             : endPrefix,
     });
-    for (const file of summary.files) {
-        const repeat = file.count > 1 ? ` ×${file.count}` : "";
-        const diffstat = file.diffstat ? ` +${file.diffstat.additions} −${file.diffstat.deletions}` : "";
-        rows.push({ kind: "file", line: fitVariableLine("", `${file.path}${repeat}${diffstat}`, input.maxColumns) });
-    }
-    if (summary.hiddenFileCount > 0) {
-        rows.push({ kind: "file", line: fitVariableLine("", `… ${summary.hiddenFileCount} more files`, input.maxColumns) });
+    if (input.includeFiles !== false) {
+        for (const file of summary.files) {
+            const repeat = file.count > 1 ? ` ×${file.count}` : "";
+            const diffstat = file.diffstat ? ` +${file.diffstat.additions} −${file.diffstat.deletions}` : "";
+            rows.push({ kind: "file", line: fitVariableLine("", `${file.path}${repeat}${diffstat}`, input.maxColumns) });
+        }
+        if (summary.hiddenFileCount > 0) {
+            rows.push({ kind: "file", line: fitVariableLine("", `… ${summary.hiddenFileCount} more files`, input.maxColumns) });
+        }
     }
     return { rows, hasMutationFiles: summary.files.length > 0 };
 }
@@ -170,6 +204,7 @@ function timelineEntries(activity) {
 export function renderProjectionActivity(activity, input) {
     const lines = [];
     const rowKinds = [];
+    const rowAts = [];
     let priorAtMs;
     let priorMinute;
     let priorCompletedRan;
@@ -177,9 +212,12 @@ export function renderProjectionActivity(activity, input) {
     let lastRunningTool;
     const maxColumns = input.maxColumns ?? resolveLineColumns();
     const entries = timelineEntries(activity);
-    const pushRow = (line, kind) => {
+    const gapBeforeOrder = input.leadingOmittedCount ? activity.window[0]?.order : undefined;
+    let gapEmitted = false;
+    const pushRow = (line, kind, at) => {
         lines.push(line);
         rowKinds.push(kind);
+        rowAts.push(at);
         return true;
     };
     for (let index = 0; index < entries.length; index += 1) {
@@ -190,8 +228,12 @@ export function renderProjectionActivity(activity, input) {
                 priorAtMs = atMs;
             continue;
         }
-        if (priorAtMs !== undefined && Number.isFinite(atMs) && atMs - priorAtMs >= SILENCE_THRESHOLD_MS) {
-            pushRow(fitVariableLine(`${"".padStart(TIME_GUTTER_WIDTH)}┆ `, `${formatTimelineDuration(atMs - priorAtMs)} pass in silence`, maxColumns), "silence");
+        if (!gapEmitted && input.leadingOmittedCount && gapBeforeOrder !== undefined && entry.row.order >= gapBeforeOrder) {
+            pushRow(renderTimelineGap(input.leadingOmittedCount, maxColumns), "activity", entry.at);
+            gapEmitted = true;
+        }
+        if (input.showSilence !== false && priorAtMs !== undefined && Number.isFinite(atMs) && atMs - priorAtMs >= SILENCE_THRESHOLD_MS) {
+            pushRow(fitVariableLine(`${"".padStart(TIME_GUTTER_WIDTH)}┆ `, `${formatTimelineDuration(atMs - priorAtMs)} pass in silence`, maxColumns), "silence", entry.at);
         }
         if (Number.isFinite(atMs))
             priorAtMs = atMs;
@@ -226,22 +268,22 @@ export function renderProjectionActivity(activity, input) {
             }
             priorCompletedRan = row.state === "completed" ? presentation.variableText : undefined;
             const budget = Math.max(0, maxColumns - displayColumns(fixed) - displayColumns(presentation.fixedSuffix));
-            pushRow(`${fixed}${truncateMiddleColumns(variable, budget)}${presentation.fixedSuffix}`, "activity");
+            pushRow(`${fixed}${truncateMiddleColumns(variable, budget)}${presentation.fixedSuffix}`, "activity", entry.at);
             continue;
         }
         if (row.kind === "said") {
             priorCompletedRan = undefined;
-            pushRow(fitVariableLine(`${timelineGutter(label, spine)} ${"said".padEnd(VERB_WIDTH)} `, `“${compactText(row.text)}”`, maxColumns), "activity");
+            pushRow(fitVariableLine(`${timelineGutter(label, spine)} ${"said".padEnd(VERB_WIDTH)} `, `“${compactText(row.text)}”`, maxColumns), "activity", entry.at);
         }
         else if (row.kind === "thought") {
             priorCompletedRan = undefined;
             const text = `${compactText(row.text)}${row.truncated && !row.text.endsWith("…") ? "…" : ""}`;
             const duration = formatActionDuration(row.durationMs);
-            pushRow(fitVariableLine(`${timelineGutter(label, spine)} ${"thought".padEnd(VERB_WIDTH)} `, `${duration ? `${duration} — ` : ""}“${text}”`, maxColumns), "activity");
+            pushRow(fitVariableLine(`${timelineGutter(label, spine)} ${"thought".padEnd(VERB_WIDTH)} `, `${duration ? `${duration} — ` : ""}“${text}”`, maxColumns), "activity", entry.at);
         }
         else if (row.kind === "warning") {
             priorCompletedRan = undefined;
-            pushRow(fitVariableLine(`${timelineGutter(label, spine)} ${"warning".padEnd(VERB_WIDTH)} `, warningText(row), maxColumns), "activity");
+            pushRow(fitVariableLine(`${timelineGutter(label, spine)} ${"warning".padEnd(VERB_WIDTH)} `, warningText(row), maxColumns), "activity", entry.at);
         }
         else {
             priorCompletedRan = undefined;
@@ -249,7 +291,7 @@ export function renderProjectionActivity(activity, input) {
                 ? ` · ${compactTokens(row.inputTokens)}▸${compactTokens(row.outputTokens)} tok`
                 : "";
             const cost = row.costUsd !== undefined ? ` · $${row.costUsd.toFixed(2)}` : "";
-            pushRow(fitVariableLine(`${"".padStart(TIME_GUTTER_WIDTH)}├ `, `turn ${row.turn}${usage}${cost}`, maxColumns), "activity");
+            pushRow(fitVariableLine(`${"".padStart(TIME_GUTTER_WIDTH)}├ `, `turn ${row.turn}${usage}${cost}`, maxColumns), "activity", entry.at);
         }
     }
     for (const row of activity.pinned) {
@@ -258,10 +300,10 @@ export function renderProjectionActivity(activity, input) {
     }
     if (input.showPlan && activity.plan) {
         const planAtMs = Date.parse(activity.plan.at);
-        if (priorAtMs !== undefined && Number.isFinite(planAtMs) && planAtMs - priorAtMs >= SILENCE_THRESHOLD_MS) {
-            pushRow(fitVariableLine(`${"".padStart(TIME_GUTTER_WIDTH)}┆ `, `${formatTimelineDuration(planAtMs - priorAtMs)} pass in silence`, maxColumns), "silence");
+        if (input.showSilence !== false && priorAtMs !== undefined && Number.isFinite(planAtMs) && planAtMs - priorAtMs >= SILENCE_THRESHOLD_MS) {
+            pushRow(fitVariableLine(`${"".padStart(TIME_GUTTER_WIDTH)}┆ `, `${formatTimelineDuration(planAtMs - priorAtMs)} pass in silence`, maxColumns), "silence", activity.plan.at);
         }
-        pushRow(renderPlan(activity.plan, maxColumns), "plan");
+        pushRow(renderPlan(activity.plan, maxColumns), "plan", activity.plan.at);
     }
     let hasMutationFiles = false;
     if (["returned", "dead", "lost", "dismissed"].includes(input.state)) {
@@ -269,10 +311,11 @@ export function renderProjectionActivity(activity, input) {
             anchorMs: input.anchorMs,
             ...(input.workspaceRoot ? { workspaceRoot: input.workspaceRoot } : {}),
             ...(input.terminalDiagnostic ? { diagnostic: input.terminalDiagnostic } : {}),
+            includeFiles: input.showTerminalFiles !== false,
             maxColumns,
         });
         for (const row of rollup.rows) {
-            pushRow(row.line, row.kind);
+            pushRow(row.line, row.kind, new Date(input.anchorMs).toISOString());
         }
         hasEndAnchor = true;
         hasMutationFiles = rollup.hasMutationFiles;
@@ -280,6 +323,7 @@ export function renderProjectionActivity(activity, input) {
     return {
         lines,
         rowKinds,
+        rowAts,
         ...(lastRunningTool ? { lastRunningTool } : {}),
         hasEndAnchor,
         hasMutationFiles,

package/build/cli/render/shared.js

@@ -3,7 +3,7 @@ import { commissionSlug, formatCommissionCoordinate } from "../../core/ids.js";
 import { assembleResponse, buildSection, DISPLAY_TEXT_MAX_CHARS, FORMAT_LIST_MAX_ITEM_CHARS, FORMAT_LIST_MAX_ITEMS, formatMaybe, formatWarnings, shellQuote, truncateForDisplay, } from "./format.js";
 import { WARNING_SECTION_TITLE } from "./response-style.js";
 import { prependAddressReceipt } from "./address.js";
-import { compactPathPreview, compactPatternPair } from "./path-prefix-compaction.js";
+import { renderPathPreview, renderPatternPair } from "./path-prefix-compaction.js";
 export function textResponse(text) {
     const payload = {};
     return {
@@ -76,16 +76,17 @@ function renderScopeOverlapWarnings(overlaps) {
     return [...overlapsByCounterparty.entries()].map(([contractId, overlaps]) => renderScopeOverlapGroup(commissionSlug(contractId), overlaps));
 }
 function renderScopeOverlapGroup(contractAddr, overlaps) {
-    const pairs = overlaps.map((overlap) => {
+    const nextAddr = commissionSlug(overlaps[0].contracts[0]);
+    const pairs = overlaps.flatMap((overlap) => {
         const [nextPattern, existingPattern] = overlap.patterns;
-        const patternPair = compactPatternPair(nextPattern, existingPattern);
+        const patternPair = renderPatternPair(nextAddr, nextPattern, contractAddr, existingPattern);
         const evidence = overlap.kind === "potential"
-            ? "potential; no current tracked path proves it"
-            : `concrete; ${overlap.paths.count} current tracked path${overlap.paths.count === 1 ? "" : "s"}: ${compactPathPreview(overlap.paths.preview)}${overlap.paths.truncated ? ", …" : ""}`;
-        return `  ${patternPair} (${evidence})`;
+            ? ["potential · no current tracked path proves it"]
+            : renderPathPreview(overlap.paths);
+        return [...patternPair, ...evidence].map((line) => `  ${line}`);
     });
     return [
-        `▲ scope overlap with ${contractAddr}:`,
+        `▲ overlap ${nextAddr} ↔ ${contractAddr}`,
         ...pairs,
         `  consider --after ${contractAddr}`,
     ].join("\n");

package/build/cli/render/status.js

@@ -69,12 +69,12 @@ function terminalFailureSuffix(row) {
 function renderProjectionOmission(board) {
     if (!board.omitted)
         return undefined;
-    const counts = ["failed", "dead", "done", "killed", "dismissed", "incompatible"]
+    const counts = ["failed", "dead", "done", "killed", "dismissed"]
         .flatMap((state) => {
         const count = board.omitted?.byState[state] ?? 0;
         return count > 0 ? [`${count} ${state}`] : [];
     });
-    return `  · +${board.omitted.total} historical projections not shown (${counts.join(" · ")}) — keiyaku status --all`;
+    return counts.length > 0 ? `+ ${counts.join(" · ")}` : undefined;
 }
 function renderProjectionAge(row) {
     const duration = formatAgeMs(row.durationMs) ?? "?";
@@ -170,15 +170,18 @@ export function renderProjectionFilteredStatus(board, projectionId) {
     if (!row)
         return `${heading}\nno projections on projection ${projectionId}\n`;
     if (row.state === "failed" || row.terminalFailure) {
-        // Same face bytes as wait; CLI success write supplies the final newline.
-        return renderTerminalFailureFace(projectionId, row.terminalFailure).join("\n");
+        const lines = [...renderTerminalFailureFace(projectionId, row.terminalFailure), "", `» keiyaku wait ${projectionId}`];
+        return lines.join("\n");
     }
     const lines = [heading, "", ...renderProjectionRow(row), ""];
     if (row.observation.compatibility === "incompatible") {
         return `${lines.join("\n")}\n`;
     }
-    if (!isTerminalProjectionStatus(row))
-        lines.push(`» ${formatTellCommand(projectionId, '"..."')}`);
+    if (isTerminalProjectionStatus(row)) {
+        lines.push(`» keiyaku wait ${projectionId}`);
+        return lines.join("\n");
+    }
+    lines.push(`» ${formatTellCommand(projectionId, '"..."')}`);
     lines.push(`» keiyaku wait ${projectionId}`);
     return `${lines.join("\n")}\n`;
 }
@@ -206,27 +209,12 @@ function renderClaimReconciliationSection(recon) {
  */
 export function renderStatusBoard(board) {
     const boardText = renderKanshiBoard(board);
-    const projectionText = renderProjectionStatusSection(board.projections);
-    const receiptsText = renderClaimReconciliationSection(board.claimReconciliation);
-    const taskText = renderTaskStatusSection(board.tasks);
     const taskDiseaseText = [
         ...(board.tasks?.diseases ?? []).map((disease) => disease.message),
         ...(board.tasks?.diagnostic ? [board.tasks.diagnostic] : []),
     ];
     const diseasesText = renderSettingsDiseasesSection(board.diseases, taskDiseaseText);
-    if (!projectionText && !receiptsText && !taskText && diseasesText === "")
+    if (diseasesText === "")
         return boardText;
-    const sections = [boardText.trimEnd()];
-    if (board.targetFilter !== null && (projectionText || receiptsText || diseasesText)) {
-        sections.push("repository-wide — not filtered by target");
-    }
-    if (projectionText)
-        sections.push(projectionText.trimEnd());
-    if (receiptsText)
-        sections.push(receiptsText.trimEnd());
-    if (taskText)
-        sections.push(taskText.trimEnd());
-    if (diseasesText)
-        sections.push(diseasesText.trimEnd());
-    return `${sections.join("\n\n")}\n`;
+    return `${[boardText.trimEnd(), diseasesText.trimEnd()].join("\n\n")}\n`;
 }

package/build/cli/render/wait.js

@@ -1,29 +1,8 @@
-import { formatTimelineDuration, renderProjectionActivity, renderProjectionActivitySummary, } from "./projection-activity.js";
+import { formatTimelineDuration, renderPendingProjectionTell, renderProjectionActivity, } from "./projection-activity.js";
 import { displayColumns, resolveLineColumns, truncateColumns } from "./line-width.js";
 import { formatTellCommand, projectionRejoinHintLines, textResponse } from "./shared.js";
 import { renderTerminalFailureFace } from "./terminal-failure.js";
 const WAIT_HEADER_MAX_COLUMNS = 60;
-const WAIT_BODY_MAX_ROWS = 10;
-const WAIT_ROW_PRIORITY = {
-    "end-anchor": 100,
-    "storage-diagnostic": 90,
-    diagnostic: 90,
-    tell: 80,
-    summary: 70,
-    activity: 60,
-    plan: 55,
-    liveness: 50,
-    silence: 65,
-    file: 20,
-};
-/** One owner admits every wait-body row, then restores presentation order. */
-export function selectWaitBodyRows(rows, limit = WAIT_BODY_MAX_ROWS) {
-    const selected = rows
-        .slice()
-        .sort((left, right) => WAIT_ROW_PRIORITY[right.kind] - WAIT_ROW_PRIORITY[left.kind] || left.order - right.order)
-        .slice(0, limit);
-    return selected.sort((left, right) => left.order - right.order);
-}
 function shortAddress(projectionId) {
     return /\/([0-9a-f]{8})$/.exec(projectionId)?.[1] ?? projectionId;
 }
@@ -70,12 +49,23 @@ function waitHeader(projectionId, akuma, snapshot, outputColumns) {
     const dashCount = Math.max(1, maxColumns - displayColumns(`${prefix}  ${state}`));
     return `${prefix} ${"─".repeat(dashCount)} ${state}`;
 }
-function pendingTellLines(snapshot, maxColumns) {
-    return snapshot.tells.window.map((tell) => {
-        const age = Math.max(0, snapshot.observedAtMs - Date.parse(tell.createdAt));
-        const fixed = `${"".padStart(6)}│ ${"tell".padEnd(7)} `;
-        const suffix = ` · undelivered ${formatTimelineDuration(Number.isFinite(age) ? age : 0)}`;
-        return `${fixed}${truncateColumns(`“${tell.text}”`, Math.max(0, maxColumns - displayColumns(fixed) - displayColumns(suffix)))}${suffix}`;
+function pendingTellRows(snapshot, maxColumns, orderOffset) {
+    return snapshot.tells.window.map((tell, index) => ({
+        line: renderPendingProjectionTell(tell, {
+            anchorMs: snapshot.observedAtMs,
+            maxColumns,
+        }),
+        at: tell.createdAt,
+        order: orderOffset + index,
+    }));
+}
+function orderFlowRows(rows) {
+    return rows.slice().sort((left, right) => {
+        const leftAt = Date.parse(left.at ?? "");
+        const rightAt = Date.parse(right.at ?? "");
+        const safeLeft = Number.isFinite(leftAt) ? leftAt : Number.POSITIVE_INFINITY;
+        const safeRight = Number.isFinite(rightAt) ? rightAt : Number.POSITIVE_INFINITY;
+        return safeLeft - safeRight || left.order - right.order;
     });
 }
 function ledgerHint(projectionId, snapshot) {
@@ -142,14 +132,13 @@ function unknownResponse(projectionId, akuma, snapshot, maxColumns) {
         anchorMs: snapshot.observedAtMs,
         state: "unknown",
         showPlan: false,
+        showSilence: false,
+        showTerminalFiles: false,
         ...(snapshot.workspaceRoot ? { workspaceRoot: snapshot.workspaceRoot } : {}),
         maxColumns,
+        leadingOmittedCount: snapshot.activity.omittedSettledCount,
     });
-    const historicalLines = selectWaitBodyRows(rendered.lines.map((line, index) => ({
-        kind: rendered.rowKinds[index] ?? "activity",
-        line,
-        order: index,
-    }))).map((row) => row.line.replace(/[┆├]/, "│"));
+    const historicalLines = rendered.lines.map((line) => line.replace(/[┆├]/, "│"));
     return {
         ...textResponse([
             `? ${akuma} · projection: ${projectionId} · unknown`,
@@ -216,43 +205,32 @@ export function buildWaitResponse(projectionId, result, options = {}) {
     if (state === "returned") {
         return returnedResponse(projectionId, result);
     }
-    const tells = pendingTellLines(snapshot, maxColumns);
-    const summary = ["running", "stalled", "unknown"].includes(state)
-        ? renderProjectionActivitySummary(snapshot.activity, {
-            state,
-            ...(snapshot.workspaceRoot ? { workspaceRoot: snapshot.workspaceRoot } : {}),
-            maxColumns,
-        })
-        : undefined;
     const rendered = renderProjectionActivity(snapshot.activity, {
         anchorMs: snapshot.observedAtMs,
         state,
-        showPlan: state === "running",
+        showPlan: false,
+        showSilence: false,
+        showTerminalFiles: false,
         ...(snapshot.workspaceRoot ? { workspaceRoot: snapshot.workspaceRoot } : {}),
         maxColumns,
+        leadingOmittedCount: snapshot.activity.omittedSettledCount,
     });
-    let order = 0;
-    const bodyPlan = [];
-    for (const diagnostic of snapshot.eventDiagnostics ?? []) {
-        bodyPlan.push({ kind: "storage-diagnostic", line: `‼ ${diagnostic.kind} · ${diagnostic.detail}`, order: order++ });
-    }
-    rendered.lines.forEach((line, index) => {
-        bodyPlan.push({ kind: rendered.rowKinds[index] ?? "activity", line, order: order++ });
-    });
-    for (const line of tells)
-        bodyPlan.push({ kind: "tell", line, order: order++ });
-    if (rendered.lines.length === 0 && tells.length === 0 && state === "running") {
-        bodyPlan.push({ kind: "liveness", line: "   not a word out of it yet — idle", order: order++ });
-    }
-    if (!rendered.hasEndAnchor && summary) {
-        bodyPlan.push({ kind: "summary", line: summary, order: order++ });
-    }
-    const bodyLines = selectWaitBodyRows(bodyPlan).map((row) => truncateColumns(row.line, maxColumns));
-    const lines = [waitHeader(projectionId, result.pact.akuma, snapshot, maxColumns), ...bodyLines];
-    const pendingTellCount = snapshot.tells.totals.undelivered;
-    if (pendingTellCount > 0) {
-        lines.push(`${pendingTellCount} tell${pendingTellCount === 1 ? "" : "s"} undelivered`);
-    }
+    const diagnosticLines = (snapshot.eventDiagnostics ?? [])
+        .map((diagnostic) => `‼ ${diagnostic.kind} · ${diagnostic.detail}`);
+    const activityRows = rendered.lines.map((line, index) => ({
+        line,
+        at: rendered.rowAts[index],
+        order: index,
+    }));
+    const flowLines = orderFlowRows([
+        ...activityRows,
+        ...pendingTellRows(snapshot, maxColumns, activityRows.length),
+    ]).map((row) => truncateColumns(row.line, maxColumns));
+    const lines = [
+        waitHeader(projectionId, result.pact.akuma, snapshot, maxColumns),
+        ...diagnosticLines,
+        ...flowLines,
+    ];
     const nextActions = state === "running" && options.runningActions === false
         ? []
         : nextActionLines(options.alias ?? projectionId, result, state);