@astrosheep/keiyaku 4.5.19 → 4.5.21

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

@@ -1,7 +1,17 @@
 import type { AkumaInvocationResult } from "../commands/akuma-invoke.js";
 import type { ParsedCommand } from "../parse.js";
+import { type ObservedCallHead } from "./akuma-activity.js";
 import { type TextRenderContext } from "./terminal.js";
 export { akumaRawAnswer } from "./akuma-activity.js";
+/**
+ * The head a streamed observing call opens with: the identity its birth already
+ * established, its Contract association, and the birth's diagnostics. The
+ * detached receipt's cwd row deliberately stays out; the observation stream
+ * owns this call's presentation.
+ */
+export declare function callObservationHead(result: Extract<AkumaInvocationResult, {
+    action: "call";
+}>["result"]): ObservedCallHead;
 export declare function renderAkumaText(command: ParsedCommand, result: AkumaInvocationResult, context?: TextRenderContext): string;
 export declare function akumaExitCode(result: AkumaInvocationResult): number;
 export declare function akumaJsonValue(result: AkumaInvocationResult): unknown;

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

@@ -1,6 +1,6 @@
 import { parseAkumaStatus } from "../../akuma/akuma.js";
 import { DEFAULT_CONTEXT, akumaRawAnswer, associatedIdentity, historyText, killResultText, mutationObservationStageText, snapshotHeading, snapshotText, tellText, waitText, } from "./akuma-activity.js";
-import { safeText, tone } from "./terminal.js";
+import { safeText } from "./terminal.js";
 export { akumaRawAnswer } from "./akuma-activity.js";
 function dispatchLines(stage) {
     if (stage.kind === "none")
@@ -12,8 +12,28 @@ function dispatchLines(stage) {
         return [`dispatch failed conflict ${stage.failure.current.contractId}`];
     return [`dispatch failed ${stage.failure.kind} ${safeText(stage.failure.diagnostic)}`];
 }
-function executionCwdLine(result) {
-    return [`cwd  ${safeText(result.execution.cwd)}`];
+/**
+ * The head a streamed observing call opens with: the identity its birth already
+ * established, its Contract association, and the birth's diagnostics. The
+ * detached receipt's cwd row deliberately stays out; the observation stream
+ * owns this call's presentation.
+ */
+export function callObservationHead(result) {
+    const alias = result.alias.kind === "aliased" ? result.alias.alias.alias : undefined;
+    const contractId = result.dispatch.kind === "dispatched" ? result.dispatch.dispatch.contractId : undefined;
+    const facts = [
+        ...dispatchLines(result.dispatch),
+        ...(result.readonly?.enforcement === "none" ? [`! ${safeText(result.readonly.diagnostic)}`] : []),
+        ...(result.alias.kind === "failed"
+            ? [`alias failed ${result.alias.failure.kind} ${safeText(result.alias.failure.diagnostic)}`]
+            : []),
+    ];
+    return {
+        id: result.akuma,
+        ...(alias === undefined ? {} : { alias }),
+        contract: contractId === undefined ? { kind: "none" } : { kind: "associated", contractId },
+        facts,
+    };
 }
 function callText(result, context) {
     if (result.schemaAnswer !== undefined)
@@ -24,27 +44,19 @@ function callText(result, context) {
     const restraint = result.result.readonly?.enforcement === "none" ? [`! ${safeText(result.result.readonly.diagnostic)}`] : [];
     if (result.result.alias.kind === "failed")
         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 = [
             associatedIdentity(result.result.akuma, alias),
-            ...(contractId === undefined ? [] : [`  \u{1f4dc} ${safeText(contractId)}`]),
-            `  \u{1f4c1} ${safeText(result.result.execution.cwd)}`,
+            ...(contractId === undefined ? [] : [`  -> ${safeText(contractId)}`]),
+            `  cwd  ${safeText(result.result.execution.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(tone("-----", "dim", context.color), `$ keiyaku wait ${selector} --timeout 5m`, tone("to wait", "dim", context.color));
-        }
         return lines.join("\n");
     }
     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)}`,
@@ -53,23 +65,21 @@ function callText(result, context) {
     return snapshotText({
         status: parseAkumaStatus(result.result.observation.status),
         contract: contractId === undefined ? { kind: "none" } : { kind: "associated", contractId },
-    }, context, { ...(alias === undefined ? {} : { alias }), facts: [...cwd, ...facts] });
+    }, context, { ...(alias === undefined ? {} : { alias }), facts: [...facts] });
 }
 export function renderAkumaText(command, result, context = DEFAULT_CONTEXT) {
     const answer = akumaRawAnswer(result);
-    if (answer !== undefined) {
-        if (result.action !== "call")
-            return answer;
-        const cwd = executionCwdLine(result.result);
-        return `${cwd.join("\n")}\n\n${answer}`;
-    }
+    if (answer !== undefined)
+        return answer;
     if (result.action === "tell" && result.mode === "schema")
         return JSON.stringify(result.result);
     switch (result.action) {
         case "call":
             return callText(result, context);
         case "status":
-            return snapshotText(result.status, context, { ...(result.alias === undefined ? {} : { alias: result.alias }) });
+            return snapshotText(result.status, context, {
+                ...(result.alias === undefined ? {} : { alias: result.alias }),
+            });
         case "wait":
             return waitText(result, context);
         case "tell":

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

@@ -94,7 +94,7 @@ function recordLines(result, columns) {
     for (const fact of result.facts) {
         receiptRow(rows, " ", "journal", [{ text: fact.entry, opaque: true }, { text: `· ${fact.kind}` }], columns);
     }
-    return ["  record", ...rows.map((line) => `  ${line}`)];
+    return rows;
 }
 export function renderAcceptedAudit(result, context) {
     const report = result.report;

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

@@ -12,7 +12,7 @@ export function worldObservationFailureText(result) {
         typeof report.diagnostic !== "string") {
         return undefined;
     }
-    return `✕ observation  ${result.command}\n  diagnostic  ${report.diagnostic}`;
+    return `× observation  ${result.command}\n  diagnostic  ${report.diagnostic}`;
 }
 export function renderObservation(result) {
     const failed = worldObservationFailureText(result);

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

@@ -1,13 +1,13 @@
-import { abbreviateGitIds, afterWording, candidateFact, dependentWording, displayGitId, gateFact, gitIdsInRow, verificationFact, targetFacts, } from "./contract-observation.js";
+import { abbreviateGitIds, afterWording, candidateFact, dependentWording, gateFact, gitIdsInRow, verificationFact, targetFacts, } from "./contract-observation.js";
 import { safeText } from "./terminal.js";
-import { taskMark } from "./task.js";
+import { dispositionText, taskMark } from "./task.js";
 function akumaMark(life) {
     if (life === "running")
         return "●";
     if (life === "asleep" || life === "unborn")
         return "○";
     if (life === "killed")
-        return "✕";
+        return "×";
     if (life === "stillborn")
         return "!";
     return "?";
@@ -38,7 +38,12 @@ function renderAkumaCatalog(catalog) {
     for (const row of rows) {
         const lifeAt = "lifeAt" in row ? row.lifeAt : null;
         const activityAt = "lastActivityAt" in row ? row.lastActivityAt : null;
-        const ages = [relativeAge(lifeAt, catalog.observedAt), relativeAge(activityAt, catalog.observedAt)].filter((age) => age !== null);
+        const lifeAge = relativeAge(lifeAt, catalog.observedAt);
+        const activityAge = relativeAge(activityAt, catalog.observedAt);
+        const ages = [
+            ...(lifeAge === null ? [] : [lifeAge]),
+            ...(activityAge === null || activityAge === lifeAge ? [] : [`activity ${activityAge}`]),
+        ];
         lines.push(`${akumaMark(row.life)} ${safeText(row.id)} · ${row.life}${ages.length === 0 ? "" : ` · ${ages.join(" · ")}`}`);
     }
     if (catalog.hasMore)
@@ -49,15 +54,15 @@ function catalogMark(row) {
     if (row.phase === "claimed")
         return "✓";
     if (row.phase === "abandoned")
-        return "✕";
+        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 "○";
+    if (row.phase === "waiting" || row.phase === "tendered")
+        return "⧗";
     return "●";
 }
 function formatAge(source, observedAt) {
@@ -78,15 +83,13 @@ function renderContractCatalog(catalog) {
         ...catalog.rows.flatMap(gitIdsInRow),
     ]);
     const rows = catalog.rows;
-    const header = catalog.state === null
-        ? `observedAt  ${catalog.observedAt}`
-        : `contract state  ${displayGitId(catalog.state, abbreviations)} · observedAt  ${catalog.observedAt}`;
+    const header = `observed  ${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)}`,
             ...targetFacts(row, abbreviations).map((fact) => `  ${safeText(fact)}`),
-            ...(row.worktreePath === null ? [] : [`  worktree  ${safeText(row.worktreePath)}`]),
+            ...[],
             ...(verificationFact(row.verification) === undefined ? [] : [`  ${verificationFact(row.verification)}`]),
             ...row.after.map((edge) => `  ${afterWording(edge)}`),
             ...(row.dependents.length === 0 ? [] : [`  dependents  ${row.dependents.map(dependentWording).join(" · ")}`]),
@@ -99,7 +102,7 @@ function renderContractCatalog(catalog) {
 export function renderCatalogText(catalog) {
     if (catalog.kind === "tasks") {
         return [
-            ...catalog.rows.map((row) => `${taskMark(row.disposition)} ${safeText(row.id)} · ${row.disposition} · P${row.priority} — ${safeText(row.title)}`),
+            ...catalog.rows.map((row) => `${taskMark(row.disposition)} ${safeText(row.id)} · ${dispositionText(row.disposition)} · P${row.priority} — ${safeText(row.title)}`),
             ...(catalog.hasMore ? ["…"] : []),
         ].join("\n");
     }
@@ -107,7 +110,7 @@ export function renderCatalogText(catalog) {
         return renderContractCatalog(catalog);
     if (catalog.kind === "archetypes") {
         return [
-            `available Akuma  ${catalog.rows.length}`,
+            `available Akuma`,
             "",
             ...catalog.rows.flatMap((row) => [
                 `${safeText(row.name)}${row.model === undefined ? "" : `  ${safeText(row.model)}`}`,

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

@@ -8,14 +8,37 @@ function journalHead(fact) {
         : `${fact.at} ${fact.kind} · ${fact.entry} · ${fact.actor}`;
 }
 function listFact(label, values) {
-    return values.length === 0 ? [`  ${label}  0`] : [`  ${label}  ${values.join(" · ")}`];
+    return values.length === 0 ? [] : [`  ${label}  ${values.join(" · ")}`];
+}
+function shortId(value) {
+    return /^[0-9a-f]{40}$/iu.test(value) ? value.slice(0, 7) : value;
+}
+/**
+ * A persisted subject is a canonical `[kind, value]` key set. Only its snapshot names the commit the verdict
+ * covers, so history speaks that component and leaves the segment and document keys to JSON.
+ */
+function subjectSnapshot(subject) {
+    let parsed;
+    try {
+        parsed = JSON.parse(subject);
+    }
+    catch {
+        return undefined;
+    }
+    if (!Array.isArray(parsed))
+        return undefined;
+    for (const key of parsed) {
+        if (Array.isArray(key) && key[0] === "snapshot" && typeof key[1] === "string")
+            return key[1];
+    }
+    return undefined;
 }
 function journalBody(fact) {
     switch (fact.kind) {
         case "bind": {
             const { coordinates, terms } = fact.data;
             return [
-                `  start commit  ${coordinates.start}`,
+                `  start commit  ${shortId(coordinates.start)}`,
                 ...(coordinates.target === undefined ? [] : [`  target  ${coordinates.target}`]),
                 `  workspace  ${coordinates.workspace}`,
                 ...listFact("gates", terms.gates),
@@ -29,24 +52,30 @@ function journalBody(fact) {
         case "deliver": {
             const { tenderSnapshot, integration, method, policy } = fact.data;
             return [
-                `  tender commit  ${tenderSnapshot}`,
-                `  predecessor commit  ${integration.predecessor}`,
-                `  integration commit  ${integration.snapshot}`,
+                `  tender commit  ${shortId(tenderSnapshot)}`,
+                `  predecessor commit  ${shortId(integration.predecessor)}`,
+                `  integration commit  ${shortId(integration.snapshot)}`,
                 `  content identity (not commit)  ${integration.changeId}`,
                 `  method  ${method}`,
-                `  require-branches-to-be-up-to-date  ${String(policy.requireBranchesToBeUpToDate)}`,
+                `  require branches up to date  ${String(policy.requireBranchesToBeUpToDate)}`,
             ];
         }
         case "reintegrated":
-            return [`  predecessor commit  ${fact.data.predecessor}`, `  integration commit  ${fact.data.snapshot}`];
+            return [
+                `  predecessor commit  ${shortId(fact.data.predecessor)}`,
+                `  integration commit  ${shortId(fact.data.snapshot)}`,
+            ];
         case "attestation": {
+            const snapshot = subjectSnapshot(fact.data.subject);
             const lines = [
                 `  gate  ${fact.data.gate}`,
                 `  verdict  ${fact.data.verdict}`,
-                `  subject identity  ${fact.data.subject}`,
+                snapshot === undefined ? "  subject  verification" : `  subject  verification  · snapshot ${shortId(snapshot)}`,
             ];
-            if (fact.data.summary !== undefined)
-                receiptPayload(lines, "summary", fact.data.summary);
+            if (fact.data.summary !== undefined) {
+                const clipped = fact.data.summary.length > 4096 ? `${fact.data.summary.slice(0, 4096)}\n[truncated]` : fact.data.summary;
+                receiptPayload(lines, "summary", clipped);
+            }
             return lines;
         }
         case "claimed":

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

@@ -1,13 +1,16 @@
 const GIT_OBJECT_ID = /^[0-9a-f]{40}$/iu;
+function shortGitId(value) {
+    return GIT_OBJECT_ID.test(value) ? value.slice(0, 7) : value;
+}
 export function gateGlyph(report) {
     if (report.current.kind === "stale")
-        return "[~]";
+        return "!";
     if (report.current.kind === "missing")
-        return "[ ]";
-    return report.current.verdict === "satisfied" ? "[✓]" : "[✗]";
+        return "○";
+    return report.current.verdict === "satisfied" ? "✓" : "×";
 }
 export function gateFact(report) {
-    return `${gateGlyph(report)} ${report.gate}${report.current.kind === "stale" ? " (stale)" : ""}`;
+    return `${gateGlyph(report)} ${report.gate}${report.current.kind === "stale" ? " · stale" : ""}`;
 }
 export function candidateFact(delivery) {
     return `candidate  ${delivery === null ? "none" : "present"}`;
@@ -16,7 +19,7 @@ export function verificationFact(status) {
     if (status === undefined)
         return undefined;
     if (status.kind === "recorded")
-        return `verification ${status.verdict}`;
+        return `verification ${status.verdict}${status.snapshot === undefined ? "" : ` · on ${shortGitId(status.snapshot)}`}`;
     return `verification ${status.kind}`;
 }
 export function afterWording(edge) {
@@ -61,7 +64,8 @@ export function gitIdsInRow(row) {
     return ids;
 }
 export function displayGitId(value, abbreviations) {
-    return abbreviations.get(value) ?? value;
+    const rendered = abbreviations.get(value) ?? value;
+    return GIT_OBJECT_ID.test(rendered) ? rendered.slice(0, 7) : rendered;
 }
 export function targetFacts(row, abbreviations) {
     if (row.target === null)