@astrosheep/keiyaku 4.5.7 → 4.5.9

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

@@ -1,8 +1,29 @@
-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";
+import { abbreviateGitIds, afterWording, candidateFact, dependentWording, displayGitId, gateFact, gitIdsInRow, mergeSummary, targetMovementFacts, } from "./contract-observation.js";
+import { entityLines, elapsedMilliseconds, identityLine, plumbFacts, RECENT_TONE_MS, renderTextBlock, renderSectionBlock, safeText, tone, } from "./terminal.js";
+import { akumaMark, endpointFact, formatAge, NARROW_COLUMNS, renderAkuma } from "./kanshi-akuma.js";
 const PLUMB = "  │ ";
 const MAX_VISIBLE_ROWS = 10;
+const REVIEW_ATTENTION_MS = 15 * 60 * 1_000;
+const PENDING_ATTENTION_MS = 60 * 60 * 1_000;
+function contractHasError(row) {
+    return (row.title === null ||
+        row.gates.reports.some((report) => report.current.kind === "attested" && report.current.verdict === "unsatisfied") ||
+        row.targetLag.kind === "unknown" ||
+        row.workspaceObservation.kind === "failed" ||
+        row.workspaceObservation.kind === "unavailable" ||
+        row.issue !== undefined);
+}
+function contractStatusTone(row, observedAt) {
+    if (contractHasError(row))
+        return "alert";
+    const phaseAge = elapsedMilliseconds(row.phaseAt, observedAt);
+    if (row.phase === "tendered" && phaseAge !== null && phaseAge >= REVIEW_ATTENTION_MS)
+        return "attention";
+    if ((row.phase === "waiting" || row.phase === "bound") && phaseAge !== null && phaseAge >= PENDING_ATTENTION_MS)
+        return "attention";
+    const journalAge = elapsedMilliseconds(row.lastJournalAt, observedAt);
+    return journalAge !== null && journalAge <= RECENT_TONE_MS ? "recent" : null;
+}
 function contractMark(row) {
     if (row.phase === "claimed")
         return "✓";
@@ -10,9 +31,8 @@ function contractMark(row) {
         return "×";
     if (row.title === null)
         return "?";
-    if (row.gates.reports.some((report) => report.current.kind === "attested" && report.current.verdict === "unsatisfied")) {
+    if (row.gates.reports.some((report) => report.current.kind === "attested" && report.current.verdict === "unsatisfied"))
         return "!";
-    }
     if (row.targetLag.kind === "unknown")
         return "?";
     if (row.phase === "waiting")
@@ -26,20 +46,7 @@ function taskMark(row) {
         return "×";
     if (row.disposition === "on_hold")
         return "⧗";
-    if (row.disposition === "in_progress")
-        return "●";
-    return row.disposition === "blocked" ? "‖" : "○";
-}
-function akumaMark(life) {
-    if (life === "running")
-        return "●";
-    if (life === "stillborn")
-        return "!";
-    if (life === "asleep")
-        return "○";
-    if (life === "killed")
-        return "×";
-    return "?";
+    return row.disposition === "in_progress" ? "●" : row.disposition === "blocked" ? "‖" : "○";
 }
 function gitAbbreviations(report) {
     const ids = [];
@@ -47,32 +54,13 @@ function gitAbbreviations(report) {
         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));
+    report.contracts.value.rows.forEach((row) => ids.push(...gitIdsInRow(row)));
     return abbreviateGitIds(ids);
 }
-function formatAge(source, observedAt) {
-    if (source === null || source === undefined)
-        return "—";
-    const sourceMs = Date.parse(source);
-    const observedMs = Date.parse(observedAt);
-    if (sourceMs > observedMs)
-        return "future";
-    const seconds = Math.floor((observedMs - sourceMs) / 1_000);
-    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`;
-}
 function branchName(target) {
-    if (target === null)
-        return null;
-    return target.startsWith("refs/heads/") ? target.slice("refs/heads/".length) : target;
+    return target === null ? null : target.startsWith("refs/heads/") ? target.slice("refs/heads/".length) : target;
 }
-function targetFacts(row) {
+function targetFacts(row, abbreviations) {
     const name = branchName(row.target);
     if (name === null)
         return ["no target"];
@@ -81,16 +69,13 @@ function targetFacts(row) {
         facts.push(`commits behind ${name} unknown`);
     if (row.targetLag.kind === "counted")
         facts.push(`${row.targetLag.behind} commits behind ${name}`);
-    if (row.targetObservation?.drift === true)
-        facts.push("target moved");
-    return facts;
+    return [...facts, ...targetMovementFacts(row, abbreviations)];
 }
 function selectedTargetFacts(row, abbreviations) {
+    const head = row.targetObservation?.head;
     return [
-        ...targetFacts(row),
-        ...(row.target !== null && row.targetObservation?.head !== null && row.targetObservation?.head !== undefined
-            ? [`target head ${displayGitId(row.targetObservation.head, abbreviations)}`]
-            : []),
+        ...targetFacts(row, abbreviations),
+        ...(row.target !== null && head ? [`target head ${displayGitId(head, abbreviations)}`] : []),
     ];
 }
 function workspaceState(row) {
@@ -103,12 +88,9 @@ function workspaceState(row) {
         return "worktree unavailable";
     if (observation.kind === "clean")
         return "worktree clean";
-    const counts = [
-        ...(observation.counts.staged > 0 ? [`staged ${observation.counts.staged}`] : []),
-        ...(observation.counts.unstaged > 0 ? [`unstaged ${observation.counts.unstaged}`] : []),
-        ...(observation.counts.untracked > 0 ? [`untracked ${observation.counts.untracked}`] : []),
-        ...(observation.counts.submodules > 0 ? [`submodules ${observation.counts.submodules}`] : []),
-    ];
+    const counts = Object.entries(observation.counts)
+        .filter(([, count]) => count > 0)
+        .map(([name, count]) => `${name} ${count}`);
     return counts.length === 0 ? "worktree dirty" : `worktree dirty · ${counts.join(" · ")}`;
 }
 function mergeFacts(row, selected, abbreviations) {
@@ -116,9 +98,8 @@ function mergeFacts(row, selected, abbreviations) {
     const summary = mergeSummary(observation);
     if (summary === undefined ||
         (observation.kind !== "clean" && observation.kind !== "dirty") ||
-        observation.merge === null) {
+        observation.merge === null)
         return [];
-    }
     if (!selected)
         return [summary];
     const paths = observation.merge.unmergedPaths;
@@ -128,80 +109,6 @@ function mergeFacts(row, selected, abbreviations) {
         ...(paths.length === 0 ? ["0 paths"] : paths),
     ];
 }
-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 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 undefined;
-    }
-    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)
-        return [];
-    const lines = [];
-    let current = PLUMB;
-    for (const fact of clean) {
-        const candidate = current === PLUMB ? `${PLUMB}${fact}` : `${current} · ${fact}`;
-        if (current !== PLUMB && displayColumns(candidate) > columns) {
-            lines.push(current);
-            current = `${PLUMB}${fact}`;
-        }
-        else
-            current = candidate;
-    }
-    lines.push(current);
-    return lines;
-}
-function identityLine(mark, identity, extra = "") {
-    return extra.length === 0 ? `${mark} ${safeText(identity)}` : `${mark} ${safeText(identity)} ${safeText(extra)}`;
-}
-function failure(name, section, context) {
-    return [`[ ${name} ]`, "", `${tone(`! ${safeText(section.failure.message)}`, "alert", context.color)}`];
-}
-function sectionAbsent(name, _columns) {
-    return [`[ ${name} ]`, "", `${PLUMB}${name.toLowerCase()} absent`];
-}
-function endpointFact(id, observed) {
-    if (observed === "missing")
-        return `-> ${id} (missing)`;
-    if (observed === "unavailable")
-        return `-> ${id} (unavailable)`;
-    return `-> ${id}`;
-}
 function linkedTask(report, taskId) {
     if (report.tasks.kind !== "present")
         return `! ${taskId} · unavailable`;
@@ -219,11 +126,11 @@ 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;
+    return "lifeAt" in akuma && akuma.lifeAt !== null
+        ? akuma.lifeAt
+        : "lastActivityAt" in akuma
+            ? akuma.lastActivityAt
+            : null;
 }
 function worldAttachments(row, report) {
     if (report.akuma.kind !== "present")
@@ -265,16 +172,37 @@ function linkedFacts(row, report, mode) {
         linked.push(linkedAkuma(report, attached.id, attached.aliases));
     return linked;
 }
+function linkedAkumaSummary(row, report) {
+    if (row.fleet.length === 0)
+        return undefined;
+    if (report.akuma.kind !== "present")
+        return "akuma unavailable";
+    const byId = new Map(report.akuma.value.rows.map((akuma) => [akuma.id, akuma]));
+    const known = row.fleet
+        .map((attached) => byId.get(attached.id))
+        .filter((akuma) => akuma !== undefined);
+    if (known.length === 0)
+        return `akuma ${row.fleet.length} missing`;
+    const live = known.filter((akuma) => !isTerminalAkuma(akuma.life)).length;
+    const terminal = known.length - live;
+    const facts = [`akuma ${row.fleet.length}`];
+    if (live > 0)
+        facts.push(`${live} live`);
+    if (terminal > 0)
+        facts.push(`${terminal} terminal`);
+    return facts.join(" · ");
+}
 function semanticBlock(name, facts, context) {
+    if (facts.length === 0)
+        return [];
     const lines = [`  ${name}`];
-    const values = facts.length === 0 ? ["none"] : facts;
-    for (const fact of values)
+    for (const fact of facts)
         lines.push(...renderTextBlock(safeText(fact), "    ", context.columns));
     return lines;
 }
 function namespaceTaskFacts(row) {
     if (row.namespaceTasks.kind === "absent")
-        return ["absent"];
+        return [];
     if (row.namespaceTasks.kind === "failed") {
         return [`failed ${row.namespaceTasks.failure.message}`];
     }
@@ -282,10 +210,18 @@ function namespaceTaskFacts(row) {
 }
 function renderSelectedContractRow(row, report, context, abbreviations) {
     const title = row.title ?? "title unavailable";
+    const statusTone = contractStatusTone(row, report.observedAt);
     const lines = [
-        identityLine(contractMark(row), row.id, `· ${row.phase} · ${formatAge(row.phaseAt, report.observedAt)} · ${title}`),
+        ...entityLines({
+            mark: statusTone === null ? contractMark(row) : tone(contractMark(row), statusTone, context.color),
+            identity: row.id,
+            state: `${row.phase} · ${formatAge(row.phaseAt, report.observedAt)}`,
+            title,
+            facts: [],
+            context,
+        }),
     ];
-    lines.push(...semanticBlock("after", worldAfterFacts(row), context));
+    lines.push(...semanticBlock("after", row.after.map(afterWording), 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)}`,
@@ -304,10 +240,8 @@ function renderSelectedContractRow(row, report, context, abbreviations) {
     }
     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 (row.issue !== undefined)
+        attachments.push(`lag (observed now): target-checkout-retained ${row.issue.target}`);
     lines.push(...semanticBlock("attachments", attachments, context));
     lines.push(...semanticBlock("namespace tasks", namespaceTaskFacts(row), context));
     return lines;
@@ -331,19 +265,27 @@ function isTerminalTask(row) {
 }
 function renderWorldContractRow(row, report, context) {
     const title = row.title ?? "title unavailable";
-    const facts = [
+    const contractFacts = [
         candidateFact(row.delivery),
-        ...targetFacts(row),
-        ...worldAfterFacts(row),
+        ...targetFacts(row, gitAbbreviations(report)),
+        ...row.after.map(afterWording),
         ...(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}`),
+    const linkedFacts = [
+        ...(row.holder.kind === "held" ? [linkedTask(report, row.holder.taskId)] : []),
+        ...(row.holder.kind === "unavailable" ? ["! task · unavailable"] : []),
+        ...(linkedAkumaSummary(row, report) === undefined ? [] : [linkedAkumaSummary(row, report)]),
     ];
-    lines.push(...plumbFacts(facts, context.columns));
-    return lines;
+    const statusTone = contractStatusTone(row, report.observedAt);
+    return entityLines({
+        mark: statusTone === null ? contractMark(row) : tone(contractMark(row), statusTone, context.color),
+        identity: row.id,
+        state: `${row.phase} · ${formatAge(row.lastJournalAt, report.observedAt)}`,
+        title,
+        facts: contractFacts,
+        context,
+    }).concat(plumbFacts(linkedFacts, context.columns));
 }
 function selectRecentRows(rows, timestamp) {
     return [...rows]
@@ -356,35 +298,24 @@ function selectRecentRows(rows, timestamp) {
     })
         .slice(0, MAX_VISIBLE_ROWS);
 }
-function sectionFooter({ visible, total, unit, selector, neutral, }) {
-    if (visible === total)
-        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) {
     const section = report.contracts;
     if (section.kind === "absent")
-        return sectionAbsent("KEIYAKU", context.columns);
+        return ["CONTRACTS // absent", "", `${PLUMB}contracts absent`];
     if (section.kind === "failed")
-        return failure("KEIYAKU", section, context);
+        return ["CONTRACTS // unavailable", "", tone(`! ${safeText(section.failure.message)}`, "alert", context.color)];
     const live = section.value.rows.filter((row) => !isTerminalContract(row));
     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",
+    const rendered = renderSectionBlock({
+        name: "CONTRACTS",
         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)];
+    const header = `CONTRACTS // ${live.length} live · ${candidates} candidates`;
+    return [header, ...rendered.slice(1)];
 }
 function renderSelectedContract(report, context) {
     const section = report.contracts;
@@ -400,65 +331,52 @@ function renderSelectedContract(report, context) {
 function renderTasks(report, context) {
     const section = report.tasks;
     if (section.kind === "absent")
-        return sectionAbsent("TASK", context.columns);
+        return ["TASKS // absent", "", `${PLUMB}tasks absent`];
     if (section.kind === "failed")
-        return failure("TASK", section, context);
+        return ["TASKS // unavailable", "", tone(`! ${safeText(section.failure.message)}`, "alert", context.color)];
     const live = section.value.rows.filter((row) => !isTerminalTask(row));
     const rows = selectRecentRows(live, (row) => row.updatedAt);
     const rowLines = rows.map((row) => {
         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({ name: "TASK", unit: "task", selector: "task", rows: rowLines, total: live.length });
-}
-function akumaLabel(row) {
-    const aliases = row.aliases ?? [];
-    return aliases.length === 0 ? "" : `(${aliases.join(" ")})`;
-}
-function renderAkuma(report, context) {
-    const section = report.akuma;
-    if (section.kind === "absent")
-        return sectionAbsent("FLEET", context.columns);
-    if (section.kind === "failed")
-        return failure("FLEET", section, context);
-    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)}`;
-        const activity = "lastActivityAt" in row && row.lastActivityAt !== null
-            ? [`activity ${formatAge(row.lastActivityAt, report.observedAt)}`]
-            : [];
-        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 snapshot = activitySnapshotLine(row);
-        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,
+        const childFacts = row.children === undefined ? [] : [`children ${row.children.live} live · ${row.children.total} total`];
+        const blockerFacts = (row.blockers ?? []).map((blocker) => `blocked ${blocker.id}`);
+        if (context.columns > NARROW_COLUMNS) {
+            return [
+                identityLine(taskMark(row), row.id, `· ${row.disposition} · P${row.priority} · ${row.title} · ${relation.join(" · ")}`),
+                ...plumbFacts([...childFacts, ...blockerFacts], context.columns),
+            ];
+        }
+        return entityLines({
+            mark: taskMark(row),
+            identity: row.id,
+            state: `${row.disposition} · P${row.priority}`,
+            title: row.title,
+            facts: [...relation, ...childFacts, ...blockerFacts],
+            context,
+        });
     });
+    return [
+        `TASKS // ${live.length} live`,
+        ...renderSectionBlock({
+            name: "TASKS",
+            unit: "task",
+            selector: "task",
+            continuation: "keiyaku task ls --world",
+            rows: rowLines,
+            total: live.length,
+        }).slice(1),
+    ];
 }
 export function renderKanshiText(report, context = { columns: 80, color: false }, selection = "world") {
     if (selection === "contract")
         return renderSelectedContract(report, context).join("\n");
     return [
-        ...renderContracts(report, context),
+        `${tone("契", "alert", context.color)} KEIYAKU // WORLD`,
         "",
+        ...renderContracts(report, context),
         "",
         ...renderAkuma(report, context),
         "",
-        "",
         ...renderTasks(report, context),
     ].join("\n");
 }

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

@@ -14,8 +14,7 @@ export declare function titleLines(mark: string, title: string, contract: string
 export declare function hookFailureSummary(failure: HookFailure): string;
 export declare function appendHookPayload(lines: string[], failure: HookFailure): void;
 export declare function reuseLines(reuse: VerificationReuse | undefined, columns: number): readonly string[];
-export declare function stopLines(label: "verification" | "completion", stop: VerificationStop | PlacementStop, columns: number, addressed: string): readonly string[];
-export declare function stopSummary(stop: VerificationStop | PlacementStop, addressed: string): readonly ReceiptSegment[];
+export declare function stopLines(stop: VerificationStop | PlacementStop, columns: number, addressed: string, dependent?: string): readonly string[];
 export declare function cleanupLines(cleanup: NonNullable<AcceptedDeliverResult["cleanup"]>, columns: number): readonly string[];
 export declare function leakLines(leak: NonNullable<AcceptedDeliverResult["leak"]>, columns: number): readonly string[];
 export {};

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

@@ -1,3 +1,4 @@
+import { renderRefusalFacts } from "./refusal.js";
 import { displayColumns, renderOpaqueBlock, safeText } from "./terminal.js";
 export function receiptRow(lines, mark, label, segments, columns) {
     let current = `${mark} ${label}`;
@@ -68,25 +69,96 @@ function prerequisiteRows(stop, columns) {
     }
     return lines;
 }
+function gateRows(stop, columns) {
+    if (!("refusal" in stop) || stop.refusal?.kind !== "gates-unsatisfied")
+        return [];
+    const lines = [];
+    for (const report of stop.refusal.unmet) {
+        const { gate, current } = report;
+        if (current.kind === "attested") {
+            receiptRow(lines, " ", "gate", [{ text: gate, opaque: true }, { text: "·" }, { text: current.verdict }, { text: `· at=${current.at}` }], columns);
+            if (current.summary !== undefined)
+                receiptPayload(lines, `  summary ${gate}`, current.summary);
+        }
+        else if (current.kind === "stale") {
+            receiptRow(lines, " ", "gate", [{ text: gate, opaque: true }, { text: "· stale" }, { text: `· prior=${current.priorVerdict}` }], columns);
+        }
+        else {
+            receiptRow(lines, " ", "gate", [{ text: gate, opaque: true }, { text: "· missing" }], columns);
+        }
+    }
+    return lines;
+}
 function targetMovedDetail(stop) {
     if ("integratedAt" in stop) {
         return [
             { text: stop.target, opaque: true },
             { text: `${stop.integratedAt} -> ${stop.observed}`, opaque: true },
             { text: `attempts=${stop.attempts}` },
+            ...(stop.observedTreeEqualsCandidate ? [{ text: "content=identical" }] : []),
         ];
     }
     return [
         { text: stop.target, opaque: true },
         { text: `${stop.expected} -> ${stop.observed}`, opaque: true },
+        ...(stop.observedTreeEqualsCandidate ? [{ text: "content=identical" }] : []),
     ];
 }
-export function stopLines(label, stop, columns, addressed) {
-    const detail = stopSummary(stop, addressed);
+function directStopName(stop) {
+    if ("refusal" in stop && stop.refusal !== undefined)
+        return stop.refusal.kind.replaceAll("-", " ");
+    if ("retry" in stop && stop.retry !== undefined)
+        return stop.retry.kind.replaceAll("-", " ");
+    return stop.failure.replaceAll("-", " ");
+}
+function refusalEvidence(stop, columns) {
     const lines = [];
-    const state = label === "verification" ? "failed" : "blocked";
-    receiptRow(lines, "!", label, [{ text: state }, { text: "·" }, ...detail], columns);
     lines.push(...prerequisiteRows(stop, columns));
+    lines.push(...gateRows(stop, columns));
+    if (!("refusal" in stop) || stop.refusal === undefined)
+        return lines;
+    const refusal = stop.refusal;
+    if (refusal.kind === "integration-failed") {
+        receiptRow(lines, " ", "reason", [{ text: refusal.reason }], columns);
+        receiptRow(lines, " ", "target", [{ text: refusal.targetHead, opaque: true }], columns);
+        if ("conflictPaths" in refusal) {
+            for (const path of refusal.conflictPaths)
+                receiptRow(lines, " ", "conflict", [{ text: path, opaque: true }], columns);
+        }
+        const recovery = "recovery" in refusal ? refusal.recovery : undefined;
+        if (typeof recovery === "object" &&
+            recovery !== null &&
+            "materialize" in recovery &&
+            typeof recovery.materialize === "string" &&
+            "continue" in recovery &&
+            typeof recovery.continue === "string") {
+            receiptRow(lines, " ", "recovery materialize conflicts", [{ text: recovery.materialize }], columns);
+            receiptRow(lines, " ", "recovery continue after resolve", [{ text: recovery.continue }], columns);
+        }
+    }
+    else if (refusal.kind === "integration-unsupported") {
+        receiptRow(lines, " ", "required Git", [{ text: refusal.requiredGit }], columns);
+    }
+    return lines;
+}
+export function stopLines(stop, columns, addressed, dependent) {
+    if ("refusal" in stop && stop.refusal?.kind === "checkout-not-followable") {
+        const checkout = renderRefusalFacts(stop.refusal, "", columns, addressed);
+        if (dependent === undefined)
+            return checkout;
+        const lines = [];
+        receiptRow(lines, "!", "continuation", [{ text: dependent, opaque: true }], columns);
+        return [...lines, ...checkout];
+    }
+    const lines = [];
+    const segments = dependent === undefined ? [] : [{ text: "·" }, { text: directStopName(stop) }];
+    if ("failure" in stop && stop.failure === "target-moved")
+        segments.push(...targetMovedDetail(stop));
+    if ("failure" in stop && stop.failure === "environment-failure" && "command" in stop) {
+        segments.push({ text: `command=${stop.command}` }, { text: hookFailureSummary(stop.detail), opaque: true });
+    }
+    receiptRow(lines, "!", dependent === undefined ? directStopName(stop) : dependent, segments, columns);
+    lines.push(...refusalEvidence(stop, columns));
     if ("failure" in stop && stop.failure === "environment-failure" && "command" in stop) {
         appendHookPayload(lines, stop.detail);
     }
@@ -98,28 +170,6 @@ export function stopLines(label, stop, columns, addressed) {
     }
     return lines;
 }
-export function stopSummary(stop, addressed) {
-    const detail = [];
-    if ("refusal" in stop && stop.refusal !== undefined) {
-        detail.push({ text: stop.refusal.kind });
-        if ("contractId" in stop.refusal && stop.refusal.contractId !== addressed) {
-            detail.push({ text: `contract=${stop.refusal.contractId}`, opaque: true });
-        }
-    }
-    else if ("retry" in stop && stop.retry !== undefined) {
-        detail.push({ text: stop.retry.kind });
-    }
-    else if ("failure" in stop) {
-        detail.push({ text: stop.failure });
-        if (stop.failure === "environment-failure" && "command" in stop) {
-            detail.push({ text: `command=${stop.command}` }, { text: hookFailureSummary(stop.detail), opaque: true });
-        }
-        else if (stop.failure === "target-moved") {
-            detail.push(...targetMovedDetail(stop));
-        }
-    }
-    return detail;
-}
 export function cleanupLines(cleanup, columns) {
     const lines = [];
     receiptRow(lines, "!", "cleanup", [

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

@@ -1,4 +1,4 @@
-import { displayColumns, gitShortStat, renderOpaqueBlock, safeText } from "./terminal.js";
+import { checkoutNotFollowableLines, displayColumns, gitShortStat, renderOpaqueBlock, safeText, } from "./terminal.js";
 function isRecord(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -78,15 +78,7 @@ export function renderRefusalFacts(refusal, indent, columns, addressed) {
         return renderOpaqueBlock(refusalHead(refusal.kind, identity, [`requiredGit=${refusal.requiredGit}`]), indent, columns);
     }
     if (refusal.kind === "checkout-not-followable") {
-        const lines = [
-            ...renderOpaqueBlock(refusalHead(refusal.kind, identity, [
-                `target=${refusal.target}`,
-                `path=${refusal.path}`,
-                `reason=${refusal.reason}`,
-            ]), indent, columns),
-        ];
-        lines.push(...collectionLines("paths", refusal.paths, indent, columns));
-        return lines;
+        return checkoutNotFollowableLines(refusal);
     }
     return renderOpaqueBlock(refusalHead(refusal.kind, identity, []), indent, columns);
 }