@astrosheep/keiyaku 4.6.14 → 4.6.16

package/build/plugins/claude/skills/keiyaku/SKILL.md

@@ -27,7 +27,7 @@ keiyaku -C <repo> debt add "title"
 keiyaku -C <repo> bind [--debt <debt-id>] -
 keiyaku -C <repo> status
 keiyaku -C <repo> deliver [<contract>|@<contract>]
-keiyaku -C <repo> review [<contract>|@<contract>] --satisfied
+keiyaku -C <repo> review [<contract>|@<contract>] --satisfied --summary "<evidence>"
 ```
 
 `-C` selects the invocation cwd and therefore the World. `--repo <path>` only

package/build/plugins/claude/skills/keiyaku-akuma/SKILL.md

@@ -61,8 +61,9 @@ keiyaku ask @reviewer --schema verdict.schema.json - < question.md
 
 `tell` admits the next instruction and returns its admission receipt; it does
 not await an answer. `ask` admits a Tell and observes that exact answer,
-unbounded unless `--wait` limits observation. Both require a prompt and accept
-`--interrupt` to put down current work before admitting the new Tell. Schema
+unbounded unless `--wait` limits observation. Both require a prompt. With
+`--interrupt`, the Tell is admitted while current work is asked to yield; an
+admitted Tell remains recoverable even if settlement cannot be proven. Schema
 belongs only to `ask`; `tell --schema` and `tell --wait` refuse and point to
 `ask`. A deadline never withdraws an admitted Tell. Read `tell --help` and
 `ask --help` for the complete flag grammar.
@@ -83,6 +84,7 @@ observes existing Akuma-wide work, not the answer to a newly admitted Tell.
 ## Inspect and retrieve results
 
 ```bash
+keiyaku whoami
 keiyaku status
 keiyaku status @reviewer
 keiyaku ls aku/
@@ -92,16 +94,19 @@ keiyaku history @reviewer --last
 keiyaku history @reviewer --id turn/3
 ```
 
-`status` shows the roster or one Akuma's workdir and effective actions.
-`ls aku/` shows callable names; `ls "aku/*/*"` shows born workers.
+`whoami` shows self and, for an Akuma, its current Turn initiator and birth profile without
+creating a World or changing Square. `status` shows the roster or one Akuma's
+workdir; use `keiyaku status <aku/...|@alias> --json` to inspect `status.allowed`.
+`ls aku/` shows callable names; `ls "aku/*/*"` shows recent retained instances.
 `ls --mine` narrows that roster to Akumas this process's caller called and their
 transitive descendants in this World; `--caller <integration>:<id>` or
 `--caller aku/<name>/<suffix>` names the same selection explicitly. Descendant
 rows show their immediate caller as `· by <akuId>`. The selection is World-local
 and refuses for Contract, Debt, and Akuma-name catalogues.
 `history --last` reads the latest complete answer; `history --id` reads an
-exact result named by status or wait. Use the complete AkuId when an alias may
-move; see `history --help` for paging.
+exact retained terminal turn's answer or failure diagnostic. Find its `historyId`
+in paged `keiyaku history <aku/...|@alias> --json`. Use the complete AkuId when
+an alias may move; see `history --help` for paging.
 
 ## Retention
 
@@ -113,8 +118,8 @@ entries. It removes only the Akuma's recognized runtime custody; it never kills
 a worker and never rewrites another Akuma, Contract, Debt, or alias. Its final
 Heart re-read keeps a pending Tell it observes; a Tell admitted immediately
 after that read is best-effort, not atomic. There is no timer and no prune
-command. Observation and Tell commands (`status`, `ls`, `history`, `wait`,
-`tell`, `ask`) never trigger retention; without a later successful
+command. Observation and Tell commands (`whoami`, `status`, `ls`, `history`,
+`wait`, `tell`, `ask`) never trigger retention; without a later successful
 `call`/`fork`, old entries simply remain.
 
 ## Stop and branch

package/build/plugins/codex/skills/keiyaku/SKILL.md

@@ -27,7 +27,7 @@ keiyaku -C <repo> debt add "title"
 keiyaku -C <repo> bind [--debt <debt-id>] -
 keiyaku -C <repo> status
 keiyaku -C <repo> deliver [<contract>|@<contract>]
-keiyaku -C <repo> review [<contract>|@<contract>] --satisfied
+keiyaku -C <repo> review [<contract>|@<contract>] --satisfied --summary "<evidence>"
 ```
 
 `-C` selects the invocation cwd and therefore the World. `--repo <path>` only

package/build/plugins/codex/skills/keiyaku-akuma/SKILL.md

@@ -61,8 +61,9 @@ keiyaku ask @reviewer --schema verdict.schema.json - < question.md
 
 `tell` admits the next instruction and returns its admission receipt; it does
 not await an answer. `ask` admits a Tell and observes that exact answer,
-unbounded unless `--wait` limits observation. Both require a prompt and accept
-`--interrupt` to put down current work before admitting the new Tell. Schema
+unbounded unless `--wait` limits observation. Both require a prompt. With
+`--interrupt`, the Tell is admitted while current work is asked to yield; an
+admitted Tell remains recoverable even if settlement cannot be proven. Schema
 belongs only to `ask`; `tell --schema` and `tell --wait` refuse and point to
 `ask`. A deadline never withdraws an admitted Tell. Read `tell --help` and
 `ask --help` for the complete flag grammar.
@@ -83,6 +84,7 @@ observes existing Akuma-wide work, not the answer to a newly admitted Tell.
 ## Inspect and retrieve results
 
 ```bash
+keiyaku whoami
 keiyaku status
 keiyaku status @reviewer
 keiyaku ls aku/
@@ -92,16 +94,19 @@ keiyaku history @reviewer --last
 keiyaku history @reviewer --id turn/3
 ```
 
-`status` shows the roster or one Akuma's workdir and effective actions.
-`ls aku/` shows callable names; `ls "aku/*/*"` shows born workers.
+`whoami` shows self and, for an Akuma, its current Turn initiator and birth profile without
+creating a World or changing Square. `status` shows the roster or one Akuma's
+workdir; use `keiyaku status <aku/...|@alias> --json` to inspect `status.allowed`.
+`ls aku/` shows callable names; `ls "aku/*/*"` shows recent retained instances.
 `ls --mine` narrows that roster to Akumas this process's caller called and their
 transitive descendants in this World; `--caller <integration>:<id>` or
 `--caller aku/<name>/<suffix>` names the same selection explicitly. Descendant
 rows show their immediate caller as `· by <akuId>`. The selection is World-local
 and refuses for Contract, Debt, and Akuma-name catalogues.
 `history --last` reads the latest complete answer; `history --id` reads an
-exact result named by status or wait. Use the complete AkuId when an alias may
-move; see `history --help` for paging.
+exact retained terminal turn's answer or failure diagnostic. Find its `historyId`
+in paged `keiyaku history <aku/...|@alias> --json`. Use the complete AkuId when
+an alias may move; see `history --help` for paging.
 
 ## Retention
 
@@ -113,8 +118,8 @@ entries. It removes only the Akuma's recognized runtime custody; it never kills
 a worker and never rewrites another Akuma, Contract, Debt, or alias. Its final
 Heart re-read keeps a pending Tell it observes; a Tell admitted immediately
 after that read is best-effort, not atomic. There is no timer and no prune
-command. Observation and Tell commands (`status`, `ls`, `history`, `wait`,
-`tell`, `ask`) never trigger retention; without a later successful
+command. Observation and Tell commands (`whoami`, `status`, `ls`, `history`,
+`wait`, `tell`, `ask`) never trigger retention; without a later successful
 `call`/`fork`, old entries simply remain.
 
 ## Stop and branch

package/build/plugins/opencode/skills/keiyaku/SKILL.md

@@ -27,7 +27,7 @@ keiyaku -C <repo> debt add "title"
 keiyaku -C <repo> bind [--debt <debt-id>] -
 keiyaku -C <repo> status
 keiyaku -C <repo> deliver [<contract>|@<contract>]
-keiyaku -C <repo> review [<contract>|@<contract>] --satisfied
+keiyaku -C <repo> review [<contract>|@<contract>] --satisfied --summary "<evidence>"
 ```
 
 `-C` selects the invocation cwd and therefore the World. `--repo <path>` only

package/build/plugins/opencode/skills/keiyaku-akuma/SKILL.md

@@ -61,8 +61,9 @@ keiyaku ask @reviewer --schema verdict.schema.json - < question.md
 
 `tell` admits the next instruction and returns its admission receipt; it does
 not await an answer. `ask` admits a Tell and observes that exact answer,
-unbounded unless `--wait` limits observation. Both require a prompt and accept
-`--interrupt` to put down current work before admitting the new Tell. Schema
+unbounded unless `--wait` limits observation. Both require a prompt. With
+`--interrupt`, the Tell is admitted while current work is asked to yield; an
+admitted Tell remains recoverable even if settlement cannot be proven. Schema
 belongs only to `ask`; `tell --schema` and `tell --wait` refuse and point to
 `ask`. A deadline never withdraws an admitted Tell. Read `tell --help` and
 `ask --help` for the complete flag grammar.
@@ -83,6 +84,7 @@ observes existing Akuma-wide work, not the answer to a newly admitted Tell.
 ## Inspect and retrieve results
 
 ```bash
+keiyaku whoami
 keiyaku status
 keiyaku status @reviewer
 keiyaku ls aku/
@@ -92,16 +94,19 @@ keiyaku history @reviewer --last
 keiyaku history @reviewer --id turn/3
 ```
 
-`status` shows the roster or one Akuma's workdir and effective actions.
-`ls aku/` shows callable names; `ls "aku/*/*"` shows born workers.
+`whoami` shows self and, for an Akuma, its current Turn initiator and birth profile without
+creating a World or changing Square. `status` shows the roster or one Akuma's
+workdir; use `keiyaku status <aku/...|@alias> --json` to inspect `status.allowed`.
+`ls aku/` shows callable names; `ls "aku/*/*"` shows recent retained instances.
 `ls --mine` narrows that roster to Akumas this process's caller called and their
 transitive descendants in this World; `--caller <integration>:<id>` or
 `--caller aku/<name>/<suffix>` names the same selection explicitly. Descendant
 rows show their immediate caller as `· by <akuId>`. The selection is World-local
 and refuses for Contract, Debt, and Akuma-name catalogues.
 `history --last` reads the latest complete answer; `history --id` reads an
-exact result named by status or wait. Use the complete AkuId when an alias may
-move; see `history --help` for paging.
+exact retained terminal turn's answer or failure diagnostic. Find its `historyId`
+in paged `keiyaku history <aku/...|@alias> --json`. Use the complete AkuId when
+an alias may move; see `history --help` for paging.
 
 ## Retention
 
@@ -113,8 +118,8 @@ entries. It removes only the Akuma's recognized runtime custody; it never kills
 a worker and never rewrites another Akuma, Contract, Debt, or alias. Its final
 Heart re-read keeps a pending Tell it observes; a Tell admitted immediately
 after that read is best-effort, not atomic. There is no timer and no prune
-command. Observation and Tell commands (`status`, `ls`, `history`, `wait`,
-`tell`, `ask`) never trigger retention; without a later successful
+command. Observation and Tell commands (`whoami`, `status`, `ls`, `history`,
+`wait`, `tell`, `ask`) never trigger retention; without a later successful
 `call`/`fork`, old entries simply remain.
 
 ## Stop and branch

package/build/skills/keiyaku/SKILL.md

@@ -27,7 +27,7 @@ keiyaku -C <repo> debt add "title"
 keiyaku -C <repo> bind [--debt <debt-id>] -
 keiyaku -C <repo> status
 keiyaku -C <repo> deliver [<contract>|@<contract>]
-keiyaku -C <repo> review [<contract>|@<contract>] --satisfied
+keiyaku -C <repo> review [<contract>|@<contract>] --satisfied --summary "<evidence>"
 ```
 
 `-C` selects the invocation cwd and therefore the World. `--repo <path>` only

package/build/skills/keiyaku-akuma/SKILL.md

@@ -61,8 +61,9 @@ keiyaku ask @reviewer --schema verdict.schema.json - < question.md
 
 `tell` admits the next instruction and returns its admission receipt; it does
 not await an answer. `ask` admits a Tell and observes that exact answer,
-unbounded unless `--wait` limits observation. Both require a prompt and accept
-`--interrupt` to put down current work before admitting the new Tell. Schema
+unbounded unless `--wait` limits observation. Both require a prompt. With
+`--interrupt`, the Tell is admitted while current work is asked to yield; an
+admitted Tell remains recoverable even if settlement cannot be proven. Schema
 belongs only to `ask`; `tell --schema` and `tell --wait` refuse and point to
 `ask`. A deadline never withdraws an admitted Tell. Read `tell --help` and
 `ask --help` for the complete flag grammar.
@@ -83,6 +84,7 @@ observes existing Akuma-wide work, not the answer to a newly admitted Tell.
 ## Inspect and retrieve results
 
 ```bash
+keiyaku whoami
 keiyaku status
 keiyaku status @reviewer
 keiyaku ls aku/
@@ -92,16 +94,19 @@ keiyaku history @reviewer --last
 keiyaku history @reviewer --id turn/3
 ```
 
-`status` shows the roster or one Akuma's workdir and effective actions.
-`ls aku/` shows callable names; `ls "aku/*/*"` shows born workers.
+`whoami` shows self and, for an Akuma, its current Turn initiator and birth profile without
+creating a World or changing Square. `status` shows the roster or one Akuma's
+workdir; use `keiyaku status <aku/...|@alias> --json` to inspect `status.allowed`.
+`ls aku/` shows callable names; `ls "aku/*/*"` shows recent retained instances.
 `ls --mine` narrows that roster to Akumas this process's caller called and their
 transitive descendants in this World; `--caller <integration>:<id>` or
 `--caller aku/<name>/<suffix>` names the same selection explicitly. Descendant
 rows show their immediate caller as `· by <akuId>`. The selection is World-local
 and refuses for Contract, Debt, and Akuma-name catalogues.
 `history --last` reads the latest complete answer; `history --id` reads an
-exact result named by status or wait. Use the complete AkuId when an alias may
-move; see `history --help` for paging.
+exact retained terminal turn's answer or failure diagnostic. Find its `historyId`
+in paged `keiyaku history <aku/...|@alias> --json`. Use the complete AkuId when
+an alias may move; see `history --help` for paging.
 
 ## Retention
 
@@ -113,8 +118,8 @@ entries. It removes only the Akuma's recognized runtime custody; it never kills
 a worker and never rewrites another Akuma, Contract, Debt, or alias. Its final
 Heart re-read keeps a pending Tell it observes; a Tell admitted immediately
 after that read is best-effort, not atomic. There is no timer and no prune
-command. Observation and Tell commands (`status`, `ls`, `history`, `wait`,
-`tell`, `ask`) never trigger retention; without a later successful
+command. Observation and Tell commands (`whoami`, `status`, `ls`, `history`,
+`wait`, `tell`, `ask`) never trigger retention; without a later successful
 `call`/`fork`, old entries simply remain.
 
 ## Stop and branch

package/build/src/akuma/archetype.js

@@ -20,10 +20,10 @@ export class AkumaArchetypeError extends Error {
     }
 }
 function projectArchetypeDirectory(project) {
-    return project === undefined ? undefined : join(project, ".keiyaku", "akuma");
+    return project === undefined ? undefined : join(project, ".keiyaku", "akumas");
 }
 function homeArchetypeDirectory(home) {
-    return join(home ?? join(homedir(), ".keiyaku"), "akuma");
+    return join(home ?? join(homedir(), ".keiyaku"), "akumas");
 }
 function archetypeDirectories(input) {
     return [projectArchetypeDirectory(input.project), homeArchetypeDirectory(input.home)].filter((directory) => directory !== undefined);

package/build/src/cli/commands/akuma-grammar.js

@@ -5,6 +5,9 @@ import { parseAkumaAlias, parseAkumaGlob } from "../../identity/selector.js";
 import { ALLOWED_ACTIONS, DEFAULT_ALLOWED_ACTIONS, decodeAllowedActions, } from "../../akuma/allowed.js";
 import { parsePublicHistoryId } from "../../akuma/identity.js";
 const EXTRA_ALLOWED_ACTIONS = ALLOWED_ACTIONS.filter((action) => !DEFAULT_ALLOWED_ACTIONS.includes(action));
+const SET_SELECTORS = '(<aku/...> | @alias | <kei/...> | "aku/<name-pattern>/<hex-pattern>")...';
+const SET_DETAILS = "Globs contain * and use lowercase hex digits or * in the suffix. --repo requires at least one Contract (kei/...) selector.";
+const SCHEMA_DETAILS = "--schema supplies a JSON Schema answer contract to the provider; on observation the CLI parses JSON but does not independently validate schema conformance.";
 const AKUMA_COMMAND_SPECS = {
     call: {
         arity: 1,
@@ -17,25 +20,24 @@ const AKUMA_COMMAND_SPECS = {
             json: "boolean",
             schema: "value",
         },
-        usage: "call <akuma-name> [--contract <kei/...>] [--workdir <path>] [--alias <name>] [--allowed <product.action>]... [--schema <file>] [--wait <duration>] [<prompt> | -]",
+        usage: "call <akuma-name> [--contract <kei/...>] [--repo <path>] [--workdir <path>] [--alias <name>] [--allowed <product.action>]... [--schema <file>] [--wait <duration>] [<prompt> | -]",
         purpose: "Call an Akuma into the world.",
         details: [
             "Use keiyaku ls aku/ to find visible Akuma names; hidden definitions can still be called by name.",
             "Omit the prompt to birth without a Tell; otherwise give <prompt> as one argument, or use - to read stdin.",
             "--schema and --wait require a prompt.",
             "By default, call returns after birth and optional first Tell admission; --wait also waits for its first answer, up to the given duration.",
-            "--contract assigns the Akuma work from that Contract; it does not choose where the Akuma works.",
-            "--workdir selects where the Akuma works; relative paths start from your current directory. Without it, the current directory is used.",
-            "--alias <name> gives the new Akuma the selector @name; use it instead of aku/<id>.",
+            "--contract records an association, not the work or execution directory; include the Contract and worktree context in the prompt as needed. --repo requires --contract.",
+            "--workdir selects where the Akuma works; relative paths resolve from the invocation directory selected by -C/--cwd, or the process cwd when omitted. Without --workdir, the invocation directory is used.",
+            "--alias <name> gives the new Akuma the selector @name instead of aku/<id>; an existing @name is reassigned to this Akuma.",
             `Default actions: ${DEFAULT_ALLOWED_ACTIONS.join(", ")}.`,
             ...(EXTRA_ALLOWED_ACTIONS.length === 0
                 ? []
                 : [`Also available with --allowed: ${EXTRA_ALLOWED_ACTIONS.join(", ")}.`]),
             "Repeated --allowed adds actions to the selected Akuma's allowed actions; it cannot remove inherited permissions.",
             "If no actions are configured, defaults apply; an explicitly empty list allows none.",
-            "An Akuma started by another Akuma can use only actions its parent can use. status <aku/...|@alias> shows that Akuma's allowed actions.",
-            "--schema checks the Akuma's answer against a JSON Schema file; stdin is still the prompt source.",
-            "On success, the Akuma is assigned to the Contract; if @name is already in use, --alias reassigns it to this Akuma.",
+            "An Akuma started by another Akuma can use only actions its parent can use. Use keiyaku status <aku/...|@alias> --json to inspect status.allowed.",
+            SCHEMA_DETAILS,
             "With --wait, completed activity streams on stderr and the final answer is written to stdout once.",
         ].join("\n"),
     },
@@ -43,10 +45,11 @@ const AKUMA_COMMAND_SPECS = {
         arity: "one-or-more",
         stdin: false,
         flags: { any: "boolean", all: "boolean", timeout: "value", json: "boolean" },
-        usage: "wait <aku/...|@alias>... [--any | --all] [--timeout <duration>]",
+        usage: `wait ${SET_SELECTORS} [--any | --all] [--timeout <duration>] [--repo <path>]`,
         purpose: "Wait for one or more Akumas to finish work.",
         details: [
             "The default mode is any; --all waits until every selected Akuma completes.",
+            SET_DETAILS,
             "An already completed member counts immediately, so repeating a selection can return at once.",
             "Text prints each selected Akuma's status snapshot, then one failure fact for any Akuma it could not read.",
             "An answer is part of that snapshot; wait writes no separate copy of it to stdout.",
@@ -74,7 +77,7 @@ const AKUMA_COMMAND_SPECS = {
         details: [
             "Give <prompt> as one argument, or use - to read stdin.",
             "--interrupt durably admits the new Tell while asking the current Body to yield; admission remains even if completion cannot be proven.",
-            "--schema reads a JSON Schema file for the answer contract; stdin remains the prompt source.",
+            SCHEMA_DETAILS,
             "--wait bounds how long to block for the answer; the Tell stays admitted past the deadline.",
             "Completed activity streams on stderr and the final answer is written to stdout once.",
         ].join("\n"),
@@ -91,10 +94,10 @@ const AKUMA_COMMAND_SPECS = {
             full: "boolean",
             json: "boolean",
         },
-        usage: "history <aku/...|@alias> [--id <historyId> | --before <index> | --since <index>] [--limit <count>] [--last]\nhistory <kei/...> [--full]",
+        usage: "history <aku/...|@alias> [--before <index> | --since <index>] [--limit <count>]\nhistory <aku/...|@alias> --id <historyId>\nhistory <aku/...|@alias> --last\nhistory <kei/...> [--full] [--repo <path>]",
         purpose: "Read an Akuma's answers and activity, or a Contract's history of changes and assigned work.",
         details: [
-            "--id reads the exact retained answered turn (turn/<number>).",
+            "--id reads an exact retained terminal turn (turn/<number>): its answer or failure diagnostic.",
             "--before <index> pages older rows before that sequence; --since <index> pages newer rows after it.",
             "--limit bounds page size (default 12); without --since, the latest rows are shown.",
             "With --since, paging starts at the earliest newer rows.",
@@ -106,16 +109,17 @@ const AKUMA_COMMAND_SPECS = {
         arity: 1,
         stdin: false,
         flags: { at: "value", json: "boolean" },
-        usage: "fork <aku/...|@alias> --at <historyId>",
+        usage: "fork <aku/...|@alias> --at <historyId> [--repo <path>]",
         purpose: "Create a new Akuma from an answered turn.",
-        details: "--at takes a retained answered turn id (turn/<n>); find one with history.",
+        details: "--at takes a retained answered turn id (turn/<n>); find its historyId in paged keiyaku history <aku/...|@alias> --json. Fork also requires a retained provider fork point.",
     },
     kill: {
         arity: "one-or-more",
         stdin: false,
         flags: { json: "boolean" },
-        usage: "kill <aku/...|@alias>...",
+        usage: `kill ${SET_SELECTORS} [--repo <path>]`,
         purpose: "Stop the selected Akuma's current work; it can be woken again with tell.",
+        details: SET_DETAILS,
     },
 };
 export function isAkumaAction(value) {

package/build/src/cli/commands/akuma.d.ts

@@ -1,5 +1,6 @@
 import type { InvokedAkumaCommand } from "./akuma-grammar.js";
 import type { CliCoordinates } from "../coordinates.js";
+import { type CliOutcome } from "../streams.js";
 import type { CliRuntime } from "../runtime.js";
 export { isParsedAkumaCommand, renderAkumaHelp } from "./akuma-grammar.js";
-export declare function runAkumaCommand(command: InvokedAkumaCommand, coordinates: CliCoordinates, workdir: string | undefined, runtime: CliRuntime): Promise<number>;
+export declare function runAkumaCommand(command: InvokedAkumaCommand, coordinates: CliCoordinates, workdir: string | undefined, runtime: CliRuntime): Promise<CliOutcome>;

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

@@ -13,10 +13,10 @@ import { akumasWithExecution } from "../../library/akumas.js";
 import { World } from "../../world.js";
 import { contractFromInput } from "../selectors.js";
 import { ActivityDriver } from "../activity.js";
-import { displayContext, emit, resultContext, writeJson, writeStderr, writeStdout } from "../streams.js";
+import { displayContext, emit, resultContext, writeJson, writeStderr, writeStdout, } from "../streams.js";
 import { callObservationStream } from "../render/akuma-activity.js";
 import { askRawAnswer, callRawAnswer, historyRawAnswer, historyText, tellText, waitText, } from "../render/akuma-activity.js";
-import { askExitCode, askProgressStream, callExitCode, callObservationHead, forkExitCode, historyExitCode, killExitCode, renderCallText, renderFailedCallObservation, renderForkText, renderKillText, tellExitCode, waitedTellProgress, } from "../render/akuma.js";
+import { askOutcome, askProgressStream, callOutcome, callObservationHead, forkOutcome, historyOutcome, killOutcome, renderCallText, renderFailedCallObservation, renderForkText, renderKillText, tellOutcome, waitedTellProgress, } from "../render/akuma.js";
 export { isParsedAkumaCommand, renderAkumaHelp } from "./akuma-grammar.js";
 // ---------------------------------------------------------------------------
 // Leaf dispatch: acquisition, one public SDK invocation, direct rendering
@@ -142,16 +142,16 @@ async function runCall(command, input) {
             writeStderr(renderFailedCallObservation(result, resultContext()));
             streamed = true;
         }
-        if (command.output === "json") {
+        if (command.output === "json")
             writeJson(result);
-            return callExitCode(result);
+        else {
+            const raw = callRawAnswer(result, streamed);
+            if (raw === undefined)
+                emitAnswer(renderCallText(result, streamed, displayContext()), false);
+            else
+                emitAnswer(raw, true);
         }
-        const raw = callRawAnswer(result, streamed);
-        if (raw === undefined)
-            emitAnswer(renderCallText(result, streamed, displayContext()), false);
-        else
-            emitAnswer(raw, true);
-        return callExitCode(result);
+        return callOutcome(result);
     }
     finally {
         driver.close(stream?.flush() ?? []);
@@ -166,12 +166,12 @@ async function runWait(command, input) {
         ...(command.timeoutMs === undefined ? {} : { timeoutMs: command.timeoutMs }),
         ...(input.signal === undefined ? {} : { signal: input.signal }),
     });
-    if (command.output === "json") {
+    const outcome = result.unobserved.length === 0 ? "accepted" : "failed";
+    if (command.output === "json")
         writeJson(result);
-        return 0;
-    }
-    emitAnswer(waitText(result, { ...(alias === undefined ? {} : { alias }) }, displayContext()), false);
-    return 0;
+    else
+        emitAnswer(waitText(result, { ...(alias === undefined ? {} : { alias }) }, displayContext()), false);
+    return outcome;
 }
 async function runTell(command, input) {
     const body = await promptBody("tell", command, input);
@@ -184,7 +184,7 @@ async function runTell(command, input) {
         ...(input.signal === undefined ? {} : { signal: input.signal }),
     });
     const text = () => tellText(result, inputAlias(command.akuma), displayContext());
-    return emit(command.output, result, text, tellExitCode(result));
+    return emit(command.output, result, text, tellOutcome(result));
 }
 async function runAsk(command, input) {
     const body = await promptBody("ask", command, input);
@@ -222,12 +222,11 @@ async function runAsk(command, input) {
             driver.conclude(progress.conclude(result).join("\n"));
         else if (command.output === "text" && channel.kind === "body-request")
             writeStderr(waitedTellProgress(result, alias, resultContext()));
-        if (command.output === "json") {
+        if (command.output === "json")
             writeJson(result);
-            return askExitCode(result);
-        }
-        emitAnswer(askRawAnswer(result, schema !== undefined) ?? "", true);
-        return askExitCode(result);
+        else
+            emitAnswer(askRawAnswer(result, schema !== undefined) ?? "", true);
+        return askOutcome(result);
     }
     finally {
         driver.close(progress?.flush() ?? []);
@@ -245,7 +244,7 @@ async function runHistory(command, input) {
     });
     if (command.output === "json") {
         writeJson(result);
-        return historyExitCode(result, command.id);
+        return historyOutcome(result, command.id);
     }
     const raw = historyRawAnswer(result, command.id);
     const presentation = {
@@ -259,7 +258,7 @@ async function runHistory(command, input) {
         emitAnswer(result.answer, true);
     else
         emitAnswer(historyText(result, presentation, displayContext()), false);
-    return historyExitCode(result, command.id);
+    return historyOutcome(result, command.id);
 }
 async function runFork(command, input) {
     const caller = await akumaCallerFromEnvironment(input.environment);
@@ -270,7 +269,7 @@ async function runFork(command, input) {
         at: command.at,
         ...(input.repo === undefined ? {} : { repo: input.repo }),
     });
-    return emit(command.output, receipt, () => renderForkText(receipt), forkExitCode(receipt));
+    return emit(command.output, receipt, () => renderForkText(receipt), forkOutcome(receipt));
 }
 async function runKill(command, input) {
     const alias = command.akuma.length === 1 ? inputAlias(command.akuma[0]) : undefined;
@@ -280,7 +279,7 @@ async function runKill(command, input) {
         ...(input.signal === undefined ? {} : { signal: input.signal }),
     });
     const text = () => renderKillText(result, alias, displayContext());
-    return emit(command.output, result, text, killExitCode(result));
+    return emit(command.output, result, text, killOutcome(result));
 }
 async function akumaWorld(command, coordinates) {
     const world = command.command === "call"

package/build/src/cli/commands/contract-help.d.ts

@@ -21,7 +21,7 @@ export declare const CONTRACT_COMMAND_SPECS: {
             readonly "fork-of": "value";
             readonly json: "boolean";
         };
-        readonly usage: "bind [--debt <debt/...>] [--target <ref> | --no-target] [--after <kei/...> ...] [--gates <name,...>] [--actor <actor>] - | bind --fork-of <kei/...> [--target <ref> | --no-target] [--actor <actor>]";
+        readonly usage: "bind [--debt <debt/...>] [--target <ref> | --no-target] [--after <kei/...>]... [--gates <name,...>] [--actor <actor>] [--repo <path>] -\nbind --fork-of <kei/...> [--target <ref> | --no-target] [--actor <actor>] [--repo <path>]";
         readonly purpose: "Create a Contract from stdin Markdown or copy an existing Contract as a starting point.";
         readonly details: string;
     };
@@ -35,7 +35,7 @@ export declare const CONTRACT_COMMAND_SPECS: {
             readonly gates: "raw-value";
             readonly json: "boolean";
         };
-        readonly usage: "amend [<contract>|@<contract>] [--after <kei/...> ... | --clear-after] [--gates <name,...>] [--actor <actor>] [-]";
+        readonly usage: "amend [<contract>|@<contract>] [--after <kei/...> [--after <kei/...>]... | --clear-after] [--gates <name,...>] [--actor <actor>] [--repo <path>] [-]";
         readonly purpose: "Change a Contract's document, prerequisites, or acceptance gates.";
         readonly details: string;
     };
@@ -51,7 +51,7 @@ export declare const CONTRACT_COMMAND_SPECS: {
             readonly overwrite: "boolean";
             readonly json: "boolean";
         };
-        readonly usage: "deliver [<contract>|@<contract>] [--message <text>] [--include-dirty] [--materialize-conflict] [--overwrite] | deliver [<contract>|@<contract>] --dry-run [--include-dirty] [--show-diff]";
+        readonly usage: "deliver [<contract>|@<contract>] [--message <text>] [--include-dirty] [--materialize-conflict] [--overwrite] [--repo <path>]\ndeliver [<contract>|@<contract>] --dry-run [--include-dirty] [--show-diff] [--repo <path>]";
         readonly purpose: "Submit work for a Contract and integrate it when its requirements are met.";
         readonly details: string;
     };
@@ -65,7 +65,7 @@ export declare const CONTRACT_COMMAND_SPECS: {
             readonly summary: "value";
             readonly json: "boolean";
         };
-        readonly usage: "review [<contract>|@<contract>] (--satisfied | --unsatisfied) (--summary <text> | -) [--actor <actor>]";
+        readonly usage: "review [<contract>|@<contract>] (--satisfied | --unsatisfied) (--summary <text> | -) [--actor <actor>] [--repo <path>]";
         readonly purpose: "Record whether a Contract meets its acceptance criteria.";
         readonly details: string;
     };
@@ -76,7 +76,7 @@ export declare const CONTRACT_COMMAND_SPECS: {
             readonly actor: "value";
             readonly json: "boolean";
         };
-        readonly usage: "arc [<contract>|@<contract>] [--actor <actor>] -";
+        readonly usage: "arc [<contract>|@<contract>] [--actor <actor>] [--repo <path>] -";
         readonly purpose: "Name the current chapter of a Contract's story (a story arc).";
         readonly details: string;
     };
@@ -88,8 +88,8 @@ export declare const CONTRACT_COMMAND_SPECS: {
             readonly note: "value";
             readonly json: "boolean";
         };
-        readonly usage: "abandon [<contract>|@<contract>] [--note <text>] [--actor <actor>]";
-        readonly purpose: "End work on a Contract without delivering it; optionally record why.";
+        readonly usage: "abandon [<contract>|@<contract>] [--note <text>] [--actor <actor>] [--repo <path>]";
+        readonly purpose: "End work on a Contract without accepting it; optionally record why.";
     };
     readonly show: {
         readonly positional: "optional";
@@ -97,7 +97,7 @@ export declare const CONTRACT_COMMAND_SPECS: {
         readonly flags: {
             readonly json: "boolean";
         };
-        readonly usage: "show [<contract>|@<contract>]";
+        readonly usage: "show [<contract>|@<contract>] [--repo <path>]";
         readonly purpose: "Read one Contract's guidance.";
         readonly details: string;
     };
@@ -121,7 +121,7 @@ export declare const CONTRACT_COMMAND_SPECS: {
             readonly mine: "boolean";
             readonly caller: "value";
         };
-        readonly usage: "ls debt[/] [--limit <count>]\nls kei[/] [--limit <count>]\nls aku[/] [--limit <count>]\nls aku/<name>[/] [--limit <count>]\nls \"aku/<name>/*\" [--limit <count>]\nls \"aku/*/*\" [--limit <count>]\nls [\"aku/*/*\"] --mine\nls [\"aku/*/*\"] --caller <integration>:<id> | aku/<name>/<suffix>";
+        readonly usage: "ls debt[/] [--limit <count>]\nls debt/<namespace>/ [--limit <count>]\nls kei[/] [--limit <count>]\nls aku[/] [--limit <count>]\nls aku/<name>[/] [--limit <count>]\nls \"aku/<name>/*\" [--limit <count>]\nls \"aku/*/*\" [--limit <count>]\nls [aku/<name>[/] | \"aku/<name>/*\" | \"aku/*/*\"] (--mine | --caller (<integration>:<id> | aku/<name>/<suffix>)) [--limit <count>]";
         readonly purpose: "List debts (ls debt), contracts (ls kei), or akumas (ls aku).";
         readonly details: string;
     };
@@ -132,7 +132,7 @@ export declare const CONTRACT_COMMAND_SPECS: {
             readonly "retry-hooks": "boolean";
             readonly json: "boolean";
         };
-        readonly usage: "reconcile [<contract>|@<contract>] [--retry-hooks]";
+        readonly usage: "reconcile [<contract>|@<contract>] [--retry-hooks] [--repo <path>]";
         readonly purpose: "Restore a Contract's Git workspace from its recorded state, or all of this World's.";
         readonly details: "--retry-hooks reruns configured setup commands even when a Contract workspace already exists; otherwise they run when reconciliation creates it.";
     };
@@ -163,7 +163,7 @@ export declare const CONTRACT_COMMAND_SPECS: {
             readonly path: "repeat";
             readonly json: "boolean";
         };
-        readonly usage: "region [<contract>]\nregion --path <pattern> [--path <pattern> ...]";
+        readonly usage: "region [<contract>] [--repo <path>]\nregion --path <pattern> [--path <pattern>]... [--repo <path>]";
         readonly purpose: "Show declared Contract write patterns — all, one Contract's, or those overlapping given paths.";
         readonly details: "Check overlap before starting parallel work.";
     };