@astrosheep/keiyaku 4.5.11 → 4.5.13

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

@@ -11,7 +11,6 @@ function targetLine(row, abbreviations) {
             : undefined;
     return [`target ${target}`, ...(lag === undefined ? [] : [lag]), ...targetMovementFacts(row, abbreviations)].join(" · ");
 }
-const CATALOG_VISIBLE_AKUMA = 10;
 function akumaMark(life) {
     if (life === "running")
         return "●";
@@ -23,15 +22,6 @@ function akumaMark(life) {
         return "!";
     return "?";
 }
-function akumaUpdatedAt(row) {
-    const lifeAt = "lifeAt" in row ? row.lifeAt : null;
-    const activityAt = "lastActivityAt" in row ? row.lastActivityAt : null;
-    if (lifeAt === null)
-        return activityAt;
-    if (activityAt === null)
-        return lifeAt;
-    return lifeAt > activityAt ? lifeAt : activityAt;
-}
 function relativeAge(source, observedAt) {
     if (source === null)
         return null;
@@ -49,20 +39,9 @@ function relativeAge(source, observedAt) {
     return `${Math.floor(hours / 24)}d`;
 }
 function renderAkumaCatalog(catalog) {
-    const ordered = [...catalog.rows].sort((left, right) => {
-        const leftAt = akumaUpdatedAt(left);
-        const rightAt = akumaUpdatedAt(right);
-        if (leftAt === rightAt)
-            return 0;
-        if (leftAt === null)
-            return 1;
-        if (rightAt === null)
-            return -1;
-        return leftAt > rightAt ? -1 : 1;
-    });
-    const rows = ordered.slice(0, CATALOG_VISIBLE_AKUMA);
+    const rows = catalog.rows;
     const lines = [
-        `akuma instances ${rows.length} of ${ordered.length} known`,
+        `akuma instances ${rows.length} recent`,
         ...(catalog.archetype === null ? [] : [`  scope ${safeText(catalog.archetype)}`]),
         "",
     ];
@@ -72,10 +51,8 @@ function renderAkumaCatalog(catalog) {
         const ages = [relativeAge(lifeAt, catalog.observedAt), relativeAge(activityAt, catalog.observedAt)].filter((age) => age !== null);
         lines.push(`${akumaMark(row.life)} ${safeText(row.id)} · ${row.life}${ages.length === 0 ? "" : ` · ${ages.join(" · ")}`}`);
     }
-    if (rows.length < ordered.length) {
-        const selector = catalog.archetype === null ? '"aku/*/*"' : `aku/${catalog.archetype}/`;
-        lines.push("", `  + ${ordered.length - rows.length} more akuma not shown`, `    keiyaku ls ${selector}`);
-    }
+    if (catalog.hasMore)
+        lines.push("…");
     return lines.join("\n");
 }
 function catalogMark(row) {
@@ -110,14 +87,10 @@ function renderContractCatalog(catalog) {
         ...(catalog.state === null ? [] : [catalog.state]),
         ...catalog.rows.flatMap(gitIdsInRow),
     ]);
-    const rows = catalog.rows.filter((row) => row.disposition === "active");
-    const candidates = rows.filter((row) => row.delivery !== null).length;
-    const header = [
-        `${rows.length} active · ${candidates} candidate${candidates === 1 ? "" : "s"}`,
-        catalog.state === null
-            ? `observedAt ${catalog.observedAt}`
-            : `contract state ${displayGitId(catalog.state, abbreviations)} · observedAt ${catalog.observedAt}`,
-    ];
+    const rows = catalog.rows;
+    const header = catalog.state === null
+        ? `observedAt ${catalog.observedAt}`
+        : `contract state ${displayGitId(catalog.state, abbreviations)} · observedAt ${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")}`,
@@ -128,13 +101,14 @@ function renderContractCatalog(catalog) {
         ];
         return lines.join("\n");
     });
-    return [...header, ...(blocks.length === 0 ? [] : ["", ...blocks])].join("\n");
+    return [header, ...(blocks.length === 0 ? [] : ["", ...blocks]), ...(catalog.hasMore ? ["…"] : [])].join("\n");
 }
 export function renderCatalogText(catalog) {
     if (catalog.kind === "tasks") {
-        return catalog.rows
-            .map((row) => `${safeText(row.id)} - P${row.priority} - ${row.disposition} - ${safeText(row.title)}`)
-            .join("\n");
+        return [
+            ...catalog.rows.map((row) => `${safeText(row.id)} - P${row.priority} - ${row.disposition} - ${safeText(row.title)}`),
+            ...(catalog.hasMore ? ["…"] : []),
+        ].join("\n");
     }
     if (catalog.kind === "contracts")
         return renderContractCatalog(catalog);

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

@@ -1,5 +1,5 @@
 import { renderAcceptedAudit } from "./audit.js";
-import { appendHookPayload, cleanupLines, hookFailureSummary, leakLines, outcomeLines, receiptPayload, receiptRow, reuseLines, stopLines, titleLines, } from "./receipt.js";
+import { appendHookPayload, cleanupLines, hookFailureSummary, leakLines, outcomeLines, seatCloseLines, receiptPayload, receiptRow, reuseLines, stopLines, titleLines, } from "./receipt.js";
 import { gitShortStat, renderOpaqueBlock } from "./terminal.js";
 const HANG = "   ";
 function isRecord(value) {
@@ -11,16 +11,6 @@ function retryLines(detail, indent, columns) {
     }
     return renderOpaqueBlock(detail.kind, indent, columns);
 }
-function refMigrationConflictRows(lag, columns) {
-    const lines = [];
-    receiptRow(lines, "!", "lag", [
-        {
-            text: `ref-migration-conflict legacy=${lag.legacyRef}@${lag.legacyOid} current=${lag.currentRef}@${lag.currentOid}`,
-            opaque: true,
-        },
-    ], columns);
-    return lines;
-}
 function lagRows(lag, columns) {
     const lines = [];
     if (lag.kind === "worktree-retained") {
@@ -59,9 +49,6 @@ function lagRows(lag, columns) {
         receiptRow(lines, "!", "lag", [{ text: `contract-file-failed ${lag.worktree} ${lag.path}`, opaque: true }], columns);
         receiptPayload(lines, "diagnostic", lag.diagnostic);
     }
-    else if (lag.kind === "ref-migration-conflict") {
-        return refMigrationConflictRows(lag, columns);
-    }
     else {
         receiptRow(lines, "!", "lag", [{ text: `reconcile-failed ${lag.stage}`, opaque: true }], columns);
         receiptPayload(lines, "diagnostic", lag.diagnostic);
@@ -144,6 +131,9 @@ function acceptedLagRows(result, columns) {
     for (const lag of result.settlementLags) {
         pushBlock(obligations, settlementLagRows(lag, columns));
     }
+    if (result.seatClose !== undefined && result.seatClose.length > 0) {
+        pushBlock(obligations, seatCloseLines(result.seatClose, columns));
+    }
     return obligations;
 }
 function indentRecord(lines) {

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

@@ -1,4 +1,3 @@
-import { visibleFleetRows } from "../../kanshi/fleet.js";
 import { boundedActivity, elapsedMilliseconds, entityLines, identityLine, plumbFacts, RECENT_TONE_MS, renderSectionBlock, safeText, tone, } from "./terminal.js";
 const PLUMB = "  │ ";
 const NARROW_COLUMNS = 72;
@@ -67,7 +66,7 @@ function renderAkuma(report, context) {
         return ["AKUMA // absent", "", `${PLUMB}akuma absent`];
     if (section.kind === "failed")
         return ["AKUMA // unavailable", "", tone(`! ${safeText(section.failure.message)}`, "alert", context.color)];
-    const rows = visibleFleetRows(section.value.rows);
+    const rows = section.value.rows;
     const rowLines = rows.map((row) => {
         const statusTone = akumaStatusTone(row, report.observedAt);
         const mark = statusTone === null ? akumaMark(row.life) : tone(akumaMark(row.life), statusTone, context.color);
@@ -101,15 +100,11 @@ function renderAkuma(report, context) {
             ? lines
             : [...lines, ...plumbFacts([boundedActivity(snapshot, context.columns, PLUMB)], context.columns)];
     });
-    const header = `AKUMA // ${rows.length} recent · ${section.value.rows.length} known`;
+    const header = `AKUMA // ${rows.length} recent`;
     const rendered = renderSectionBlock({
         name: "AKUMA",
-        unit: "akuma",
-        selector: "aku",
-        continuation: 'keiyaku ls "aku/*/*"',
         rows: rowLines,
-        total: section.value.rows.length,
-        neutral: true,
+        hasMore: section.value.hasMore,
     });
     return [header, ...rendered.slice(1)];
 }

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

@@ -2,7 +2,6 @@ import { abbreviateGitIds, afterWording, candidateFact, dependentWording, displa
 import { entityLines, elapsedMilliseconds, identityLine, plumbFacts, RECENT_TONE_MS, renderTextBlock, renderSectionBlock, safeText, tone, } from "./terminal.js";
 import { akumaMark, endpointFact, formatAge, NARROW_COLUMNS, renderAkuma } from "./kanshi-akuma.js";
 const PLUMB = "  │ ";
-const MAX_VISIBLE_ROWS = 10;
 const REVIEW_ATTENTION_MS = 15 * 60 * 1_000;
 const PENDING_ATTENTION_MS = 60 * 60 * 1_000;
 function contractHasError(row) {
@@ -201,6 +200,8 @@ function semanticBlock(name, facts, context) {
     return lines;
 }
 function namespaceTaskFacts(row) {
+    if (row.namespaceTasks === undefined)
+        return [];
     if (row.namespaceTasks.kind === "absent")
         return [];
     if (row.namespaceTasks.kind === "failed") {
@@ -257,12 +258,6 @@ function candidateFacts(row, abbreviations) {
         `change ${delivery.integration.changeId}`,
     ];
 }
-function isTerminalContract(row) {
-    return row.phase === "claimed" || row.phase === "abandoned";
-}
-function isTerminalTask(row) {
-    return row.disposition === "done" || row.disposition === "drop";
-}
 function renderWorldContractRow(row, report, context) {
     const title = row.title ?? "title unavailable";
     const contractFacts = [
@@ -287,35 +282,18 @@ function renderWorldContractRow(row, report, context) {
         context,
     }).concat(plumbFacts(linkedFacts, context.columns));
 }
-function selectRecentRows(rows, timestamp) {
-    return [...rows]
-        .sort((left, right) => {
-        const leftAt = timestamp(left);
-        const rightAt = timestamp(right);
-        if (leftAt === rightAt)
-            return 0;
-        return leftAt > rightAt ? -1 : 1;
-    })
-        .slice(0, MAX_VISIBLE_ROWS);
-}
 function renderContracts(report, context) {
     const section = report.contracts;
     if (section.kind === "absent")
         return ["CONTRACTS // absent", "", `${PLUMB}contracts absent`];
     if (section.kind === "failed")
         return ["CONTRACTS // unavailable", "", tone(`! ${safeText(section.failure.message)}`, "alert", context.color)];
-    const live = section.value.rows.filter((row) => !isTerminalContract(row));
-    const rows = selectRecentRows(live, (row) => row.lastJournalAt);
-    const candidates = live.filter((row) => row.delivery !== null).length;
     const rendered = renderSectionBlock({
         name: "CONTRACTS",
-        unit: "keiyaku",
-        selector: "kei",
-        rows: rows.map((row) => renderWorldContractRow(row, report, context)),
-        total: live.length,
+        rows: section.value.rows.map((row) => renderWorldContractRow(row, report, context)),
     });
-    const header = `CONTRACTS // ${live.length} live · ${candidates} candidates`;
-    return [header, ...rendered.slice(1)];
+    const header = "CONTRACTS // recent";
+    return [header, ...rendered.slice(1), ...(section.value.hasMore === true ? ["…"] : [])];
 }
 function renderSelectedContract(report, context) {
     const section = report.contracts;
@@ -334,8 +312,7 @@ function renderTasks(report, context) {
         return ["TASKS // absent", "", `${PLUMB}tasks absent`];
     if (section.kind === "failed")
         return ["TASKS // unavailable", "", tone(`! ${safeText(section.failure.message)}`, "alert", context.color)];
-    const live = section.value.rows.filter((row) => !isTerminalTask(row));
-    const rows = selectRecentRows(live, (row) => row.updatedAt);
+    const rows = section.value.rows;
     const rowLines = rows.map((row) => {
         const relation = row.contract === undefined ? ["unbound"] : [endpointFact(row.contract.id, row.contract.observed)];
         const childFacts = row.children === undefined ? [] : [`children ${row.children.live} live · ${row.children.total} total`];
@@ -356,15 +333,12 @@ function renderTasks(report, context) {
         });
     });
     return [
-        `TASKS // ${live.length} live`,
+        "TASKS // recent",
         ...renderSectionBlock({
             name: "TASKS",
-            unit: "task",
-            selector: "task",
-            continuation: "keiyaku task ls --world",
             rows: rowLines,
-            total: live.length,
         }).slice(1),
+        ...(section.value.hasMore ? ["…"] : []),
     ];
 }
 export function renderKanshiText(report, context = { columns: 80, color: false }, selection = "world") {

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

@@ -1,7 +1,11 @@
 export function renderNukeText(result) {
-    return result.kind === "success"
-        ? `nuke success ${result.world}`
-        : `nuke failed ${result.world}\n${result.diagnostic}`;
+    const seatClose = result.seatClose === undefined || result.seatClose.length === 0
+        ? []
+        : result.seatClose.flatMap((lag) => [`lag ${lag.kind}`, `diagnostic ${lag.diagnostic}`]);
+    if (result.kind === "success") {
+        return [`nuke success ${result.world}`, ...seatClose].join("\n");
+    }
+    return [`nuke failed ${result.world}`, result.diagnostic, ...seatClose].join("\n");
 }
 export function nukeExitCode(result) {
     return result.kind === "failed" ? 2 : 0;

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

@@ -17,4 +17,5 @@ export declare function reuseLines(reuse: VerificationReuse | undefined, columns
 export declare function stopLines(stop: VerificationStop | PlacementStop, columns: number, addressed: string, dependent?: string): readonly string[];
 export declare function cleanupLines(cleanup: NonNullable<AcceptedDeliverResult["cleanup"]>, columns: number): readonly string[];
 export declare function leakLines(leak: NonNullable<AcceptedDeliverResult["leak"]>, columns: number): readonly string[];
+export declare function seatCloseLines(seatClose: NonNullable<AcceptedDeliverResult["seatClose"]>, columns: number): readonly string[];
 export {};

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

@@ -186,3 +186,11 @@ export function leakLines(leak, columns) {
     receiptPayload(lines, "diagnostic", leak.diagnostic);
     return lines;
 }
+export function seatCloseLines(seatClose, columns) {
+    const lines = [];
+    for (const lag of seatClose) {
+        receiptRow(lines, "!", "lag", [{ text: lag.kind }], columns);
+        receiptPayload(lines, "diagnostic", lag.diagnostic);
+    }
+    return lines;
+}

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

@@ -28,13 +28,14 @@ function refusalHead(kind, identity, details) {
 function renderDirtyRefusal(refusal, indent, columns, identity) {
     const lines = [];
     wrap(lines, refusalHead(refusal.kind, identity, []), indent, columns);
+    wrap(lines, "reason worktree has uncommitted changes", indent, columns);
     for (const name of ["staged", "unstaged", "untracked", "submodules"]) {
         lines.push(...collectionLines(name, refusal[name], indent, columns));
     }
     wrap(lines, gitShortStat(refusal.shortStat), indent, columns);
-    if (refusal.option !== undefined) {
-        wrap(lines, `option ${refusal.option.flag} ${refusal.option.available ? "available" : "unavailable"}`, indent, columns);
-    }
+    wrap(lines, "--include-dirty captures all non-ignored worktree bytes in the candidate", indent, columns);
+    if (refusal.option?.available === false)
+        wrap(lines, "--include-dirty unavailable while submodules have changes", indent, columns);
     return lines;
 }
 export function renderRefusalFacts(refusal, indent, columns, addressed) {

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

@@ -87,10 +87,8 @@ function edge(label, ref, mark) {
     const prefix = mark === undefined ? `  ${label}` : `  ${mark} ${label}`;
     return `${prefix} ${ref.id} · ${ref.state}`;
 }
-function pageHeading(view, page) {
-    if (page.truncated)
-        return `${view} ${page.returned} of ${page.total} · limit ${page.returned}`;
-    return `${view} ${page.returned}`;
+function pageHeading(view) {
+    return view;
 }
 function updatedAge(updatedAt) {
     const elapsed = Math.max(0, performance.timeOrigin + performance.now() - Date.parse(updatedAt));
@@ -126,42 +124,11 @@ function renderListRow(item, columns, omitDisposition) {
     }
     return lines;
 }
-function shellQuote(value) {
-    return `'${value.replaceAll("'", "'\\''")}'`;
-}
-function recoveryCommand(command, total) {
-    const parts = ["keiyaku", "task", command.action];
-    if (command.action === "ls") {
-        if (command.positionals.length > 0)
-            parts.push(command.positionals[0]);
-        if (command.flags.closed === true)
-            parts.push("--closed");
-        if (command.flags.all === true)
-            parts.push("--all");
-    }
-    if (command.flags.world === true)
-        parts.push("--world");
-    if ((command.action === "ready" || command.action === "blocked") && typeof command.flags.parent === "string") {
-        parts.push("--parent", command.flags.parent);
-    }
-    if (command.action === "query" && typeof command.flags.where === "string")
-        parts.push("--where", shellQuote(command.flags.where));
-    if (command.action === "query" && typeof command.flags.sort === "string")
-        parts.push("--sort", command.flags.sort);
-    parts.push("--limit", String(total));
-    return parts.join(" ");
-}
 function renderRows(command, result, columns) {
     if (result.kind !== "accepted")
         return renderFailure(command.action, result, columns);
     const view = command.action === "ls" ? "tasks" : command.action;
-    const footer = result.value.truncated
-        ? [
-            "",
-            `  + ${result.value.total - result.value.returned} more not shown`,
-            `    ${recoveryCommand(command, result.value.total)}`,
-        ]
-        : [];
+    const footer = result.value.hasMore ? ["…"] : [];
     const scope = command.action === "ls"
         ? command.flags.world === true
             ? "world"
@@ -169,7 +136,7 @@ function renderRows(command, result, columns) {
                 ? `namespace ${command.positionals[0].replace(/^task\//u, "").replace(/\/$/u, "") || "root"}`
                 : "current namespace"
         : undefined;
-    const heading = scope === undefined ? pageHeading(view, result.value) : `${pageHeading(view, result.value)} · ${scope}`;
+    const heading = scope === undefined ? pageHeading(view) : `${pageHeading(view)} · ${scope}`;
     return [
         heading,
         ...result.value.rows.flatMap((item) => renderListRow(item, columns, command.action === "ready")),

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

@@ -47,13 +47,9 @@ export declare function entityLines(entity: Readonly<{
     facts: readonly string[];
     context: TextRenderContext;
 }>): readonly string[];
-export declare function renderSectionBlock({ name, unit, selector, continuation, rows, total, neutral, }: Readonly<{
+export declare function renderSectionBlock({ name, rows, hasMore, }: Readonly<{
     name: string;
-    unit: string;
-    selector: string;
-    continuation?: string;
     rows: readonly (readonly string[])[];
-    total: number;
-    neutral?: boolean;
+    hasMore?: boolean;
 }>): readonly string[];
 export {};

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

@@ -242,14 +242,9 @@ export function entityLines(entity) {
         ...plumbFacts(facts, context.columns),
     ];
 }
-export function renderSectionBlock({ name, unit, selector, continuation, rows, total, neutral = false, }) {
-    const lines = [`[ ${name} ]  ${total}${neutral ? ` ${unit}` : " live"}`, "", ...rows.flat()];
-    if (lines.at(-1) !== "")
-        lines.push("");
-    lines.push(rows.length === total
-        ? `  (all ${total}${neutral ? "" : " live"} ${unit} shown)`
-        : `  + ${total - rows.length} more${neutral ? "" : " live"} ${unit} not shown`);
-    if (rows.length !== total)
-        lines.push(`    ${continuation ?? `keiyaku ls ${selector}/`}`);
+export function renderSectionBlock({ name, rows, hasMore = false, }) {
+    const lines = [`[ ${name} ]`, "", ...rows.flat()];
+    if (hasMore)
+        lines.push("…");
     return lines;
 }

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

@@ -27,7 +27,7 @@ export type AcceptedFact = (AcceptedFactEnvelope & Readonly<{
     }>["data"];
 }>);
 export type Lag = ReconcileReport["lag"][number];
-type MutationEnvelope = Pick<MutationResult<unknown>, "head" | "settlementLags" | "recoverySnapshot">;
+type MutationEnvelope = Pick<MutationResult<unknown>, "head" | "settlementLags" | "recoverySnapshot" | "seatClose">;
 export type AcceptedEnvelope = Readonly<{
     kind: "accepted";
     contract: ContractId;
@@ -36,6 +36,7 @@ export type AcceptedEnvelope = Readonly<{
     settlementLags: MutationEnvelope["settlementLags"];
     recoverySnapshot?: MutationEnvelope["recoverySnapshot"];
     lag?: readonly [Lag, ...Lag[]];
+    seatClose?: MutationEnvelope["seatClose"];
 }>;
 export type AcceptedBindResult = AcceptedEnvelope & Readonly<{
     verb: "bind";

package/build/src/contract-guidance.js

@@ -21,14 +21,16 @@ export const CONTRACT_DELIVERER_SKILL = [
     "",
     "`deliver` creates the immutable candidate commit and prepares its integration with the target as it exists for that invocation. It runs or reuses Verification, records the candidate, and requests placement. If the target moves, run `deliver` again; Keiyaku recomputes the current-target integration. A manual rebase is optional candidate shaping, not target refresh.",
     "",
-    "When the finished worktree itself is the candidate, use `deliver --include-dirty`; Keiyaku captures its complete non-ignored state without moving this worktree's HEAD or real index.",
+    "`keiyaku deliver` submits the current state of the whole worktree as the Contract's candidate.",
+    "",
+    "When the finished worktree itself is the candidate, use `deliver --include-dirty`; Keiyaku captures its complete non-ignored state without moving this worktree's HEAD or real index. When materializing a conflict, the same flag preserves those bytes as the handoff base before projecting the judged conflict.",
     "",
     "```bash",
     "keiyaku deliver <contract> --include-dirty",
-    "keiyaku deliver <contract> --materialize-conflict",
+    "keiyaku deliver <contract> --materialize-conflict --include-dirty",
     "```",
     "",
-    "If delivery reports an integration conflict, materialize that judged conflict, resolve it in this worktree, then deliver the resolved bytes with `--include-dirty`. Deliver when the candidate is ready and the evidence is in place; delivery records and requests placement, while the Reviewer independently judges any declared review gate.",
+    "If delivery reports an integration conflict, materialize that judged conflict with `--include-dirty`; Keiyaku preserves the complete non-ignored worktree bytes as the handoff base before projecting the conflict. Resolve it in this worktree, then deliver the resolved bytes with `--include-dirty`. Deliver when the candidate is ready and the evidence is in place; delivery records and requests placement, while the Reviewer independently judges any declared review gate.",
 ]
     .join("\n")
     .concat("\n");
@@ -61,6 +63,14 @@ export const CONTRACT_REVIEWER_SKILL = [
     "",
     "## Review",
     "",
+    "`keiyaku review` records a verdict on the whole Contract.",
+    "",
+    "Record `--satisfied` when you have verified two things and hold the evidence: the current worktree meets every Criterion, and the result actually achieves what the Objective set out to do. Criteria are the written checks; the Objective is the intent behind them — work that passes every check but misses the intent is not satisfied. If a delivered candidate, prerequisites, and all declared gates are in place, the Contract is claimed immediately and cannot be reopened.",
+    "",
+    "Record `--unsatisfied` when any Criterion is unmet, the work is incomplete, or the result does not achieve the Objective's intent — and state what is missing.",
+    "",
+    "If the commission asked for findings rather than a verdict, report them in your reply without running `keiyaku review`.",
+    "",
     "```bash",
     "keiyaku review <contract> --satisfied --summary <conclusion>",
     "keiyaku review <contract> --unsatisfied --summary <finding>",

package/build/src/contract-worktree.d.ts

@@ -24,6 +24,7 @@ export type ContractFileLag = Readonly<{
     path: string;
     diagnostic: string;
 }>;
+export declare function decodeContractFileLag(value: unknown): ContractFileLag;
 export type ContractWorktreeResult = Readonly<{
     effects: readonly ContractFileEffect[];
     lag: readonly ContractFileLag[];

package/build/src/contract-worktree.js

@@ -8,6 +8,8 @@ import { worktreeGitDirectory, worktreeRoot } from "./git/repository.js";
 import { GitPlumbingError, runGit } from "./git/process.js";
 import { worktreePath } from "./git/workspace.js";
 import { appointmentFor, placeRegisterPath } from "./workspace-place.js";
+import { repairNamespaceContext } from "./task/context.js";
+import { contractNamespace } from "./task/identity.js";
 const IGNORE_BYTES = ".gitignore\nKEIYAKU.md\n";
 const PRIMARY_IGNORE_BYTES = "*\n!settings.json\n!tasks/\n!tasks/**\n";
 const SEAT_IGNORE_BYTES = ".gitignore\nSKILL.md\n";
@@ -15,6 +17,22 @@ const SEAT_SKILLS = [
     ["keiyaku-deliver", CONTRACT_DELIVERER_SKILL],
     ["keiyaku-review", CONTRACT_REVIEWER_SKILL],
 ];
+export function decodeContractFileLag(value) {
+    if (value === null || typeof value !== "object" || Array.isArray(value))
+        throw new Error("malformed contract-file lag");
+    const object = value;
+    if (object.kind !== "contract-file-failed")
+        throw new Error("malformed contract-file lag");
+    if (Object.keys(object).some((key) => key !== "kind" && key !== "worktree" && key !== "path" && key !== "diagnostic"))
+        throw new Error("malformed contract-file lag");
+    if (typeof object.worktree !== "string" || object.worktree.trim() === "")
+        throw new Error("malformed contract-file lag");
+    if (typeof object.path !== "string" || object.path.trim() === "")
+        throw new Error("malformed contract-file lag");
+    if (typeof object.diagnostic !== "string" || object.diagnostic.trim() === "")
+        throw new Error("malformed contract-file lag");
+    return { kind: "contract-file-failed", worktree: object.worktree, path: object.path, diagnostic: object.diagnostic };
+}
 async function isTracked(repository, relativePath) {
     try {
         await runGit(repository, ["ls-files", "--error-unmatch", "--", relativePath]);
@@ -110,7 +128,7 @@ async function materializeSeatSkill(repository, worktree, seat, bytes) {
         await repair(repository, worktree, skill, bytes),
     ];
 }
-async function materialize(repository, worktree, guidance) {
+async function materialize(repository, worktree, guidance, namespace) {
     const effects = [];
     const failed = (target, path, error) => ({
         effects,
@@ -148,6 +166,12 @@ async function materialize(repository, worktree, guidance) {
         };
     }
     const scoped = { ...repository, effectiveCwd: worktree };
+    try {
+        await repairNamespaceContext(worktree, namespace);
+    }
+    catch (error) {
+        return failed(worktree, join(worktree, ".keiyaku", "namespace", "current"), error);
+    }
     for (const [relativePath, bytes] of [
         [".keiyaku/.gitignore", IGNORE_BYTES],
         [".keiyaku/KEIYAKU.md", guidance],
@@ -186,5 +210,5 @@ export async function projectContractWorktree(repository, state, register, _onCo
             ],
         };
     }
-    return await materialize(repository, worktreePath(repository, appointed.place), renderContractGuidance(state));
+    return await materialize(repository, worktreePath(repository, appointed.place), renderContractGuidance(state), contractNamespace(state.id));
 }

package/build/src/core/facts/codec.d.ts

@@ -1,5 +1,6 @@
-import type { JournalEntry } from "./types.js";
+import type { DeliverData, JournalEntry } from "./types.js";
 /** Validate one in-memory journal value with the persisted-fact authority. */
 export declare function decodeJournalEntry(value: unknown): JournalEntry;
+export declare function decodeDeliverData(value: unknown): DeliverData;
 export declare function encodeEntry(entry: JournalEntry): string;
 export declare function decodeJournal(journal: string): JournalEntry[];

package/build/src/core/facts/codec.js

@@ -239,6 +239,9 @@ function validateEntry(value) {
 export function decodeJournalEntry(value) {
     return validateEntry(value);
 }
+export function decodeDeliverData(value) {
+    return validateData("deliver", value);
+}
 function canonicalValue(value) {
     if (value === null)
         return "null";

package/build/src/core/facts/gate.d.ts

@@ -1,4 +1,4 @@
-import type { AttestationEntry, ContractState, Gate } from "./types.js";
+import { type AttestationEntry, type ContractState, type Gate } from "./types.js";
 export type GateCurrent = Readonly<{
     kind: "attested";
     verdict: "satisfied" | "unsatisfied";
@@ -14,6 +14,7 @@ export type GateReport = Readonly<{
     gate: Gate;
     current: GateCurrent;
 }>;
+export declare function decodeGateReport(value: unknown): GateReport;
 export type GateReports = Readonly<{
     reports: readonly GateReport[];
     satisfied: boolean;

package/build/src/core/facts/gate.js

@@ -1,4 +1,67 @@
 import { currentSubjectPredicate } from "../subject.js";
+import { gate } from "./types.js";
+function fail() {
+    throw new Error("malformed gate report");
+}
+function object(value) {
+    if (value === null || typeof value !== "object" || Array.isArray(value))
+        fail();
+    return value;
+}
+function decodeAttestedGateCurrent(current) {
+    for (const key of Object.keys(current)) {
+        if (key !== "kind" && key !== "verdict" && key !== "at" && key !== "summary")
+            fail();
+    }
+    if (current.kind !== "attested")
+        fail();
+    if (current.verdict !== "satisfied" && current.verdict !== "unsatisfied")
+        fail();
+    if (typeof current.at !== "string")
+        fail();
+    return {
+        kind: "attested",
+        verdict: current.verdict,
+        at: current.at,
+        ...(current.summary === undefined
+            ? {}
+            : { summary: typeof current.summary === "string" ? current.summary : fail() }),
+    };
+}
+function decodeGateCurrent(value) {
+    const current = object(value);
+    if (current.kind === "missing") {
+        if (Object.keys(current).length !== 1)
+            fail();
+        return { kind: "missing" };
+    }
+    if (current.kind === "stale") {
+        if (current.priorVerdict !== "satisfied" && current.priorVerdict !== "unsatisfied")
+            fail();
+        if (Object.keys(current).length !== 2)
+            fail();
+        return { kind: "stale", priorVerdict: current.priorVerdict };
+    }
+    return decodeAttestedGateCurrent(current);
+}
+export function decodeGateReport(value) {
+    const record = object(value);
+    if (!("gate" in record) || !("current" in record))
+        fail();
+    for (const key of Object.keys(record))
+        if (key !== "gate" && key !== "current")
+            fail();
+    let decodedGate;
+    try {
+        if (typeof record.gate !== "string")
+            fail();
+        decodedGate = gate(record.gate);
+    }
+    catch {
+        fail();
+    }
+    return { gate: decodedGate, current: decodeGateCurrent(record.current) };
+}
 /** Resolve the latest testimony for each requested gate and current subject. */
 export function latestCurrentAttestations(state, requested) {
     const attestations = new Map();