@astrosheep/keiyaku 4.0.4 → 4.0.6

package/build/src/cli/parse.js

@@ -1,12 +1,12 @@
-import { isTaskAction, parseTaskCommand, renderTaskUsage, } from "./commands/task.js";
-import { isAkumaAction, parseAkumaCatalogPath, parseAkumaCommand, renderAkumaRootRows, renderAkumaUsage, } from "./commands/akuma.js";
+import { isTaskAction, parseTaskCommand, renderTaskHelp, renderTaskUsage, } from "./commands/task.js";
+import { isAkumaAction, parseAkumaCatalogPath, parseAkumaCommand, renderAkumaHelp, renderAkumaRootRows, renderAkumaUsage, } from "./commands/akuma.js";
 import { INSTALL_USAGE, parseInstallCommand, renderInstallHelp } from "./commands/install.js";
-import { AMEND_MINIMAL_STDIN_HELP, CONTRACT_COMMAND_SPECS } from "./commands/contract.js";
-import { CliUsageError, isBlankInput, usageLine, withJsonAutomationHelp } from "./usage.js";
+import { AMEND_OPERATIONS_HELP, CONTRACT_COMMAND_SPECS, } from "./commands/contract.js";
+import { CliUsageError, isBlankInput, usageLine } from "./usage.js";
 export { CliUsageError } from "./usage.js";
 const ROOT_USAGE = "usage: keiyaku [-C <path>] [--repo <path>] <command> [<contract>|@<contract>] [--flag ...] [-]";
 export function renderRootHelp() {
-    return withJsonAutomationHelp([
+    return [
         ROOT_USAGE,
         "",
         "global options:",
@@ -20,12 +20,12 @@ export function renderRootHelp() {
         "  task ...",
         "    Task coordination; see `keiyaku task --help`.",
         ...renderAkumaRootRows(),
-    ].join("\n"));
+    ].join("\n");
 }
 export function renderContractHelp(command) {
     const spec = CONTRACT_COMMAND_SPECS[command];
     const help = `${spec.purpose}\n\n${usageLine(spec.usage)}`;
-    return withJsonAutomationHelp(command === "amend" ? `${help}\n\n${AMEND_MINIMAL_STDIN_HELP}` : help);
+    return command === "amend" ? `${help}\n\n${AMEND_OPERATIONS_HELP}` : help;
 }
 function contractUsage(command) {
     return usageLine(CONTRACT_COMMAND_SPECS[command].usage);
@@ -39,6 +39,65 @@ export function renderCommandUsage(command) {
         return renderAkumaUsage(command.command);
     return contractUsage(command.command);
 }
+export function renderHelp(coordinate) {
+    switch (coordinate.kind) {
+        case "root": return renderRootHelp();
+        case "contract": return renderContractHelp(coordinate.command);
+        case "task": return renderTaskHelp(coordinate.action);
+        case "install": return renderInstallHelp();
+        case "akuma": return renderAkumaHelp(coordinate.action);
+    }
+}
+export function commandRepoPolicy(command) {
+    switch (command.command) {
+        case "bind":
+        case "amend":
+        case "deliver":
+        case "review":
+        case "arc":
+        case "abandon":
+        case "audit":
+        case "reconcile":
+        case "show":
+        case "region":
+            return { use: "required", acceptsExplicit: true };
+        case "ls":
+            return { use: command.query.kind === "contracts" ? "required" : "none", acceptsExplicit: false };
+        case "status":
+        case "tell":
+            return { use: "optional", acceptsExplicit: false };
+        case "history":
+            return "contract" in command
+                ? { use: "required", acceptsExplicit: true }
+                : { use: "optional", acceptsExplicit: false };
+        case "fork":
+            return { use: "optional", acceptsExplicit: true };
+        case "wait":
+        case "kill": {
+            const contractSelector = command.akuma.some((selector) => selector.startsWith("kei/"));
+            return { use: contractSelector ? "required" : "optional", acceptsExplicit: contractSelector };
+        }
+        case "call":
+            return {
+                use: command.contract === undefined ? "none" : "required",
+                acceptsExplicit: command.contract !== undefined,
+            };
+        case "settings":
+        case "nuke":
+        case "task":
+        case "install":
+            return { use: "none", acceptsExplicit: false };
+    }
+}
+function refuseUnusedRepo(command) {
+    if (command.command === "call")
+        throw new CliUsageError("--repo has no consumer without --contract");
+    throw new CliUsageError(`--repo has no consumer for ${command.command}`);
+}
+export function assertExplicitRepoUse(command, repo) {
+    if (repo !== undefined && !commandRepoPolicy(command).acceptsExplicit)
+        refuseUnusedRepo(command);
+}
 function optionalFlag(flags, name) {
     const value = flags[name];
     return typeof value === "string" ? value : undefined;
@@ -69,9 +128,12 @@ function scanOption(command, argv, state, index) {
         return index;
     }
     const value = argv[index + 1];
-    if (value === undefined || value === "-" || value.startsWith("--"))
+    if (value === undefined)
+        refuse(command, `${token} requires a value`);
+    if (kind !== "raw-value" && (value === "-" || value.startsWith("--"))) {
         refuse(command, `${token} requires a value`);
-    if (isBlankInput(value))
+    }
+    if (kind !== "raw-value" && isBlankInput(value))
         refuse(command, `${token} requires a nonblank value`);
     if (kind === "repeat-value") {
         const values = state.flags[name];
@@ -121,7 +183,7 @@ function parseBind(parts) {
     const task = optionalFlag(parts.flags, "task");
     const target = optionalFlag(parts.flags, "target");
     const after = parts.flags.after === undefined ? [] : Array.isArray(parts.flags.after) ? parts.flags.after : [parts.flags.after];
-    const gates = optionalFlag(parts.flags, "gates");
+    const gates = parseGateBundleNames(parts, "bind");
     return {
         command: "bind",
         ...(task === undefined ? {} : { task }),
@@ -138,7 +200,7 @@ function parseAmend(parts) {
     const after = parts.flags.after === undefined ? [] : Array.isArray(parts.flags.after) ? parts.flags.after : [parts.flags.after];
     if (parts.flags["clear-after"] === true && after.length > 0)
         refuse("amend", "--clear-after and --after are mutually exclusive");
-    const gates = optionalFlag(parts.flags, "gates");
+    const gates = parseGateBundleNames(parts, "amend");
     if (!parts.stdin && parts.flags.after === undefined && parts.flags["clear-after"] !== true && gates === undefined) {
         refuse("amend", "amend requires stdin or --after, --clear-after, or --gates");
     }
@@ -153,6 +215,16 @@ function parseAmend(parts) {
         output: parts.output,
     };
 }
+function parseGateBundleNames(parts, command) {
+    const value = optionalFlag(parts.flags, "gates");
+    if (value === undefined)
+        return undefined;
+    const names = value.split(",");
+    if (names.some((name) => name.length === 0)) {
+        refuse(command, "--gates requires nonempty comma-separated names");
+    }
+    return names;
+}
 function parseDeliver(parts) {
     const contract = parts.positionals[0];
     const message = optionalFlag(parts.flags, "message");
@@ -162,6 +234,7 @@ function parseDeliver(parts) {
         ...(parts.actor === undefined ? {} : { actor: parts.actor }),
         ...(message === undefined ? {} : { message }),
         includeDirty: parts.flags["include-dirty"] === true,
+        materializeConflict: parts.flags["materialize-conflict"] === true,
         output: parts.output,
     };
 }
@@ -240,14 +313,14 @@ function parseRegion(parts) {
 }
 function parseLs(parts) {
     const path = parts.positionals[0];
-    if (path === "task/")
+    if (path === "task" || path === "task/")
         return { command: "ls", query: { kind: "tasks" }, output: parts.output };
-    if (path === "kei/")
+    if (path === "kei" || path === "kei/")
         return { command: "ls", query: { kind: "contracts" }, output: parts.output };
     try {
         const query = parseAkumaCatalogPath(path);
         if (query === null)
-            refuse("ls", "ls requires an identity directory with a trailing slash");
+            refuse("ls", "ls requires a supported identity directory selector");
         return { command: "ls", query, output: parts.output };
     }
     catch (error) {
@@ -343,6 +416,10 @@ function parseCommand(parts) {
                 output: parts.output,
             };
         }
+        case "nuke": {
+            const confirm = optionalFlag(parts.flags, "confirm");
+            return { command: "nuke", ...(confirm === undefined ? {} : { confirm }), output: parts.output };
+        }
         case "settings": return { command: "settings", output: parts.output };
         case "region": return parseRegion(parts);
     }
@@ -366,9 +443,10 @@ export function parseArgv(argv) {
     const akuma = isAkumaAction(invocation.commandArgv[0])
         ? parseAkumaCommand(invocation.commandArgv)
         : undefined;
-    return {
+    const parsed = {
         ...(invocation.cwd === undefined ? {} : { cwd: invocation.cwd }),
         ...(invocation.repo === undefined ? {} : { repo: invocation.repo }),
         command: task ?? akuma ?? install ?? parseCommand(scanArgv(invocation.commandArgv)),
     };
+    return parsed;
 }

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

@@ -1,5 +1,5 @@
 import { toolRepr } from "./akuma-tool.js";
-import { displayColumns, renderBoundedTextBlock, renderTextBlock, safeText, truncateMiddleDisplayText, } from "./terminal.js";
+import { displayColumns, renderBoundedTextBlock, safeText, truncateMiddleDisplayText, } from "./terminal.js";
 const DEFAULT_CONTEXT = { columns: 80, color: false };
 const OPENING_STROKE = "─────";
 const TIME_WIDTH = 5;
@@ -7,19 +7,30 @@ const VERB_WIDTH = 6;
 function identity(id, alias) {
     return `${id}${alias === undefined ? "" : ` (${alias})`}`;
 }
-function associatedIdentity(id, alias, contractId) {
+function associatedContractId(contract) {
+    return contract.kind === "associated" ? contract.contractId : undefined;
+}
+function associatedIdentity(id, alias, contract) {
+    const contractId = contract === undefined ? undefined : associatedContractId(contract);
     return `${identity(id, alias)}${contractId === undefined ? "" : ` [${contractId}]`}`;
 }
-function snapshotHeading(id, alias, contractId) {
+function snapshotHeading(id, alias, contract) {
+    const contractId = contract === undefined ? undefined : associatedContractId(contract);
     return [
         OPENING_STROKE,
         identity(id, alias),
         ...(contractId === undefined ? [] : [`└─ ${contractId}`]),
     ];
 }
+function contractFacts(contract) {
+    return contract.kind === "failed" ? [`! contract failed ${safeText(contract.diagnostic)}`] : [];
+}
+function unobservedText(id, diagnostic) {
+    return `! ${id} unobserved: ${safeText(diagnostic)}`;
+}
 function lifeLabel(life) {
     if (life === "running")
-        return "● running";
+        return "● STILL RUNNING";
     if (life === "asleep")
         return "○ asleep";
     if (life === "killed")
@@ -59,7 +70,7 @@ function mark(row) {
             return "?";
         return row.state.status === "ok" ? "✓" : "!";
     }
-    return "·";
+    return "│";
 }
 function rowText(row) {
     if (row.kind === "said" || row.kind === "thought" || row.kind === "note" || row.kind === "call" || row.kind === "tell") {
@@ -149,47 +160,59 @@ function taskDispositionMark(disposition) {
         return "●";
     return disposition === "blocked" ? "‖" : "○";
 }
-function taskScanLine(row, indent = "") {
-    return `${indent}${taskDispositionMark(row.disposition)} ${row.id} · P${row.priority} ${row.disposition}`;
-}
-function changeOp(op) {
-    return op === "add" ? "write" : op === "delete" ? "delete" : "edit";
-}
-function renderReportedChangeLines(snapshot, columns) {
-    const lines = [`  changes ${snapshot.reportedChanges.length + snapshot.reportedChangesOmitted}`];
-    for (const change of snapshot.reportedChanges) {
-        const scan = `  ${changeOp(change.op)}`;
-        const path = safeText(change.path);
-        const stat = change.diffstat === undefined
-            ? ""
-            : ` — +${change.diffstat.added} -${change.diffstat.removed}`;
-        const inline = `${scan} ${path}${stat}`;
-        if (displayColumns(inline) <= columns)
-            lines.push(inline);
-        else
-            lines.push(`${scan}`, ...renderTextBlock(`${path}${stat}`, "    ", columns));
+function changeStat(group) {
+    let added = 0;
+    let removed = 0;
+    for (const change of group) {
+        if (change.diffstat === undefined)
+            return "+? -?";
+        added += change.diffstat.added;
+        removed += change.diffstat.removed;
     }
-    if (snapshot.reportedChangesOmitted > 0) {
-        lines.push(`  ⋮ ${snapshot.reportedChangesOmitted} earlier changes`);
+    return `+${added} -${removed}`;
+}
+function groupedChangeRows(changes) {
+    const groups = [];
+    const seen = new Map();
+    for (const change of changes) {
+        const index = seen.get(change.path);
+        if (index === undefined) {
+            seen.set(change.path, groups.length);
+            groups.push([change]);
+        }
+        else
+            groups[index].push(change);
     }
-    return lines;
+    return groups.map((group) => ({ path: group[0].path, stat: changeStat(group) }));
+}
+function renderReportedChangeLines(snapshot) {
+    const rows = groupedChangeRows(snapshot.reportedChanges);
+    const width = rows.reduce((max, row) => Math.max(max, row.stat.length), 0);
+    return [
+        `changes ${snapshot.reportedChanges.length + snapshot.reportedChangesOmitted}`,
+        ...rows.map((row) => `  ${row.stat.padEnd(width)}  ${safeText(row.path)}`),
+        ...(snapshot.reportedChangesOmitted > 0 ? [`  ⋮ ${snapshot.reportedChangesOmitted} earlier changes`] : []),
+    ];
+}
+function renderTaskRow(row, columns) {
+    const prefix = `  ${taskDispositionMark(row.disposition)} ${row.id} · `;
+    const body = `${safeText(row.title)} · ${row.disposition} · P${row.priority}`;
+    const inline = `${prefix}${body}`;
+    if (displayColumns(inline) <= columns)
+        return [inline];
+    return renderBoundedTextBlock(body, {
+        first: prefix,
+        continuation: "    ",
+        columns,
+        lines: Number.MAX_SAFE_INTEGER,
+    });
 }
 function renderTaskContextLines(created, columns) {
     if (created === undefined)
         return [];
     if (created.kind === "failed")
         return [`! tasks failed ${safeText(created.diagnostic)}`];
-    const lines = [`  tasks ${created.rows.length}`];
-    for (const row of created.rows) {
-        const scan = `  ${taskScanLine(row)}`;
-        const title = safeText(row.title);
-        const inline = `${scan} — ${title}`;
-        if (displayColumns(inline) <= columns)
-            lines.push(inline);
-        else
-            lines.push(`${scan} —`, ...renderTextBlock(title, "    ", columns));
-    }
-    return lines;
+    return [`tasks ${created.rows.length}`, ...created.rows.flatMap((row) => renderTaskRow(row, columns))];
 }
 function snapshotText(view, context, options = {}) {
     const snapshot = view.status.timeline;
@@ -201,29 +224,46 @@ function snapshotText(view, context, options = {}) {
         : groupedEntries(snapshot.entries, context);
     const facts = [
         ...(view.status.readonly?.enforcement === "none" ? [`! ${safeText(view.status.readonly.diagnostic)}`] : []),
+        ...contractFacts(view.contract),
         ...(options.facts ?? []),
     ];
-    const footer = options.showLife === false ? [] : [`  ${lifeLabel(view.status.life)}`];
+    const footer = options.showLife === false ? [] : ["", lifeLabel(view.status.life)];
     return [
-        ...snapshotHeading(view.status.id, options.alias, view.contractId),
+        ...snapshotHeading(view.status.id, options.alias, view.contract),
         ...facts,
         ...activity,
-        ...footer,
-        ...renderReportedChangeLines(snapshot, context.columns),
         ...renderTaskContextLines(view.createdTasks, context.columns),
+        ...renderReportedChangeLines(snapshot),
+        ...footer,
     ].join("\n");
 }
+function observationStageText(id, observation, context, options = {}) {
+    if (observation.kind === "unobserved")
+        return unobservedText(id, observation.diagnostic);
+    return snapshotText(observation, context, options);
+}
+function waitText(result, context) {
+    const alias = result.alias;
+    const blocks = [
+        ...result.result.observations.map((observation) => snapshotText(observation, context, { ...(alias === undefined ? {} : { alias }) })),
+        ...result.result.unobserved.map((member) => unobservedText(member.id, member.diagnostic)),
+    ];
+    return blocks.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");
-    const contractId = result.historyResult.contractId;
-    return [...snapshotHeading(result.akuma, result.alias, contractId), ...groupedRows(result.history.rows, context, true)].join("\n");
+    return [...snapshotHeading(result.akuma, result.alias, result.historyResult.contract), ...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)}`];
-    return snapshotText(result.result.observation, context, { ...(result.alias === undefined ? {} : { alias: result.alias }), facts, showLife: false });
+    return observationStageText(result.result.akuma, result.result.observation, context, {
+        ...(result.alias === undefined ? {} : { alias: result.alias }),
+        facts,
+        showLife: false,
+    });
 }
 function dispatchLines(stage) {
     if (stage.kind === "none" || stage.kind === "dispatched")
@@ -263,6 +303,9 @@ export function akumaRawAnswer(result) {
 function executionCwdLine(result) {
     return result.execution.source === "contract-worktree" ? [`cwd ${result.execution.cwd}`] : [];
 }
+function posixShellArgument(value) {
+    return `'${value.replace(/'/g, `'\"'\"'`)}'`;
+}
 function callText(result, context) {
     const alias = result.result.alias.kind === "aliased" ? result.result.alias.alias.alias : undefined;
     const contractId = result.result.dispatch.kind === "dispatched" ? result.result.dispatch.dispatch.contractId : undefined;
@@ -272,17 +315,24 @@ function callText(result, context) {
         facts.push(`alias failed ${result.result.alias.failure.kind} ${safeText(result.result.alias.failure.diagnostic)}`);
     const cwd = executionCwdLine(result.result);
     if (result.result.observation.kind === "detached") {
-        const lines = [...snapshotHeading(result.result.akuma, alias, contractId), ...cwd, ...restraint, ...facts];
+        const lines = [...snapshotHeading(result.result.akuma, alias, contractId === undefined
+                ? { kind: "none" }
+                : { kind: "associated", contractId }), ...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 ${result.world} wait ${selector} --timeout 5m`);
+            lines.push(`$ keiyaku -C ${posixShellArgument(result.world)} wait ${selector} --timeout 5m`);
         }
         return lines.join("\n");
     }
     if (result.result.observation.kind === "failed") {
-        return [...snapshotHeading(result.result.akuma, alias, contractId), ...cwd, ...restraint, ...facts, `! error ${safeText(result.result.observation.failure.diagnostic)}`].join("\n");
+        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");
     }
-    return snapshotText({ status: result.result.observation.status, ...(contractId === undefined ? {} : { contractId }) }, context, {
+    return snapshotText({
+        status: result.result.observation.status,
+        contract: contractId === undefined ? { kind: "none" } : { kind: "associated", contractId },
+    }, context, {
         ...(alias === undefined ? {} : { alias }),
         facts: [...cwd, ...facts],
     });
@@ -299,17 +349,25 @@ export function renderAkumaText(command, result, context = DEFAULT_CONTEXT) {
         case "call": return callText(result, context);
         case "status": return snapshotText(result.status, context, { ...(result.alias === undefined ? {} : { alias: result.alias }) });
         case "wait":
-            return result.result.observations.map((observation) => snapshotText(observation, context, { ...(result.alias === undefined ? {} : { alias: result.alias }) })).join("\n\n");
-        case "tell": return result.mode === "ordinary" ? tellText(result, context) : snapshotText(result.result.observation, context, { ...(result.alias === undefined ? {} : { alias: result.alias }), showLife: false });
+            return waitText(result, context);
+        case "tell":
+            return result.mode === "ordinary"
+                ? tellText(result, context)
+                : observationStageText(result.result.id, result.result.observation, context, {
+                    ...(result.alias === undefined ? {} : { alias: result.alias }),
+                    showLife: false,
+                });
         case "history":
             return historyText(command, result, context);
         case "fork": {
             if (result.receipt.kind !== "forked")
                 return result.receipt.kind === "unknown-history" ? `${result.receipt.at} has no matching retained answered turn` : result.receipt.kind === "provider-cannot-fork" ? `${result.receipt.provider} cannot fork` : result.receipt.diagnostic;
             const contractId = result.receipt.dispatch.kind === "dispatched" ? result.receipt.dispatch.dispatch.contractId : undefined;
-            return associatedIdentity(result.receipt.child, undefined, contractId);
+            return associatedIdentity(result.receipt.child, undefined, contractId === undefined
+                ? { kind: "none" }
+                : { kind: "associated", contractId });
         }
-        case "kill": return result.result.results.map((member) => snapshotText(member.observation, context, { facts: [`kill ${member.evidence}`], ...(result.alias === undefined ? {} : { alias: result.alias }) })).join("\n\n");
+        case "kill": return result.result.results.map((member) => observationStageText(member.id, member.observation, context, { facts: [`kill ${member.evidence}`], ...(result.alias === undefined ? {} : { alias: result.alias }) })).join("\n\n");
     }
 }
 function callExitCode(result) {

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

@@ -1,6 +1,6 @@
 import { cleanupLines, leakLines, receiptPayload, receiptRow, stopLines, titleLines, } from "./receipt.js";
 import { renderRefusalFacts } from "./refusal.js";
-import { gitShortStat, renderBoundedTextBlock, renderOpaqueBlock, } from "./terminal.js";
+import { gitShortStat, renderOpaqueBlock, } from "./terminal.js";
 const CHILD = "  ";
 function workspaceEvidence(workspace, columns) {
     return renderOpaqueBlock(`workspace ${workspace.kind} ${workspace.path}`, CHILD, columns);
@@ -46,11 +46,7 @@ function verificationLines(verification, columns, addressed) {
         { text: `${verification.passed} of ${verification.total}` },
     ], columns);
     if (verification.summary !== undefined) {
-        lines.push(...renderBoundedTextBlock(verification.summary, {
-            first: `${CHILD}summary `,
-            continuation: CHILD,
-            columns,
-        }));
+        receiptPayload(lines, "summary", verification.summary);
     }
     return lines;
 }

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

@@ -113,11 +113,20 @@ function acceptedRecord(result, columns) {
     const record = [];
     for (const fact of result.facts) {
         const contract = fact.contract === result.contract ? [] : [{ text: fact.contract, opaque: true }];
-        receiptRow(record, " ", "journal", [
-            ...contract,
-            { text: fact.entry, opaque: true },
-            { text: `· ${fact.kind}` },
-        ], columns);
+        receiptRow(record, " ", "journal", fact.kind === "reintegrated"
+            ? [
+                ...contract,
+                { text: fact.entry, opaque: true },
+                { text: "· reintegrated" },
+                { text: fact.data.predecessor, opaque: true },
+                { text: "->" },
+                { text: fact.data.snapshot, opaque: true },
+            ]
+            : [
+                ...contract,
+                { text: fact.entry, opaque: true },
+                { text: `· ${fact.kind}` },
+            ], columns);
     }
     receiptRow(record, " ", "head", [{ text: result.head, opaque: true }], columns);
     if (result.verb === "deliver") {
@@ -176,11 +185,36 @@ function recordBlock(result, columns) {
     const rows = [...acceptedRecord(result, columns), ...acceptedLagRows(result, columns)];
     return ["  record", ...indentRecord(rows)];
 }
-function verificationVerdictLine(verdict, columns) {
+function completionLines(result, columns) {
     const lines = [];
-    receiptRow(lines, verdict === "satisfied" ? "✓" : "!", "verification", [
-        { text: verdict === "satisfied" ? "passed" : "failed" },
+    const completion = result.completion;
+    if (completion === undefined)
+        return lines;
+    const verification = completion.verification;
+    receiptRow(lines, " ", "target", [
+        { text: "->" },
+        { text: completion.integration, opaque: true },
+        ...(verification?.verdict === "satisfied"
+            ? [{ text: `· verified (${verification.mode})` }]
+            : []),
     ], columns);
+    if (verification?.verdict === "unsatisfied") {
+        receiptRow(lines, "!", "verification", [
+            { text: "unsatisfied" },
+            { text: `(${verification.mode})` },
+        ], columns);
+        if (result.verificationSummary !== undefined) {
+            receiptPayload(lines, "  summary", result.verificationSummary);
+        }
+    }
+    return lines;
+}
+function movementLines(result, columns) {
+    const count = result.facts.filter((fact) => fact.kind === "reintegrated").length;
+    if (count === 0)
+        return [];
+    const lines = [];
+    receiptRow(lines, "~", "target", [{ text: `moved · re-integrated x${count}` }], columns);
     return lines;
 }
 function renderAcceptedBind(result, columns) {
@@ -202,23 +236,18 @@ function renderAcceptedAmend(result, columns) {
     return lines.join("\n");
 }
 function renderAcceptedDeliver(result, columns) {
-    const complete = result.facts.some((fact) => fact.kind === "claimed");
+    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));
     if (!complete)
         receiptRow(lines, " ", "candidate", [{ text: "kept" }], columns);
     if (result.verification !== undefined) {
         lines.push(...stopLines("verification", result.verification, columns, result.contract));
     }
-    else if (result.verificationVerdict !== undefined) {
-        lines.push(...verificationVerdictLine(result.verificationVerdict, columns));
-    }
     if (!complete && result.placement !== undefined) {
         lines.push(...stopLines("completion", result.placement, columns, result.contract));
     }
-    else if (!complete && (result.verification !== undefined || result.verificationVerdict === "unsatisfied")) {
-        receiptRow(lines, "·", "completion", [{ text: "not attempted" }], columns);
-    }
     if (result.cleanup !== undefined)
         pushBlock(lines, cleanupLines(result.cleanup, columns));
     if (result.leak !== undefined)
@@ -227,14 +256,21 @@ function renderAcceptedDeliver(result, columns) {
     return lines.join("\n");
 }
 function renderAcceptedReview(result, columns) {
-    const complete = result.facts.some((fact) => fact.kind === "claimed");
-    const lines = titleLines("✓", `review ${result.verdict}`, result.contract, columns);
-    receiptRow(lines, complete ? "✓" : "!", "contract", [
-        { text: complete ? "complete" : "not complete" },
-    ], 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));
+    if (!complete)
+        receiptRow(lines, " ", "candidate", [{ text: "kept" }], columns);
     if (result.placement !== undefined) {
         lines.push(...stopLines("completion", result.placement, columns, result.contract));
     }
+    if (result.verification !== undefined) {
+        lines.push(...stopLines("verification", result.verification, columns, result.contract));
+    }
+    if (result.cleanup !== undefined)
+        pushBlock(lines, cleanupLines(result.cleanup, columns));
+    if (result.leak !== undefined)
+        pushBlock(lines, leakLines(result.leak, columns));
     lines.push(...acceptedDeviations(result, columns), ...recordBlock(result, columns));
     return lines.join("\n");
 }
@@ -338,6 +374,11 @@ function journalBody(fact) {
                 `  require-branches-to-be-up-to-date ${String(policy.requireBranchesToBeUpToDate)}`,
             ];
         }
+        case "reintegrated":
+            return [
+                `  predecessor ${fact.data.predecessor}`,
+                `  snapshot ${fact.data.snapshot}`,
+            ];
         case "attestation": {
             const lines = [
                 `  gate ${fact.data.gate}`,