@astrosheep/keiyaku 2.9.8 → 2.9.10

package/build/cli/render/kanshi.js

@@ -1,25 +1,82 @@
+import { getConfig } from "../../config/env.js";
 import { formatAgeMs } from "./format.js";
+import { displayColumns, resolveLineColumns, truncateColumns } from "./line-width.js";
+import { renderPendingProjectionTell, renderProjectionActivity, selectProjectionActivityWindow, } from "./projection-activity.js";
+const KANSHI_MAX_COLUMNS = 120;
+const KANSHI_ACTIVITY_ROWS = 3;
 function shortHead(hash) {
-    if (!hash)
-        return "????????";
-    return hash.slice(0, 7);
+    return hash?.slice(0, 7);
+}
+function supportsColor() {
+    const { terminal } = getConfig();
+    if (terminal.noColor !== undefined || terminal.forceColor === "0")
+        return false;
+    if (terminal.forceColor !== undefined)
+        return true;
+    return process.stdout.isTTY === true && terminal.term?.toLowerCase() !== "dumb";
+}
+function tone(text, value) {
+    if (!supportsColor() || value === undefined || value === "normal")
+        return text;
+    return value === "description"
+        ? `\x1b[2m${text}\x1b[0m`
+        : `\x1b[31m${text}\x1b[0m`;
+}
+function renderFacts(facts) {
+    return {
+        plain: facts.map((fact) => fact.text).join(" · "),
+        rendered: facts.map((fact) => tone(fact.text, fact.tone)).join(" · "),
+    };
+}
+/** Align facts without allowing ANSI bytes to enter width arithmetic. */
+function alignedBoardRow(input) {
+    const facts = renderFacts(input.facts);
+    const prefix = `${input.prefix} `;
+    const titleBudget = Math.max(0, input.width - displayColumns(prefix) - displayColumns(facts.plain) - 1);
+    const visibleTitle = truncateColumns(input.title, titleBudget);
+    const spaces = " ".repeat(Math.max(1, input.width - displayColumns(prefix) - displayColumns(visibleTitle) - displayColumns(facts.plain)));
+    return `${prefix}${tone(visibleTitle, input.titleTone ?? "description")}${spaces}${facts.rendered}`;
 }
 function arcSparkline(arcs) {
-    if (arcs <= 0)
-        return "";
+    if (arcs <= 1)
+        return undefined;
     return Array.from({ length: arcs }, () => "·").join("──");
 }
 function pendingAfterIds(contract) {
     return contract.after.filter((item) => !item.terminal).map((item) => item.id);
 }
-function kanshiGlyph(contract) {
-    if (contract.state.state === "corrupt")
-        return "×";
-    if (pendingAfterIds(contract).length > 0)
-        return "○";
-    if (contract.state.state === "petitioned")
-        return "◎";
-    return "●";
+/**
+ * The Kanshi shape is the after DAG, not the petition/claim settlement queue.
+ * Stable input order settles independent lanes and any malformed cycle remains
+ * observable rather than dropping a contract.
+ */
+export function orderKanshiContracts(contracts) {
+    const byId = new Map(contracts.map((contract) => [contract.id, contract]));
+    const remaining = new Set(contracts.map((contract) => contract.id));
+    const emitted = new Set();
+    const ordered = [];
+    while (remaining.size > 0) {
+        const next = contracts.find((contract) => (remaining.has(contract.id)
+            && pendingAfterIds(contract)
+                .filter((id) => byId.has(id))
+                .every((id) => emitted.has(id))));
+        if (!next) {
+            // The bind boundary normally rejects cycles. Keep a corrupt historical
+            // graph visible in its original deterministic order instead of inventing
+            // a dependency edge or omitting work from the board.
+            const fallback = contracts.find((contract) => remaining.has(contract.id));
+            if (!fallback)
+                break;
+            ordered.push(fallback);
+            emitted.add(fallback.id);
+            remaining.delete(fallback.id);
+            continue;
+        }
+        ordered.push(next);
+        emitted.add(next.id);
+        remaining.delete(next.id);
+    }
+    return ordered;
 }
 function renderDriftMark(drift) {
     if (drift.state === "drift")
@@ -28,73 +85,179 @@ function renderDriftMark(drift) {
         return "▲orphaned";
     return undefined;
 }
-export function renderKanshiBoard(status) {
-    const head = shortHead(status.defaultHead);
-    if (status.contracts.length === 0) {
-        if (status.targetFilter !== null) {
-            return `現世 ${head} · target selected\nno commissions on selected target\n`;
-        }
-        return `現世 ${head} 无在飞契约\n`;
+function contractGlyph(contract) {
+    if (contract.state.state === "corrupt")
+        return "×";
+    return pendingAfterIds(contract).length > 0 ? "⧗" : "□";
+}
+function contractFacts(contract) {
+    const facts = [];
+    const spark = arcSparkline(contract.arcs);
+    if (spark)
+        facts.push({ text: spark });
+    const drift = renderDriftMark(contract.baseDrift);
+    if (drift)
+        facts.push({ text: drift });
+    const lifecycle = contract.state.state === "active" ? "open" : contract.state.state;
+    const age = formatAgeMs(contract.lastActiveMs);
+    facts.push({ text: age ? `${lifecycle} ${age}` : lifecycle });
+    if (contract.queueHeadStalled) {
+        facts.push({ text: age ? `stalled ${age}` : "stalled", tone: "alert" });
     }
-    const header = status.targetFilter !== null
-        ? `現世 ${head} · target selected`
-        : `現世 ${head}`;
-    const lines = [header, ""];
-    for (const contract of status.contracts) {
-        const glyph = kanshiGlyph(contract);
-        const name = contract.place ? `${contract.slug} @${contract.place}` : contract.slug;
-        const spark = arcSparkline(contract.arcs);
-        const facts = [];
-        const lifecycle = contract.state.state === "active" ? "open" : contract.state.state;
-        if (lifecycle === "bound" || lifecycle === "open" || lifecycle === "petitioned") {
-            facts.push(lifecycle);
-        }
-        const arcMark = contract.currentArc.state === "open"
-            ? `a${contract.currentArc.number}+`
-            : `a${contract.currentArc.number}`;
-        facts.push(contract.title);
-        facts.push(arcMark);
-        facts.push(`next ${contract.nextStep.detail}`);
-        const age = formatAgeMs(contract.lastActiveMs);
-        if (age)
-            facts.push(age);
-        if (contract.queuePosition)
-            facts.push(`Q${contract.queuePosition}`);
-        const drift = renderDriftMark(contract.baseDrift);
-        if (drift)
-            facts.push(drift);
-        if (contract.nextStep.hint)
-            facts.push(contract.nextStep.hint);
-        const pending = pendingAfterIds(contract);
-        if (pending.length > 0) {
-            facts.push(`⧗ ${pending.map((id) => {
-                const dot = id.indexOf(".");
-                return dot > 0 ? id.slice(0, dot) : id;
-            }).join(",")}`);
-        }
-        if (contract.state.state === "corrupt") {
-            facts.push(`corrupt (${contract.state.reason ?? contract.corruptReason ?? "unknown"})`);
-        }
-        if (contract.queueHeadStalled) {
-            facts.push("朱 stall 去广场");
-        }
-        const sparkCol = spark.padEnd(14);
-        const factText = facts.join(" · ");
-        lines.push(`${glyph} ${name.padEnd(18)} ${sparkCol} ${factText}`.trimEnd());
-        if (contract.bootstrapDiagnostics.some((diagnostic) => diagnostic.kind === "plan-without-result")) {
-            lines.push("  ! bootstrap · no result recorded · forfeit and re-bind");
-        }
-        for (const diagnostic of contract.queueDiagnostics) {
-            if (diagnostic.kind === "legacy-petition") {
-                lines.push("  ! legacy petition · no seat · reject then re-petition");
-                continue;
-            }
-            if (diagnostic.kind === "duplicate-seat") {
-                lines.push(`  ! seat ${diagnostic.seat} duplicated with ${diagnostic.with} · ordered by contract id`);
-                continue;
-            }
-            lines.push("  ! target mismatch");
+    return facts;
+}
+function renderKeiyakuSection(board, width) {
+    if (!board.contractsObservable)
+        return undefined;
+    const lines = [`keiyaku ${board.contracts.length}`];
+    for (const contract of orderKanshiContracts(board.contracts)) {
+        lines.push(alignedBoardRow({
+            prefix: `${contractGlyph(contract)} ${contract.place ?? contract.slug}`,
+            title: contract.title,
+            facts: contractFacts(contract),
+            width,
+        }));
+        if (contract.replayBlockers.length > 0) {
+            lines.push(`  ! incomplete replay · ${contract.replayBlockers.map((blocker) => blocker.surface).join(", ")}`);
+            lines.push(`  • ${contract.replayBlockers[0].recoveryCommand}`);
         }
     }
-    return `${lines.join("\n")}\n`;
+    return lines.join("\n");
+}
+function activityState(row) {
+    switch (row.state) {
+        case "lost": return "lost";
+        case "startup-timeout": return "stalled";
+        case "unknown":
+        case "incompatible": return "unknown";
+        case "failed":
+        case "dead": return "dead";
+        case "done": return "returned";
+        case "killed":
+        case "dismissed": return "dismissed";
+        case "minting":
+        case "out": return "running";
+    }
+}
+function projectionBinding(board, row) {
+    if (row.binding?.kind !== "commission")
+        return "";
+    const place = board.commissionPlaces.get(row.binding.commissionId);
+    return place ? `@${place}` : "";
+}
+function projectionFacts(row) {
+    const facts = [];
+    if (row.durationMs !== undefined)
+        facts.push({ text: `up ${formatAgeMs(row.durationMs) ?? "0s"}` });
+    if (row.activityAgeMs !== undefined)
+        facts.push({ text: `active ${formatAgeMs(row.activityAgeMs) ?? "0s"}` });
+    if (row.state !== "out" && row.state !== "minting")
+        facts.push({ text: row.state, tone: row.state === "startup-timeout" ? "alert" : "normal" });
+    return facts;
+}
+function renderEmbeddedActivity(row, width) {
+    const observedAtMs = row.observedAtMs ?? Date.now();
+    const selection = row.activity
+        ? selectProjectionActivityWindow(row.activity, KANSHI_ACTIVITY_ROWS)
+        : undefined;
+    const ordinary = row.activity
+        ? renderProjectionActivity(selection.activity, {
+            anchorMs: observedAtMs,
+            state: activityState(row),
+            showPlan: false,
+            showSilence: false,
+            ...(row.workspaceRoot ? { workspaceRoot: row.workspaceRoot } : {}),
+            maxColumns: width,
+            leadingOmittedCount: selection.leadingOmittedCount,
+        })
+        : undefined;
+    const rendered = ordinary?.lines.map((line, index) => ({
+        line,
+        at: ordinary.rowAts[index],
+        order: index,
+    })) ?? [];
+    const tells = (row.pendingTells ?? []).map((tell, index) => ({
+        line: renderPendingProjectionTell(tell, {
+            anchorMs: observedAtMs,
+            maxColumns: width,
+            renderUnconsumedTail: (tail) => tone(tail, "alert"),
+        }),
+        at: tell.createdAt,
+        order: rendered.length + index,
+    }));
+    return [...rendered, ...tells]
+        .sort((left, right) => {
+        const leftAt = Date.parse(left.at ?? "");
+        const rightAt = Date.parse(right.at ?? "");
+        const safeLeft = Number.isFinite(leftAt) ? leftAt : Number.POSITIVE_INFINITY;
+        const safeRight = Number.isFinite(rightAt) ? rightAt : Number.POSITIVE_INFINITY;
+        return safeLeft - safeRight || left.order - right.order;
+    })
+        .map((entry) => entry.line);
+}
+function terminalSummary(board) {
+    const omitted = board.projections?.omitted;
+    if (!omitted)
+        return undefined;
+    const compatibleStates = ["failed", "dead", "done", "killed", "dismissed"];
+    const details = compatibleStates
+        .flatMap((state) => omitted.byState[state] > 0 ? [`${omitted.byState[state]} ${state}`] : []);
+    return details.length > 0 ? `+ ${details.join(" · ")}` : undefined;
+}
+function renderAkumaSection(board, width) {
+    if (!board.projections)
+        return undefined;
+    const lines = [`akuma ${board.projections.rows.length}`];
+    for (const row of board.projections.rows) {
+        const alias = row.alias ? ` ${row.alias}` : "";
+        lines.push(alignedBoardRow({
+            prefix: `◆ ${row.id}${alias}`,
+            title: projectionBinding(board, row),
+            titleTone: "normal",
+            facts: projectionFacts(row),
+            width,
+        }));
+        lines.push(...renderEmbeddedActivity(row, width));
+    }
+    const folded = terminalSummary(board);
+    if (folded)
+        lines.push(tone(folded, "description"));
+    return lines.join("\n");
+}
+function taskLabel(task) {
+    return task.title === task.id ? `P${task.pri} ${task.id}` : `P${task.pri} ${task.id} ${task.title}`;
+}
+function renderTaskSection(tasks, width) {
+    if (!tasks)
+        return undefined;
+    const lines = [`task ${tasks.total}`];
+    for (const task of tasks.topTasks) {
+        lines.push(alignedBoardRow({
+            prefix: "▶",
+            title: taskLabel(task),
+            facts: [{ text: `${task.state === "on_hold" ? "on hold · updated" : "in_progress · active"} ${formatAgeMs(task.activityAgeMs) ?? "0s"}` }],
+            width,
+        }));
+    }
+    const folded = [
+        tasks.ready > 0 ? `${tasks.ready} ready` : undefined,
+        tasks.blocked > 0 ? `${tasks.blocked} blocked` : undefined,
+        tasks.onHold > 0 ? `${tasks.onHold} on hold` : undefined,
+    ].filter((fact) => fact !== undefined);
+    if (folded.length > 0)
+        lines.push(tone(`+ ${folded.join(" · ")}`, "description"));
+    return lines.join("\n");
+}
+export function renderKanshiBoard(board) {
+    const width = Math.min(KANSHI_MAX_COLUMNS, resolveLineColumns());
+    const left = "kanshi ";
+    const head = shortHead(board.defaultHead);
+    const right = head ? ` 現世 ${head}` : " 現世";
+    const dashes = "─".repeat(Math.max(1, width - displayColumns(left) - displayColumns(right)));
+    const sections = [
+        renderKeiyakuSection(board, width),
+        renderAkumaSection(board, width),
+        renderTaskSection(board.tasks, width),
+    ].filter((section) => section !== undefined);
+    return `${[`${left}${dashes}${right}`, ...sections].join("\n\n")}\n`;
 }

package/build/cli/render/lifecycle.js

@@ -0,0 +1,56 @@
+import { attachAddressCarrier } from "../../core/addressing.js";
+import { isCompleteLifecycleOutcome } from "../../core/outcome-base.js";
+import { FlowError } from "../../flow-error.js";
+import { handleCliError } from "./errors.js";
+import { coreTextResponse } from "./shared.js";
+function isSuccessfulDerivedCleanup(result) {
+    return result.family === "precommit-effects-only"
+        && "status" in result
+        && result.status === "success"
+        && "cleanup" in result
+        && typeof result.cleanup === "object"
+        && result.cleanup !== null
+        && "status" in result.cleanup
+        && result.cleanup.status === "succeeded"
+        && [...result.prerequisites, ...result.downstream].every((row) => row.status !== "failed");
+}
+export async function buildLifecycleOutcomeResponse(result, context) {
+    if (result.family === "committed") {
+        return coreTextResponse(`lifecycle committed at ${result.committed.head}${result.replay.action === "reconcile" ? "; downstream reconciliation required" : ""}`, result);
+    }
+    const cause = result.family === "cancelled-before-effects"
+        ? result.cancellation
+        : result.family === "refused-before-effects"
+            ? result.failedInvariant
+            : [...result.prerequisites, ...result.downstream].find((row) => row.status === "failed")?.cause
+                ?? { code: "INTERNAL_STATE", message: "durable prerequisite effects require lifecycle reconciliation" };
+    if (!context) {
+        return { ...coreTextResponse(cause.message, result), exitCode: result.family === "cancelled-before-effects" ? 130 : 1 };
+    }
+    const facts = "facts" in cause ? cause.facts : undefined;
+    const error = new FlowError(cause.code, cause.message, {
+        ...(facts ? { facts: facts } : {}),
+    });
+    const rendered = await handleCliError({
+        error: context.address ? attachAddressCarrier(error, context.address) : error,
+        cwd: context.cwd,
+        logLabel: "lifecycle",
+    });
+    return {
+        ...rendered,
+        payload: result,
+        isDomainFailure: true,
+        exitCode: result.family === "cancelled-before-effects" ? 130 : 1,
+    };
+}
+export async function renderLifecycleResult(work, render, context) {
+    const value = await work;
+    if (isCompleteLifecycleOutcome(value))
+        return render(value);
+    if (isSuccessfulDerivedCleanup(value)) {
+        // Derived cleanup is a successful verb result, but deliberately is not a
+        // committed lifecycle result. The verb renderer owns that exact payload.
+        return render(value);
+    }
+    return buildLifecycleOutcomeResponse(value, context);
+}

package/build/cli/render/misc.js

@@ -3,6 +3,7 @@ import { RESPONSE_MARKERS } from "./response-style.js";
 import { formatReview, HINTS_LIST_MAX_ITEMS, REVIEW_SECTION_TITLE, toReviewPayload, } from "./shared.js";
 import { prependAddressReceipt, renderAddressCarrier } from "./address.js";
 import { commissionSlug } from "../../core/ids.js";
+import { renderAmendmentWarning } from "./amendment-warning.js";
 export function buildErrorResponse(input) {
     const shouldRaiseProtocolError = input.errorType === "runtime_error";
     const text = input.errorCode === "PROJECTION_INCOMPATIBLE"
@@ -28,14 +29,17 @@ export function buildErrorResponse(input) {
 }
 function buildErrorText(input) {
     const errorSection = buildSection("Error", input.message);
-    const recoverySection = input.facts?.kind === "renew_conflict"
-        ? buildSection("Recovery", [
+    const conflictSection = input.facts?.kind === "renew_conflict_scratch"
+        ? buildSection("Conflict scratch", [
+            input.facts.scratchPath,
+            "",
             "Conflicting paths:",
             ...input.facts.conflictPaths.map((filePath) => `  ${filePath}`),
-            ...(input.facts.conflictPathCapture.status === "failed"
-                ? [`Conflict-path capture failed: ${input.facts.conflictPathCapture.diagnostic}`]
-                : []),
-            "Delivery branch and worktree were restored; no ledger writes were appended.",
+            "",
+            `Ledger: ${input.facts.observedLedgerHead}`,
+            `Delivery: ${input.facts.deliveryRef} at ${input.facts.oldHead}`,
+            `Target: ${input.facts.targetRef} at ${input.facts.newBase}`,
+            "Authoritative ledger and delivery refs were unchanged.",
         ].join("\n"))
         : null;
     const reviewSection = input.review ? buildSection(REVIEW_SECTION_TITLE, formatReview(input.review)) : null;
@@ -43,32 +47,22 @@ function buildErrorText(input) {
         && input.addressCarrier.binding.kind === "commission"
         ? input.addressCarrier
         : undefined;
-    const recoveryAddress = commissionedCarrier
+    const renewAddress = commissionedCarrier
         ? `@${commissionedCarrier.place.display ?? commissionSlug(commissionedCarrier.binding.commissionId)}`
-        : input.facts?.kind === "renew_session"
-            ? `@${commissionSlug(input.facts.commission)}`
-            : undefined;
-    const nextActionSection = input.facts?.kind === "renew_session" && recoveryAddress
-        ? buildSection("Next action", input.facts.nextAction === "resolve-conflicts"
-            ? [
-                "Resolve and stage the conflicting delivery with ordinary Git, then:",
-                `» keiyaku ${recoveryAddress} renew --continue`,
-                "Or restore the pre-renew delivery:",
-                `» keiyaku ${recoveryAddress} renew --abort`,
-            ]
-            : input.facts.nextAction === "continue-or-abort" ? [
-                `» keiyaku ${recoveryAddress} renew --continue`,
-                `» keiyaku ${recoveryAddress} renew --abort`,
-            ] : [`» keiyaku ${recoveryAddress} renew --abort`])
+        : undefined;
+    const nextActionSection = input.facts?.kind === "renew_conflict_scratch" && renewAddress
+        ? buildSection("Next action", [
+            "Resolve files in the conflict scratch, then:",
+            `» keiyaku ${renewAddress} renew --continue`,
+            "Or discard the conflict scratch:",
+            `» keiyaku ${renewAddress} renew --abort`,
+        ])
         : null;
-    const hints = input.facts?.kind === "renew_session"
+    const hints = input.facts?.kind === "renew_conflict_scratch"
         ? []
         : formatHints(input.hints, { maxItems: HINTS_LIST_MAX_ITEMS, maxItemChars: FORMAT_LIST_MAX_ITEM_CHARS });
-    if (input.facts?.kind === "renew_conflict") {
-        hints.push("your old head survives:", `» git log ${input.facts.recoveryRef}`);
-    }
     const hintsSection = buildSection("Hints", hints);
-    const body = assembleResponse(colorizeErrorStatus(`${RESPONSE_MARKERS.failure} Failed [${input.errorCode}]`), "Request could not be completed.", [errorSection, recoverySection, nextActionSection, reviewSection, hintsSection].filter((section) => section !== null));
+    const body = assembleResponse(colorizeErrorStatus(`${RESPONSE_MARKERS.failure} Failed [${input.errorCode}]`), "Request could not be completed.", [errorSection, conflictSection, nextActionSection, reviewSection, hintsSection].filter((section) => section !== null));
     return input.addressCarrier ? `${renderAddressCarrier(input.addressCarrier)}\n${body}` : body;
 }
 export function buildHelpResponse(input) {
@@ -82,7 +76,9 @@ export function buildLogResponse(result) {
     const { address: _address, ...resultData } = result;
     const payload = resultData;
     return prependAddressReceipt({
-        text: result.markdown,
+        text: result.amendmentWarning
+            ? `${result.markdown.trimEnd()}\n\nWarning\n${renderAmendmentWarning(result.amendmentWarning)}\n`
+            : result.markdown,
         payload: buildPayload(payload),
     }, result.address);
 }

package/build/cli/render/petition.js

@@ -8,6 +8,11 @@ import { prependAddressReceipt } from "./address.js";
 export function renderPetitionRenewedConsequence(input) {
     return `renewed onto ${input.newBase.slice(0, 8)} · ${input.sealed?.receipts.length ?? 0} receipts replayed`;
 }
+export function renderPetitionRetryConsequence(reason) {
+    return reason === "target-drift"
+        ? "rejected petition after target drift · contract active"
+        : "rejected petition after delivery drift · contract active";
+}
 function formatPetitionSealSource(source) {
     return source.arc === null
         ? `no open arc · fence ${source.fence}`