@astrosheep/keiyaku 2.9.3 → 2.9.5

package/build/agents/selector.js

@@ -5,35 +5,8 @@ import { resolveDefaultAgentName } from "../config/settings/knobs.js";
 import { loadKeiyakuSettings } from "../config/settings/loader.js";
 import { nativePolicyOwnership } from "../config/provider-policy-ownership.js";
 import { FlowError } from "../flow-error.js";
-const ACCESS_VALUES = ["read", "write", "auto"];
-const NETWORK_VALUES = ["disabled", "enabled"];
-const SUPPORTED_EXPLICIT = {
-    "codex-sdk": {
-        access: new Set(ACCESS_VALUES),
-        network: new Set(NETWORK_VALUES),
-        webSearch: new Set(["disabled", "cached", "live"]),
-    },
-    "codex-app-server": {
-        access: new Set(["write"]),
-        network: new Set(NETWORK_VALUES),
-        webSearch: new Set(),
-    },
-    "claude-agent-sdk": {
-        access: new Set(ACCESS_VALUES),
-        network: new Set(),
-        webSearch: new Set(["disabled"]),
-    },
-    "opencode-sdk": {
-        access: new Set(),
-        network: new Set(),
-        webSearch: new Set(),
-    },
-    pi: {
-        access: new Set(),
-        network: new Set(),
-        webSearch: new Set(),
-    },
-};
+import { PROVIDER_PORTABLE_POLICY } from "./providers/registry.js";
+const SUPPORTED_EXPLICIT = PROVIDER_PORTABLE_POLICY;
 export function formatAvailableAgentNames(names) {
     if (names.length === 0)
         return "(none configured)";

package/build/agents/types.js

@@ -1,3 +1,13 @@
+export const SUBAGENT_FAILURE_CODES = [
+    "SUBAGENT_TIMEOUT",
+    "SUBAGENT_TRANSPORT_ERROR",
+    "SUBAGENT_POLICY_BUDGET",
+    "SUBAGENT_NON_ZERO_EXIT",
+    "SUBAGENT_SPAWN_ERROR",
+    "SUBAGENT_EXEC_ERROR",
+    "SUBAGENT_PROVIDER_UNAVAILABLE",
+];
+export const OUTCOME_ERROR_VERSION = 1;
 export class SubagentFailure extends Error {
     code;
     timeoutMs;

package/build/artifact-directories.js

@@ -0,0 +1,22 @@
+import * as path from "path";
+export const KEIYAKU_DRAFT_DIR = path.join(".keiyaku", "draft");
+export const RESPONSE_HISTORY_DIR = path.join(".keiyaku", "response");
+export const KEIYAKU_ARTIFACT_DIRS = [KEIYAKU_DRAFT_DIR, RESPONSE_HISTORY_DIR];
+function formatArtifactDirectory(directory) {
+    return `\`${directory}/\``;
+}
+export function formatArtifactDirectories(directories) {
+    const formatted = directories.map(formatArtifactDirectory);
+    if (formatted.length === 0)
+        return "";
+    if (formatted.length === 1)
+        return formatted[0];
+    if (formatted.length === 2)
+        return `${formatted[0]} and ${formatted[1]}`;
+    return `${formatted.slice(0, -1).join(", ")}, and ${formatted[formatted.length - 1]}`;
+}
+function buildArtifactNotice(directory) {
+    return `Auto-generated artifact. Add ${formatArtifactDirectory(directory)} to \`.gitignore\` if you do not want it tracked.`;
+}
+export const DRAFT_ARTIFACT_NOTICE = buildArtifactNotice(KEIYAKU_ARTIFACT_DIRS[0]);
+export const RESPONSE_ARTIFACT_NOTICE = buildArtifactNotice(KEIYAKU_ARTIFACT_DIRS[1]);

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

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

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

@@ -2,7 +2,7 @@ export const meta = {
     command: "akuma",
     summary: "Inspect Akuma profiles",
     usage: ["keiyaku akuma ls|view"],
-    stdin: "none",
+    stdin: { mode: "argument" },
     flags: [],
     purpose: "Inspect configured helper profiles.",
     subcommands: ["ls", "view"],

package/build/cli/commands/akuma/list/meta-ls.js

@@ -2,7 +2,7 @@ export const meta = {
     command: "akuma ls",
     summary: "List Akuma profiles",
     usage: ["keiyaku akuma ls [-C|--cwd DIR] [--repo DIR]"],
-    stdin: "none",
+    stdin: { mode: "argument" },
     flags: ["cwd", "repo"],
     purpose: "List configured helper profiles.",
     notes: ["Project profiles override user profiles, which override builtins."],

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

@@ -2,12 +2,12 @@ import { FlowError } from "../../../../flow-error.js";
 import { assertSettingsKnobUsable } from "../../../../config/settings/disease.js";
 import { loadKeiyakuSettings } from "../../../../config/settings/loader.js";
 import { loadAkumaCatalog } from "../../../../config/akuma-loader.js";
-import { readProjectionStatusBoard } from "../../../../core/projection-status.js";
+import { readProjectionStatusBoard } from "../../../../core/projection/index.js";
 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 } from "../../akuma.js";
+import { renderAkumaShow, renderAkumaView } from "../../akuma.js";
 const NONTERMINAL_PROJECTION_STATES = new Set([
     "minting",
     "startup-timeout",
@@ -28,7 +28,8 @@ export const handler = async (_stdin, flags, _signal, positional) => {
     assertSettingsKnobUsable(loaded, "default");
     assertSettingsKnobUsable(loaded, "reviewer");
     const profile = renderAkumaShow(await loadAkumaCatalog(cwd), loaded.providerInstances, loaded.knobs, name).trimEnd();
-    const rows = (readProjectionStatusBoard(cwd, Date.now(), { showAll: true })?.rows ?? []).filter((row) => row.akuma === name && NONTERMINAL_PROJECTION_STATES.has(row.state));
+    const projectionStatus = await readProjectionStatusBoard(cwd, Date.now(), { showAll: true });
+    const rows = (projectionStatus?.rows ?? []).filter((row) => row.akuma === name && NONTERMINAL_PROJECTION_STATES.has(row.state));
     const projections = renderProjectionStatusSection({ rows }).trimEnd();
-    return textResponse(projections ? `${profile}\n\n${projections}` : profile);
+    return textResponse(renderAkumaView(profile, projections));
 };

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

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

package/build/cli/commands/akuma.js

@@ -140,6 +140,12 @@ export function renderAkumaList(catalog, providerInstances, settings) {
     }
     return lines.join("\n");
 }
+/** Compose profile inspection with an optional nonterminal projection section. */
+export function renderAkumaView(profile, projectionsSection) {
+    return projectionsSection ? `${profile}
+
+${projectionsSection}` : profile;
+}
 export function renderAkumaShow(catalog, providerInstances, settings, name) {
     const candidate = catalog.selected[name];
     if (candidate === undefined) {

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

@@ -1,10 +1,16 @@
 import { amendKeiyaku } from "../../../../core/amend.js";
-import { buildAmendInput } from "../../../../core/command-io.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 { effectiveDirectory, repositoryDirectory } from "../../shared.js";
 export const handler = async (stdin, flags) => {
     const parsed = buildAmendInput(stdin, effectiveDirectory(flags), flags.contractId, flags.contractAddressSource);
     const cwd = await repositoryDirectory(flags, "amend");
-    return renderCoreResult(amendKeiyaku({ ...parsed, cwd }), buildAmendResponse);
+    const address = await resolveExistingContractAddress(cwd, flags.contractId, flags.contractAddressSource, effectiveDirectory(flags));
+    return renderCoreResult(amendKeiyaku({
+        ...parsed,
+        cwd,
+        address,
+    }), buildAmendResponse);
 };

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

@@ -2,11 +2,11 @@ export const meta = {
     command: "amend",
     summary: "Record an amendment",
     usage: [
-        "keiyaku amend [-C|--cwd DIR] [--repo DIR] [--contract ADDR] < amendment.md",
-        "keiyaku @addr amend [-C|--cwd DIR] [--repo DIR] < amendment.md",
+        "keiyaku amend [-C|--cwd DIR] [--repo DIR] [--contract ADDR] - < amendment.md",
+        "keiyaku @addr amend [-C|--cwd DIR] [--repo DIR] - < amendment.md",
     ],
-    stdin: "required",
+    stdin: { mode: "document", selector: { kind: "positional", index: 0, required: true, rejectBlank: true } },
     flags: ["cwd", "repo", "contract"],
-    purpose: "Append a prose amendment and optional structured scope delta.",
+    purpose: "Append a prose amendment and optional Scope Append gitignore-pattern delta.",
     completionRank: 8,
 };

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

@@ -1,9 +1,15 @@
 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 { effectiveDirectory, repositoryDirectory } from "../../shared.js";
 export const handler = async (stdin, flags) => {
-    const parsed = buildArcInput(stdin, effectiveDirectory(flags), flags.waivePaths, flags.contractId, flags.contractAddressSource);
+    const parsed = buildArcInput(stdin, effectiveDirectory(flags), flags.appendScope, flags.contractId, flags.contractAddressSource);
     const cwd = await repositoryDirectory(flags, "arc");
-    return renderCoreResult(arcKeiyaku({ ...parsed, cwd }), buildArcResponse);
+    const address = await resolveExistingContractAddress(cwd, flags.contractId, flags.contractAddressSource, effectiveDirectory(flags));
+    return renderCoreResult(arcKeiyaku({
+        ...parsed,
+        cwd,
+        address,
+    }), buildArcResponse);
 };

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

@@ -2,11 +2,11 @@ export const meta = {
     command: "arc",
     summary: "Optional iteration; seals current intent first",
     usage: [
-        "keiyaku arc [-C|--cwd DIR] [--repo DIR] [--contract ADDR] [--waive PATH] < arc.md",
-        "keiyaku @addr arc [-C|--cwd DIR] [--repo DIR] [--waive PATH] < arc.md",
+        "keiyaku arc [-C|--cwd DIR] [--repo DIR] [--contract ADDR] [--append-scope PATTERN] - < arc.md",
+        "keiyaku @addr arc [-C|--cwd DIR] [--repo DIR] [--append-scope PATTERN] - < arc.md",
     ],
-    stdin: "required",
-    flags: ["cwd", "repo", "contract", "waive"],
+    stdin: { mode: "document", selector: { kind: "positional", index: 0, required: true, rejectBlank: true } },
+    flags: ["cwd", "repo", "contract", "append-scope"],
     purpose: "Optional iteration boundary: record the next title, objective, and brief, and seal the current intent first.",
     input: [
         "# <arc title>",

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

@@ -0,0 +1,16 @@
+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) => {
+    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);
+        });
+    }
+    catch (error) {
+        return buildAuditConstructionFailure(error, flags.json === true);
+    }
+};

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

@@ -0,0 +1,16 @@
+export const meta = {
+    command: "audit",
+    summary: "Read settlement facts from one pinned delivery candidate",
+    usage: [
+        "keiyaku audit [-C|--cwd DIR] [--repo DIR] [--contract ADDR] [--diff-budget BYTES] [--json]",
+        "keiyaku @<id> audit [--diff-budget BYTES] [--json]",
+    ],
+    stdin: { mode: "argument" },
+    flags: ["cwd", "repo", "contract", "diff-budget", "json"],
+    purpose: "Inspect one pinned delivery candidate, report settlement facts, and recheck its coordinates without mutating the source repository.",
+    notes: [
+        "Audit never invokes an Akuma or settles the contract.",
+        "Exit 0 means the report was constructed; exit 1 carries a typed construction cause.",
+    ],
+    completionRank: 9,
+};

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

@@ -1,9 +1,9 @@
 import { bindContract } from "../../../../core/bind.js";
-import { defaultActorClock } from "../../../../core/command-io.js";
+import { defaultActorClock } from "../../../../core/outcome-base.js";
 import { writeDraftArtifact } from "../../../draft-artifact.js";
 import { buildBindDraftResponse, buildBindResponse, textResponse } from "../../../render/shared.js";
 import { repositoryDirectory } from "../../shared.js";
-export const handler = async (stdin, flags) => {
+export const handler = async (stdin, flags, signal) => {
     if (flags.dryRun) {
         return textResponse(stdin);
     }
@@ -14,7 +14,8 @@ export const handler = async (stdin, flags) => {
     const result = await bindContract({
         cwd, draft: stdin, ...defaultActorClock(), workspace: "worktree",
         after: flags.after ?? [], exclusive: flags.exclusive,
-        ...(flags.bindTaskId === undefined ? {} : { taskId: flags.bindTaskId }),
+        ...(flags.bindTaskIds === undefined ? {} : { taskIds: flags.bindTaskIds }),
+        signal,
         onProgress: (line) => {
             process.stdout.write(`${line}\n`);
         },

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

@@ -2,14 +2,14 @@ export const meta = {
     command: "bind",
     summary: "Create a contract ledger and workspace files",
     usage: [
-        "keiyaku bind [-C|--cwd DIR] [--repo DIR] [--task ID] < keiyaku.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]... [- < contract.md]",
+        "keiyaku bind [-C|--cwd DIR] [--repo DIR] [--task ID]... --place NAME --objective TEXT --scope GLOB --checks CHECK [--dry-run]",
     ],
-    stdin: "optional",
+    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"],
-    purpose: "Bind a Keiyaku from a contract draft.",
+    purpose: "Bind a Keiyaku from contract Markdown selected by literal -.",
     input: [
         "# <name>",
         "",
@@ -17,14 +17,50 @@ export const meta = {
         "<what the commission should accomplish>",
         "",
         "## Scope",
-        "- <glob>",
+        "```",
+        "<pattern>",
+        "<another-pattern>",
+        "```",
         "",
         "## Checks",
-        "- <acceptance check>",
+        "- <verification>",
     ],
     notes: [
-        "bind creates a commission and does not accept @addr or --contract.",
-        "Use either stdin Markdown or all four domain flags; they cannot be combined.",
+        "bind creates a contract and does not accept @addr or --contract.",
+        "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 -.",
+    ],
+    examples: [
+        [
+            "keiyaku bind - <<'KEIYAKU'",
+            "# <name>",
+            "",
+            "## Objective",
+            "<what the commission should accomplish>",
+            "",
+            "## Scope",
+            "```",
+            "<pattern>",
+            "<another-pattern>",
+            "```",
+            "",
+            "## Checks",
+            "- <verification>",
+            "KEIYAKU",
+        ].join("\n"),
+        [
+            "keiyaku bind --task fix-flaky-pump - <<'KEIYAKU'",
+            "## Scope",
+            "```",
+            "<pattern>",
+            "<another-pattern>",
+            "```",
+            "",
+            "## Checks",
+            "- <verification>",
+            "KEIYAKU",
+        ].join("\n"),
     ],
     completionRank: 0,
 };

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

@@ -2,6 +2,7 @@ import { meta as bindMeta } from "./bind/meta.js";
 import { meta as arcMeta } from "./arc/meta.js";
 import { meta as logMeta } from "./log/meta.js";
 import { meta as amendMeta } from "./amend/meta.js";
+import { meta as auditMeta } from "./audit/meta.js";
 import { meta as renewMeta } from "./renew/meta.js";
 import { meta as petitionMeta } from "./petition/meta.js";
 import { meta as forfeitMeta } from "./forfeit/meta.js";
@@ -10,6 +11,7 @@ export const contractCatalog = [
     { meta: arcMeta, load: () => import("./arc/handler.js") },
     { meta: logMeta, load: () => import("./log/handler.js") },
     { meta: amendMeta, load: () => import("./amend/handler.js") },
+    { meta: auditMeta, load: () => import("./audit/handler.js") },
     { meta: renewMeta, load: () => import("./renew/handler.js") },
     { meta: petitionMeta, load: () => import("./petition/handler.js") },
     { meta: forfeitMeta, load: () => import("./forfeit/handler.js") },

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

@@ -1,11 +1,11 @@
-import { resolveContractAddress, withResolvedAddress } from "../../../../core/addressing.js";
-import { defaultActorClock } from "../../../../core/command-io.js";
+import { resolveExistingContractAddress, withResolvedAddress } from "../../../../core/addressing.js";
+import { defaultActorClock } from "../../../../core/outcome-base.js";
 import { forfeitContractCommand } from "../../../../core/forfeit.js";
 import { buildForfeitResponse } from "../../../render/shared.js";
-import { repositoryDirectory } from "../../shared.js";
+import { effectiveDirectory, repositoryDirectory } from "../../shared.js";
 export const handler = async (_stdin, flags) => {
     const cwd = await repositoryDirectory(flags, "forfeit");
-    const address = await resolveContractAddress(cwd, flags.contractId, flags.contractAddressSource);
+    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,

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

@@ -5,7 +5,7 @@ export const meta = {
         "keiyaku forfeit [-C|--cwd DIR] [--repo DIR] [--contract ADDR] [--reason TEXT]",
         "keiyaku @addr forfeit [-C|--cwd DIR] [--repo DIR] [--reason TEXT]",
     ],
-    stdin: "none",
+    stdin: { mode: "argument" },
     flags: ["cwd", "repo", "contract", "reason"],
     purpose: "Record an abandoned contract without sealing it.",
     completionRank: 11,

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

@@ -1,10 +1,10 @@
-import { resolveContractAddress, withResolvedAddress } from "../../../../core/addressing.js";
+import { resolveExistingContractAddress, withResolvedAddress } from "../../../../core/addressing.js";
 import { readContractLog } from "../../../../core/log.js";
 import { buildLogResponse } from "../../../render/misc.js";
-import { repositoryDirectory } from "../../shared.js";
+import { effectiveDirectory, repositoryDirectory } from "../../shared.js";
 export const handler = async (_stdin, flags) => {
     const cwd = await repositoryDirectory(flags, "log");
-    const address = await resolveContractAddress(cwd, flags.contractId, flags.contractAddressSource);
+    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 });
         return buildLogResponse({ ...result, address });

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

@@ -5,7 +5,7 @@ export const meta = {
         "keiyaku log [-C|--cwd DIR] [--repo DIR] [--contract ADDR]",
         "keiyaku @addr log [-C|--cwd DIR] [--repo DIR]",
     ],
-    stdin: "none",
+    stdin: { mode: "argument" },
     flags: ["cwd", "repo", "contract"],
     purpose: "Read a contract ledger.",
     completionRank: 5,

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

@@ -1,24 +1,21 @@
 import { FlowError } from "../../../../flow-error.js";
-import { resolveContractAddress, withResolvedAddress } from "../../../../core/addressing.js";
-import { buildPetitionClaimInput } from "../../../../core/petition.js";
-import { previewPetition } from "../../../../core/petition-preview.js";
-import { petitionKeiyaku } from "../../../../core/petition-run.js";
+import { resolveExistingContractAddress, withResolvedAddress } from "../../../../core/addressing.js";
+import { buildPetitionClaimInput, petitionKeiyaku, previewPetition, } from "../../../../core/settlement/index.js";
 import { buildPetitionClaimResponse, buildPetitionPreviewResponse } from "../../../render/petition.js";
-import { repositoryDirectory } from "../../shared.js";
+import { effectiveDirectory, repositoryDirectory } from "../../shared.js";
 export const handler = async (stdin, flags, signal) => {
     if (flags.json && !flags.dryRun) {
         throw new FlowError("EMPTY_PARAM", "petition --json requires --dry-run");
     }
     const cwd = await repositoryDirectory(flags, "petition");
-    const address = await resolveContractAddress(cwd, flags.contractId, flags.contractAddressSource);
+    const address = await resolveExistingContractAddress(cwd, flags.contractId, flags.contractAddressSource, effectiveDirectory(flags));
     return await withResolvedAddress(address, async () => {
-        const input = buildPetitionClaimInput({ cwd, contractId: address.binding.commissionId, stdin, signal, waivePaths: flags.waivePaths });
+        const input = buildPetitionClaimInput({ cwd, contractId: address.binding.commissionId, stdin, signal, appendScope: flags.appendScope });
         if (flags.dryRun) {
             return buildPetitionPreviewResponse(await previewPetition({
                 cwd,
                 contractId: address.binding.commissionId,
                 oath: input.oath,
-                waivePaths: flags.waivePaths,
             }), flags.json === true);
         }
         return buildPetitionClaimResponse({ ...await petitionKeiyaku(input), address }, input);

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

@@ -2,19 +2,19 @@ export const meta = {
     command: "petition",
     summary: "Run or preview the gated settlement pipeline",
     usage: [
-        "keiyaku petition [-C|--cwd DIR] [--repo DIR] [--contract ADDR] [--waive PATH] [< petition.md]",
-        "keiyaku @<id> petition [-C|--cwd DIR] [--repo DIR] [--waive PATH] [< petition.md]",
-        "keiyaku @<id> petition --dry-run [--json] [< petition.md]",
+        "keiyaku petition [-C|--cwd DIR] [--repo DIR] [--contract ADDR] [--append-scope PATTERN] [- < petition.md]",
+        "keiyaku @<id> petition [-C|--cwd DIR] [--repo DIR] [--append-scope PATTERN] [- < petition.md]",
+        "keiyaku @<id> petition --dry-run [--json] [- < petition.md]",
     ],
-    stdin: "optional",
-    flags: ["cwd", "repo", "contract", "waive", "dry-run", "json"],
+    stdin: { mode: "document", selector: { kind: "positional", index: 0, required: false, rejectBlank: false } },
+    flags: ["cwd", "repo", "contract", "append-scope", "dry-run", "json"],
     purpose: "Seal the current a0 or open explicit arc, queue the contract, and run verdict and claim processing; dry-run previews deterministic gates without mutation.",
     input: [
         "## Oath",
         "<free first-person attestation>",
     ],
     notes: [
-        "Petition stdin is optional at the command mouth; a missing, empty, or blank oath is rejected by the settlement gate with OATH_MISSING.",
+        "Petition stdin is optional and read only when literal - is supplied; a missing, empty, or blank oath is rejected by the settlement gate with OATH_MISSING.",
         "The machine checks only that the oath is present. Accepted oath text is persisted in the petition entry and hidden from the reviewer.",
         "Base drift requires explicit `keiyaku renew` before petition.",
         "Dry-run never runs verification or review and exits 0, 1, or 2.",

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

@@ -1,10 +1,24 @@
-import { resolveContractAddress } from "../../../../core/addressing.js";
-import { renewKeiyaku } from "../../../../core/renew.js";
-import { buildRenewResponse } from "../../../render/arc.js";
+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 { repositoryDirectory } from "../../shared.js";
+import { effectiveDirectory, repositoryDirectory } from "../../shared.js";
 export const handler = async (_stdin, flags) => {
     const cwd = await repositoryDirectory(flags, "renew");
-    const address = await resolveContractAddress(cwd, flags.contractId, flags.contractAddressSource);
-    return renderCoreResult(renewKeiyaku({ cwd, address, waivePaths: flags.waivePaths }), buildRenewResponse);
+    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);
+    }
+    if (flags.renewAbort) {
+        return renderCoreResult(abortRenewKeiyaku({ cwd, address }), buildRenewAbortResponse);
+    }
+    return renderCoreResult(renewKeiyaku({
+        cwd,
+        address,
+        appendScope: flags.appendScope,
+        resolveConflicts: flags.renewResolve,
+    }), buildRenewResponse);
 };

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

@@ -2,16 +2,17 @@ export const meta = {
     command: "renew",
     summary: "Rewrite delivery onto the current base",
     usage: [
-        "keiyaku renew [-C|--cwd DIR] [--repo DIR] [--contract ADDR] [--waive PATH]",
-        "keiyaku @<id> renew [-C|--cwd DIR] [--repo DIR] [--waive PATH]",
+        "keiyaku renew [-C|--cwd DIR] [--repo DIR] [--contract ADDR] [--append-scope PATTERN] [--resolve]",
+        "keiyaku @<id> renew --continue [--append-scope PATTERN]",
+        "keiyaku @<id> renew --abort",
     ],
-    stdin: "none",
-    flags: ["cwd", "repo", "contract", "waive"],
+    stdin: { mode: "argument" },
+    flags: ["cwd", "repo", "contract", "append-scope", "resolve", "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.",
-        "Conflicts restore the worktree without ledger writes.",
+        "Ordinary conflicts restore the delivery branch and worktree without ledger writes; --resolve opens an owned session for --continue or --abort.",
     ],
     completionRank: 9,
 };

package/build/cli/commands/metadata.js

@@ -0,0 +1,59 @@
+import { meta as bindMeta } from "./contract/bind/meta.js";
+import { meta as arcMeta } from "./contract/arc/meta.js";
+import { meta as callMeta } from "./projection/call/meta.js";
+import { meta as reviveMeta } from "./projection/revive/meta.js";
+import { meta as waitMeta } from "./projection/wait/meta.js";
+import { meta as tellMeta } from "./projection/tell/meta.js";
+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 skillsMeta } from "./skills/skills/meta.js";
+import { meta as skillsInstallMeta } from "./skills/install/meta.js";
+import { meta as amendMeta } from "./contract/amend/meta.js";
+import { meta as auditMeta } from "./contract/audit/meta.js";
+import { meta as renewMeta } from "./contract/renew/meta.js";
+import { meta as petitionMeta } from "./contract/petition/meta.js";
+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 taskMeta } from "./task/task/meta.js";
+import { meta as taskAddMeta } from "./task/add/meta.js";
+import { meta as taskShowMeta } from "./task/show/meta.js";
+import { meta as taskLsMeta } from "./task/ls/meta.js";
+import { meta as taskStartMeta } from "./task/start/meta.js";
+import { meta as taskStopMeta } from "./task/stop/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";
+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 start", "task stop", "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,
+    taskMeta, taskAddMeta, taskShowMeta, taskLsMeta, taskStartMeta, taskStopMeta,
+    taskDoneMeta, taskDropMeta, taskUpdateMeta, taskDoctorMeta, dumpEnvMeta,
+];
+export const CLI_COMMAND_METADATA = Object.fromEntries(COMMAND_METADATA.map((meta) => [meta.command, meta]));
+export function getCommandMetadata(command) {
+    return CLI_COMMAND_METADATA[command];
+}
+export function allCommandMetadata() {
+    return COMMAND_METADATA_ORDER.map((command) => CLI_COMMAND_METADATA[command]);
+}
+export function commandParseOrder() {
+    return [...COMMAND_METADATA_ORDER].sort((a, b) => {
+        const tokenDelta = b.split(" ").length - a.split(" ").length;
+        return tokenDelta !== 0 ? tokenDelta : COMMAND_METADATA_ORDER.indexOf(a) - COMMAND_METADATA_ORDER.indexOf(b);
+    });
+}