@astrosheep/keiyaku 2.9.8 → 2.9.10

package/build/cli/flags.js

@@ -83,22 +83,37 @@ export const FLAG_SPECS = {
     place: {
         kind: "value",
         placeholder: "NAME",
-        description: "Set the H1 contract name for flag-generated bind Markdown.",
+        description: "Legacy bind title spelling; bind rejects it with --title migration guidance.",
     },
     objective: {
         kind: "value",
         placeholder: "TEXT",
         description: "Set the objective for flag-generated bind Markdown.",
     },
+    context: {
+        kind: "value",
+        placeholder: "TEXT",
+        description: "Set established facts and constraints for flag-generated bind Markdown.",
+    },
+    design: {
+        kind: "value",
+        placeholder: "TEXT",
+        description: "Set the settled design for flag-generated bind Markdown.",
+    },
     scope: {
         kind: "value",
         placeholder: "GLOB",
         description: "Set the single scope pattern for flag-generated bind Markdown.",
     },
-    checks: {
+    criteria: {
         kind: "value",
-        placeholder: "CHECK",
-        description: "Set the single acceptance check for flag-generated bind Markdown.",
+        placeholder: "CRITERION",
+        description: "Set the single declarative acceptance criterion for flag-generated bind Markdown.",
+    },
+    verification: {
+        kind: "value",
+        placeholder: "DECLARATION",
+        description: "Set the single executable verification declaration for flag-generated bind Markdown.",
     },
     task: {
         kind: "value",
@@ -132,17 +147,13 @@ export const FLAG_SPECS = {
         kind: "boolean",
         description: "Renew onto the current target before petitioning.",
     },
-    resolve: {
-        kind: "boolean",
-        description: "Open a durable Keiyaku-owned renew recovery session when the rewrite conflicts.",
-    },
     continue: {
         kind: "boolean",
-        description: "Continue the open Keiyaku-owned renew recovery session.",
+        description: "Continue from the derived renew conflict scratch.",
     },
     abort: {
         kind: "boolean",
-        description: "Restore and remove the open Keiyaku-owned renew recovery session.",
+        description: "Delete the derived renew conflict scratch without moving authoritative refs.",
     },
     shell: {
         kind: "value",
@@ -174,7 +185,7 @@ export const FLAG_SPECS = {
     },
     json: {
         kind: "boolean",
-        description: "Render task data as JSON.",
+        description: "Render structured data as JSON.",
     },
     "diff-budget": {
         kind: "value",
@@ -188,12 +199,12 @@ export const FLAG_SPECS = {
     filter: {
         kind: "value",
         placeholder: TASK_FILTER_GRAMMAR,
-        description: "Filter structured task facts. Repeat --filter for AND; comma values or | terms are OR.",
+        description: "Filter structured facts. Repeat --filter for AND; comma values or | terms are OR.",
     },
     sort: {
         kind: "value",
         placeholder: "KEY[,KEY...]",
-        description: "Sort by priority ascending, modified descending, or created descending.",
+        description: "Sort the selected structured collection.",
     },
     pri: {
         kind: "value",
@@ -224,16 +235,41 @@ export const FLAG_SPECS = {
         placeholder: "ID",
         description: "Add a discovery-lineage task. May be repeated.",
     },
+    supersedes: {
+        kind: "value",
+        placeholder: "ID",
+        description: "Record that this task supersedes another task. May be repeated.",
+    },
+    "drop-supersedes": {
+        kind: "value",
+        placeholder: "ID",
+        description: "Remove a supersedes relation. May be repeated.",
+    },
+    "relates-to": {
+        kind: "value",
+        placeholder: "ID",
+        description: "Record related work. May be repeated.",
+    },
+    "drop-relates-to": {
+        kind: "value",
+        placeholder: "ID",
+        description: "Remove a related-work relation. May be repeated.",
+    },
     title: {
         kind: "value",
         placeholder: "TEXT",
-        description: "Replace the task title.",
+        description: "Set the bind document title or replace the task title.",
     },
     body: {
         kind: "value",
         placeholder: "TEXT|-",
         description: "Replace the task body; literal - reads stdin.",
     },
+    append: {
+        kind: "value",
+        placeholder: "TEXT|-",
+        description: "Append a Markdown paragraph to the task body; literal - reads stdin.",
+    },
 };
 export const CONTROL_FLAGS = new Set(Object.keys(FLAG_SPECS));
 export const VALUE_FLAGS = new Set(Object.entries(FLAG_SPECS)
@@ -244,5 +280,6 @@ export const BOOLEAN_FLAGS = new Set(Object.entries(FLAG_SPECS)
     .map(([name]) => name));
 export const SHORT_FLAG_ALIASES = {
     C: "cwd",
+    d: "detach",
     f: "force",
 };

package/build/cli/help.js

@@ -13,6 +13,9 @@ function flagUsage(name, specs) {
     if (name === "cwd") {
         return `-C, --cwd ${spec?.placeholder ?? "DIR"}`;
     }
+    if (name === "detach") {
+        return "-d, --detach";
+    }
     return spec?.kind === "value" ? `--${name} ${spec.placeholder ?? "VALUE"}` : `--${name}`;
 }
 export { CLI_COMMAND_METADATA };
@@ -69,7 +72,7 @@ export function renderCliHelp(version) {
         "Configuration:",
         "  Akuma profiles  <KEIYAKU_HOME>/akuma/*.md or .keiyaku/akuma/*.md",
         "  Settings        <KEIYAKU_HOME>/settings.json or .keiyaku/settings.json",
-        "  Inspect         keiyaku akuma ls | keiyaku akuma view NAME",
+        "  Inspect         keiyaku akuma ls | keiyaku akuma show NAME",
         "  Environment     keiyaku dump-env",
         "  Full format     README Configuration",
     ].join("\n");

package/build/cli/index.js

@@ -23,42 +23,54 @@ function commandSavesFailedStdin(command) {
     return (commandRequiresStdin(command) || commandAcceptsOptionalStdin(command)) && command !== "call";
 }
 function hasBindDomainFlags(flags) {
-    return (flags.bindPlace !== undefined
+    return (flags.bindTitle !== undefined
+        || flags.bindContext !== undefined
         || flags.bindObjective !== undefined
+        || flags.bindDesign !== undefined
         || flags.bindScope !== undefined
-        || flags.bindChecks !== undefined);
+        || flags.bindCriteria !== undefined
+        || flags.bindVerification !== undefined);
 }
-function prepareBindInput(stdin, flags) {
+function prepareBindInput(stdin, flags, selectsStdin) {
+    if (flags.contractId !== undefined)
+        return "";
     const nonblankStdin = stdin.trim().length > 0;
     const domainFlags = hasBindDomainFlags(flags);
     if (flags.dryRun && flags.draftOnly) {
         throw new FlowError("EMPTY_PARAM", "--dry-run cannot be combined with --draft-only");
     }
-    if (nonblankStdin && domainFlags) {
-        throw new FlowError("EMPTY_PARAM", "bind accepts either stdin Markdown or the four domain flags, not both");
+    if (selectsStdin && domainFlags) {
+        throw new FlowError("EMPTY_PARAM", "bind accepts either stdin Markdown or domain flags, not both");
     }
     if (domainFlags) {
         const missing = [];
-        if (flags.bindPlace === undefined)
-            missing.push("--place");
+        if (flags.bindTitle === undefined)
+            missing.push("--title");
+        if (flags.bindContext === undefined)
+            missing.push("--context");
         if (flags.bindObjective === undefined)
             missing.push("--objective");
+        if (flags.bindDesign === undefined)
+            missing.push("--design");
         if (flags.bindScope === undefined)
             missing.push("--scope");
-        if (flags.bindChecks === undefined)
-            missing.push("--checks");
-        if (missing.length > 0) {
-            throw new FlowError("EMPTY_PARAM", `bind flag mode requires --place, --objective, --scope, and --checks; missing ${missing.join(", ")}`);
+        if (flags.bindCriteria === undefined)
+            missing.push("--criteria");
+        if (missing.length > 0 && (flags.bindTaskIds?.length ?? 0) === 0) {
+            throw new FlowError("EMPTY_PARAM", `bind flag mode requires --title, --context, --objective, --design, --scope, and --criteria; missing ${missing.join(", ")}`);
         }
         return compileBindDraftFlags({
-            place: flags.bindPlace,
+            title: flags.bindTitle,
+            context: flags.bindContext,
             objective: flags.bindObjective,
+            design: flags.bindDesign,
             scope: flags.bindScope,
-            checks: flags.bindChecks,
+            criteria: flags.bindCriteria,
+            verification: flags.bindVerification,
         });
     }
     if (!nonblankStdin) {
-        // --task may supply name/objective defaults; core merges and reports missing sections.
+        // --task may supply title/objective defaults; core merges and reports missing sections.
         if (flags.bindTaskIds !== undefined && flags.bindTaskIds.length > 0) {
             return "";
         }
@@ -76,6 +88,7 @@ async function readStdin() {
 function makeAbortSignal() {
     const controller = new AbortController();
     process.once("SIGINT", () => controller.abort());
+    process.once("SIGTERM", () => controller.abort());
     return controller.signal;
 }
 function responseText(response) {
@@ -93,8 +106,8 @@ async function saveFailedStdin(input) {
 /**
  * Rebuild bind flags for a failed-stdin retry in deterministic shell-safe order.
  * Order follows bind usage/parse authority: cwd, repo, after, exclusive,
- * draft-only, task. Domain-flag bind does not save stdin, so place/objective/
- * scope/checks are not reconstructed. --dry-run never reaches this path.
+ * draft-only, task. Domain-flag bind does not save stdin, so title/objective/
+ * scope/criteria are not reconstructed. --dry-run never reaches this path.
  */
 function bindRetryFlagTokens(flags) {
     const tokens = [];
@@ -190,13 +203,13 @@ function selectedArgument(parsed) {
             return undefined;
         return { token, replace: () => parsed.flags };
     }
-    const flagName = stdin.selector.name;
-    const token = parsed.flags[flagName];
+    const flagName = stdin.selector.names.find((name) => parsed.flags[name] !== undefined);
+    const token = flagName === undefined ? undefined : parsed.flags[flagName];
     if (token === undefined && !stdin.selector.required)
         return undefined;
     return {
         token,
-        replace: (value) => ({ ...parsed.flags, [flagName]: value }),
+        replace: (value) => flagName === undefined ? parsed.flags : ({ ...parsed.flags, [flagName]: value }),
     };
 }
 async function resolveCliInput(parsed) {
@@ -221,7 +234,7 @@ async function resolveCliInput(parsed) {
             : `${parsed.command} body cannot be empty`;
         throw new FlowError("EMPTY_PARAM", message);
     }
-    return { stdin: input, flags: selected?.replace(input) ?? parsed.flags };
+    return { stdin: input, flags: selected?.replace(input) ?? parsed.flags, selectsStdin };
 }
 function usageExample(command) {
     const meta = getCommandMetadata(command);
@@ -242,9 +255,11 @@ export async function runCliCommand(tokens) {
     }
     const cwd = parsed.flags.cwd ?? process.cwd();
     let stdin;
+    let selectsStdin = false;
     try {
         const resolved = await resolveCliInput(parsed);
         stdin = resolved.stdin;
+        selectsStdin = resolved.selectsStdin;
         parsed = { ...parsed, flags: resolved.flags };
     }
     catch (error) {
@@ -255,7 +270,7 @@ export async function runCliCommand(tokens) {
     // repository admission as bind but does not persist an artifact on failure.
     if (parsed.command === "bind") {
         try {
-            stdin = prepareBindInput(stdin, parsed.flags);
+            stdin = prepareBindInput(stdin, parsed.flags, selectsStdin);
         }
         catch (error) {
             await printFailure(error, cwd);
@@ -267,7 +282,7 @@ export async function runCliCommand(tokens) {
         response = await runResponse(parsed.command, parsed.flags, stdin, parsed.positional);
     }
     catch (error) {
-        if (commandRequiresStdin(parsed.command) || (parsed.command === "bind" && !parsed.flags.dryRun)) {
+        if (commandRequiresStdin(parsed.command) || (parsed.command === "bind" && !parsed.flags.dryRun && parsed.flags.contractId === undefined)) {
             return await handleFailureAfterStdin({
                 error,
                 cwd,
@@ -282,12 +297,12 @@ export async function runCliCommand(tokens) {
             return 2;
         return failureExitCode(error);
     }
-    const success = !response.payload || !("error" in response.payload);
+    const success = !response.isDomainFailure && (!response.payload || !("error" in response.payload));
     if (success) {
         await writeSuccessResponse(parsed.command, parsed.flags, response);
         return response.exitCode ?? 0;
     }
-    if (commandRequiresStdin(parsed.command) || (parsed.command === "bind" && !parsed.flags.dryRun)) {
+    if (commandRequiresStdin(parsed.command) || (parsed.command === "bind" && !parsed.flags.dryRun && parsed.flags.contractId === undefined)) {
         return await handleFailureAfterStdin({
             response,
             cwd,
@@ -298,7 +313,7 @@ export async function runCliCommand(tokens) {
         });
     }
     await writeCliOutput(process.stderr, `${responseText(response)}\n`);
-    return 1;
+    return response.exitCode ?? 1;
 }
 export function renderCliCommandHelp(command) {
     const meta = getCommandMetadata(command);

package/build/cli/parse-flags.js

@@ -75,17 +75,35 @@ export function assignFlag(flags, name, value) {
             }
             flags.bindObjective = String(value);
             return;
+        case "context":
+            if (flags.bindContext !== undefined) {
+                throw new FlowError("EMPTY_PARAM", "option --context may only be specified once");
+            }
+            flags.bindContext = String(value);
+            return;
+        case "design":
+            if (flags.bindDesign !== undefined) {
+                throw new FlowError("EMPTY_PARAM", "option --design may only be specified once");
+            }
+            flags.bindDesign = String(value);
+            return;
         case "scope":
             if (flags.bindScope !== undefined) {
                 throw new FlowError("EMPTY_PARAM", "option --scope may only be specified once");
             }
             flags.bindScope = String(value);
             return;
-        case "checks":
-            if (flags.bindChecks !== undefined) {
-                throw new FlowError("EMPTY_PARAM", "option --checks may only be specified once");
+        case "criteria":
+            if (flags.bindCriteria !== undefined) {
+                throw new FlowError("EMPTY_PARAM", "option --criteria may only be specified once");
             }
-            flags.bindChecks = String(value);
+            flags.bindCriteria = String(value);
+            return;
+        case "verification":
+            if (flags.bindVerification !== undefined) {
+                throw new FlowError("EMPTY_PARAM", "option --verification may only be specified once");
+            }
+            flags.bindVerification = String(value);
             return;
         case "task":
             flags.bindTaskIds = [...(flags.bindTaskIds ?? []), String(value)];
@@ -108,9 +126,6 @@ export function assignFlag(flags, name, value) {
         case "renew":
             flags.renewBeforePetition = Boolean(value);
             return;
-        case "resolve":
-            flags.renewResolve = Boolean(value);
-            return;
         case "continue":
             flags.renewContinue = Boolean(value);
             return;
@@ -184,6 +199,18 @@ export function assignFlag(flags, name, value) {
         case "from":
             flags.taskFrom = [...(flags.taskFrom ?? []), String(value)];
             return;
+        case "supersedes":
+            flags.taskSupersedes = [...(flags.taskSupersedes ?? []), String(value)];
+            return;
+        case "drop-supersedes":
+            flags.taskDropSupersedes = [...(flags.taskDropSupersedes ?? []), String(value)];
+            return;
+        case "relates-to":
+            flags.taskRelatesTo = [...(flags.taskRelatesTo ?? []), String(value)];
+            return;
+        case "drop-relates-to":
+            flags.taskDropRelatesTo = [...(flags.taskDropRelatesTo ?? []), String(value)];
+            return;
         case "parent":
             if (flags.taskParent !== undefined) {
                 throw new FlowError("EMPTY_PARAM", "option --parent may only be specified once");
@@ -205,6 +232,12 @@ export function assignFlag(flags, name, value) {
             }
             flags.taskBody = String(value);
             return;
+        case "append":
+            if (flags.taskAppend !== undefined) {
+                throw new FlowError("EMPTY_PARAM", "option --append may only be specified once");
+            }
+            flags.taskAppend = String(value);
+            return;
         default:
             throw new FlowError("EMPTY_PARAM", `unknown option: --${name}`);
     }

package/build/cli/parse-metadata.js

@@ -56,7 +56,7 @@ export function parseWaitTimeout(value) {
     return timeoutMs;
 }
 export function commandPositionalRange(command) {
-    if (command === "akuma view") {
+    if (command === "akuma show") {
         return { min: 1, max: 1, label: "<name>" };
     }
     if (command === "log") {
@@ -80,10 +80,13 @@ export function commandPositionalRange(command) {
     if (command === "status") {
         return { min: 0, max: 1, label: "[projection-id]" };
     }
+    if (command === "history") {
+        return { min: 0, max: 1, label: "[projection|alias|rsp]" };
+    }
     if (command === "task add") {
         return { min: 1, max: 1, label: "<BODY|->" };
     }
-    if (command === "task show" || command === "task log" || command === "task start" || command === "task drop") {
+    if (command === "task show" || command === "task log" || command === "task start" || command === "task hold" || command === "task resume" || command === "task drop") {
         return { min: 1, max: 1, label: "<ID>" };
     }
     if (command === "task update") {

package/build/cli/parse-selectors.js

@@ -2,6 +2,7 @@ import { FlowError } from "../flow-error.js";
 import { assignFlag } from "./parse-flags.js";
 import { normalizeContractAddress } from "./parse-metadata.js";
 const COMMISSION_SELECTOR_COMMANDS = new Set([
+    "bind",
     "arc",
     "amend",
     "call",
@@ -45,9 +46,7 @@ export function assertCommissionSelectorAllowed(command, flags) {
     if (flags.contractId === undefined || COMMISSION_SELECTOR_COMMANDS.has(command)) {
         return;
     }
-    throw new FlowError("EMPTY_PARAM", command === "bind"
-        ? `bind creates a commission and does not accept @${flags.contractId}; use -C/--cwd to select the repository`
-        : `contract address @${flags.contractId} is not valid for ${command}`);
+    throw new FlowError("EMPTY_PARAM", `contract address @${flags.contractId} is not valid for ${command}`);
 }
 export function assertProjectionSelectorPresent(command, flags, atTokens, contractFlagRaws, restLength, payloadLength) {
     if ((command !== "wait" && command !== "tell") || flags.contractId === undefined) {

package/build/cli/parse.js

@@ -1,6 +1,7 @@
 import { FlowError } from "../flow-error.js";
 import { agentNameSchema } from "../config/settings/schema.js";
 import { isResponseArtifactId } from "../core/response-artifact-id.js";
+import { isCommissionId } from "../core/ids.js";
 import { HELP_FLAGS } from "./flags.js";
 import { getCommandMetadata } from "./commands/metadata.js";
 import { assertAllowedFlag, assignFlag, BOOLEAN_FLAGS, CONTROL_FLAGS, parseFlagName, readValueFlag, SHORT_FLAG_ALIASES, VALUE_FLAGS, } from "./parse-flags.js";
@@ -102,7 +103,7 @@ export function parseCliArgs(tokens) {
         };
     }
     if (command === "akuma") {
-        throw new FlowError("EMPTY_PARAM", "akuma requires subcommand: ls or view");
+        throw new FlowError("EMPTY_PARAM", "akuma requires subcommand: ls or show");
     }
     if (command === "skills") {
         throw new FlowError("EMPTY_PARAM", "skills requires subcommand: install");
@@ -110,12 +111,19 @@ export function parseCliArgs(tokens) {
     if (command === "task") {
         throw new FlowError("EMPTY_PARAM", `task requires subcommand: ${TASK_SUBCOMMANDS.join(", ")}`);
     }
-    if (command !== "bind" && seenFlagNames.has("place")) {
+    if (seenFlagNames.has("place")) {
+        if (command === "bind") {
+            throw new FlowError("EMPTY_PARAM", "bind no longer accepts --place; use --title <text>");
+        }
         throw new FlowError("EMPTY_PARAM", "unknown option --place; use @addr or --contract <addr>");
     }
     for (const name of seenFlagNames) {
         assertAllowedFlag(command, name);
     }
+    if (command === "bind" && flags.taskTitle !== undefined) {
+        flags.bindTitle = flags.taskTitle;
+        delete flags.taskTitle;
+    }
     if (command === "call" && flags.detach && flags.timeoutMs !== undefined) {
         throw new FlowError("EMPTY_PARAM", "call cannot combine --detach and --wait");
     }
@@ -128,9 +136,14 @@ export function parseCliArgs(tokens) {
     if (command === "task update" && flags.taskParent !== undefined && flags.taskNoParent) {
         throw new FlowError("EMPTY_PARAM", "task update cannot combine --parent and --no-parent");
     }
-    if (command === "task update" && flags.taskTitle === undefined && flags.taskBody === undefined
+    if (command === "task update" && flags.taskBody !== undefined && flags.taskAppend !== undefined) {
+        throw new FlowError("EMPTY_PARAM", "task update cannot combine --body and --append");
+    }
+    if (command === "task update" && flags.taskTitle === undefined && flags.taskBody === undefined && flags.taskAppend === undefined
         && flags.taskPri === undefined && flags.taskNeeds === undefined && flags.taskDropNeeds === undefined
-        && flags.taskParent === undefined && !flags.taskNoParent && flags.taskFrom === undefined) {
+        && flags.taskParent === undefined && !flags.taskNoParent && flags.taskFrom === undefined
+        && flags.taskSupersedes === undefined && flags.taskDropSupersedes === undefined
+        && flags.taskRelatesTo === undefined && flags.taskDropRelatesTo === undefined) {
         throw new FlowError("EMPTY_PARAM", "task update requires at least one change");
     }
     if (command === "petition" && flags.json && !flags.dryRun) {
@@ -140,9 +153,9 @@ export function parseCliArgs(tokens) {
         throw new FlowError("EMPTY_PARAM", "petition --dry-run does not accept --append-scope");
     }
     if (command === "renew") {
-        const recoveryModes = [flags.renewResolve, flags.renewContinue, flags.renewAbort].filter(Boolean).length;
+        const recoveryModes = [flags.renewContinue, flags.renewAbort].filter(Boolean).length;
         if (recoveryModes > 1) {
-            throw new FlowError("EMPTY_PARAM", "renew accepts only one of --resolve, --continue, or --abort");
+            throw new FlowError("EMPTY_PARAM", "renew accepts only one of --continue or --abort");
         }
         if (flags.renewAbort && (flags.appendScope?.length ?? 0) > 0) {
             throw new FlowError("EMPTY_PARAM", "renew --abort does not accept --append-scope");
@@ -151,6 +164,27 @@ export function parseCliArgs(tokens) {
     assertCommissionSelectorAllowed(command, flags);
     assertProjectionSelectorPresent(command, flags, atTokens, contractFlagRaws, rest.length, payload.length);
     const positional = [...rest, ...payload];
+    if (command === "bind" && flags.contractId !== undefined) {
+        if (!isCommissionId(flags.contractId)) {
+            throw new FlowError("EMPTY_PARAM", `bind replay requires a full canonical contract id; got ${flags.contractId}`);
+        }
+        const hasReplayInput = positional.length > 0
+            || flags.bindTaskIds !== undefined
+            || flags.after !== undefined
+            || flags.exclusive === true
+            || flags.draftOnly === true
+            || flags.dryRun === true
+            || flags.bindTitle !== undefined
+            || flags.bindContext !== undefined
+            || flags.bindObjective !== undefined
+            || flags.bindDesign !== undefined
+            || flags.bindScope !== undefined
+            || flags.bindCriteria !== undefined
+            || flags.bindVerification !== undefined;
+        if (hasReplayInput) {
+            throw new FlowError("EMPTY_PARAM", "addressed bind is replay-only and accepts no draft or creation input");
+        }
+    }
     if (command === "wait") {
         if (positional.length === 0 && !flags.contractId) {
             throw new FlowError("EMPTY_PARAM", "wait requires <projection-address>");

package/build/cli/projection-address.js

@@ -1,9 +1,9 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { AddressResolutionError, buildObjectResolutionAttempt, } from "../core/addressing.js";
-import { assertProjectionTellable, resolveProjectionCoordinate } from "../core/projection/index.js";
-import { isProjectionId, projectionDir } from "../core/projection/index.js";
-import { isProjectionAlias, readProjectionAlias } from "../core/projection/index.js";
+import { assertProjectionTellable, projectionAliasRootAtCoordinate, projectionDirAtCoordinate, resolveProjectionCoordinate, } from "../core/projection/index.js";
+import { isProjectionId } from "../core/projection/index.js";
+import { isProjectionAlias, readProjectionAliasAtRoot } from "../core/projection/index.js";
 import { readProjectionIdentity } from "../core/projection/index.js";
 import { isResponseArtifactId } from "../core/response-artifact-id.js";
 import { isErrnoException } from "../errno.js";
@@ -22,11 +22,14 @@ export async function resolveProjectionAddress(input) {
     // Scoped lookup reuses the commission carrier's repository root: zero Git probes.
     // Unscoped lookup performs exactly one coordinate probe.
     let repo;
-    let physicalRoot;
+    let coordinate;
     let attempt;
     if (input.scope) {
         repo = input.scope.repo;
-        physicalRoot = input.scope.repo.stableRoot;
+        coordinate = {
+            physicalRoot: input.scope.repo.stableRoot,
+            authority: { kind: "repository", stableRoot: input.scope.repo.stableRoot },
+        };
         attempt = buildObjectResolutionAttempt({
             repo,
             workdir,
@@ -40,11 +43,10 @@ export async function resolveProjectionAddress(input) {
         });
     }
     else {
-        const coordinate = await resolveProjectionCoordinate(input.cwd);
+        coordinate = input.coordinate ?? await resolveProjectionCoordinate(input.cwd);
         repo = coordinate.authority.kind === "repository"
             ? { kind: "repository", stableRoot: coordinate.authority.stableRoot }
             : { kind: "user" };
-        physicalRoot = coordinate.physicalRoot;
         attempt = buildObjectResolutionAttempt({
             repo,
             workdir,
@@ -69,13 +71,13 @@ export async function resolveProjectionAddress(input) {
     else {
         if (!isProjectionAlias(input.address))
             throw new AddressResolutionError("EMPTY_PARAM", `projection alias ${input.address} has no match ${suffix}`, attempt);
-        const target = await readProjectionAlias(physicalRoot, input.address);
+        const target = await readProjectionAliasAtRoot(projectionAliasRootAtCoordinate(coordinate), input.address);
         if (!target)
             throw new AddressResolutionError("EMPTY_PARAM", `projection alias ${input.address} has no match ${suffix}`, attempt);
         id = target;
         alias = input.address;
     }
-    const directory = await projectionDir(physicalRoot, id);
+    const directory = projectionDirAtCoordinate(coordinate, id);
     if (!isRealDirectory(directory)) {
         const subject = alias ? `projection alias ${alias} points to missing projection ${id}` : `projection ${id}`;
         throw new AddressResolutionError("EMPTY_PARAM", `${subject} has no match ${suffix}`, attempt);
@@ -99,5 +101,5 @@ export async function resolveProjectionAddress(input) {
     if (input.scope && (identity.binding.kind !== "commission" || identity.binding.commissionId !== input.scope.binding.commissionId)) {
         throw new AddressResolutionError("EMPTY_PARAM", `projection ${id} has no match ${suffix}`, attempt);
     }
-    return { id, ...(alias ? { alias } : {}) };
+    return { id, directory, ...(alias ? { alias } : {}) };
 }

package/build/cli/render/amendment-warning.js

@@ -0,0 +1,8 @@
+export function renderAmendmentWarning(warning) {
+    return [
+        `You have amended this contract ${warning.amendmentCount} times. Consider whether its intent has drifted.`,
+        "If the original intent is complete, move the remaining work to a task and start a new Keiyaku.",
+        "If this contract no longer fits the work, forfeit it and bind a new one.",
+        "If the amendments are intentional and the contract still fits, continue.",
+    ].join(" ");
+}

package/build/cli/render/arc.js

@@ -4,6 +4,7 @@ import { assembleResponse, buildPayload, buildSection, formatHints, formatList,
 import { DIFF_OVERVIEW_SECTION_TITLE, RESPONSE_MARKERS, WARNING_SECTION_TITLE } from "./response-style.js";
 import { appendPersistenceSummary, CONTENT_SECTION_TITLE, HINTS_LIST_MAX_ITEMS, HINTS_SECTION_TITLE, INFO_COMMIT_MAX_CHARS, INFO_PLEA_MAX_CHARS, INFO_SECTION_TITLE, } from "./shared.js";
 import { prependAddressReceipt } from "./address.js";
+import { renderAmendmentWarning } from "./amendment-warning.js";
 function sealLines(result) {
     if (!result.sealed)
         return ["nothing sealed"];
@@ -55,7 +56,7 @@ export function buildRenewAbortResponse(result) {
     const payload = {
         contractId: result.contractId,
         oldHead: result.oldHead,
-        recoveryCleanup: result.recoveryCleanup,
+        scratchName: result.scratchName,
         summary: result.summary,
     };
     return prependAddressReceipt({ text: result.summary, payload }, result.address);
@@ -68,8 +69,11 @@ export function buildAmendResponse(result) {
         ...formatMaybe("Amendment", String(result.amendmentNumber), INFO_COMMIT_MAX_CHARS),
         ...formatMaybe("Ledger Commit", renderedLedgerCommit, INFO_COMMIT_MAX_CHARS),
     ]);
+    const warningSection = result.amendmentWarning
+        ? buildSection(WARNING_SECTION_TITLE, renderAmendmentWarning(result.amendmentWarning))
+        : null;
     return prependAddressReceipt({
-        text: assembleResponse(`${RESPONSE_MARKERS.arc} Amended`, `Amended contract ledger with Amendment ${result.amendmentNumber} [${renderedLedgerCommit}].`, [buildSection(CONTENT_SECTION_TITLE, result.summary), infoSection].filter((section) => section !== null)),
+        text: assembleResponse(`${RESPONSE_MARKERS.arc} Amended`, `Amended contract ledger with Amendment ${result.amendmentNumber} [${renderedLedgerCommit}].`, [buildSection(CONTENT_SECTION_TITLE, result.summary), infoSection, warningSection].filter((section) => section !== null)),
         payload: buildPayload(payload),
     }, result.address);
 }