@astrosheep/keiyaku 4.6.14 → 4.6.16

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

@@ -102,7 +102,7 @@ export function renderCallText(result, streamed, context) {
                 evidence: callEvidence(result, head),
             }),
             ...(admittedTell === undefined ? [] : tellPayloadLines(admittedTell.row.text, context)),
-            ...subordinateLines([`! error ${safeText(result.observation.failure.diagnostic)}`]),
+            ...subordinateLines([`! ${safeText(result.observation.failure.diagnostic)}`]),
         ].join("\n");
     }
     const inputObservation = result.observation;
@@ -152,32 +152,36 @@ export function renderKillText(result, alias, context) {
     void context;
     return result.results.map((member) => killResultText(member.id, member.evidence, alias)).join("\n");
 }
-export function callExitCode(result) {
+export function callOutcome(result) {
     if (result.dispatch.kind === "failed" || result.alias.kind === "failed" || result.observation.kind === "failed")
-        return 2;
+        return "failed";
     if (result.observation.kind !== "observed")
-        return 0;
+        return "accepted";
     return result.observation.observation.reason === "failed" ||
         result.observation.observation.reason === "invalid-output"
-        ? 2
-        : 0;
+        ? "failed"
+        : "accepted";
 }
-export function killExitCode(result) {
+export function killOutcome(result) {
     return result.results.some((member) => member.evidence === "unavailable" || member.evidence === "hung" || member.evidence === "untidy")
-        ? 1
-        : 0;
+        ? "failed"
+        : "accepted";
 }
-export function tellExitCode(result) {
-    return result.tell.wake.kind === "failed" ? 2 : 0;
+export function tellOutcome(result) {
+    return result.tell.wake.kind === "failed" ? "failed" : "accepted";
 }
-export function askExitCode(result) {
-    return result.observation.reason === "failed" || result.observation.reason === "invalid-output" ? 2 : 0;
+export function askOutcome(result) {
+    return result.observation.reason === "failed" || result.observation.reason === "invalid-output"
+        ? "failed"
+        : "accepted";
 }
-export function forkExitCode(receipt) {
-    return receipt.kind === "forked" ? 0 : receipt.kind === "upstream-forked" ? 2 : 1;
+export function forkOutcome(receipt) {
+    if (receipt.kind === "forked")
+        return receipt.dispatch.kind === "failed" ? "failed" : "accepted";
+    return receipt.kind === "upstream-forked" || receipt.kind === "fork-failed" ? "failed" : "refused";
 }
-export function historyExitCode(result, id) {
+export function historyOutcome(result, id) {
     if (id === undefined)
-        return 0;
-    return result.kind === "exact" ? 0 : 1;
+        return "accepted";
+    return result.kind === "exact" ? "accepted" : "refused";
 }

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

@@ -58,6 +58,7 @@ export function renderContractCatalogue(list) {
             : row.phase === "abandoned"
                 ? row.abandonNote
                 : undefined;
+        const testimonyLead = `  ${row.phase === "claimed" ? "review" : "note"}  `;
         const lines = [
             `${contractMark(row)} ${safeText(row.id)} · ${formatAge(row.phaseAt, list.observedAt)} · ${safeText(row.title ?? "title unavailable")}`,
             `  ${terminal ? outcome : progressStrip(row)}`,
@@ -65,11 +66,11 @@ export function renderContractCatalogue(list) {
                 ? []
                 : renderBoundedPayload({
                     text: testimony,
-                    first: `  ${row.phase === "claimed" ? "review" : "note"}  `,
-                    continuation: "    │ ",
+                    first: testimonyLead,
+                    continuation: " ".repeat(testimonyLead.length),
                     columns: 100,
                     maxLines: 3,
-                    quote: "“",
+                    quote: "",
                     truncated: false,
                 })),
         ];

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

@@ -1,4 +1,3 @@
-import { parseAkuId } from "../../akuma/identity.js";
 import { gateDisplayName, lifecycleWord, shortGitId } from "./contract-observation.js";
 import { receiptPayload } from "./receipt.js";
 import { renderOpaqueBlock, DEFAULT_CLI_COLUMNS } from "./terminal.js";
@@ -68,9 +67,7 @@ function journalBody(fact, workspace) {
             const lines = [
                 `  gate  ${fact.data.gate}`,
                 `  verdict  ${fact.data.verdict}`,
-                snapshot === undefined
-                    ? "  subject  verification"
-                    : `  subject  verification  · snapshot ${shortGitId(snapshot)}`,
+                ...(snapshot === undefined ? [] : [`  snapshot  ${shortGitId(snapshot)}`]),
             ];
             if (fact.data.summary !== undefined) {
                 const clipped = fact.data.summary.length > 4096 ? `${fact.data.summary.slice(0, 4096)}\n[truncated]` : fact.data.summary;
@@ -84,7 +81,7 @@ function journalBody(fact, workspace) {
             const lines = [`  sequence  ${String(fact.data.seq)}`, `  title  ${fact.data.title}`];
             const body = fact.data.body.replace(/^(?:\r?\n)+/u, "").trimEnd();
             if (body.length > 0)
-                lines.push("  body", ...renderOpaqueBlock(body, "  │ ", DEFAULT_CLI_COLUMNS));
+                lines.push("  body", ...renderOpaqueBlock(body, "  ", DEFAULT_CLI_COLUMNS));
             return lines;
         }
         case "abandoned": {
@@ -127,16 +124,8 @@ function bindLine(bind, dispatch) {
     const target = bind.data.coordinates.target?.replace(/^refs\/heads\//u, "") ?? "targetless";
     const gates = bind.data.terms.gates.map(gateDisplayName);
     const gateFact = gates.length === 0 ? "" : ` · ${gates.length === 1 ? "gate" : "gates"} ${gates.join(" · ")}`;
-    let alias = "";
-    if (dispatch?.source === "dispatch") {
-        try {
-            alias = ` · @${parseAkuId(dispatch.dispatch.akuId).archetype}`;
-        }
-        catch {
-            alias = "";
-        }
-    }
-    return `bound to ${target} @ ${shortGitId(bind.data.coordinates.start)}${gateFact}${alias}`;
+    const caller = dispatch?.source === "dispatch" ? ` · ${dispatch.dispatch.akuId}` : "";
+    return `bound to ${target} @ ${shortGitId(bind.data.coordinates.start)}${gateFact}${caller}`;
 }
 /**
  * The skeleton row is itself the first line of the beat's full form; the fold names the rest.
@@ -196,7 +185,7 @@ function skeletonBeatLines(beat, history) {
         }
         case "arc": {
             const body = fact.data.body.replace(/^(?:\r?\n)+/u, "").trimEnd();
-            const folded = body.length === 0 ? [] : renderOpaqueBlock(body, "  │ ", DEFAULT_CLI_COLUMNS);
+            const folded = body.length === 0 ? [] : renderOpaqueBlock(body, "  ", DEFAULT_CLI_COLUMNS);
             return [`${clock(first)} arc ${fact.data.title}${payloadSuffix(folded)}`];
         }
         case "claimed":

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

@@ -1,3 +1,4 @@
+import type { CliOutcome } from "../streams.js";
 import type { BlockedDebtList, DebtBatchResult, DebtContextResult, DebtDecompositionTree, DebtDetail, DebtDoctorReport, DebtList, DebtMutationResult, DebtQueryResult, DebtUpdateResult } from "../../debt/index.js";
 import { type TextRenderContext } from "./terminal.js";
 export { debtMark } from "./marks.js";
@@ -25,4 +26,4 @@ export declare function renderDebtContext(result: DebtContextResult, context?: T
 export declare function renderDebtMutation(verb: string, result: DebtMutationResult, context?: TextRenderContext): string;
 /** One lifecycle answer: a single mutation or a plural batch, both native shapes. */
 export declare function renderDebtLifecycle(verb: string, result: DebtMutationResult | DebtBatchResult, context?: TextRenderContext): string;
-export declare function debtExitCode(result: DebtNativeResult): number;
+export declare function debtOutcome(result: DebtNativeResult): CliOutcome;

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

@@ -240,18 +240,18 @@ export function renderDebtMutation(verb, result, context = DEFAULT_CONTEXT) {
 export function renderDebtLifecycle(verb, result, context = DEFAULT_CONTEXT) {
     return "items" in result ? renderBatch(verb, result, context.columns) : renderMutation(verb, result, context.columns);
 }
-export function debtExitCode(result) {
+export function debtOutcome(result) {
     if ("issues" in result)
-        return result.issues.length === 0 ? 0 : 1;
+        return result.issues.length === 0 ? "accepted" : "failed";
     if ("items" in result) {
         const kinds = result.items.map((item) => item.outcome.kind);
-        return kinds.includes("retry") ? 2 : kinds.includes("refused") ? 1 : 0;
+        return kinds.includes("retry") ? "retryable" : kinds.includes("refused") ? "refused" : "accepted";
     }
     if ("kind" in result) {
         if (result.kind === "retry")
-            return 2;
+            return "retryable";
         if (result.kind === "refused")
-            return 1;
+            return "refused";
     }
-    return 0;
+    return "accepted";
 }

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

@@ -1,3 +1,4 @@
+import type { CliOutcome } from "../streams.js";
 import type { NukeResult } from "../../index.js";
 export declare function renderNukeText(result: NukeResult): string;
-export declare function nukeExitCode(result: NukeResult): number;
+export declare function nukeOutcome(result: NukeResult): CliOutcome;

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

@@ -18,6 +18,8 @@ export function renderNukeText(result) {
     }
     return "";
 }
-export function nukeExitCode(result) {
-    return result.kind === "refused" ? 1 : result.pending.some((surface) => surface.required) ? 2 : 0;
+export function nukeOutcome(result) {
+    if (result.kind === "refused")
+        return "refused";
+    return result.pending.some((surface) => surface.required) ? "retryable" : "accepted";
 }

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

@@ -102,7 +102,7 @@ export function gatesAwaitLines(placement) {
         .map((report) => gateDisplayName(report.gate));
     if (events.length === 0)
         return [];
-    return [`⧗ awaiting ${events.length > 3 ? `${events.length} gates` : events.join(", ")}`];
+    return [`⧗ awaiting ${events.join(", ")}`];
 }
 function targetMovedDetail(stop) {
     if ("integratedAt" in stop) {
@@ -192,8 +192,13 @@ function gatesUnsatisfiedStopLines(stop, columns, dependent) {
     // carry the story, and the caller closes the receipt with the awaiting margin line.
     const lines = [];
     const target = stop.refusal.target;
-    if (dependent !== undefined)
-        receiptRow(lines, "⧗", dependent, [{ text: "·" }, { text: "gates unmet" }], columns);
+    if (dependent !== undefined) {
+        const awaiting = gatesAwaitLines(stop);
+        if (awaiting.length === 0)
+            receiptRow(lines, " ", "dependent", [{ text: dependent, opaque: true }], columns);
+        for (const line of awaiting)
+            receiptRow(lines, "⧗", dependent, [{ text: "·" }, { text: line.slice(2) }], columns);
+    }
     else if (target !== undefined)
         receiptRow(lines, " ", "target", [{ text: target, opaque: true }, { text: "· unchanged" }], columns);
     lines.push(...gateAlarmRows(stop, columns));

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

@@ -121,12 +121,7 @@ export function reconcileHasFailure(report) {
     if (isRepoReport(report)) {
         if (report.kind === "world-observation-failed")
             return true;
-        const completed = report;
-        return completed.contracts.some((item) => {
-            return (item.report.lag.some((lag) => reconcileLagIsFailure(lag)) ||
-                item.report.settlement.lags.length > 0 ||
-                (item.report.settlement.seatClose?.length ?? 0) > 0);
-        });
+        return report.contracts.some((item) => reconcileHasFailure(item.report));
     }
     return (report.lag.some((lag) => reconcileLagIsFailure(lag)) ||
         (report.settlement?.lags.length ?? 0) > 0 ||
@@ -134,7 +129,13 @@ export function reconcileHasFailure(report) {
 }
 export function renderReconcile(report, context) {
     const columns = context?.columns ?? DEFAULT_CLI_COLUMNS;
-    const lines = ["✓ reconcile"];
+    const lines = [
+        isRepoReport(report) && report.kind === "world-observation-failed"
+            ? "! reconcile failed"
+            : reconcileHasFailure(report)
+                ? "! reconcile incomplete"
+                : "✓ reconcile",
+    ];
     const seen = new Set();
     if (isRepoReport(report)) {
         if (report.kind === "world-observation-failed") {

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

@@ -33,11 +33,15 @@ function renderDirtyRefusal(refusal, indent, columns, identity) {
         lines.push(...collectionLines(name, refusal[name], indent));
     }
     wrap(lines, gitShortStat(refusal.shortStat), indent, columns);
-    if (refusal.option?.available === false) {
-        lines.push(`${indent}option  --include-dirty · unavailable with submodule changes`);
+    if (refusal.option === undefined) {
+        if (refusal.submodules.length > 0)
+            wrap(lines, "reason  submodule changes cannot be captured for review", indent, columns);
+    }
+    else if (!refusal.option.available) {
+        lines.push(`${indent}option  ${refusal.option.flag} · unavailable with submodule changes`);
     }
     else {
-        lines.push(`${indent}option  --include-dirty · captures complete non-ignored worktree bytes`);
+        lines.push(`${indent}option  ${refusal.option.flag} · captures complete non-ignored worktree bytes`);
         lines.push(`${indent}capture index  private · real index unchanged, including any unmerged entries`);
         lines.push(`${indent}staging  not required for --include-dirty`);
     }

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

@@ -31,7 +31,7 @@ export declare function renderBoundedTextBlock(value: string, input: Readonly<{
     lines?: number;
     truncated?: boolean;
 }>): readonly string[];
-export declare function renderBoundedPayload(input: Readonly<{
+type BoundedPayload = Readonly<{
     text: string;
     first: string;
     continuation: string;
@@ -39,7 +39,10 @@ export declare function renderBoundedPayload(input: Readonly<{
     maxLines: number;
     quote: string;
     truncated: boolean;
-}>): readonly string[];
+    /** Keep source line breaks and indentation; single-line previews fold whitespace instead. */
+    preserveLines?: true;
+}>;
+export declare function renderBoundedPayload(input: BoundedPayload): readonly string[];
 export declare function quotedText(value: string): string;
 export declare function safeText(value: string): string;
 type CheckoutNotFollowable = Readonly<{

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

@@ -138,18 +138,8 @@ export function truncateMiddleDisplayText(value, maximum) {
     const headColumns = Math.ceil(available / 2);
     const tailColumns = available - headColumns;
     const head = takeDisplayColumns(clean, headColumns).text.replace(/…+$/u, "");
-    const characters = [...GRAPHEMES.segment(clean)].map(({ segment }) => segment);
-    let tailStart = characters.length;
-    let used = 0;
-    while (tailStart > 0) {
-        const candidate = characters[tailStart - 1];
-        const width = displayColumns(candidate);
-        if (used + width > tailColumns)
-            break;
-        used += width;
-        tailStart -= 1;
-    }
-    return `${head}…${characters.slice(tailStart).join("").replace(/^…+/u, "")}`;
+    const tail = takeDisplayColumnsFromEnd(clean, tailColumns).text.replace(/^…+/u, "");
+    return `${head}…${tail}`;
 }
 export function renderBoundedTextBlock(value, input) {
     const maximumLines = input.lines ?? 3;
@@ -179,6 +169,78 @@ export function renderBoundedTextBlock(value, input) {
     return lines.length === 0 ? [input.first.trimEnd()] : lines;
 }
 export function renderBoundedPayload(input) {
+    return input.preserveLines === true ? renderPreservedPayload(input) : renderFoldedPayload(input);
+}
+/**
+ * Paragraph-preserving payload: source line breaks and leading indentation stay,
+ * each line wraps at a word boundary where one exists, and the last rendered
+ * line carries either the closing quote or the one truncation mark.
+ */
+function renderPreservedPayload(input) {
+    const closing = input.quote === "" ? "" : input.quote === "“" ? "”" : input.quote;
+    if (input.text.length === 0)
+        return [input.quote === "" ? input.first.trimEnd() : `${input.first}${input.quote}${closing}`];
+    const source = input.text.split(/\r?\n/u).map((line) => safeText(line).replace(/\s+$/u, ""));
+    const lines = [];
+    let truncated = input.truncated;
+    let done = false;
+    /** Paragraph breaks are deferred so they never spend the preview's last usable line. */
+    let pendingBlanks = 0;
+    for (const line of source) {
+        if (done)
+            break;
+        if (line.length === 0) {
+            if (lines.length > 0)
+                pendingBlanks += 1;
+            continue;
+        }
+        // A paragraph break never spends the preview's last line: content wins over a blank.
+        const room = input.maxLines - lines.length - 1;
+        for (let count = 0; count < Math.min(pendingBlanks, Math.max(0, room)); count += 1)
+            lines.push(input.continuation.trimEnd());
+        pendingBlanks = 0;
+        const indent = /^ */u.exec(line)[0];
+        let rest = line.slice(indent.length);
+        while (rest.length > 0) {
+            if (lines.length >= input.maxLines) {
+                truncated = true;
+                done = true;
+                break;
+            }
+            const prefix = lines.length === 0 ? input.first : input.continuation;
+            const opening = input.quote !== "" && lines.length === 0 ? input.quote : "";
+            // One cell stays reserved for a closing quote or an omission mark.
+            const budget = Math.max(1, input.columns - displayColumns(prefix) - displayColumns(opening) - 1);
+            const fragment = wrapFragment(rest, budget);
+            if (fragment.body.length === 0) {
+                truncated = true;
+                done = true;
+                break;
+            }
+            lines.push(`${prefix}${opening}${indent}${fragment.body}`);
+            rest = fragment.remaining;
+        }
+    }
+    if (lines.length === 0)
+        return [input.first.trimEnd()];
+    if (truncated)
+        lines[lines.length - 1] = truncateDisplayText(`${lines[lines.length - 1]}…`, input.columns);
+    else if (closing !== "")
+        lines[lines.length - 1] += closing;
+    return lines;
+}
+/** One wrapped fragment: a word boundary is preferred over splitting a word. */
+function wrapFragment(rest, budget) {
+    const taken = takeDisplayColumns(rest, budget);
+    if (taken.rest.length === 0)
+        return { body: taken.text, remaining: "" };
+    const split = taken.text.lastIndexOf(" ");
+    if (split <= 0 || split < Math.floor(taken.text.length / 2))
+        return { body: taken.text, remaining: taken.rest };
+    return { body: taken.text.slice(0, split), remaining: `${taken.text.slice(split + 1)}${taken.rest}` };
+}
+/** Single-line and bounded summaries fold whitespace into one grapheme-safe stream. */
+function renderFoldedPayload(input) {
     let rest = safeText(input.text).replace(/\s+/gu, " ").trim();
     const lines = [];
     for (let index = 0; index < input.maxLines; index += 1) {

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

@@ -0,0 +1,2 @@
+import type { WhoamiFacts } from "../commands/whoami.js";
+export declare function renderWhoami(facts: WhoamiFacts): string;

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

@@ -0,0 +1,56 @@
+import { panelHead } from "./akuma-activity.js";
+import { safeText } from "./terminal.js";
+function callerText(caller) {
+    if (caller.kind === "unknown")
+        return "unknown";
+    return caller.kind === "akuma" ? `${caller.akuId} · world ${caller.world}` : `${caller.integration}:${caller.id}`;
+}
+function originText(origin) {
+    return origin.kind === "request"
+        ? `request · ${origin.parent} · ${origin.requestId}`
+        : `fork · ${origin.parent} · ${origin.at}`;
+}
+function selfHead(facts, dispatch, workdir) {
+    const self = facts.self;
+    if (self.kind === "akuma") {
+        const aliases = facts.profile?.kind === "available" ? facts.profile.aliases : [];
+        const identity = `${self.akuId}${aliases.length ? ` (${aliases.join(" · ")})` : ""}`;
+        return panelHead(identity, undefined, dispatch === undefined ? undefined : { kind: "associated", contractId: dispatch }, workdir == null ? [] : [workdir]).map(safeText);
+    }
+    const value = self.kind === "none" ? "none" : self.kind === "invalid" ? `invalid · ${self.reason}` : callerText(self);
+    return [safeText(`${value} (not an akuma)`)];
+}
+function contextText(contract) {
+    if (contract.kind === "resolved")
+        return contract.id;
+    if (contract.kind === "unavailable")
+        return `unavailable · ${contract.reason}`;
+    return contract.kind;
+}
+export function renderWhoami(facts) {
+    const row = (label, value) => `  ${label.padEnd(11)} ${safeText(value)}`;
+    const self = facts.self;
+    const profile = self.kind === "akuma" && facts.profile?.kind === "available" ? facts.profile : undefined;
+    const dispatch = profile?.contracts.length === 1 ? profile.contracts[0] : undefined;
+    const lines = selfHead(facts, dispatch, profile?.workdir);
+    if (self.kind === "akuma") {
+        lines.push(row("initiator", facts.initiatorUnavailable === undefined
+            ? (facts.initiator ?? "none")
+            : `unavailable · ${facts.initiatorUnavailable}`));
+        if (profile !== undefined)
+            lines.push(row("parent", callerText(profile.birth.caller)));
+    }
+    lines.push(row("world", facts.world ?? "none"));
+    const context = contextText(facts.contract);
+    if (context !== dispatch)
+        lines.push(row("context", context));
+    lines.push(row("requests", facts.requests));
+    if (self.kind === "akuma" && facts.profile?.kind === "unavailable")
+        lines.push(row("profile", `unavailable · ${facts.profile.reason}`));
+    if (profile !== undefined) {
+        lines.push(row("runtime", `${profile.provider ?? "unknown"} · ${profile.model ?? "unknown"}`));
+        if (profile.birth.origin.kind !== "direct")
+            lines.push(row("origin", originText(profile.birth.origin)));
+    }
+    return lines.join("\n");
+}

package/build/src/cli/runtime.d.ts

@@ -2,6 +2,7 @@ import { type LibraryExecution } from "../akuma/requests.js";
 import { type ActorId } from "../index.js";
 import type { ExecutionObserver } from "../protocol/execution-observation.js";
 import { type ParsedCommand, type ParsedInvocation } from "./parse.js";
+import { type CliOutcome } from "./streams.js";
 export type ParsedCommandInvocation = Extract<ParsedInvocation, {
     command: ParsedCommand;
 }>;
@@ -30,7 +31,7 @@ export type CliRuntimeInput = Readonly<{
 export declare function writeExecutionProgress(stream?: NodeJS.WritableStream): Promise<ExecutionProgressDriver>;
 type AkumaFailureProjection = Readonly<{
     body: string;
-    exitCode: 1 | 3;
+    outcome: CliOutcome;
 }>;
 /** Projection of one native Akuma addressing/observation failure into its stated refusal body. */
 export declare function akumaFailureProjection(error: unknown, command: ParsedCommand): Promise<AkumaFailureProjection | undefined>;