@astrosheep/keiyaku 4.0.6 → 4.1.0

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

@@ -14,14 +14,20 @@ function associatedIdentity(id, alias, contract) {
     const contractId = contract === undefined ? undefined : associatedContractId(contract);
     return `${identity(id, alias)}${contractId === undefined ? "" : ` [${contractId}]`}`;
 }
-function snapshotHeading(id, alias, contract) {
+function ruler(columns) {
+    return "─".repeat(Math.max(OPENING_STROKE.length, columns));
+}
+function snapshotHeading(id, alias, contract, columns) {
     const contractId = contract === undefined ? undefined : associatedContractId(contract);
     return [
-        OPENING_STROKE,
         identity(id, alias),
+        ruler(columns),
         ...(contractId === undefined ? [] : [`└─ ${contractId}`]),
     ];
 }
+function answeredHeading(id, alias, columns) {
+    return [`✓ came back ${identity(id, alias)}`, ruler(columns)].join("\n");
+}
 function contractFacts(contract) {
     return contract.kind === "failed" ? [`! contract failed ${safeText(contract.diagnostic)}`] : [];
 }
@@ -32,7 +38,7 @@ function lifeLabel(life) {
     if (life === "running")
         return "● STILL RUNNING";
     if (life === "asleep")
-        return "○ asleep";
+        return "✓ came back";
     if (life === "killed")
         return "× killed";
     return `? ${life}`;
@@ -214,6 +220,19 @@ function renderTaskContextLines(created, columns) {
         return [`! tasks failed ${safeText(created.diagnostic)}`];
     return [`tasks ${created.rows.length}`, ...created.rows.flatMap((row) => renderTaskRow(row, columns))];
 }
+function answerContextLines(observation, columns) {
+    return [
+        ...renderTaskContextLines(observation.createdTasks, columns),
+        ...renderReportedChangeLines(observation.status.timeline),
+    ];
+}
+function answeredBlock(observation, answer, alias, columns) {
+    const context = answerContextLines(observation, columns).join("\n");
+    if (context.length === 0)
+        return `${answeredHeading(observation.status.id, alias, columns)}\n${answer}`;
+    const separator = answer.endsWith("\n") ? "\n" : "\n\n";
+    return `${answeredHeading(observation.status.id, alias, columns)}\n${answer}${separator}${context}`;
+}
 function snapshotText(view, context, options = {}) {
     const snapshot = view.status.timeline;
     const activity = snapshot.kind === "idle" && snapshot.outcome !== undefined
@@ -227,13 +246,16 @@ function snapshotText(view, context, options = {}) {
         ...contractFacts(view.contract),
         ...(options.facts ?? []),
     ];
+    const taskContext = renderTaskContextLines(view.createdTasks, context.columns);
+    const changes = renderReportedChangeLines(snapshot);
     const footer = options.showLife === false ? [] : ["", lifeLabel(view.status.life)];
     return [
-        ...snapshotHeading(view.status.id, options.alias, view.contract),
+        ...snapshotHeading(view.status.id, options.alias, view.contract, context.columns),
         ...facts,
         ...activity,
-        ...renderTaskContextLines(view.createdTasks, context.columns),
-        ...renderReportedChangeLines(snapshot),
+        ...(activity.length > 0 && taskContext.length > 0 ? [""] : []),
+        ...taskContext,
+        ...changes,
         ...footer,
     ].join("\n");
 }
@@ -244,18 +266,27 @@ function observationStageText(id, observation, context, options = {}) {
 }
 function waitText(result, context) {
     const alias = result.alias;
+    const total = result.result.observations.length + result.result.unobserved.length;
+    const done = result.result.observations.filter((observation) => observation.status.life !== "running").length;
     const blocks = [
-        ...result.result.observations.map((observation) => snapshotText(observation, context, { ...(alias === undefined ? {} : { alias }) })),
+        ...result.result.observations.map((observation) => {
+            const answer = statusAnswer(observation);
+            if (answer !== undefined)
+                return answeredBlock(observation, answer, alias, context.columns);
+            return snapshotText(observation, context, { ...(alias === undefined ? {} : { alias }) });
+        }),
         ...result.result.unobserved.map((member) => unobservedText(member.id, member.diagnostic)),
     ];
-    return blocks.join("\n\n");
+    if (total <= 1)
+        return blocks.join("\n\n");
+    return [...blocks, `${done} of ${total} done`].join("\n\n");
 }
 function historyText(command, result, context) {
     if (command.last)
         return result.mode === "last" ? result.answer : "no answer retained";
     if (result.mode !== "page")
         throw new Error("history result lacks page");
-    return [...snapshotHeading(result.akuma, result.alias, result.historyResult.contract), ...groupedRows(result.history.rows, context, true)].join("\n");
+    return [...snapshotHeading(result.akuma, result.alias, result.historyResult.contract, context.columns), ...groupedRows(result.history.rows, context, true)].join("\n");
 }
 function tellText(result, context) {
     const facts = typeof result.result.tell.wake === "string" ? [] : [`! error ${safeText(result.result.tell.wake.diagnostic)}`];
@@ -317,7 +348,7 @@ function callText(result, context) {
     if (result.result.observation.kind === "detached") {
         const lines = [...snapshotHeading(result.result.akuma, alias, contractId === undefined
                 ? { kind: "none" }
-                : { kind: "associated", contractId }), ...cwd, ...restraint, ...facts];
+                : { kind: "associated", contractId }, context.columns), ...cwd, ...restraint, ...facts];
         if (!callFailed(result.result)) {
             const selector = result.result.alias.kind === "aliased" ? result.result.alias.alias.alias : result.result.akuma;
             lines.push(`$ keiyaku -C ${posixShellArgument(result.world)} wait ${selector} --timeout 5m`);
@@ -327,7 +358,7 @@ function callText(result, context) {
     if (result.result.observation.kind === "failed") {
         return [...snapshotHeading(result.result.akuma, alias, contractId === undefined
                 ? { kind: "none" }
-                : { kind: "associated", contractId }), ...cwd, ...restraint, ...facts, `! error ${safeText(result.result.observation.failure.diagnostic)}`].join("\n");
+                : { kind: "associated", contractId }, context.columns), ...cwd, ...restraint, ...facts, `! error ${safeText(result.result.observation.failure.diagnostic)}`].join("\n");
     }
     return snapshotText({
         status: result.result.observation.status,

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

@@ -12,5 +12,9 @@ export function renderCatalogText(catalog) {
             ...(row.description === undefined ? [] : [`  ${safeText(row.description)}`]),
         ]).join("\n");
     }
-    return catalog.rows.map((row) => `${safeText(row.id)} - ${row.life}`).join("\n");
+    return catalog.rows.map((row) => {
+        if (!("lifeAt" in row))
+            return `${safeText(row.id)} - ${row.life}`;
+        return `${safeText(row.id)} - ${row.life} - runtime ${row.lifeAt ?? "-"} - last activity ${row.lastActivityAt ?? "-"}`;
+    }).join("\n");
 }

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

@@ -1,5 +1,5 @@
 import { renderAcceptedAudit } from "./audit.js";
-import { appendHookPayload, cleanupLines, hookFailureSummary, leakLines, outcomeLines, receiptPayload, receiptRow, reuseLines, stopLines, titleLines, } from "./receipt.js";
+import { appendHookPayload, cleanupLines, hookFailureSummary, leakLines, outcomeLines, receiptPayload, receiptRow, reuseLines, stopLines, stopSummary, titleLines, } from "./receipt.js";
 import { gitShortStat, renderOpaqueBlock } from "./terminal.js";
 const HANG = "   ";
 function isRecord(value) {
@@ -217,6 +217,28 @@ function movementLines(result, columns) {
     receiptRow(lines, "~", "target", [{ text: `moved · re-integrated x${count}` }], columns);
     return lines;
 }
+function continuationLines(result, columns) {
+    const report = result.continuation;
+    if (report === undefined)
+        return [];
+    const lines = [];
+    for (const contractId of report.claimed) {
+        receiptRow(lines, "✓", "continuation", [
+            { text: "complete" },
+            { text: contractId, opaque: true },
+        ], columns);
+    }
+    for (const { contractId, stop } of report.stopped) {
+        const detail = "kind" in stop ? [{ text: stop.kind }] : stopSummary(stop, contractId);
+        receiptRow(lines, "!", "continuation", [
+            { text: "blocked" },
+            { text: contractId, opaque: true },
+            { text: "·" },
+            ...detail,
+        ], columns);
+    }
+    return lines;
+}
 function renderAcceptedBind(result, columns) {
     const lines = titleLines("✓", "bound", result.contract, columns);
     receiptRow(lines, " ", "workspace", [
@@ -239,7 +261,7 @@ function renderAcceptedDeliver(result, columns) {
     const complete = result.completion !== undefined;
     const title = complete ? "delivered" : "deliver — not complete";
     const lines = titleLines("✓", title, result.contract, columns);
-    lines.push(...movementLines(result, columns), ...completionLines(result, columns));
+    lines.push(...movementLines(result, columns), ...completionLines(result, columns), ...continuationLines(result, columns));
     if (!complete)
         receiptRow(lines, " ", "candidate", [{ text: "kept" }], columns);
     if (result.verification !== undefined) {
@@ -258,7 +280,7 @@ function renderAcceptedDeliver(result, columns) {
 function renderAcceptedReview(result, columns) {
     const complete = result.completion !== undefined;
     const lines = titleLines("✓", `review ${result.verdict} — ${complete ? "complete" : "not complete"}`, result.contract, columns);
-    lines.push(...movementLines(result, columns), ...completionLines(result, columns));
+    lines.push(...movementLines(result, columns), ...completionLines(result, columns), ...continuationLines(result, columns));
     if (!complete)
         receiptRow(lines, " ", "candidate", [{ text: "kept" }], columns);
     if (result.placement !== undefined) {

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

@@ -1,8 +1,8 @@
 import { displayColumns, renderTextBlock, safeText, tone } from "./terminal.js";
-const RULE = "─";
-const HORIZON = "───";
 const PLUMB = "  │ ";
 const PATH_PREFIX = `${PLUMB}↳ `;
+const MAX_VISIBLE_ROWS = 10;
+const FIELD_WIDTH = 8;
 function contractMark(row) {
     if (row.phase === "claimed")
         return "✓";
@@ -46,6 +46,13 @@ function gateMark(report) {
         return "?";
     return report.current.verdict === "satisfied" ? "✓" : "!";
 }
+function worldGateMark(report) {
+    if (report.current.kind === "stale")
+        return "~";
+    if (report.current.kind !== "attested")
+        return " ";
+    return report.current.verdict === "satisfied" ? "✓" : "✗";
+}
 function formatAge(source, observedAt) {
     if (source === null || source === undefined)
         return "—";
@@ -76,11 +83,11 @@ function targetFacts(row) {
         return ["no target"];
     const facts = [`target ${name}`];
     if (row.targetLag.kind === "unknown")
-        facts.push("behind unknown");
+        facts.push(`commits behind ${name} unknown`);
     if (row.targetLag.kind === "counted")
-        facts.push(`behind ${row.targetLag.behind}`);
+        facts.push(`${row.targetLag.behind} commits behind ${name}`);
     if (row.targetObservation?.drift === true)
-        facts.push("drift");
+        facts.push("target moved");
     return facts;
 }
 function workspaceState(row) {
@@ -140,10 +147,24 @@ function akumaHot(row) {
         return true;
     return row.contract?.observed === "missing" || row.contract?.observed === "unavailable";
 }
-function aperture(label, columns) {
-    const prefix = `──[ ${label} ]`;
-    const fill = Math.max(1, columns - displayColumns(prefix));
-    return `${prefix}${RULE.repeat(fill)}`;
+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 "empty";
+    }
+    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 plumbFacts(facts, columns) {
     const clean = facts.map(safeText).filter((fact) => fact.length > 0);
@@ -185,11 +206,28 @@ function renderGates(reports, observedAt, columns, includeSummaries) {
     }
     return lines;
 }
+function fieldPrefix(label) {
+    return `  ${label.padEnd(FIELD_WIDTH, " ")}`;
+}
+function fieldLine(label, value) {
+    return `${fieldPrefix(label)}${safeText(value)}`;
+}
+function fieldBlock(label, value, columns) {
+    const continuation = " ".repeat(fieldPrefix(label).length);
+    return renderTextBlock(value, continuation, columns).map((line, index) => index === 0
+        ? `${fieldPrefix(label)}${line.slice(continuation.length)}`
+        : line);
+}
+function renderWorldGates(reports) {
+    if (reports.length === 0)
+        return [];
+    return [fieldLine("GATES", reports.map((report) => `[${worldGateMark(report)}] ${report.gate}`).join("   "))];
+}
 function failure(name, section, context) {
-    return [aperture(name, context.columns), `${tone(`! ${safeText(section.failure.message)}`, "alert", context.color)}`];
+    return [`[ ${name} ]`, "", `${tone(`! ${safeText(section.failure.message)}`, "alert", context.color)}`];
 }
-function sectionAbsent(name, columns) {
-    return [aperture(name, columns), `${PLUMB}${name.toLowerCase()} absent`];
+function sectionAbsent(name, _columns) {
+    return [`[ ${name} ]`, "", `${PLUMB}${name.toLowerCase()} absent`];
 }
 function endpointFact(id, observed) {
     if (observed === "missing")
@@ -249,22 +287,69 @@ function renderContractRow(row, report, context, selection) {
         lines.push(...renderNamespaceTasks(row, context));
     return lines;
 }
+function isTerminalContract(row) {
+    return row.phase === "claimed" || row.phase === "abandoned";
+}
+function isTerminalTask(row) {
+    return row.disposition === "done" || row.disposition === "drop";
+}
+function renderWorldContractRow(row, report, context) {
+    const hot = contractHot(row);
+    const title = row.title ?? "title unavailable";
+    const phase = `${row.phase} · ${formatAge(row.phaseAt, report.observedAt)}`;
+    if (!hot)
+        return [identityLine(contractMark(row), row.id, `· "${title}" · ${phase} · ${targetFacts(row).join(" · ")}`)];
+    const lines = [identityLine(contractMark(row), row.id)];
+    lines.push(...fieldBlock("TITLE", title, context.columns));
+    lines.push(fieldLine("STATE", phase));
+    lines.push(fieldLine("GIT", [...targetFacts(row), workspaceState(row)].join(" · ")));
+    if (showWorkspacePath(row, hot)
+        && row.workspaceObservation.kind !== "unappointed"
+        && row.workspaceObservation.kind !== "failed"
+        && row.workspaceObservation.location.kind === "worktree") {
+        lines.push(fieldLine("DIR", row.workspaceObservation.location.path));
+    }
+    lines.push(...renderWorldGates(row.gates.reports));
+    const linked = [];
+    if (row.holder.kind === "held")
+        linked.push(row.holder.taskId);
+    if (row.holder.kind === "unavailable")
+        linked.push("holder unavailable");
+    for (const attached of row.fleet) {
+        const aliases = attached.aliases.length === 0 ? "" : ` (${attached.aliases.join(" ")})`;
+        linked.push(`${attached.id}${aliases}`);
+    }
+    if (linked.length > 0) {
+        lines.push(fieldLine("LINKED", linked[0]));
+        for (const item of linked.slice(1))
+            lines.push(`  ${" ".repeat(FIELD_WIDTH)}${safeText(item)}`);
+    }
+    return lines;
+}
+function selectRows(rows, isHot) {
+    return [...rows.filter(isHot), ...rows.filter((row) => !isHot(row))].slice(0, MAX_VISIBLE_ROWS);
+}
+function sectionFooter(visible, total, unit, selector) {
+    if (visible === total)
+        return [`  (all ${total} live ${unit} shown)`];
+    return [`  + ${total - visible} more live ${unit} not shown`, `    keiyaku ls ${selector}/`];
+}
+function sectionBlock(name, unit, selector, rows, total) {
+    const lines = [`[ ${name} ]  ${total} live`, ""];
+    for (const row of rows)
+        lines.push(...row);
+    lines.push("", ...sectionFooter(rows.length, total, unit, selector));
+    return lines;
+}
 function renderContracts(report, context) {
     const section = report.contracts;
     if (section.kind === "absent")
         return sectionAbsent("KEIYAKU", context.columns);
     if (section.kind === "failed")
         return failure("KEIYAKU", section, context);
-    const rows = [
-        ...section.value.rows.filter(contractHot),
-        ...section.value.rows.filter((row) => !contractHot(row)),
-    ];
-    const lines = [aperture("KEIYAKU", context.columns)];
-    for (const row of rows)
-        lines.push(...renderContractRow(row, report, context, "world"));
-    const attention = rows.filter(contractHot).length;
-    lines.push(aperture(`${rows.length} keiyaku · ${attention} attention`, context.columns));
-    return lines;
+    const live = section.value.rows.filter((row) => !isTerminalContract(row));
+    const rows = selectRows(live, contractHot);
+    return sectionBlock("KEIYAKU", "keiyaku", "kei", rows.map((row) => renderWorldContractRow(row, report, context)), live.length);
 }
 function renderSelectedContract(report, context) {
     const section = report.contracts;
@@ -281,32 +366,24 @@ function renderTasks(report, context) {
         return sectionAbsent("TASK", context.columns);
     if (section.kind === "failed")
         return failure("TASK", section, context);
-    const rows = [
-        ...section.value.rows.filter(taskHot),
-        ...section.value.rows.filter((row) => !taskHot(row)),
-    ];
-    const lines = [aperture("TASK", context.columns)];
-    for (const row of rows) {
+    const live = section.value.rows.filter((row) => !isTerminalTask(row));
+    const rows = selectRows(live, taskHot);
+    const rowLines = rows.map((row) => {
         const compact = !taskHot(row);
-        lines.push(identityLine(taskMark(row), row.id));
         const relation = row.contract === undefined
             ? ["unbound"]
             : [endpointFact(row.contract.id, row.contract.observed)];
-        const facts = [row.title, row.disposition, `P${row.priority}`, ...relation];
         if (compact)
-            lines.push(...plumbFacts(facts, context.columns));
-        else {
-            lines.push(...plumbBlock(row.title, context.columns));
-            lines.push(...plumbFacts([row.disposition, `P${row.priority}`], context.columns));
-            for (const blocker of row.blockers ?? []) {
-                lines.push(...plumbFacts([`blocked by ${blocker.id}`], context.columns));
-            }
-            lines.push(...plumbFacts(relation, context.columns));
-        }
-    }
-    const attention = rows.filter(taskHot).length;
-    lines.push(aperture(`${rows.length} task · ${attention} attention`, context.columns));
-    return lines;
+            return [identityLine(taskMark(row), row.id, `· "${row.title}" · ${row.disposition} · P${row.priority} · ${relation.join(" · ")}`)];
+        const lines = [identityLine(taskMark(row), row.id)];
+        lines.push(...fieldBlock("TITLE", row.title, context.columns));
+        lines.push(fieldLine("STATE", `${row.disposition} · P${row.priority}`));
+        for (const blocker of row.blockers ?? [])
+            lines.push(fieldLine("BLOCKED", blocker.id));
+        lines.push(fieldLine("LINKED", relation.join(" · ")));
+        return lines;
+    });
+    return sectionBlock("TASK", "task", "task", rowLines, live.length);
 }
 function akumaLabel(row) {
     const aliases = row.aliases ?? [];
@@ -318,13 +395,15 @@ function renderAkuma(report, context) {
         return sectionAbsent("FLEET", context.columns);
     if (section.kind === "failed")
         return failure("FLEET", section, context);
-    const rows = [
-        ...section.value.rows.filter(akumaHot),
-        ...section.value.rows.filter((row) => !akumaHot(row)),
-    ];
-    const lines = [aperture("FLEET", context.columns)];
-    for (const row of rows) {
-        lines.push(identityLine(akumaMark(row.life), row.id, akumaLabel(row)));
+    const live = section.value.rows
+        .filter((row) => row.life === "running")
+        .sort((left, right) => {
+        const l = "lastActivityAt" in left && left.lastActivityAt !== null ? Date.parse(left.lastActivityAt) : -Infinity;
+        const r = "lastActivityAt" in right && right.lastActivityAt !== null ? Date.parse(right.lastActivityAt) : -Infinity;
+        return r - l;
+    });
+    const rows = live.slice(0, MAX_VISIBLE_ROWS);
+    const 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
@@ -336,57 +415,26 @@ function renderAkuma(report, context) {
         const relation = row.contract === undefined
             ? ["unbound"]
             : [endpointFact(row.contract.id, row.contract.observed)];
+        const snapshot = activitySnapshotLine(row);
         if (!akumaHot(row))
-            lines.push(...plumbFacts([...key, ...relation], context.columns));
-        else {
-            lines.push(...plumbFacts(key, context.columns));
-            lines.push(...plumbFacts(relation, context.columns));
-        }
-    }
-    const attention = rows.filter(akumaHot).length;
-    lines.push(aperture(`${rows.length} akuma · ${attention} attention`, context.columns));
-    return lines;
-}
-function sectionCount(name, section) {
-    if (section.kind === "present")
-        return `${section.value.rows.length} ${name}`;
-    return `${section.kind} ${name}`;
-}
-function worldCoordinate(report) {
-    const project = report.root;
-    const branch = report.branch?.startsWith("refs/heads/") === true
-        ? report.branch.slice("refs/heads/".length)
-        : report.branch;
-    const state = report.contracts.kind === "present" ? report.contracts.value.state ?? null : null;
-    return [project, branch, state].filter((part) => part !== null && part.length > 0).map(safeText).join(" ");
-}
-function splitHorizon(report, columns) {
-    if (report.root === null)
-        return ["✗ keiyaku world absent"];
-    const aggregate = [
-        sectionCount("keiyaku", report.contracts),
-        sectionCount("akuma", report.akuma),
-        sectionCount("task", report.tasks),
-    ].join(" · ");
-    const world = worldCoordinate(report);
-    const minimum = `kanshi ${HORIZON} ${aggregate} ${HORIZON} ${world}`;
-    if (displayColumns(minimum) > columns)
-        return [minimum];
-    const fill = columns - displayColumns(minimum);
-    const left = Math.floor(fill / 2);
-    const right = Math.ceil(fill / 2);
-    return [`kanshi ${HORIZON}${RULE.repeat(left)} ${aggregate} ${HORIZON}${RULE.repeat(right)} ${world}`];
+            return [identityLine(akumaMark(row.life), row.id, `${akumaLabel(row)} · ${[...key, ...relation, ...(snapshot === undefined ? [] : [snapshot])].join(" · ")}`.trim())];
+        const lines = [identityLine(akumaMark(row.life), row.id, akumaLabel(row))];
+        lines.push(fieldLine("LIFE", key.join(" · ")));
+        if (snapshot !== undefined)
+            lines.push(fieldLine("SNAPSHOT", snapshot));
+        lines.push(fieldLine("LINKED", relation.join(" · ")));
+        return lines;
+    });
+    return sectionBlock("FLEET", "akuma", "aku", rowLines, live.length);
 }
 export function renderKanshiText(report, context = { columns: 80, color: false }, selection = "world") {
     if (selection === "contract")
         return renderSelectedContract(report, context).join("\n");
     return [
-        ...splitHorizon(report, context.columns),
-        "",
         ...renderContracts(report, context),
-        "",
-        ...renderTasks(report, context),
-        "",
+        "", "",
         ...renderAkuma(report, context),
+        "", "",
+        ...renderTasks(report, context),
     ].join("\n");
 }

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

@@ -15,6 +15,7 @@ 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 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

@@ -86,6 +86,23 @@ function targetMovedDetail(stop) {
     ];
 }
 export function stopLines(label, stop, columns, addressed) {
+    const detail = stopSummary(stop, addressed);
+    const lines = [];
+    const state = label === "verification" ? "failed" : "blocked";
+    receiptRow(lines, "!", label, [{ text: state }, { text: "·" }, ...detail], columns);
+    lines.push(...prerequisiteRows(stop, columns));
+    if ("failure" in stop && stop.failure === "environment-failure" && "command" in stop) {
+        appendHookPayload(lines, stop.detail);
+    }
+    if ("retry" in stop && stop.retry?.kind === "publication-failed") {
+        receiptPayload(lines, "diagnostic", stop.retry.diagnostic);
+    }
+    else if ("failure" in stop && "diagnostic" in stop) {
+        receiptPayload(lines, "diagnostic", stop.diagnostic);
+    }
+    return lines;
+}
+export function stopSummary(stop, addressed) {
     const detail = [];
     if ("refusal" in stop && stop.refusal !== undefined) {
         detail.push({ text: stop.refusal.kind });
@@ -105,20 +122,7 @@ export function stopLines(label, stop, columns, addressed) {
             detail.push(...targetMovedDetail(stop));
         }
     }
-    const lines = [];
-    const state = label === "verification" ? "failed" : "blocked";
-    receiptRow(lines, "!", label, [{ text: state }, { text: "·" }, ...detail], columns);
-    lines.push(...prerequisiteRows(stop, columns));
-    if ("failure" in stop && stop.failure === "environment-failure" && "command" in stop) {
-        appendHookPayload(lines, stop.detail);
-    }
-    if ("retry" in stop && stop.retry?.kind === "publication-failed") {
-        receiptPayload(lines, "diagnostic", stop.retry.diagnostic);
-    }
-    else if ("failure" in stop && "diagnostic" in stop) {
-        receiptPayload(lines, "diagnostic", stop.diagnostic);
-    }
-    return lines;
+    return detail;
 }
 export function cleanupLines(cleanup, columns) {
     const lines = [];

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

@@ -52,6 +52,12 @@ export function renderRefusalFacts(refusal, indent, columns, addressed) {
     }
     if (refusal.kind === "dirty-workspace")
         return renderDirtyRefusal(refusal, indent, columns, identity);
+    if (refusal.kind === "unmerged-paths") {
+        return [
+            ...renderOpaqueBlock(refusalHead(refusal.kind, identity, []), indent, columns),
+            ...collectionLines("paths", refusal.paths, indent, columns),
+        ];
+    }
     if (refusal.kind === "integration-failed") {
         const lines = [
             ...renderOpaqueBlock(refusalHead(refusal.kind, identity, [`reason=${refusal.reason}`, `targetHead=${refusal.targetHead}`]), indent, columns),