@astrosheep/keiyaku 4.1.0 → 4.1.2

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

@@ -1,301 +1,6 @@
-import { toolRepr } from "./akuma-tool.js";
-import { displayColumns, renderBoundedTextBlock, safeText, truncateMiddleDisplayText, } from "./terminal.js";
-const DEFAULT_CONTEXT = { columns: 80, color: false };
-const OPENING_STROKE = "─────";
-const TIME_WIDTH = 5;
-const VERB_WIDTH = 6;
-function identity(id, alias) {
-    return `${id}${alias === undefined ? "" : ` (${alias})`}`;
-}
-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 ruler(columns) {
-    return "─".repeat(Math.max(OPENING_STROKE.length, columns));
-}
-function snapshotHeading(id, alias, contract, columns) {
-    const contractId = contract === undefined ? undefined : associatedContractId(contract);
-    return [
-        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)}`] : [];
-}
-function unobservedText(id, diagnostic) {
-    return `! ${id} unobserved: ${safeText(diagnostic)}`;
-}
-function lifeLabel(life) {
-    if (life === "running")
-        return "● STILL RUNNING";
-    if (life === "asleep")
-        return "✓ came back";
-    if (life === "killed")
-        return "× killed";
-    return `? ${life}`;
-}
-function clock(at) {
-    const date = new Date(at);
-    return Number.isFinite(date.getTime()) ? `${String(date.getHours()).padStart(2, "0")}:${String(date.getMinutes()).padStart(2, "0")}` : "unknown";
-}
-function label(row) {
-    if (row.kind === "said")
-        return "say";
-    if (row.kind === "thought")
-        return "think";
-    if (row.kind === "note")
-        return "note";
-    if (row.kind === "call")
-        return "call";
-    if (row.kind === "tell")
-        return "tell";
-    if (row.kind === "outcome")
-        return row.outcome.kind === "answered" ? "say" : "error";
-    if (row.kind === "turn")
-        return "call";
-    return toolRepr(row).label;
-}
-function mark(row) {
-    if (row.kind === "outcome")
-        return row.outcome.kind === "answered" ? "✓" : "!";
-    if (row.kind === "tell" && row.state === "pending")
-        return "⧗";
-    if (row.kind === "tool") {
-        if (row.state === "active")
-            return "⧖";
-        if (row.state === "unsettled")
-            return "?";
-        return row.state.status === "ok" ? "✓" : "!";
-    }
-    return "│";
-}
-function rowText(row) {
-    if (row.kind === "said" || row.kind === "thought" || row.kind === "note" || row.kind === "call" || row.kind === "tell") {
-        return { text: row.text, lines: row.kind === "said" || row.kind === "thought" ? 2 : row.kind === "tell" || row.kind === "call" ? 1 : 2 };
-    }
-    if (row.kind === "outcome")
-        return row.outcome.kind === "answered"
-            ? { text: row.outcome.answer, lines: 3 }
-            : { text: row.outcome.diagnostic, lines: 2 };
-    if (row.kind === "turn")
-        return { text: "", lines: 1 };
-    const repr = toolRepr(row);
-    return { text: repr.text, lines: 2, ...(repr.overflow === "middle-ellipsis" ? { middle: true } : {}), ...(repr.suffix === undefined ? {} : { suffix: repr.suffix }) };
-}
-function eventPrefix(glyph, verb, time) {
-    const gutter = time === undefined ? " ".repeat(TIME_WIDTH) : time.padEnd(TIME_WIDTH);
-    return `${gutter} ${glyph} ${verb.padEnd(VERB_WIDTH)} `;
-}
-function continuationPrefix() {
-    return eventPrefix("│", "");
-}
-function quotedBody(row) {
-    return row.kind === "said" || row.kind === "thought" || row.kind === "tell"
-        || (row.kind === "outcome" && row.outcome.kind === "answered");
-}
-function quoteLines(lines, prefix) {
-    const prefixWidth = prefix.length;
-    return lines.map((line) => {
-        const body = line.slice(prefixWidth);
-        if (body.length === 0)
-            return line;
-        return `${line.slice(0, prefixWidth)}“${body}”`;
-    });
-}
-function renderMiddleEllipsis(first, text, suffix, columns) {
-    const prefixWidth = displayColumns(first);
-    const remaining = columns - prefixWidth;
-    const suffixWidth = displayColumns(suffix);
-    const withSuffix = remaining - suffixWidth;
-    // `$ ` + one head char + ellipsis + tail; cue and ellipsis alone are not a subject.
-    const showSuffix = suffix.length > 0 && withSuffix >= 6;
-    return `${first}${truncateMiddleDisplayText(text, Math.max(0, showSuffix ? withSuffix : remaining))}${showSuffix ? suffix : ""}`;
-}
-function renderRow(row, context, history, first) {
-    const value = rowText(row);
-    const quoted = quotedBody(row);
-    const quoteWidth = quoted ? 2 : 0;
-    if (value.middle === true) {
-        return [renderMiddleEllipsis(first, value.text, value.suffix ?? "", context.columns - quoteWidth)];
-    }
-    const lines = renderBoundedTextBlock(value.text, {
-        first,
-        continuation: continuationPrefix(),
-        columns: context.columns - quoteWidth,
-        lines: history ? Number.MAX_SAFE_INTEGER : value.lines,
-        ...("truncated" in row && row.truncated === true ? { truncated: true } : {}),
-    });
-    return quoted ? quoteLines(lines, first) : lines;
-}
-function groupedEntries(entries, context, history = false) {
-    const lines = [];
-    let previousClock;
-    for (const entry of entries) {
-        if (entry.kind === "gap") {
-            lines.push(`${" ".repeat(TIME_WIDTH)} ⋮ ${entry.count} omitted`);
-            continue;
-        }
-        const row = entry.row;
-        const at = clock(row.at);
-        const changed = previousClock === undefined || at !== previousClock;
-        lines.push(...renderRow(row, context, history, eventPrefix(mark(row), label(row), changed ? at : undefined)));
-        previousClock = at;
-    }
-    return lines;
-}
-function groupedRows(rows, context, history = false) {
-    return groupedEntries(rows.filter((row) => row.kind !== "turn").map((row) => ({ kind: "row", row })), context, history);
-}
-function taskDispositionMark(disposition) {
-    if (disposition === "done")
-        return "✓";
-    if (disposition === "drop")
-        return "×";
-    if (disposition === "on_hold")
-        return "⧗";
-    if (disposition === "in_progress")
-        return "●";
-    return disposition === "blocked" ? "‖" : "○";
-}
-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;
-    }
-    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 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)}`];
-    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
-        ? groupedRows([
-            ...snapshot.entries.filter((entry) => entry.kind === "row").map((entry) => entry.row),
-            snapshot.outcome,
-        ].sort((left, right) => left.sequence - right.sequence), context)
-        : groupedEntries(snapshot.entries, context);
-    const facts = [
-        ...(view.status.readonly?.enforcement === "none" ? [`! ${safeText(view.status.readonly.diagnostic)}`] : []),
-        ...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, context.columns),
-        ...facts,
-        ...activity,
-        ...(activity.length > 0 && taskContext.length > 0 ? [""] : []),
-        ...taskContext,
-        ...changes,
-        ...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 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) => {
-            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)),
-    ];
-    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, 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)}`];
-    return observationStageText(result.result.akuma, result.result.observation, context, {
-        ...(result.alias === undefined ? {} : { alias: result.alias }),
-        facts,
-        showLife: false,
-    });
-}
+import { DEFAULT_CONTEXT, akumaRawAnswer, associatedIdentity, historyText, mutationObservationStageText, snapshotHeading, snapshotText, tellText, waitText, } from "./akuma-activity.js";
+import { safeText } from "./terminal.js";
+export { akumaRawAnswer } from "./akuma-activity.js";
 function dispatchLines(stage) {
     if (stage.kind === "none" || stage.kind === "dispatched")
         return [];
@@ -305,32 +10,6 @@ function dispatchLines(stage) {
         return ["dispatch failed contention"];
     return [`dispatch failed ${stage.failure.kind} ${safeText(stage.failure.diagnostic)}`];
 }
-function callFailed(result) {
-    return result.dispatch.kind === "failed"
-        || result.alias.kind === "failed"
-        || result.readonly?.enforcement === "none";
-}
-function statusAnswer(view) {
-    if (view.status.life !== "asleep")
-        return undefined;
-    if (view.status.readonly?.enforcement === "none")
-        return undefined;
-    const timeline = view.status.timeline;
-    if (timeline.kind !== "idle" || timeline.outcome?.outcome.kind !== "answered")
-        return undefined;
-    return timeline.outcome.outcome.answer;
-}
-export function akumaRawAnswer(result) {
-    if (result.action === "call") {
-        if (callFailed(result.result) || result.result.observation.kind !== "observed")
-            return undefined;
-        return statusAnswer({ status: result.result.observation.status });
-    }
-    if (result.action === "wait" && result.result.observations.length === 1) {
-        return statusAnswer(result.result.observations[0]);
-    }
-    return undefined;
-}
 function executionCwdLine(result) {
     return result.execution.source === "contract-worktree" ? [`cwd ${result.execution.cwd}`] : [];
 }
@@ -346,27 +25,33 @@ 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 === undefined
-                ? { kind: "none" }
-                : { kind: "associated", contractId }, context.columns), ...cwd, ...restraint, ...facts];
-        if (!callFailed(result.result)) {
+        const lines = [
+            ...snapshotHeading(result.result.akuma, alias, contractId === undefined ? { kind: "none" } : { kind: "associated", contractId }),
+            ...cwd,
+            ...restraint,
+            ...facts,
+        ];
+        if (!(result.result.dispatch.kind === "failed" ||
+            result.result.alias.kind === "failed" ||
+            result.result.readonly?.enforcement === "none")) {
             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`);
         }
         return lines.join("\n");
     }
     if (result.result.observation.kind === "failed") {
-        return [...snapshotHeading(result.result.akuma, alias, contractId === undefined
-                ? { kind: "none" }
-                : { kind: "associated", contractId }, context.columns), ...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,
         contract: contractId === undefined ? { kind: "none" } : { kind: "associated", contractId },
-    }, context, {
-        ...(alias === undefined ? {} : { alias }),
-        facts: [...cwd, ...facts],
-    });
+    }, context, { ...(alias === undefined ? {} : { alias }), facts: [...cwd, ...facts] });
 }
 export function renderAkumaText(command, result, context = DEFAULT_CONTEXT) {
     const answer = akumaRawAnswer(result);
@@ -377,14 +62,16 @@ export function renderAkumaText(command, result, context = DEFAULT_CONTEXT) {
         return cwd.length === 0 ? answer : `${cwd.join("\n")}\n${answer}`;
     }
     switch (result.action) {
-        case "call": return callText(result, context);
-        case "status": return snapshotText(result.status, context, { ...(result.alias === undefined ? {} : { alias: result.alias }) });
+        case "call":
+            return callText(result, context);
+        case "status":
+            return snapshotText(result.status, context, { ...(result.alias === undefined ? {} : { alias: result.alias }) });
         case "wait":
             return waitText(result, context);
         case "tell":
             return result.mode === "ordinary"
                 ? tellText(result, context)
-                : observationStageText(result.result.id, result.result.observation, context, {
+                : mutationObservationStageText(result.result.id, result.result.observation, context, {
                     ...(result.alias === undefined ? {} : { alias: result.alias }),
                     showLife: false,
                 });
@@ -392,17 +79,27 @@ export function renderAkumaText(command, result, context = DEFAULT_CONTEXT) {
             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;
+                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 === undefined
-                ? { kind: "none" }
-                : { kind: "associated", contractId });
+            return associatedIdentity(result.receipt.child, undefined, contractId === undefined ? { kind: "none" } : { kind: "associated", contractId });
         }
-        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");
+        case "kill":
+            return result.result.results
+                .map((member) => mutationObservationStageText(member.id, member.observation, context, {
+                facts: [`kill ${member.evidence}`],
+                ...(result.alias === undefined ? {} : { alias: result.alias }),
+            }))
+                .join("\n\n");
     }
 }
 function callExitCode(result) {
-    if (result.result.dispatch.kind === "failed" || result.result.alias.kind === "failed" || result.result.observation.kind === "failed")
+    if (result.result.dispatch.kind === "failed" ||
+        result.result.alias.kind === "failed" ||
+        result.result.observation.kind === "failed")
         return 2;
     if (result.result.observation.kind !== "observed")
         return 0;
@@ -410,23 +107,34 @@ function callExitCode(result) {
     return timeline.kind === "idle" && timeline.outcome?.outcome.kind === "failed" ? 2 : 0;
 }
 function killExitCode(result) {
-    return result.result.results.some((member) => member.evidence === "unavailable" || member.evidence === "hung" || member.evidence === "untidy") ? 1 : 0;
+    return result.result.results.some((member) => member.evidence === "unavailable" || member.evidence === "hung" || member.evidence === "untidy")
+        ? 1
+        : 0;
 }
 function tellExitCode(result) {
-    if (result.mode === "ordinary")
-        return typeof result.result.tell.wake === "string" ? 0 : 2;
-    return result.result.receipt.kind === "interrupted" ? 0 : 1;
+    return result.mode === "ordinary"
+        ? result.result.tell.wake.kind === "failed"
+            ? 2
+            : 0
+        : result.result.receipt.kind === "interrupted"
+            ? 0
+            : 1;
 }
 function forkExitCode(result) {
     return result.receipt.kind === "forked" ? 0 : result.receipt.kind === "upstream-forked" ? 2 : 1;
 }
 export function akumaExitCode(result) {
     switch (result.action) {
-        case "call": return callExitCode(result);
-        case "kill": return killExitCode(result);
-        case "tell": return tellExitCode(result);
-        case "fork": return forkExitCode(result);
-        default: return 0;
+        case "call":
+            return callExitCode(result);
+        case "kill":
+            return killExitCode(result);
+        case "tell":
+            return tellExitCode(result);
+        case "fork":
+            return forkExitCode(result);
+        default:
+            return 0;
     }
 }
 export function akumaJsonValue(result) {

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

@@ -1,6 +1,6 @@
-import { cleanupLines, leakLines, receiptPayload, receiptRow, stopLines, titleLines, } from "./receipt.js";
+import { cleanupLines, leakLines, receiptPayload, receiptRow, stopLines, titleLines } from "./receipt.js";
 import { renderRefusalFacts } from "./refusal.js";
-import { gitShortStat, 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);
@@ -41,10 +41,7 @@ function verificationLines(verification, columns, addressed) {
     if (verification.kind === "stopped") {
         return stopLines("verification", verification.stop, columns, addressed);
     }
-    receiptRow(lines, verification.kind === "satisfied" ? "✓" : "!", "verification", [
-        { text: verification.kind },
-        { text: `${verification.passed} of ${verification.total}` },
-    ], columns);
+    receiptRow(lines, verification.kind === "satisfied" ? "✓" : "!", "verification", [{ text: verification.kind }, { text: `${verification.passed} of ${verification.total}` }], columns);
     if (verification.summary !== undefined) {
         receiptPayload(lines, "summary", verification.summary);
     }
@@ -57,11 +54,7 @@ function targetLines(target, columns, addressed) {
         return lines;
     }
     if (target.kind === "placeable") {
-        receiptRow(lines, "✓", "target", [
-            { text: "placeable" },
-            { text: target.ref, opaque: true },
-            { text: target.head, opaque: true },
-        ], columns);
+        receiptRow(lines, "✓", "target", [{ text: "placeable" }, { text: target.ref, opaque: true }, { text: target.head, opaque: true }], columns);
         return lines;
     }
     if (target.kind === "moved") {
@@ -92,10 +85,7 @@ function recordLines(result, columns) {
         return [];
     const rows = [];
     for (const fact of result.facts) {
-        receiptRow(rows, " ", "journal", [
-            { text: fact.entry, opaque: true },
-            { text: `· ${fact.kind}` },
-        ], columns);
+        receiptRow(rows, " ", "journal", [{ text: fact.entry, opaque: true }, { text: `· ${fact.kind}` }], columns);
     }
     receiptRow(rows, " ", "head", [{ text: result.head, opaque: true }], columns);
     return ["  record", ...rows.map((line) => `  ${line}`)];

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

@@ -1,2 +1,3 @@
 import type { ObservationResult } from "../result.js";
+export declare function worldObservationFailureText(result: ObservationResult): string | undefined;
 export declare function renderObservation(result: ObservationResult): string;

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

@@ -1,4 +1,21 @@
+export function worldObservationFailureText(result) {
+    if (result.command !== "reconcile")
+        return undefined;
+    const report = result.report;
+    if (typeof report !== "object" ||
+        report === null ||
+        !("kind" in report) ||
+        report.kind !== "world-observation-failed" ||
+        !("diagnostic" in report) ||
+        typeof report.diagnostic !== "string") {
+        return undefined;
+    }
+    return `reconcile: world observation failed · ${report.diagnostic}`;
+}
 export function renderObservation(result) {
+    const failed = worldObservationFailureText(result);
+    if (failed !== undefined)
+        return failed;
     const { kind: _kind, command, ...observation } = result;
     return [`observation ${command}`, JSON.stringify(observation, null, 2)].join("\n");
 }

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

@@ -1,20 +1,93 @@
+import { abbreviateGitIds, afterWording, candidateFact, dependentWording, displayGitId, gateFact, gitIdsInRow, } from "./contract-observation.js";
 import { safeText } from "./terminal.js";
+function targetLine(row) {
+    if (row.target === null)
+        return "no target";
+    const target = row.target.startsWith("refs/heads/") ? row.target.slice("refs/heads/".length) : row.target;
+    const lag = row.targetLag.kind === "counted"
+        ? `${row.targetLag.behind} commits behind ${target}`
+        : row.targetLag.kind === "unknown"
+            ? `commits behind ${target} unknown`
+            : undefined;
+    return [
+        `target ${target}`,
+        ...(lag === undefined ? [] : [lag]),
+        ...(row.targetObservation?.drift === true ? ["target moved"] : []),
+    ].join(" · ");
+}
+function catalogMark(row) {
+    if (row.phase === "claimed")
+        return "✓";
+    if (row.phase === "abandoned")
+        return "×";
+    if (row.title === null)
+        return "?";
+    if (row.gates.reports.some((gate) => gate.current.kind === "attested" && gate.current.verdict === "unsatisfied"))
+        return "!";
+    if (row.targetLag.kind === "unknown")
+        return "?";
+    if (row.phase === "waiting")
+        return "○";
+    return "●";
+}
+function formatAge(source, observedAt) {
+    const seconds = Math.floor((Date.parse(observedAt) - Date.parse(source)) / 1_000);
+    if (seconds < 0)
+        return "future";
+    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 renderContractCatalog(catalog) {
+    const abbreviations = abbreviateGitIds([
+        ...(catalog.state === null ? [] : [catalog.state]),
+        ...catalog.rows.flatMap(gitIdsInRow),
+    ]);
+    const rows = catalog.rows.filter((row) => row.disposition === "active");
+    const candidates = rows.filter((row) => row.delivery !== null).length;
+    const header = [
+        `${rows.length} active · ${candidates} candidate${candidates === 1 ? "" : "s"}`,
+        catalog.state === null
+            ? `observedAt ${catalog.observedAt}`
+            : `contract state ${displayGitId(catalog.state, abbreviations)} · observedAt ${catalog.observedAt}`,
+    ];
+    const blocks = rows.map((row) => {
+        const lines = [
+            `${catalogMark(row)} ${safeText(row.id)} · ${row.phase} · ${formatAge(row.phaseAt, catalog.observedAt)} · ${safeText(row.title ?? "title unavailable")}`,
+            `  ${candidateFact(row.delivery)} · ${targetLine(row)}`,
+            ...row.after.map((edge) => `  ${afterWording(edge)}`),
+            ...(row.dependents.length === 0 ? [] : [`  dependents ${row.dependents.map(dependentWording).join(" · ")}`]),
+            ...(row.gates.reports.length === 0 ? [] : [`  ${row.gates.reports.map(gateFact).join("  ")}`]),
+        ];
+        return lines.join("\n");
+    });
+    return [...header, ...(blocks.length === 0 ? [] : ["", ...blocks])].join("\n");
+}
 export function renderCatalogText(catalog) {
     if (catalog.kind === "tasks") {
-        return catalog.rows.map((row) => `${safeText(row.id)} - P${row.priority} - ${row.disposition} - ${safeText(row.title)}`).join("\n");
-    }
-    if (catalog.kind === "contracts") {
-        return catalog.rows.map((row) => `${safeText(row.id)} - ${row.phase}`).join("\n");
+        return catalog.rows
+            .map((row) => `${safeText(row.id)} - P${row.priority} - ${row.disposition} - ${safeText(row.title)}`)
+            .join("\n");
     }
+    if (catalog.kind === "contracts")
+        return renderContractCatalog(catalog);
     if (catalog.kind === "archetypes") {
-        return catalog.rows.flatMap((row) => [
+        return catalog.rows
+            .flatMap((row) => [
             `${safeText(row.name)}${row.model === undefined ? "" : ` - ${safeText(row.model)}`}`,
             ...(row.description === undefined ? [] : [`  ${safeText(row.description)}`]),
-        ]).join("\n");
+        ])
+            .join("\n");
     }
-    return catalog.rows.map((row) => {
+    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");
+    })
+        .join("\n");
 }

package/build/src/cli/render/contract-history.d.ts

@@ -0,0 +1,2 @@
+import type { ContractHistory } from "../../index.js";
+export declare function renderContractHistory(history: ContractHistory): string;