@astrosheep/keiyaku 2.9.8 → 2.9.9

package/build/agents/harness/projection.js

@@ -239,12 +239,14 @@ async function settleProjection(shared) {
         }, shared.terms.idleTimeoutMs);
         idleTimeout.unref?.();
     };
-    executionTimeout = setTimeout(() => {
-        policyBudgetExceeded = true;
-        requestPolicyBudgetCleanup(shared, createAbortError(`${shared.terms.provider} execution policy budget expired`));
-        resolvePolicyBudget();
-    }, shared.terms.executionTimeoutMs);
-    executionTimeout.unref?.();
+    if (shared.terms.executionTimeoutMs > 0) {
+        executionTimeout = setTimeout(() => {
+            policyBudgetExceeded = true;
+            requestPolicyBudgetCleanup(shared, createAbortError(`${shared.terms.provider} execution policy budget expired`));
+            resolvePolicyBudget();
+        }, shared.terms.executionTimeoutMs);
+        executionTimeout.unref?.();
+    }
     const requestLiveAbort = () => {
         if (shared.explicitlyAborted)
             return;

package/build/cli/render/kanshi.js

@@ -1,25 +1,82 @@
+import { getConfig } from "../../config/env.js";
 import { formatAgeMs } from "./format.js";
+import { displayColumns, resolveLineColumns, truncateColumns } from "./line-width.js";
+import { renderPendingProjectionTell, renderProjectionActivity, selectProjectionActivityWindow, } from "./projection-activity.js";
+const KANSHI_MAX_COLUMNS = 120;
+const KANSHI_ACTIVITY_ROWS = 3;
 function shortHead(hash) {
-    if (!hash)
-        return "????????";
-    return hash.slice(0, 7);
+    return hash?.slice(0, 7);
+}
+function supportsColor() {
+    const { terminal } = getConfig();
+    if (terminal.noColor !== undefined || terminal.forceColor === "0")
+        return false;
+    if (terminal.forceColor !== undefined)
+        return true;
+    return process.stdout.isTTY === true && terminal.term?.toLowerCase() !== "dumb";
+}
+function tone(text, value) {
+    if (!supportsColor() || value === undefined || value === "normal")
+        return text;
+    return value === "description"
+        ? `\x1b[2m${text}\x1b[0m`
+        : `\x1b[31m${text}\x1b[0m`;
+}
+function renderFacts(facts) {
+    return {
+        plain: facts.map((fact) => fact.text).join(" · "),
+        rendered: facts.map((fact) => tone(fact.text, fact.tone)).join(" · "),
+    };
+}
+/** Align facts without allowing ANSI bytes to enter width arithmetic. */
+function alignedBoardRow(input) {
+    const facts = renderFacts(input.facts);
+    const prefix = `${input.prefix} `;
+    const titleBudget = Math.max(0, input.width - displayColumns(prefix) - displayColumns(facts.plain) - 1);
+    const visibleTitle = truncateColumns(input.title, titleBudget);
+    const spaces = " ".repeat(Math.max(1, input.width - displayColumns(prefix) - displayColumns(visibleTitle) - displayColumns(facts.plain)));
+    return `${prefix}${tone(visibleTitle, input.titleTone ?? "description")}${spaces}${facts.rendered}`;
 }
 function arcSparkline(arcs) {
-    if (arcs <= 0)
-        return "";
+    if (arcs <= 1)
+        return undefined;
     return Array.from({ length: arcs }, () => "·").join("──");
 }
 function pendingAfterIds(contract) {
     return contract.after.filter((item) => !item.terminal).map((item) => item.id);
 }
-function kanshiGlyph(contract) {
-    if (contract.state.state === "corrupt")
-        return "×";
-    if (pendingAfterIds(contract).length > 0)
-        return "○";
-    if (contract.state.state === "petitioned")
-        return "◎";
-    return "●";
+/**
+ * The Kanshi shape is the after DAG, not the petition/claim settlement queue.
+ * Stable input order settles independent lanes and any malformed cycle remains
+ * observable rather than dropping a contract.
+ */
+export function orderKanshiContracts(contracts) {
+    const byId = new Map(contracts.map((contract) => [contract.id, contract]));
+    const remaining = new Set(contracts.map((contract) => contract.id));
+    const emitted = new Set();
+    const ordered = [];
+    while (remaining.size > 0) {
+        const next = contracts.find((contract) => (remaining.has(contract.id)
+            && pendingAfterIds(contract)
+                .filter((id) => byId.has(id))
+                .every((id) => emitted.has(id))));
+        if (!next) {
+            // The bind boundary normally rejects cycles. Keep a corrupt historical
+            // graph visible in its original deterministic order instead of inventing
+            // a dependency edge or omitting work from the board.
+            const fallback = contracts.find((contract) => remaining.has(contract.id));
+            if (!fallback)
+                break;
+            ordered.push(fallback);
+            emitted.add(fallback.id);
+            remaining.delete(fallback.id);
+            continue;
+        }
+        ordered.push(next);
+        emitted.add(next.id);
+        remaining.delete(next.id);
+    }
+    return ordered;
 }
 function renderDriftMark(drift) {
     if (drift.state === "drift")
@@ -28,73 +85,174 @@ function renderDriftMark(drift) {
         return "▲orphaned";
     return undefined;
 }
-export function renderKanshiBoard(status) {
-    const head = shortHead(status.defaultHead);
-    if (status.contracts.length === 0) {
-        if (status.targetFilter !== null) {
-            return `現世 ${head} · target selected\nno commissions on selected target\n`;
-        }
-        return `現世 ${head} 无在飞契约\n`;
+function contractGlyph(contract) {
+    if (contract.state.state === "corrupt")
+        return "×";
+    return pendingAfterIds(contract).length > 0 ? "⧗" : "□";
+}
+function contractFacts(contract) {
+    const facts = [];
+    const spark = arcSparkline(contract.arcs);
+    if (spark)
+        facts.push({ text: spark });
+    const drift = renderDriftMark(contract.baseDrift);
+    if (drift)
+        facts.push({ text: drift });
+    const lifecycle = contract.state.state === "active" ? "open" : contract.state.state;
+    const age = formatAgeMs(contract.lastActiveMs);
+    facts.push({ text: age ? `${lifecycle} ${age}` : lifecycle });
+    if (contract.queueHeadStalled) {
+        facts.push({ text: age ? `stalled ${age}` : "stalled", tone: "alert" });
     }
-    const header = status.targetFilter !== null
-        ? `現世 ${head} · target selected`
-        : `現世 ${head}`;
-    const lines = [header, ""];
-    for (const contract of status.contracts) {
-        const glyph = kanshiGlyph(contract);
-        const name = contract.place ? `${contract.slug} @${contract.place}` : contract.slug;
-        const spark = arcSparkline(contract.arcs);
-        const facts = [];
-        const lifecycle = contract.state.state === "active" ? "open" : contract.state.state;
-        if (lifecycle === "bound" || lifecycle === "open" || lifecycle === "petitioned") {
-            facts.push(lifecycle);
-        }
-        const arcMark = contract.currentArc.state === "open"
-            ? `a${contract.currentArc.number}+`
-            : `a${contract.currentArc.number}`;
-        facts.push(contract.title);
-        facts.push(arcMark);
-        facts.push(`next ${contract.nextStep.detail}`);
-        const age = formatAgeMs(contract.lastActiveMs);
-        if (age)
-            facts.push(age);
-        if (contract.queuePosition)
-            facts.push(`Q${contract.queuePosition}`);
-        const drift = renderDriftMark(contract.baseDrift);
-        if (drift)
-            facts.push(drift);
-        if (contract.nextStep.hint)
-            facts.push(contract.nextStep.hint);
-        const pending = pendingAfterIds(contract);
-        if (pending.length > 0) {
-            facts.push(`⧗ ${pending.map((id) => {
-                const dot = id.indexOf(".");
-                return dot > 0 ? id.slice(0, dot) : id;
-            }).join(",")}`);
-        }
-        if (contract.state.state === "corrupt") {
-            facts.push(`corrupt (${contract.state.reason ?? contract.corruptReason ?? "unknown"})`);
-        }
-        if (contract.queueHeadStalled) {
-            facts.push("朱 stall 去广场");
-        }
-        const sparkCol = spark.padEnd(14);
-        const factText = facts.join(" · ");
-        lines.push(`${glyph} ${name.padEnd(18)} ${sparkCol} ${factText}`.trimEnd());
-        if (contract.bootstrapDiagnostics.some((diagnostic) => diagnostic.kind === "plan-without-result")) {
-            lines.push("  ! bootstrap · no result recorded · forfeit and re-bind");
-        }
-        for (const diagnostic of contract.queueDiagnostics) {
-            if (diagnostic.kind === "legacy-petition") {
-                lines.push("  ! legacy petition · no seat · reject then re-petition");
-                continue;
-            }
-            if (diagnostic.kind === "duplicate-seat") {
-                lines.push(`  ! seat ${diagnostic.seat} duplicated with ${diagnostic.with} · ordered by contract id`);
-                continue;
-            }
-            lines.push("  ! target mismatch");
-        }
+    return facts;
+}
+function renderKeiyakuSection(board, width) {
+    if (!board.contractsObservable)
+        return undefined;
+    const lines = [`keiyaku ${board.contracts.length}`];
+    for (const contract of orderKanshiContracts(board.contracts)) {
+        lines.push(alignedBoardRow({
+            prefix: `${contractGlyph(contract)} ${contract.place ?? contract.slug}`,
+            title: contract.title,
+            facts: contractFacts(contract),
+            width,
+        }));
+    }
+    return lines.join("\n");
+}
+function activityState(row) {
+    switch (row.state) {
+        case "lost": return "lost";
+        case "startup-timeout": return "stalled";
+        case "unknown":
+        case "incompatible": return "unknown";
+        case "failed":
+        case "dead": return "dead";
+        case "done": return "returned";
+        case "killed":
+        case "dismissed": return "dismissed";
+        case "minting":
+        case "out": return "running";
+    }
+}
+function projectionBinding(board, row) {
+    if (row.binding?.kind !== "commission")
+        return "";
+    const place = board.commissionPlaces.get(row.binding.commissionId);
+    return place ? `@${place}` : "";
+}
+function projectionFacts(row) {
+    const facts = [];
+    if (row.durationMs !== undefined)
+        facts.push({ text: `up ${formatAgeMs(row.durationMs) ?? "0s"}` });
+    if (row.activityAgeMs !== undefined)
+        facts.push({ text: `active ${formatAgeMs(row.activityAgeMs) ?? "0s"}` });
+    if (row.state !== "out" && row.state !== "minting")
+        facts.push({ text: row.state, tone: row.state === "startup-timeout" ? "alert" : "normal" });
+    return facts;
+}
+function renderEmbeddedActivity(row, width) {
+    const observedAtMs = row.observedAtMs ?? Date.now();
+    const selection = row.activity
+        ? selectProjectionActivityWindow(row.activity, KANSHI_ACTIVITY_ROWS)
+        : undefined;
+    const ordinary = row.activity
+        ? renderProjectionActivity(selection.activity, {
+            anchorMs: observedAtMs,
+            state: activityState(row),
+            showPlan: false,
+            showSilence: false,
+            ...(row.workspaceRoot ? { workspaceRoot: row.workspaceRoot } : {}),
+            maxColumns: width,
+            leadingOmittedCount: selection.leadingOmittedCount,
+        })
+        : undefined;
+    const rendered = ordinary?.lines.map((line, index) => ({
+        line,
+        at: ordinary.rowAts[index],
+        order: index,
+    })) ?? [];
+    const tells = (row.pendingTells ?? []).map((tell, index) => ({
+        line: renderPendingProjectionTell(tell, {
+            anchorMs: observedAtMs,
+            maxColumns: width,
+            renderUnconsumedTail: (tail) => tone(tail, "alert"),
+        }),
+        at: tell.createdAt,
+        order: rendered.length + index,
+    }));
+    return [...rendered, ...tells]
+        .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;
+    })
+        .map((entry) => entry.line);
+}
+function terminalSummary(board) {
+    const omitted = board.projections?.omitted;
+    if (!omitted)
+        return undefined;
+    const compatibleStates = ["failed", "dead", "done", "killed", "dismissed"];
+    const details = compatibleStates
+        .flatMap((state) => omitted.byState[state] > 0 ? [`${omitted.byState[state]} ${state}`] : []);
+    return details.length > 0 ? `+ ${details.join(" · ")}` : undefined;
+}
+function renderAkumaSection(board, width) {
+    if (!board.projections)
+        return undefined;
+    const lines = [`akuma ${board.projections.rows.length}`];
+    for (const row of board.projections.rows) {
+        const alias = row.alias ? ` ${row.alias}` : "";
+        lines.push(alignedBoardRow({
+            prefix: `◆ ${row.id}${alias}`,
+            title: projectionBinding(board, row),
+            titleTone: "normal",
+            facts: projectionFacts(row),
+            width,
+        }));
+        lines.push(...renderEmbeddedActivity(row, width));
     }
-    return `${lines.join("\n")}\n`;
+    const folded = terminalSummary(board);
+    if (folded)
+        lines.push(tone(folded, "description"));
+    return lines.join("\n");
+}
+function taskLabel(task) {
+    return task.title === task.id ? `P${task.pri} ${task.id}` : `P${task.pri} ${task.id} ${task.title}`;
+}
+function renderTaskSection(tasks, width) {
+    if (!tasks)
+        return undefined;
+    const lines = [`task ${tasks.total}`];
+    for (const task of tasks.topTasks) {
+        lines.push(alignedBoardRow({
+            prefix: "▶",
+            title: taskLabel(task),
+            facts: [{ text: `in_progress · active ${formatAgeMs(task.activityAgeMs) ?? "0s"}` }],
+            width,
+        }));
+    }
+    const folded = [
+        tasks.ready > 0 ? `${tasks.ready} ready` : undefined,
+        tasks.blocked > 0 ? `${tasks.blocked} blocked` : undefined,
+    ].filter((fact) => fact !== undefined);
+    if (folded.length > 0)
+        lines.push(tone(`+ ${folded.join(" · ")}`, "description"));
+    return lines.join("\n");
+}
+export function renderKanshiBoard(board) {
+    const width = Math.min(KANSHI_MAX_COLUMNS, resolveLineColumns());
+    const left = "kanshi ";
+    const head = shortHead(board.defaultHead);
+    const right = head ? ` 現世 ${head}` : " 現世";
+    const dashes = "─".repeat(Math.max(1, width - displayColumns(left) - displayColumns(right)));
+    const sections = [
+        renderKeiyakuSection(board, width),
+        renderAkumaSection(board, width),
+        renderTaskSection(board.tasks, width),
+    ].filter((section) => section !== undefined);
+    return `${[`${left}${dashes}${right}`, ...sections].join("\n\n")}\n`;
 }

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

@@ -1,11 +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 = 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)
@@ -40,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];
@@ -73,8 +101,8 @@ function compressedPrefix(prefix) {
 function timelineGutter(label, spine) {
     return label || `${"".padStart(TIME_GUTTER_WIDTH)}${spine}`;
 }
-function renderTimelineGap(omittedEventCount, maxColumns) {
-    return fitVariableLine(`${timelineGutter("", TIMELINE_GAP_MARKER)} `, `${omittedEventCount} more`, maxColumns);
+function renderTimelineGap(omittedRowCount, maxColumns) {
+    return fitVariableLine(`${timelineGutter("", TIMELINE_GAP_MARKER)} `, `${omittedRowCount} more`, maxColumns);
 }
 function compactTokens(value) {
     if (value < 1_000)
@@ -148,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 };
 }
@@ -174,33 +204,36 @@ function timelineEntries(activity) {
 export function renderProjectionActivity(activity, input) {
     const lines = [];
     const rowKinds = [];
+    const rowAts = [];
     let priorAtMs;
-    let priorOrder;
     let priorMinute;
     let priorCompletedRan;
     let hasEndAnchor = false;
     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) {
         const entry = entries[index];
         const atMs = Date.parse(entry.at);
-        if (priorOrder !== undefined && entry.order > priorOrder + 1) {
-            pushRow(renderTimelineGap(entry.order - priorOrder - 1, maxColumns), "activity");
-        }
-        priorOrder = entry.order;
         if (entry.kind === "clock") {
             if (Number.isFinite(atMs))
                 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;
@@ -235,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;
@@ -258,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) {
@@ -267,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)) {
@@ -278,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;
@@ -289,6 +323,7 @@ export function renderProjectionActivity(activity, input) {
     return {
         lines,
         rowKinds,
+        rowAts,
         ...(lastRunningTool ? { lastRunningTool } : {}),
         hasEndAnchor,
         hasMutationFiles,

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(" · ")})`;
+    return counts.length > 0 ? `+ ${counts.join(" · ")}` : undefined;
 }
 function renderProjectionAge(row) {
     const duration = formatAgeMs(row.durationMs) ?? "?";
@@ -209,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`;
 }