@astrosheep/keiyaku 2.9.9 → 2.9.11

package/build/agents/providers/pi/checkpoint.js

@@ -30,9 +30,17 @@ export function createPiCheckpointController(session, options) {
         enqueue,
         control,
         setTurnStartedEmitter(emitter) { emitTurnStarted = emitter; },
+        beginTurn() {
+            const checkpoint = { fence: { kind: "ordinal", ordinal: submittedTurnOrdinal } };
+            options.onSyncCheckpoint?.(control, checkpoint);
+        },
+        modelInputVisible() {
+            // Pi's public event exposes an assistant start but no identity for the
+            // queued input accepted by that model call. Event order is not a receipt.
+        },
         completeTurn() {
             submittedTurnOrdinal += 1;
-            const checkpoint = { fence: { kind: "ordinal", ordinal: submittedTurnOrdinal }, consumptionEvidence: true };
+            const checkpoint = { fence: { kind: "ordinal", ordinal: submittedTurnOrdinal } };
             if (options.onEvidence)
                 emitProviderEvidence(options.onEvidence, { type: "checkpoint", provider: PI_PROVIDER, fence: checkpoint.fence, source: "notification" }, options.diagnostic());
             options.onSyncCheckpoint?.(control, checkpoint);

package/build/agents/providers/pi/events.js

@@ -219,10 +219,12 @@ export function bindPiSessionEvents(session, builder, controller, state, settle)
                 state.thoughtTurnOrdinal += 1;
                 state.assistantMessageOrdinal = -1;
                 state.activeAssistantMessageOrdinal = undefined;
+                controller.beginTurn();
             }
             if (event.type === "message_start") {
                 const message = event.message;
                 if (message?.role === "assistant") {
+                    controller.modelInputVisible();
                     state.assistantMessageOrdinal += 1;
                     state.activeAssistantMessageOrdinal = state.assistantMessageOrdinal;
                 }

package/build/agents/providers/pi/registration.js

@@ -109,7 +109,8 @@ export const piRegistration = {
         return loader ? { ...terms, loader } : terms;
     },
     nativePolicyOwnership: () => null,
-    startLive: async ({ terms, signal, reviveTerms, onSyncCheckpoint, onSessionAdmission, onIngress }) => {
+    tellReceiptCapabilities: { seen: "unavailable", consumed: "unavailable" },
+    startLive: async ({ terms, signal, reviveTerms, onSyncCheckpoint, onSessionAdmission, onIngress, observer }) => {
         if (terms.provider !== PI_PROVIDER) {
             throw new Error(`startLive expected ${PI_PROVIDER}`);
         }
@@ -124,6 +125,12 @@ export const piRegistration = {
                 sessionFile: session.sessionFile,
                 appendSystemPromptOverride: piTerms.appendSystemPromptOverride,
                 onSyncCheckpoint,
+                onTellReceipt: observer ? (receipt) => {
+                    try {
+                        observer.onTellReceipt(receipt);
+                    }
+                    catch { /* Receipt persistence cannot alter provider control. */ }
+                } : undefined,
                 onEvidence: piTerms.onEvidence,
                 onSessionAdmission,
                 onIngress,
@@ -137,6 +144,12 @@ export const piRegistration = {
             signal,
             appendSystemPromptOverride: piTerms.appendSystemPromptOverride,
             onSyncCheckpoint,
+            onTellReceipt: observer ? (receipt) => {
+                try {
+                    observer.onTellReceipt(receipt);
+                }
+                catch { /* Receipt persistence cannot alter provider control. */ }
+            } : undefined,
             onEvidence: piTerms.onEvidence,
             onSessionAdmission,
             onIngress,

package/build/cli/commands/akuma/akuma/handler.js

@@ -1,4 +1,4 @@
 import { missingSubcommandError } from "../../../missing-subcommand.js";
 export const handler = async () => {
-    throw missingSubcommandError("akuma", ["ls", "view"]);
+    throw missingSubcommandError("akuma", ["ls", "show"]);
 };

package/build/cli/commands/akuma/akuma/meta.js

@@ -1,16 +1,16 @@
 export const meta = {
     command: "akuma",
     summary: "Inspect Akuma profiles",
-    usage: ["keiyaku akuma ls|view"],
+    usage: ["keiyaku akuma ls|show"],
     stdin: { mode: "argument" },
     flags: [],
     purpose: "Inspect configured helper profiles.",
-    subcommands: ["ls", "view"],
+    subcommands: ["ls", "show"],
     notes: [
         "Define user profiles in <KEIYAKU_HOME>/akuma/<name>.md.",
         "Define project profiles in .keiyaku/akuma/<name>.md.",
         "See README Configuration for the Markdown frontmatter format.",
     ],
-    examples: ["keiyaku akuma ls", "keiyaku akuma view akuma-codex"],
+    examples: ["keiyaku akuma ls", "keiyaku akuma show akuma-codex"],
     completionRank: 6,
 };

package/build/cli/commands/akuma/catalog.js

@@ -1,8 +1,8 @@
 import { meta as akumaMeta } from "./akuma/meta.js";
 import { meta as lsMeta } from "./list/meta-ls.js";
-import { meta as viewMeta } from "./view/meta.js";
+import { meta as showMeta } from "./show/meta.js";
 export const akumaCatalog = [
     { meta: akumaMeta, load: () => import("./akuma/handler.js") },
     { meta: lsMeta, load: () => import("./list/handler.js") },
-    { meta: viewMeta, load: () => import("./view/handler.js") },
+    { meta: showMeta, load: () => import("./show/handler.js") },
 ];

package/build/cli/commands/akuma/{view → show}/handler.js

@@ -7,15 +7,15 @@ import { isResponseArtifactId } from "../../../../core/response-artifact-id.js";
 import { textResponse } from "../../../render/shared.js";
 import { renderProjectionStatusSection } from "../../../render/status.js";
 import { projectDirectory } from "../../shared.js";
-import { renderAkumaShow, renderAkumaView } from "../../akuma.js";
+import { composeAkumaDetail, renderAkumaShow } from "../../akuma.js";
 export const handler = async (_stdin, flags, _signal, positional) => {
     const [name] = positional;
     if (!name)
-        throw new FlowError("EMPTY_PARAM", "akuma view requires an Akuma name");
+        throw new FlowError("EMPTY_PARAM", "akuma show requires an Akuma name");
     if (isResponseArtifactId(name)) {
-        throw new FlowError("EMPTY_PARAM", `artifact ${name} is a response artifact; akuma view expects an Akuma profile name`);
+        throw new FlowError("EMPTY_PARAM", `artifact ${name} is a response artifact; akuma show expects an Akuma profile name`);
     }
-    const cwd = await projectDirectory(flags, "akuma view");
+    const cwd = await projectDirectory(flags, "akuma show");
     const loaded = await loadKeiyakuSettings(cwd);
     assertSettingsKnobUsable(loaded, "agents");
     assertSettingsKnobUsable(loaded, "default");
@@ -23,5 +23,5 @@ export const handler = async (_stdin, flags, _signal, positional) => {
     const profile = renderAkumaShow(await loadAkumaCatalog(cwd), loaded.providerInstances, loaded.knobs, name).trimEnd();
     const projectionStatus = await readAkumaNonterminalProjectionStatus(cwd, Date.now(), name);
     const projections = renderProjectionStatusSection(projectionStatus).trimEnd();
-    return textResponse(renderAkumaView(profile, projections));
+    return textResponse(composeAkumaDetail(profile, projections));
 };

package/build/cli/commands/akuma/{view → show}/meta.js

@@ -1,7 +1,7 @@
 export const meta = {
-    command: "akuma view",
-    summary: "View one Akuma profile",
-    usage: ["keiyaku akuma view NAME [-C|--cwd DIR] [--repo DIR]"],
+    command: "akuma show",
+    summary: "Show one Akuma profile",
+    usage: ["keiyaku akuma show NAME [-C|--cwd DIR] [--repo DIR]"],
     stdin: { mode: "argument" },
     flags: ["cwd", "repo"],
     purpose: "Read one configured helper profile and its current nonterminal projections.",

package/build/cli/commands/akuma.js

@@ -141,7 +141,7 @@ export function renderAkumaList(catalog, providerInstances, settings) {
     return lines.join("\n");
 }
 /** Compose profile inspection with an optional nonterminal projection section. */
-export function renderAkumaView(profile, projectionsSection) {
+export function composeAkumaDetail(profile, projectionsSection) {
     return projectionsSection ? `${profile}
 
 ${projectionsSection}` : profile;

package/build/cli/commands/contract/amend/handler.js

@@ -2,15 +2,16 @@ import { amendKeiyaku } from "../../../../core/amend.js";
 import { resolveExistingContractAddress } from "../../../../core/addressing.js";
 import { buildAmendInput } from "../../../../core/amend.js";
 import { buildAmendResponse } from "../../../render/arc.js";
-import { renderCoreResult } from "../../../render/shared.js";
+import { renderLifecycleResult } from "../../../render/lifecycle.js";
 import { effectiveDirectory, repositoryDirectory } from "../../shared.js";
-export const handler = async (stdin, flags) => {
+export const handler = async (stdin, flags, signal) => {
     const parsed = buildAmendInput(stdin, effectiveDirectory(flags), flags.contractId, flags.contractAddressSource, flags.appendScope);
     const cwd = await repositoryDirectory(flags, "amend");
     const address = await resolveExistingContractAddress(cwd, flags.contractId, flags.contractAddressSource, effectiveDirectory(flags));
-    return renderCoreResult(amendKeiyaku({
+    return renderLifecycleResult(amendKeiyaku({
         ...parsed,
         cwd,
         address,
-    }), buildAmendResponse);
+        signal,
+    }), buildAmendResponse, { cwd, address });
 };

package/build/cli/commands/contract/arc/handler.js

@@ -1,15 +1,16 @@
 import { arcKeiyaku, buildArcInput } from "../../../../core/arc.js";
 import { resolveExistingContractAddress } from "../../../../core/addressing.js";
 import { buildArcResponse } from "../../../render/arc.js";
-import { renderCoreResult } from "../../../render/shared.js";
+import { renderLifecycleResult } from "../../../render/lifecycle.js";
 import { effectiveDirectory, repositoryDirectory } from "../../shared.js";
-export const handler = async (stdin, flags) => {
+export const handler = async (stdin, flags, signal) => {
     const parsed = buildArcInput(stdin, effectiveDirectory(flags), flags.appendScope, flags.contractId, flags.contractAddressSource);
     const cwd = await repositoryDirectory(flags, "arc");
     const address = await resolveExistingContractAddress(cwd, flags.contractId, flags.contractAddressSource, effectiveDirectory(flags));
-    return renderCoreResult(arcKeiyaku({
+    return renderLifecycleResult(arcKeiyaku({
         ...parsed,
         cwd,
         address,
-    }), buildArcResponse);
+        signal,
+    }), buildArcResponse, { cwd, address });
 };

package/build/cli/commands/contract/audit/handler.js

@@ -2,12 +2,12 @@ import { auditContract } from "../../../../core/audit.js";
 import { resolveContractAddress, withResolvedAddress } from "../../../../core/addressing.js";
 import { buildAuditConstructionFailure, buildAuditResponse } from "../../../render/audit.js";
 import { effectiveDirectory, repositoryDirectory } from "../../shared.js";
-export const handler = async (_stdin, flags) => {
+export const handler = async (_stdin, flags, signal) => {
     try {
         const cwd = await repositoryDirectory(flags, "audit");
         const address = await resolveContractAddress(cwd, flags.contractId, flags.contractAddressSource, effectiveDirectory(flags));
         return await withResolvedAddress(address, async () => {
-            return buildAuditResponse(await auditContract({ cwd, address, diffBudgetBytes: flags.auditDiffBudgetBytes }), flags.json === true);
+            return buildAuditResponse(await auditContract({ cwd, address, diffBudgetBytes: flags.auditDiffBudgetBytes, signal }), flags.json === true);
         });
     }
     catch (error) {

package/build/cli/commands/contract/bind/handler.js

@@ -1,10 +1,19 @@
-import { bindContract, previewBindContract } from "../../../../core/bind.js";
+import { bindContract, previewBindContract, reconcileBindContract } from "../../../../core/bind.js";
 import { defaultActorClock } from "../../../../core/outcome-base.js";
 import { writeDraftArtifact } from "../../../draft-artifact.js";
-import { buildBindDraftResponse, buildBindPreviewResponse, buildBindResponse } from "../../../render/shared.js";
+import { buildBindDraftResponse, buildBindOutcomeResponse, buildBindPreviewResponse } from "../../../render/shared.js";
 import { repositoryDirectory } from "../../shared.js";
 export const handler = async (stdin, flags, signal) => {
     const cwd = await repositoryDirectory(flags, "bind");
+    if (flags.contractId !== undefined) {
+        return buildBindOutcomeResponse(await reconcileBindContract({
+            cwd,
+            contractId: flags.contractId,
+            ...defaultActorClock(),
+            signal,
+            onProgress: (line) => { process.stdout.write(`${line}\n`); },
+        }), cwd);
+    }
     if (flags.dryRun) {
         const preview = await previewBindContract({
             cwd, draft: stdin, ...defaultActorClock(), workspace: "worktree",
@@ -26,5 +35,5 @@ export const handler = async (stdin, flags, signal) => {
             process.stdout.write(`${line}\n`);
         },
     });
-    return buildBindResponse(result, cwd);
+    return buildBindOutcomeResponse(result, cwd);
 };

package/build/cli/commands/contract/bind/meta.js

@@ -2,63 +2,93 @@ export const meta = {
     command: "bind",
     summary: "Create a contract ledger and workspace files",
     usage: [
+        "keiyaku @<full-contract-id> bind [-C|--cwd DIR] [--repo DIR]",
+        "keiyaku bind --contract <full-contract-id> [-C|--cwd DIR] [--repo DIR]",
         "keiyaku bind [-C|--cwd DIR] [--repo DIR] [--task ID]... [- < contract.md]",
-        "keiyaku bind [-C|--cwd DIR] [--repo DIR] [--task ID]... --place NAME --objective TEXT --scope GLOB --checks CHECK [--dry-run]",
+        "keiyaku bind [-C|--cwd DIR] [--repo DIR] [--task ID]... --title TEXT --context TEXT --objective TEXT --design TEXT --scope GLOB --criteria CRITERION [--verification DECLARATION] [--dry-run]",
     ],
     stdin: { mode: "document", selector: { kind: "positional", index: 0, required: false, rejectBlank: false } },
-    flags: ["cwd", "repo", "after", "exclusive", "draft-only", "place", "objective", "scope", "checks", "task", "dry-run"],
-    // contract is parseable only so the mouth can reject it with bind-specific copy.
-    parseFlags: ["cwd", "repo", "contract", "after", "exclusive", "draft-only", "place", "objective", "scope", "checks", "task", "dry-run"],
+    flags: ["cwd", "repo", "contract", "after", "exclusive", "draft-only", "title", "context", "objective", "design", "scope", "criteria", "verification", "task", "dry-run"],
+    // contract and place are parseable only so the mouth can reject them with bind-specific copy.
+    parseFlags: ["cwd", "repo", "contract", "after", "exclusive", "draft-only", "place", "title", "context", "objective", "design", "scope", "criteria", "verification", "task", "dry-run"],
     purpose: "Bind a Keiyaku from contract Markdown selected by literal -.",
     input: [
-        "# <name>",
+        "# <title>",
+        "",
+        "## Context",
+        "<established facts and constraints>",
         "",
         "## Objective",
         "<what the commission should accomplish>",
         "",
+        "## Design",
+        "<settled blueprint>",
+        "",
         "## Scope",
         "~~~",
         "<pattern>",
         "<another-pattern>",
         "~~~",
         "",
-        "## Checks",
-        "- <verification>",
+        "## Criteria",
+        "- <declarative acceptance criterion>",
+        "",
+        "## Verification",
+        "- <executable declaration>",
     ],
     notes: [
-        "bind creates a contract and does not accept @addr or --contract.",
+        "Bare bind creates a distinct contract. Addressed bind accepts only a full contract ID and replays its committed derived surfaces.",
         "Primary document form is literal - followed by Markdown on stdin (full document below).",
-        "With --task, title and body supply name/objective defaults; literal - may send only the missing sections and any present section overrides the task default.",
-        "Domain flags remain available as a full-document alternative; they cannot mix with Markdown selected by literal -.",
+        "With --task, task title and body supply title/objective defaults; literal - or domain flags may send only the missing sections and any present section overrides the task default.",
+        "Domain flags remain available as a partial-document alternative; they cannot mix with Markdown selected by literal -.",
+        "Verification is optional; omit it when the contract has no executable testimony declarations.",
     ],
     examples: [
         [
             "keiyaku bind - <<'KEIYAKU'",
-            "# <name>",
+            "# <title>",
+            "",
+            "## Context",
+            "<established facts and constraints>",
             "",
             "## Objective",
             "<what the commission should accomplish>",
             "",
+            "## Design",
+            "<settled blueprint>",
+            "",
             "## Scope",
             "~~~",
             "<pattern>",
             "<another-pattern>",
             "~~~",
             "",
-            "## Checks",
-            "- <verification>",
+            "## Criteria",
+            "- <declarative acceptance criterion>",
+            "",
+            "## Verification",
+            "- <executable declaration>",
             "KEIYAKU",
         ].join("\n"),
         [
             "keiyaku bind --task fix-flaky-pump - <<'KEIYAKU'",
+            "## Context",
+            "<established facts and constraints>",
+            "",
+            "## Design",
+            "<settled blueprint>",
+            "",
             "## Scope",
             "~~~",
             "<pattern>",
             "<another-pattern>",
             "~~~",
             "",
-            "## Checks",
-            "- <verification>",
+            "## Criteria",
+            "- <declarative acceptance criterion>",
+            "",
+            "## Verification",
+            "- <executable declaration>",
             "KEIYAKU",
         ].join("\n"),
     ],

package/build/cli/commands/contract/forfeit/handler.js

@@ -2,12 +2,16 @@ import { resolveExistingContractAddress, withResolvedAddress } from "../../../..
 import { defaultActorClock } from "../../../../core/outcome-base.js";
 import { forfeitContractCommand } from "../../../../core/forfeit.js";
 import { buildForfeitResponse } from "../../../render/shared.js";
+import { buildLifecycleOutcomeResponse } from "../../../render/lifecycle.js";
+import { isCompleteLifecycleOutcome } from "../../../../core/outcome-base.js";
 import { effectiveDirectory, repositoryDirectory } from "../../shared.js";
-export const handler = async (_stdin, flags) => {
+export const handler = async (_stdin, flags, signal) => {
     const cwd = await repositoryDirectory(flags, "forfeit");
     const address = await resolveExistingContractAddress(cwd, flags.contractId, flags.contractAddressSource, effectiveDirectory(flags));
-    return await withResolvedAddress(address, async () => buildForfeitResponse({
-        ...await forfeitContractCommand({ cwd, contractId: address.binding.commissionId, ...defaultActorClock(), note: flags.reason }),
-        address,
-    }));
+    return await withResolvedAddress(address, async () => {
+        const result = await forfeitContractCommand({ cwd, contractId: address.binding.commissionId, ...defaultActorClock(), note: flags.reason, signal });
+        if (!isCompleteLifecycleOutcome(result))
+            return buildLifecycleOutcomeResponse(result, { cwd, address });
+        return buildForfeitResponse({ ...result, address, cleanup: result.cleanup });
+    });
 };

package/build/cli/commands/contract/log/handler.js

@@ -2,11 +2,11 @@ import { resolveExistingContractAddress, withResolvedAddress } from "../../../..
 import { readContractLog } from "../../../../core/log.js";
 import { buildLogResponse } from "../../../render/misc.js";
 import { effectiveDirectory, repositoryDirectory } from "../../shared.js";
-export const handler = async (_stdin, flags) => {
+export const handler = async (_stdin, flags, signal) => {
     const cwd = await repositoryDirectory(flags, "log");
     const address = await resolveExistingContractAddress(cwd, flags.contractId, flags.contractAddressSource, effectiveDirectory(flags));
     return await withResolvedAddress(address, async () => {
-        const result = await readContractLog({ cwd, contractId: address.binding.commissionId });
+        const result = await readContractLog({ cwd, contractId: address.binding.commissionId, signal });
         return buildLogResponse({ ...result, address });
     });
 };

package/build/cli/commands/contract/petition/handler.js

@@ -1,9 +1,11 @@
 import { FlowError } from "../../../../flow-error.js";
 import { resolveExistingContractAddress, withResolvedAddress } from "../../../../core/addressing.js";
-import { buildPetitionClaimInput, petitionKeiyaku, previewPetition, } from "../../../../core/settlement/index.js";
+import { buildPetitionClaimInput, petitionKeiyaku, previewPetition, reconcilePetitionRetry, } from "../../../../core/settlement/index.js";
 import { renewKeiyaku } from "../../../../core/renew.js";
-import { buildPetitionClaimResponse, buildPetitionPreviewResponse, renderPetitionRenewedConsequence, } from "../../../render/petition.js";
+import { buildPetitionClaimResponse, buildPetitionPreviewResponse, renderPetitionRetryConsequence, renderPetitionRenewedConsequence, } from "../../../render/petition.js";
 import { writeCliOutput } from "../../../output-stream-error-policy.js";
+import { buildLifecycleOutcomeResponse } from "../../../render/lifecycle.js";
+import { isCompleteLifecycleOutcome } from "../../../../core/outcome-base.js";
 import { effectiveDirectory, repositoryDirectory } from "../../shared.js";
 export const handler = async (stdin, flags, signal) => {
     if (flags.json && !flags.dryRun) {
@@ -21,16 +23,41 @@ export const handler = async (stdin, flags, signal) => {
                 cwd,
                 contractId: address.binding.commissionId,
                 oath: input.oath,
+                signal,
             }), flags.json === true);
         }
-        const renewed = flags.renewBeforePetition
-            ? await renewKeiyaku({ cwd, address, appendScope: flags.appendScope })
+        const retry = await reconcilePetitionRetry({
+            cwd,
+            contractId: address.binding.commissionId,
+            signal,
+        });
+        if (retry.status === "verdict") {
+            if (!isCompleteLifecycleOutcome(retry.verdict)) {
+                return buildLifecycleOutcomeResponse(retry.verdict, { cwd, address });
+            }
+            if (retry.result === "rejected") {
+                await writeCliOutput(process.stdout, `${renderPetitionRetryConsequence(retry.reason)}\n`);
+            }
+        }
+        const resumesApprovedClaim = retry.status === "approved-awaiting-claim"
+            || (retry.status === "verdict" && retry.result === "approved");
+        const renewed = flags.renewBeforePetition && !resumesApprovedClaim
+            ? await renewKeiyaku({ cwd, address, appendScope: flags.appendScope, signal })
             : undefined;
-        if (renewed && !renewed.alreadyFresh) {
+        const alreadyFresh = renewed?.family === "refused-before-effects"
+            && renewed.failedInvariant.code === "NO_LIFECYCLE_CHANGE";
+        if (renewed && renewed.family !== "committed" && !alreadyFresh)
+            return buildLifecycleOutcomeResponse(renewed, { cwd, address });
+        if (renewed && renewed.family === "committed" && !isCompleteLifecycleOutcome(renewed))
+            return buildLifecycleOutcomeResponse(renewed, { cwd, address });
+        if (renewed && isCompleteLifecycleOutcome(renewed) && !renewed.alreadyFresh) {
             await writeCliOutput(process.stdout, `${renderPetitionRenewedConsequence(renewed)}\n`);
         }
         const input = buildPetitionClaimInput({ cwd, contractId: address.binding.commissionId, stdin, signal, appendScope: flags.appendScope });
-        const petitionInput = renewed ? { ...input, appendScope: undefined } : input;
-        return buildPetitionClaimResponse({ ...await petitionKeiyaku(petitionInput), address }, input);
+        const petitionInput = renewed && isCompleteLifecycleOutcome(renewed) ? { ...input, appendScope: undefined } : input;
+        const result = await petitionKeiyaku(petitionInput);
+        return isCompleteLifecycleOutcome(result) && "status" in result
+            ? buildPetitionClaimResponse({ ...result, address }, input)
+            : buildLifecycleOutcomeResponse(result, { cwd, address });
     });
 };

package/build/cli/commands/contract/renew/handler.js

@@ -1,24 +1,24 @@
 import { resolveContractAddress, resolveExistingContractAddress } from "../../../../core/addressing.js";
 import { abortRenewKeiyaku, continueRenewKeiyaku, renewKeiyaku } from "../../../../core/renew.js";
 import { buildRenewAbortResponse, buildRenewResponse } from "../../../render/arc.js";
-import { renderCoreResult } from "../../../render/shared.js";
+import { renderLifecycleResult } from "../../../render/lifecycle.js";
 import { effectiveDirectory, repositoryDirectory } from "../../shared.js";
-export const handler = async (_stdin, flags) => {
+export const handler = async (_stdin, flags, signal) => {
     const cwd = await repositoryDirectory(flags, "renew");
     const resolveAddress = flags.renewContinue || flags.renewAbort
         ? resolveContractAddress
         : resolveExistingContractAddress;
     const address = await resolveAddress(cwd, flags.contractId, flags.contractAddressSource, effectiveDirectory(flags));
     if (flags.renewContinue) {
-        return renderCoreResult(continueRenewKeiyaku({ cwd, address, appendScope: flags.appendScope }), buildRenewResponse);
+        return renderLifecycleResult(continueRenewKeiyaku({ cwd, address, appendScope: flags.appendScope, signal }), buildRenewResponse, { cwd, address });
     }
     if (flags.renewAbort) {
-        return renderCoreResult(abortRenewKeiyaku({ cwd, address }), buildRenewAbortResponse);
+        return renderLifecycleResult(abortRenewKeiyaku({ cwd, address, signal }), buildRenewAbortResponse, { cwd, address });
     }
-    return renderCoreResult(renewKeiyaku({
+    return renderLifecycleResult(renewKeiyaku({
         cwd,
         address,
         appendScope: flags.appendScope,
-        resolveConflicts: flags.renewResolve,
-    }), buildRenewResponse);
+        signal,
+    }), buildRenewResponse, { cwd, address });
 };

package/build/cli/commands/contract/renew/meta.js

@@ -2,17 +2,17 @@ export const meta = {
     command: "renew",
     summary: "Rewrite delivery onto the current base",
     usage: [
-        "keiyaku renew [-C|--cwd DIR] [--repo DIR] [--contract ADDR] [--append-scope PATTERN] [--resolve]",
+        "keiyaku renew [-C|--cwd DIR] [--repo DIR] [--contract ADDR] [--append-scope PATTERN]",
         "keiyaku @<id> renew --continue [--append-scope PATTERN]",
         "keiyaku @<id> renew --abort",
     ],
     stdin: { mode: "argument" },
-    flags: ["cwd", "repo", "contract", "append-scope", "resolve", "continue", "abort"],
+    flags: ["cwd", "repo", "contract", "append-scope", "continue", "abort"],
     purpose: "Capture receipts, rewrite delivery onto the default branch, then seal the current a0 or open explicit arc and record the renewal.",
     notes: [
         "After an explicit arc closes, refuses loose commits until another arc is open.",
         "Refuses while an Akuma is in flight.",
-        "Ordinary conflicts restore the delivery branch and worktree without ledger writes; --resolve opens an owned session for --continue or --abort.",
+        "Conflicts create derived scratch without changing the ledger, delivery branch, or worktree; resolve that scratch with --continue or discard it with --abort.",
     ],
     completionRank: 9,
 };

package/build/cli/commands/metadata.js

@@ -8,7 +8,7 @@ import { meta as killMeta } from "./projection/kill/meta.js";
 import { meta as logMeta } from "./contract/log/meta.js";
 import { meta as akumaMeta } from "./akuma/akuma/meta.js";
 import { meta as akumaLsMeta } from "./akuma/list/meta-ls.js";
-import { meta as akumaViewMeta } from "./akuma/view/meta.js";
+import { meta as akumaShowMeta } from "./akuma/show/meta.js";
 import { meta as skillsMeta } from "./skills/skills/meta.js";
 import { meta as skillsInstallMeta } from "./skills/install/meta.js";
 import { meta as amendMeta } from "./contract/amend/meta.js";
@@ -19,6 +19,7 @@ import { meta as forfeitMeta } from "./contract/forfeit/meta.js";
 import { meta as guideMeta } from "./system/guide/meta.js";
 import { meta as completionMeta } from "./system/completion/meta.js";
 import { meta as statusMeta } from "./projection/status/meta.js";
+import { meta as historyMeta } from "./projection/history/meta.js";
 import { meta as taskMeta } from "./task/task/meta.js";
 import { meta as taskAddMeta } from "./task/add/meta.js";
 import { meta as taskShowMeta } from "./task/show/meta.js";
@@ -26,6 +27,8 @@ import { meta as taskLsMeta } from "./task/ls/meta.js";
 import { meta as taskLogMeta } from "./task/log/meta.js";
 import { meta as taskStartMeta } from "./task/start/meta.js";
 import { meta as taskStopMeta } from "./task/stop/meta.js";
+import { meta as taskHoldMeta } from "./task/hold/meta.js";
+import { meta as taskResumeMeta } from "./task/resume/meta.js";
 import { meta as taskDoneMeta } from "./task/done/meta.js";
 import { meta as taskDropMeta } from "./task/drop/meta.js";
 import { meta as taskUpdateMeta } from "./task/update/meta.js";
@@ -33,16 +36,17 @@ import { meta as taskDoctorMeta } from "./task/doctor/meta.js";
 import { meta as dumpEnvMeta } from "./system/dump-env/meta.js";
 export const COMMAND_METADATA_ORDER = [
     "bind", "arc", "call", "revive", "wait", "tell", "kill", "log",
-    "akuma", "akuma ls", "akuma view", "skills", "skills install", "amend", "audit",
-    "renew", "petition", "forfeit", "guide", "completion", "status", "task",
-    "task add", "task show", "task ls", "task log", "task start", "task stop", "task done",
+    "akuma", "akuma ls", "akuma show", "skills", "skills install", "amend", "audit",
+    "renew", "petition", "forfeit", "guide", "completion", "status", "history", "task",
+    "task add", "task show", "task ls", "task log", "task start", "task stop", "task hold", "task resume", "task done",
     "task drop", "task update", "task doctor", "dump-env",
 ];
 const COMMAND_METADATA = [
     bindMeta, arcMeta, callMeta, reviveMeta, waitMeta, tellMeta, killMeta, logMeta,
-    akumaMeta, akumaLsMeta, akumaViewMeta, skillsMeta, skillsInstallMeta, amendMeta, auditMeta,
-    renewMeta, petitionMeta, forfeitMeta, guideMeta, completionMeta, statusMeta,
+    akumaMeta, akumaLsMeta, akumaShowMeta, skillsMeta, skillsInstallMeta, amendMeta, auditMeta,
+    renewMeta, petitionMeta, forfeitMeta, guideMeta, completionMeta, statusMeta, historyMeta,
     taskMeta, taskAddMeta, taskShowMeta, taskLsMeta, taskLogMeta, taskStartMeta, taskStopMeta,
+    taskHoldMeta, taskResumeMeta,
     taskDoneMeta, taskDropMeta, taskUpdateMeta, taskDoctorMeta, dumpEnvMeta,
 ];
 export const CLI_COMMAND_METADATA = Object.fromEntries(COMMAND_METADATA.map((meta) => [meta.command, meta]));

package/build/cli/commands/projection/call/meta.js

@@ -1,7 +1,7 @@
 export const meta = {
     command: "call",
     summary: "Start an Akuma helper session",
-    usage: ["keiyaku call NAME [--wait DURATION] <BODY|->"],
+    usage: ["keiyaku call NAME [-d|--detach] [--wait DURATION] <BODY|->"],
     stdin: {
         mode: "argument",
         selector: { kind: "positional", index: 0, required: true, rejectBlank: true },

package/build/cli/commands/projection/catalog.js

@@ -4,6 +4,7 @@ import { meta as waitMeta } from "./wait/meta.js";
 import { meta as tellMeta } from "./tell/meta.js";
 import { meta as killMeta } from "./kill/meta.js";
 import { meta as statusMeta } from "./status/meta.js";
+import { meta as historyMeta } from "./history/meta.js";
 export const projectionCatalog = [
     { meta: callMeta, load: () => import("./call/handler.js") },
     { meta: reviveMeta, load: () => import("./revive/handler.js") },
@@ -11,4 +12,5 @@ export const projectionCatalog = [
     { meta: tellMeta, load: () => import("./tell/handler.js") },
     { meta: killMeta, load: () => import("./kill/handler.js") },
     { meta: statusMeta, load: () => import("./status/handler.js") },
+    { meta: historyMeta, load: () => import("./history/handler.js") },
 ];

package/build/cli/commands/projection/history/handler.js

@@ -0,0 +1,21 @@
+import { readProjectionHistoryAddress, readProjectionHistory, selectProjectionHistory, } from "../../../../core/projection/index.js";
+import { FlowError } from "../../../../flow-error.js";
+import { projectionHistoryJson, renderProjectionHistoryDetail, renderProjectionHistoryList } from "../../../render/projection-history.js";
+import { textResponse } from "../../../render/shared.js";
+import { projectDirectory } from "../../shared.js";
+export const handler = async (_stdin, flags, _signal, positional) => {
+    const cwd = await projectDirectory(flags, "history");
+    const [address] = positional;
+    if (!address) {
+        const runs = selectProjectionHistory(await readProjectionHistory(cwd), {
+            filters: flags.taskFilters,
+            sort: flags.taskSort,
+            nowMs: Date.now(),
+        });
+        return textResponse(flags.json ? projectionHistoryJson(runs) : renderProjectionHistoryList(runs));
+    }
+    const detail = await readProjectionHistoryAddress(cwd, address);
+    if (!detail)
+        throw new FlowError("PROJECTION_HISTORY_NOT_FOUND", `history has no retained run for '${address}'`);
+    return textResponse(flags.json ? projectionHistoryJson(detail) : renderProjectionHistoryDetail(detail));
+};