@astrosheep/keiyaku 2.9.11 → 2.9.13

package/build/cli/render/kanshi.js

@@ -1,9 +1,10 @@
 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";
+import { renderProjectionActivitySummary, } from "./projection-activity.js";
+import { contractStatusIndicator, projectionStatusIndicator, STATUS_INDICATOR_LEGEND, taskStatusIndicator, } from "./status-indicator.js";
 const KANSHI_MAX_COLUMNS = 120;
-const KANSHI_ACTIVITY_ROWS = 3;
+const KANSHI_MAX_LINES = 40;
 function shortHead(hash) {
     return hash?.slice(0, 7);
 }
@@ -80,27 +81,31 @@ export function orderKanshiContracts(contracts) {
 }
 function renderDriftMark(drift) {
     if (drift.state === "drift")
-        return `▲${drift.behindBy}`;
+        return `behind ${drift.defaultBranch} by ${drift.behindBy}`;
     if (drift.state === "orphaned")
-        return "▲orphaned";
+        return `base not on ${drift.defaultBranch}`;
     return undefined;
 }
-function contractGlyph(contract) {
-    if (contract.state.state === "corrupt")
-        return "×";
-    return pendingAfterIds(contract).length > 0 ? "⧗" : "□";
+function contractIndicator(contract) {
+    return contractStatusIndicator({
+        state: contract.state.state,
+        waiting: pendingAfterIds(contract).length > 0,
+        broken: contract.queueHeadStalled || contract.replayBlockers.length > 0,
+    });
 }
 function contractFacts(contract) {
     const facts = [];
     const spark = arcSparkline(contract.arcs);
     if (spark)
         facts.push({ text: spark });
+    const waitingOn = pendingAfterIds(contract);
+    if (waitingOn.length > 0)
+        facts.push({ text: `waiting on ${waitingOn.join(", ")}` });
     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 });
+    facts.push({ text: age ? `${contract.state.state} ${age}` : contract.state.state });
     if (contract.queueHeadStalled) {
         facts.push({ text: age ? `stalled ${age}` : "stalled", tone: "alert" });
     }
@@ -112,11 +117,26 @@ function renderKeiyakuSection(board, width) {
     const lines = [`keiyaku ${board.contracts.length}`];
     for (const contract of orderKanshiContracts(board.contracts)) {
         lines.push(alignedBoardRow({
-            prefix: `${contractGlyph(contract)} ${contract.place ?? contract.slug}`,
+            prefix: `${contractIndicator(contract)} ${contract.place ?? contract.slug}`,
             title: contract.title,
             facts: contractFacts(contract),
             width,
         }));
+        if (contract.tasks) {
+            const progress = contract.tasks;
+            const summary = `${progress.done}/${progress.total} done`;
+            if (board.commissionFilter === contract.id) {
+                for (const task of progress.tasks) {
+                    lines.push(`  ${taskStatusIndicator(task)} task ${task.coordinate} · ${task.state} · ${task.title}`);
+                }
+            }
+            else if (progress.current) {
+                lines.push(`  ${taskStatusIndicator(progress.current)} task ${summary} · ${progress.current.state} · ${progress.current.coordinate} · ${progress.current.title}`);
+            }
+            else {
+                lines.push(`  task ${summary}`);
+            }
+        }
         if (contract.replayBlockers.length > 0) {
             lines.push(`  ! incomplete replay · ${contract.replayBlockers.map((blocker) => blocker.surface).join(", ")}`);
             lines.push(`  • ${contract.replayBlockers[0].recoveryCommand}`);
@@ -147,81 +167,71 @@ function projectionBinding(board, row) {
 }
 function projectionFacts(row) {
     const facts = [];
-    if (row.durationMs !== undefined)
-        facts.push({ text: `up ${formatAgeMs(row.durationMs) ?? "0s"}` });
+    const terminal = row.state === "done" || row.state === "failed" || row.state === "dead"
+        || row.state === "killed" || row.state === "dismissed" || row.state === "incompatible";
+    const terminalAge = row.terminalAgeMs === undefined ? undefined : formatAgeMs(row.terminalAgeMs);
+    facts.push({ text: terminalAge ? `${row.state} ${terminalAge} ago` : row.state, tone: row.state === "startup-timeout" ? "alert" : "normal" });
+    if (row.durationMs !== undefined) {
+        facts.push({ text: `${terminal ? "ran" : "running for"} ${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" });
+        facts.push({ text: `last activity ${formatAgeMs(row.activityAgeMs) ?? "0s"} ago` });
     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 renderSnapshot(row) {
+    if (!row.activity)
+        return "";
+    return renderProjectionActivitySummary(row.activity, {
+        state: activityState(row),
+        ...(row.workspaceRoot ? { workspaceRoot: row.workspaceRoot } : {}),
+    }) ?? "";
 }
-function renderAkumaSection(board, width) {
+function renderAkumaSection(board, width, includeRosterFooter = true) {
     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));
+        return "akuma 0\nno akuma out there · full roster: keiyaku status --akuma";
+    const triage = board.projections.triage;
+    const sections = triage
+        ? [
+            ["startup failed", triage.startupFailed],
+            ["unknown", triage.unknown],
+            ["running", triage.active],
+            ["recent terminal", triage.recentTerminal],
+        ]
+        : [[null, board.projections.rows]];
+    const total = board.projections.rows.length + (triage?.overflow ?? board.projections.omitted?.total ?? 0);
+    const lines = [`akuma ${board.projections.rows.length}/${total}`];
+    for (const [label, rows] of sections) {
+        if (triage && rows.length === 0)
+            continue;
+        if (label !== null) {
+            const sectionTotal = label === "startup failed"
+                ? triage.totals.startupFailed
+                : label === "unknown"
+                    ? triage.totals.unknown
+                    : label === "running"
+                        ? triage.totals.active
+                        : triage.totals.terminal;
+            lines.push(`${label} ${rows.length}/${sectionTotal}`);
+        }
+        for (const row of rows) {
+            const identity = row.alias ? `${row.identity.canonicalId} (${row.alias})` : row.identity.canonicalId;
+            const pending = (row.pendingTells?.length ?? 0) > 0 ? [{ text: `pending tell ${row.pendingTells.length}` }] : [];
+            const snapshot = renderSnapshot(row) || projectionBinding(board, row);
+            lines.push(alignedBoardRow({
+                prefix: `${projectionStatusIndicator(row.state)} ${identity}`,
+                title: snapshot,
+                titleTone: "normal",
+                facts: [...projectionFacts(row), ...pending],
+                width,
+            }));
+        }
+    }
+    if (board.projections.rows.length === 0) {
+        lines.push(includeRosterFooter ? "no akuma out there · full roster: keiyaku status --akuma" : "no akuma out there");
+    }
+    else if (includeRosterFooter) {
+        lines.push(tone("full roster: keiyaku status --akuma", "description"));
     }
-    const folded = terminalSummary(board);
-    if (folded)
-        lines.push(tone(folded, "description"));
     return lines.join("\n");
 }
 function taskLabel(task) {
@@ -233,9 +243,9 @@ function renderTaskSection(tasks, width) {
     const lines = [`task ${tasks.total}`];
     for (const task of tasks.topTasks) {
         lines.push(alignedBoardRow({
-            prefix: "▶",
+            prefix: `${taskStatusIndicator(task)} ${task.state}`,
             title: taskLabel(task),
-            facts: [{ text: `${task.state === "on_hold" ? "on hold · updated" : "in_progress · active"} ${formatAgeMs(task.activityAgeMs) ?? "0s"}` }],
+            facts: [{ text: `last update ${formatAgeMs(task.activityAgeMs) ?? "0s"} ago` }],
             width,
         }));
     }
@@ -248,16 +258,43 @@ function renderTaskSection(tasks, width) {
         lines.push(tone(`+ ${folded.join(" · ")}`, "description"));
     return lines.join("\n");
 }
-export function renderKanshiBoard(board) {
+export function renderKanshiBoard(board, beforeAkuma = []) {
     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 = [
+        STATUS_INDICATOR_LEGEND,
         renderKeiyakuSection(board, width),
+        board.commissionFilter === undefined ? renderTaskSection(board.tasks, width) : undefined,
+        ...beforeAkuma,
         renderAkumaSection(board, width),
-        renderTaskSection(board.tasks, width),
     ].filter((section) => section !== undefined);
-    return `${[`${left}${dashes}${right}`, ...sections].join("\n\n")}\n`;
+    const header = `${left}${dashes}${right}`;
+    const rendered = [header, ...sections].join("\n\n");
+    if (board.commissionFilter !== undefined || rendered.split("\n").length <= KANSHI_MAX_LINES) {
+        return `${rendered}\n`;
+    }
+    const akuma = sections.at(-1);
+    const leading = sections.slice(0, -1).join("\n\n").split("\n");
+    const akumaLines = akuma.split("\n");
+    const leadingBudget = Math.max(0, KANSHI_MAX_LINES - 3 - akumaLines.length);
+    const visible = leading.slice(0, Math.max(0, leadingBudget - 1));
+    while (visible.at(-1) === "")
+        visible.pop();
+    const omitted = leading.length - visible.length;
+    if (omitted > 0 && leadingBudget > 0)
+        visible.push(tone(`+ ${omitted} board lines omitted`, "description"));
+    return `${[header, visible.join("\n"), akuma].filter(Boolean).join("\n\n")}\n`;
+}
+/** Akuma roster mouth: reuse the shared frame and row grammar without unrelated board sections. */
+export function renderAkumaRosterBoard(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 akuma = renderAkumaSection(board, width, false) ?? "akuma 0\nno akuma out there";
+    return `${[`${left}${dashes}${right}`, STATUS_INDICATOR_LEGEND, akuma].join("\n\n")}\n`;
 }

package/build/cli/render/misc.js

@@ -31,7 +31,7 @@ function buildErrorText(input) {
     const errorSection = buildSection("Error", input.message);
     const conflictSection = input.facts?.kind === "renew_conflict_scratch"
         ? buildSection("Conflict scratch", [
-            input.facts.scratchPath,
+            `${input.facts.scratchPath}/files`,
             "",
             "Conflicting paths:",
             ...input.facts.conflictPaths.map((filePath) => `  ${filePath}`),
@@ -52,7 +52,7 @@ function buildErrorText(input) {
         : undefined;
     const nextActionSection = input.facts?.kind === "renew_conflict_scratch" && renewAddress
         ? buildSection("Next action", [
-            "Resolve files in the conflict scratch, then:",
+            "Resolve files in the linked conflict worktree, then:",
             `» keiyaku ${renewAddress} renew --continue`,
             "Or discard the conflict scratch:",
             `» keiyaku ${renewAddress} renew --abort`,

package/build/cli/render/petition.js

@@ -30,6 +30,15 @@ export function buildPetitionPreviewResponse(preview, json) {
         : [
             `contract ${commissionSlug(preview.contract)}`,
             `arc ${source}`,
+            ...(preview.scopeWarning
+                ? [
+                    `Scope warning: ${preview.scopeWarning.violations.join(", ")}`,
+                    ...preview.scopeWarning.evidence.map((evidence) => {
+                        const patterns = evidence.patterns.length ? ` · ${evidence.patterns.map((pattern) => pattern.pattern).join(", ")}` : "";
+                        return `  ${evidence.path} · ${evidence.outcome}${patterns}`;
+                    }),
+                ]
+                : []),
             ...preview.gates.map((gate) => {
                 if (gate.result === "not_evaluated")
                     return `gate ${gate.name} · not evaluated`;
@@ -53,7 +62,13 @@ export function buildPetitionClaimResponse(result, input) {
     const summary = `Claimed contract${commitSuffix}.`;
     const diffSection = result.diff ? buildSection(DIFF_OVERVIEW_SECTION_TITLE, result.diff) : null;
     const ledgerSection = result.ledgerView ? buildSection("Ledger", result.ledgerView) : null;
-    const warningSection = buildSection(WARNING_SECTION_TITLE, formatWarnings(result.meta?.warnings ?? []));
+    const scopeWarning = result.sealed?.scopeAudit.violations.length
+        ? [`Scope warning: ${result.sealed.scopeAudit.violations.join(", ")}`]
+        : [];
+    const warningSection = buildSection(WARNING_SECTION_TITLE, [
+        ...scopeWarning,
+        ...formatWarnings(result.meta?.warnings ?? []),
+    ]);
     const infoLines = [
         ...formatMaybe("Result", result.result, INFO_COMMIT_MAX_CHARS),
         ...formatMaybe("Title", input.title),

package/build/cli/render/projection-history.js

@@ -28,17 +28,30 @@ function runLines(run) {
         `activity: ${run.activityRetention} · ${run.activityCount} retained${run.activityRange ? ` · ${run.activityRange.first}-${run.activityRange.last}` : ""}`,
         ...(run.telemetry ? [`telemetry: ${run.telemetry.inputTokens} in · ${run.telemetry.outputTokens} out${run.telemetry.cachedInputTokens !== undefined ? ` · ${run.telemetry.cachedInputTokens} cached` : ""}${run.telemetry.costUsd !== undefined ? ` · $${run.telemetry.costUsd.toFixed(2)}` : ""}`] : []),
         ...(run.artifact ? [`artifact: ${fact(run.artifact.id)} · ${run.artifact.retention}${run.artifact.path ? ` · path: ${run.artifact.path}` : ""}`] : []),
+        ...(run.terminalAnswer ? [`answer: ${run.terminalAnswer.text}`] : []),
         ...consequenceLines(run),
         ...run.diagnostics.map((diagnostic) => `diagnostic: ${diagnostic}`),
     ];
 }
-export function renderProjectionHistoryList(runs) {
-    return runs.flatMap((run, index) => index === 0 ? runLines(run) : ["", ...runLines(run)]).join("\n");
+export function renderProjectionHistoryList(runs, pagination) {
+    const lines = runs.flatMap((run, index) => index === 0 ? runLines(run) : ["", ...runLines(run)]);
+    if (!pagination)
+        return lines.join("\n");
+    const range = runs.length === 0
+        ? "none"
+        : `${pagination.offset}-${pagination.offset + runs.length - 1}`;
+    return [...lines, ...(lines.length > 0 ? [""] : []), `entries: ${range} of ${pagination.total}${pagination.nextOffset === null ? "" : ` · next offset: ${pagination.nextOffset}`}`].join("\n");
 }
-export function renderProjectionHistoryDetail(detail) {
+export function renderProjectionHistoryDetail(detail, entry) {
     const lines = runLines(detail);
-    if (!detail.activity || detail.activity.retainedTimeline.length === 0)
+    if (entry) {
+        return [...lines, "", `entry: ${entry.index}`, `event: ${JSON.stringify(entry.event)}`,
+            ...(entry.raw ? [`raw: ${entry.raw.retention} · ${entry.raw.reason}`] : []),
+        ].join("\n");
+    }
+    if (!detail.activity || detail.activity.retainedTimeline.length === 0) {
         return lines.join("\n");
+    }
     const state = detail.outcome === "done" ? "returned"
         : detail.outcome === "out" ? "running"
             : detail.outcome === "failed" || detail.outcome === "dead" ? "dead"

package/build/cli/render/shared.js

@@ -192,11 +192,11 @@ export function formatCallCompletionHeading(projection) {
         default: return "no record of this akuma";
     }
 }
-/** Machine-generated durable revive command: artifactId + explicit repository coordinate. */
+/** Machine-generated durable fork command: artifactId + explicit repository coordinate. */
 export function formatDurableReviveCommand(input) {
     return input.repositoryCoordinate
-        ? `keiyaku revive ${input.artifactId} --repo ${shellQuote(input.repositoryCoordinate)}`
-        : `keiyaku revive ${input.artifactId}`;
+        ? `keiyaku fork ${input.artifactId} --repo ${shellQuote(input.repositoryCoordinate)}`
+        : `keiyaku fork ${input.artifactId}`;
 }
 export function formatTellCommand(projectionId, body) {
     return `keiyaku tell ${projectionId} [--wait DURATION] ${body}`;
@@ -211,14 +211,14 @@ export function projectionRejoinHintLines(projectionId) {
 }
 export function formatCallNextAction(input) {
     if (input.projection?.phase === "active") {
-        return projectionRejoinHintLines(input.projection.alias ?? input.projection.id).join("\n");
+        return projectionRejoinHintLines(input.projection.id).join("\n");
     }
     if (input.projection?.phase === "done") {
         return [
             "The akuma is back.",
             ...(input.artifactId ? [`record: ${input.artifactId}`] : []),
             "talk to it:",
-            `  » ${formatTellCommand(input.projection.alias ?? input.projection.id, '"your words"')}`,
+            `  » ${formatTellCommand(input.projection.id, '"your words"')}`,
         ].join("\n");
     }
     return "» keiyaku status";

package/build/cli/render/status-indicator.js

@@ -0,0 +1,47 @@
+export const STATUS_INDICATOR = {
+    active: "●",
+    starting: "…",
+    waiting: "⧗",
+    ready: "○",
+    paused: "‖",
+    success: "✓",
+    stopped: "×",
+    failed: "!",
+    unknown: "?",
+};
+export const STATUS_INDICATOR_LEGEND = "marks ● active · … starting · ⧗ waiting · ○ ready · ‖ paused · ✓ success · × stopped · ! failed/broken · ? unknown";
+export function projectionStatusIndicator(state) {
+    switch (state) {
+        case "out": return STATUS_INDICATOR.active;
+        case "minting": return STATUS_INDICATOR.starting;
+        case "done": return STATUS_INDICATOR.success;
+        case "killed":
+        case "dismissed": return STATUS_INDICATOR.stopped;
+        case "failed":
+        case "dead":
+        case "startup-timeout": return STATUS_INDICATOR.failed;
+        case "lost":
+        case "unknown":
+        case "incompatible": return STATUS_INDICATOR.unknown;
+    }
+}
+export function contractStatusIndicator(input) {
+    if (input.state === "corrupt" || input.broken)
+        return STATUS_INDICATOR.failed;
+    if (input.state === "claimed")
+        return STATUS_INDICATOR.success;
+    if (input.state === "forfeited")
+        return STATUS_INDICATOR.stopped;
+    if (input.state === "petitioned" || input.waiting)
+        return STATUS_INDICATOR.waiting;
+    return STATUS_INDICATOR.active;
+}
+export function taskStatusIndicator(input) {
+    if (input.state === "done")
+        return STATUS_INDICATOR.success;
+    if (input.state === "on_hold")
+        return STATUS_INDICATOR.paused;
+    if (input.state === "in_progress")
+        return STATUS_INDICATOR.active;
+    return input.blocked ? STATUS_INDICATOR.waiting : STATUS_INDICATOR.ready;
+}