@astrosheep/keiyaku 4.1.0 → 4.1.2

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

@@ -0,0 +1,83 @@
+import { receiptPayload } from "./receipt.js";
+function journalCount(events, source) {
+    return events.filter((event) => event.source === source).length;
+}
+function journalHead(fact) {
+    return fact.actor === undefined
+        ? `${fact.at} ${fact.kind} · ${fact.entry}`
+        : `${fact.at} ${fact.kind} · ${fact.entry} · ${fact.actor}`;
+}
+function listFact(label, values) {
+    return values.length === 0 ? [`  ${label} 0`] : [`  ${label} ${values.join(" · ")}`];
+}
+function journalBody(fact) {
+    switch (fact.kind) {
+        case "bind": {
+            const { coordinates, terms } = fact.data;
+            return [
+                `  start ${coordinates.start}`,
+                ...(coordinates.target === undefined ? [] : [`  target ${coordinates.target}`]),
+                `  workspace ${coordinates.workspace}`,
+                `  document ${terms.document.key}`,
+                ...listFact("gates", terms.gates),
+                ...listFact("after", terms.after),
+            ];
+        }
+        case "amend":
+            return [
+                `  document ${fact.data.document.key}`,
+                ...listFact("gates", fact.data.gates),
+                ...listFact("after", fact.data.after),
+            ];
+        case "bound":
+            return [];
+        case "deliver": {
+            const { tenderSnapshot, integration, method, policy } = fact.data;
+            return [
+                `  tender ${tenderSnapshot}`,
+                `  predecessor ${integration.predecessor}`,
+                `  snapshot ${integration.snapshot}`,
+                `  change ${integration.changeId}`,
+                `  method ${method}`,
+                `  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}`, `  verdict ${fact.data.verdict}`, `  subject ${fact.data.subject}`];
+            if (fact.data.summary !== undefined)
+                receiptPayload(lines, "summary", fact.data.summary);
+            return lines;
+        }
+        case "claimed":
+            return [`  delivery ${fact.data.delivery}`];
+        case "arc": {
+            const lines = [`  sequence ${String(fact.data.seq)}`, `  title ${fact.data.title}`];
+            receiptPayload(lines, "objective", fact.data.objective);
+            receiptPayload(lines, "brief", fact.data.brief);
+            return lines;
+        }
+        case "abandoned": {
+            if (fact.data.note === undefined)
+                return [];
+            const lines = [];
+            receiptPayload(lines, "note", fact.data.note);
+            return lines;
+        }
+    }
+}
+function contractHistoryEventLines(event) {
+    if (event.source === "dispatch")
+        return [`${event.dispatch.dispatchedAt} dispatch · ${event.dispatch.akuId}`];
+    return [journalHead(event.fact), ...journalBody(event.fact)];
+}
+export function renderContractHistory(history) {
+    const journals = journalCount(history.events, "journal");
+    const dispatches = journalCount(history.events, "dispatch");
+    return [
+        `history ${history.id} · ${journals} journal · ${dispatches} dispatch`,
+        "",
+        ...history.events.flatMap(contractHistoryEventLines),
+    ].join("\n");
+}

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

@@ -0,0 +1,10 @@
+import type { ContractAfterEdge, ContractDependent, ContractGateReport, ContractRow, ContractWorkspaceObservation } from "../../index.js";
+export declare function gateGlyph(report: ContractGateReport): string;
+export declare function gateFact(report: ContractGateReport): string;
+export declare function candidateFact(delivery: ContractRow["delivery"]): string;
+export declare function afterWording(edge: ContractAfterEdge): string;
+export declare function dependentWording(dependent: ContractDependent): string;
+export declare function mergeSummary(observation: ContractWorkspaceObservation): string | undefined;
+export declare function abbreviateGitIds(ids: readonly string[]): ReadonlyMap<string, string>;
+export declare function gitIdsInRow(row: ContractRow): readonly string[];
+export declare function displayGitId(value: string, abbreviations: ReadonlyMap<string, string>): string;

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

@@ -0,0 +1,58 @@
+const GIT_OBJECT_ID = /^[0-9a-f]{40}$/iu;
+export function gateGlyph(report) {
+    if (report.current.kind === "stale")
+        return "[~]";
+    if (report.current.kind === "missing")
+        return "[ ]";
+    return report.current.verdict === "satisfied" ? "[✓]" : "[✗]";
+}
+export function gateFact(report) {
+    return `${gateGlyph(report)} ${report.gate}${report.current.kind === "stale" ? " (stale)" : ""}`;
+}
+export function candidateFact(delivery) {
+    return delivery === null ? "no candidate" : "candidate";
+}
+export function afterWording(edge) {
+    if (edge.endpoint.kind === "claimed")
+        return `after ${edge.contractId} (claimed)`;
+    const condition = edge.endpoint.kind === "active" ? edge.endpoint.phase : edge.endpoint.kind;
+    return `blocked by ${edge.contractId} (${condition})`;
+}
+export function dependentWording(dependent) {
+    return `${dependent.contractId} (${dependent.phase})`;
+}
+export function mergeSummary(observation) {
+    if (observation.kind !== "clean" && observation.kind !== "dirty")
+        return undefined;
+    if (observation.merge === null)
+        return undefined;
+    const count = observation.merge.unmergedPaths.length;
+    return count > 0 ? `merge conflict in worktree (${count} paths)` : "merge in progress (resolution staged)";
+}
+export function abbreviateGitIds(ids) {
+    const unique = [...new Set(ids.filter((id) => GIT_OBJECT_ID.test(id)))];
+    let length = 7;
+    while (length < 40) {
+        const prefixes = unique.map((id) => id.slice(0, length).toLowerCase());
+        if (new Set(prefixes).size === unique.length)
+            break;
+        length += 1;
+    }
+    return new Map(unique.map((id) => [id, id.slice(0, length)]));
+}
+export function gitIdsInRow(row) {
+    const ids = [];
+    if (row.delivery !== null) {
+        ids.push(row.delivery.tenderSnapshot, row.delivery.integration.predecessor, row.delivery.integration.snapshot);
+    }
+    if (row.targetObservation?.head != null)
+        ids.push(row.targetObservation.head);
+    const observation = row.workspaceObservation;
+    if ((observation.kind === "clean" || observation.kind === "dirty") && observation.merge !== null) {
+        ids.push(observation.merge.head);
+    }
+    return ids;
+}
+export function displayGitId(value, abbreviations) {
+    return abbreviations.get(value) ?? value;
+}

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

@@ -1,6 +1,5 @@
-import type { ContractHistory } from "../../index.js";
 import type { AcceptedResult, RetryResult } from "../result.js";
 import { type TextRenderContext } from "./terminal.js";
 export declare function renderAccepted(result: AcceptedResult, context?: TextRenderContext): string;
 export declare function renderRetry(result: RetryResult, context?: TextRenderContext): string;
-export declare function renderContractHistory(history: ContractHistory): string;
+export { renderContractHistory } from "./contract-history.js";

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

@@ -24,18 +24,10 @@ function effectRows(effect, columns) {
         receiptRow(lines, mark, "contract-file", [{ text: effect.action }, { text: effect.path, opaque: true }], columns);
     }
     else if (effect.kind === "target-checkout") {
-        receiptRow(lines, mark, "target-checkout", [
-            { text: effect.action },
-            { text: effect.target, opaque: true },
-            { text: effect.path, opaque: true },
-        ], columns);
+        receiptRow(lines, mark, "target-checkout", [{ text: effect.action }, { text: effect.target, opaque: true }, { text: effect.path, opaque: true }], columns);
     }
     else if (effect.kind === "recovery-snapshot") {
-        receiptRow(lines, mark, "recovery-snapshot", [
-            { text: effect.action },
-            { text: effect.snapshot, opaque: true },
-            { text: effect.retention },
-        ], columns);
+        receiptRow(lines, mark, "recovery-snapshot", [{ text: effect.action }, { text: effect.snapshot, opaque: true }, { text: effect.retention }], columns);
     }
     else {
         receiptRow(lines, mark, "ref", [
@@ -51,15 +43,33 @@ function lagRows(lag, columns) {
     if (lag.kind === "worktree-retained") {
         receiptRow(lines, "!", "lag", [{ text: `worktree-retained ${lag.path}`, opaque: true }], columns);
     }
+    else if (lag.kind === "worktree-follow-retained") {
+        receiptRow(lines, "!", "lag", [
+            {
+                text: `${lag.kind} reason=${lag.reason} tender=${lag.tender} head=${lag.head} path=${lag.path}`,
+                opaque: true,
+            },
+        ], columns);
+    }
     else if (lag.kind === "unsealed-bytes") {
-        receiptRow(lines, "!", "lag", [{ text: `unsealed-bytes ${lag.path}${lag.head === undefined ? "" : ` head=${lag.head}`}${lag.paths.length === 0 ? "" : ` paths=${lag.paths.join(",")}`}`, opaque: true }], columns);
+        receiptRow(lines, "!", "lag", [
+            {
+                text: `unsealed-bytes ${lag.path}${lag.head === undefined ? "" : ` head=${lag.head}`}${lag.paths.length === 0 ? "" : ` paths=${lag.paths.join(",")}`}`,
+                opaque: true,
+            },
+        ], columns);
     }
     else if (lag.kind === "target-checkout-retained") {
         receiptRow(lines, "!", "lag", [{ text: `target-checkout-retained ${lag.target} ${lag.path}`, opaque: true }], columns);
         receiptPayload(lines, "diagnostic", lag.diagnostic);
     }
     else if (lag.kind === "worktree-hook-failed") {
-        receiptRow(lines, "!", "lag", [{ text: `worktree-hook-failed ${lag.phase} ${lag.path} command=${lag.command} ${hookFailureSummary(lag.failure)}`, opaque: true }], columns);
+        receiptRow(lines, "!", "lag", [
+            {
+                text: `worktree-hook-failed ${lag.phase} ${lag.path} command=${lag.command} ${hookFailureSummary(lag.failure)}`,
+                opaque: true,
+            },
+        ], columns);
         appendHookPayload(lines, lag.failure);
     }
     else if (lag.kind === "contract-file-failed") {
@@ -74,11 +84,18 @@ function lagRows(lag, columns) {
 }
 function settlementLagRows(lag, columns) {
     const lines = [];
-    receiptRow(lines, "!", "settlement", [{ text: [
+    receiptRow(lines, "!", "settlement", [
+        {
+            text: [
                 `surface=${lag.surface}`,
                 lag.taskId === undefined ? undefined : `task=${lag.taskId}`,
                 lag.path === undefined ? undefined : `path=${lag.path}`,
-            ].filter((part) => part !== undefined).join(" "), opaque: true }], columns);
+            ]
+                .filter((part) => part !== undefined)
+                .join(" "),
+            opaque: true,
+        },
+    ], columns);
     receiptPayload(lines, "diagnostic", lag.diagnostic);
     return lines;
 }
@@ -122,11 +139,7 @@ function acceptedRecord(result, columns) {
                 { text: "->" },
                 { text: fact.data.snapshot, opaque: true },
             ]
-            : [
-                ...contract,
-                { text: fact.entry, opaque: true },
-                { text: `· ${fact.kind}` },
-            ], columns);
+            : [...contract, { text: fact.entry, opaque: true }, { text: `· ${fact.kind}` }], columns);
     }
     receiptRow(record, " ", "head", [{ text: result.head, opaque: true }], columns);
     if (result.verb === "deliver") {
@@ -194,15 +207,10 @@ function completionLines(result, columns) {
     receiptRow(lines, " ", "target", [
         { text: "->" },
         { text: completion.integration, opaque: true },
-        ...(verification?.verdict === "satisfied"
-            ? [{ text: `· verified (${verification.mode})` }]
-            : []),
+        ...(verification?.verdict === "satisfied" ? [{ text: `· verified (${verification.mode})` }] : []),
     ], columns);
     if (verification?.verdict === "unsatisfied") {
-        receiptRow(lines, "!", "verification", [
-            { text: "unsatisfied" },
-            { text: `(${verification.mode})` },
-        ], columns);
+        receiptRow(lines, "!", "verification", [{ text: "unsatisfied" }, { text: `(${verification.mode})` }], columns);
         if (result.verificationSummary !== undefined) {
             receiptPayload(lines, "  summary", result.verificationSummary);
         }
@@ -223,27 +231,17 @@ function continuationLines(result, columns) {
         return [];
     const lines = [];
     for (const contractId of report.claimed) {
-        receiptRow(lines, "✓", "continuation", [
-            { text: "complete" },
-            { text: contractId, opaque: true },
-        ], columns);
+        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);
+        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", [
-        { text: result.workspace === "worktree" ? "managed worktree" : "here" },
-    ], columns);
+    receiptRow(lines, " ", "workspace", [{ text: "managed worktree" }], columns);
     if (result.target === null)
         receiptRow(lines, " ", "no target", [], columns);
     else
@@ -298,11 +296,7 @@ function renderAcceptedReview(result, columns) {
 }
 function renderAcceptedArc(result, columns) {
     const lines = titleLines("✓", "chapter recorded", result.contract, columns);
-    receiptRow(lines, " ", "chapter", [
-        { text: String(result.chapter.seq) },
-        { text: "·" },
-        { text: result.chapter.title },
-    ], columns);
+    receiptRow(lines, " ", "chapter", [{ text: String(result.chapter.seq) }, { text: "·" }, { text: result.chapter.title }], columns);
     lines.push(...recordBlock(result, columns));
     return lines.join("\n");
 }
@@ -312,16 +306,10 @@ function renderAcceptedAbandon(result, columns) {
         receiptRow(lines, " ", "note", [{ text: result.note }], columns);
     for (const effect of result.effects) {
         if (effect.kind === "worktree") {
-            receiptRow(lines, " ", "workspace", [
-                { text: effect.action },
-                { text: effect.path, opaque: true },
-            ], columns);
+            receiptRow(lines, " ", "workspace", [{ text: effect.action }, { text: effect.path, opaque: true }], columns);
         }
         else if (effect.kind === "recovery-snapshot") {
-            receiptRow(lines, " ", "recovery snapshot", [
-                { text: effect.snapshot, opaque: true },
-                { text: `· ${effect.retention}` },
-            ], columns);
+            receiptRow(lines, " ", "recovery snapshot", [{ text: effect.snapshot, opaque: true }, { text: `· ${effect.retention}` }], columns);
         }
     }
     lines.push(...recordBlock(result, columns));
@@ -353,93 +341,4 @@ export function renderRetry(result, context) {
         : [];
     return [...outcomeLines("?", result.verb, "retry", result.contract, columns), ...detail].join("\n");
 }
-function journalCount(events, source) {
-    return events.filter((event) => event.source === source).length;
-}
-function journalHead(fact) {
-    return fact.actor === undefined
-        ? `${fact.at} ${fact.kind} · ${fact.entry}`
-        : `${fact.at} ${fact.kind} · ${fact.entry} · ${fact.actor}`;
-}
-function listFact(label, values) {
-    return values.length === 0 ? [`  ${label} 0`] : [`  ${label} ${values.join(" · ")}`];
-}
-function journalBody(fact) {
-    switch (fact.kind) {
-        case "bind": {
-            const { coordinates, terms } = fact.data;
-            return [
-                `  start ${coordinates.start}`,
-                ...(coordinates.target === undefined ? [] : [`  target ${coordinates.target}`]),
-                `  workspace ${coordinates.workspace}`,
-                `  document ${terms.document.key}`,
-                ...listFact("gates", terms.gates),
-                ...listFact("after", terms.after),
-            ];
-        }
-        case "amend":
-            return [
-                `  document ${fact.data.document.key}`,
-                ...listFact("gates", fact.data.gates),
-                ...listFact("after", fact.data.after),
-            ];
-        case "bound":
-            return [];
-        case "deliver": {
-            const { tenderSnapshot, integration, method, policy } = fact.data;
-            return [
-                `  tender ${tenderSnapshot}`,
-                `  predecessor ${integration.predecessor}`,
-                `  snapshot ${integration.snapshot}`,
-                `  change ${integration.changeId}`,
-                `  method ${method}`,
-                `  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}`,
-                `  verdict ${fact.data.verdict}`,
-                `  subject ${fact.data.subject}`,
-            ];
-            if (fact.data.summary !== undefined)
-                receiptPayload(lines, "summary", fact.data.summary);
-            return lines;
-        }
-        case "claimed":
-            return [`  delivery ${fact.data.delivery}`];
-        case "arc": {
-            const lines = [`  sequence ${String(fact.data.seq)}`, `  title ${fact.data.title}`];
-            receiptPayload(lines, "objective", fact.data.objective);
-            receiptPayload(lines, "brief", fact.data.brief);
-            return lines;
-        }
-        case "abandoned": {
-            if (fact.data.note === undefined)
-                return [];
-            const lines = [];
-            receiptPayload(lines, "note", fact.data.note);
-            return lines;
-        }
-    }
-}
-function contractHistoryEventLines(event) {
-    if (event.source === "dispatch") {
-        return [`${event.dispatch.dispatchedAt} dispatch · ${event.dispatch.akuId}`];
-    }
-    return [journalHead(event.fact), ...journalBody(event.fact)];
-}
-export function renderContractHistory(history) {
-    const journals = journalCount(history.events, "journal");
-    const dispatches = journalCount(history.events, "dispatch");
-    return [
-        `history ${history.id} · ${journals} journal · ${dispatches} dispatch`,
-        "",
-        ...history.events.flatMap(contractHistoryEventLines),
-    ].join("\n");
-}
+export { renderContractHistory } from "./contract-history.js";