@astrosheep/keiyaku 4.6.19 → 4.6.21

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

@@ -2,7 +2,7 @@ import { defaultWaitComplete } from "../../akuma/akuma-observe.js";
 import { renderDiffstat, toolContent, toolRepr } from "./akuma-tool.js";
 import { dispositionText } from "./debt.js";
 import { debtDispositionMark } from "./marks.js";
-import { DEFAULT_CLI_COLUMNS, displayColumns, padToDisplay, renderBoundedPayload, renderBoundedTextBlock, safeText, takeDisplayColumns, takeDisplayColumnsFromEnd, truncateDisplayText, truncateMiddleDisplayText, } from "./terminal.js";
+import { DEFAULT_CLI_COLUMNS, diagnosticLines, displayColumns, padToDisplay, renderBoundedPayload, renderBoundedTextBlock, safeText, takeDisplayColumns, takeDisplayColumnsFromEnd, truncateDisplayText, truncateMiddleDisplayText, } from "./terminal.js";
 export const DEFAULT_CONTEXT = { columns: DEFAULT_CLI_COLUMNS, color: false };
 /** The action family's fixed 3-cell state margin and minimum verb cell. */
 const ACTION_MARGIN = "   ";
@@ -64,8 +64,8 @@ export function panelHead(id, alias, contract, context = []) {
 export function actionReceipt(input) {
     return [`${input.mark} ${input.verb} ${identity(input.id, input.alias)}`, ...subordinateLines(input.evidence ?? [])];
 }
-function contractFacts(contract) {
-    return contract.kind === "failed" ? [`! contract failed ${safeText(contract.diagnostic)}`] : [];
+function contractFacts(contract, columns) {
+    return contract.kind === "failed" ? diagnosticLines("contract association", contract.diagnostic, columns) : [];
 }
 /** The action family's one mark cell: a settled success stays blank, and live is only a frame mark. */
 function toolMargin(row, live) {
@@ -76,7 +76,8 @@ function toolMargin(row, live) {
     return row.state.status === "ok" ? ACTION_MARGIN : "!  ";
 }
 function rowText(row, tool) {
-    if (row.kind === "said" ||
+    if (row.kind === "report" ||
+        row.kind === "said" ||
         row.kind === "thought" ||
         row.kind === "note" ||
         row.kind === "call" ||
@@ -89,7 +90,7 @@ function rowText(row, tool) {
     if (row.kind === "outcome")
         return row.outcome.kind === "answered"
             ? { text: row.outcome.answer, lines: 3 }
-            : { text: row.outcome.diagnostic, lines: 2 };
+            : { text: row.outcome.kind === "canceled" ? "canceled" : row.outcome.diagnostic, lines: 2 };
     if (row.kind === "turn")
         return { text: "", lines: 1 };
     if (row.kind !== "tool")
@@ -118,10 +119,15 @@ function rowPrefix(row, tool, columns, view) {
         return actionPrefix(toolMargin(row, view.live === true), tool.label, columns);
     if (row.kind === "thought")
         return actionPrefix(ACTION_MARGIN, "think", columns);
+    if (row.kind === "report")
+        return actionPrefix(ACTION_MARGIN, "report", columns);
     if (row.kind === "note")
         return actionPrefix(ACTION_MARGIN, "note", columns);
     if (row.kind === "outcome")
-        return { first: row.outcome.kind === "answered" ? TOP_ANSWER : TOP_FAILURE, continuation: TOP_CONTINUATION };
+        return {
+            first: row.outcome.kind === "answered" ? TOP_ANSWER : row.outcome.kind === "canceled" ? "○ " : TOP_FAILURE,
+            continuation: TOP_CONTINUATION,
+        };
     if (row.kind === "said")
         return { first: TOP_SPEAK, continuation: TOP_SPEAK };
     if (row.kind === "tell" && row.state === "pending")
@@ -724,7 +730,7 @@ function renderDebtContextLines(created, columns) {
     if (created === undefined)
         return [];
     if (created.kind === "failed")
-        return [`! debts failed ${safeText(created.diagnostic)}`];
+        return diagnosticLines("created debts", created.diagnostic, columns);
     if (created.rows.length === 0)
         return [];
     return [`debts ${created.rows.length}`, ...created.rows.flatMap((row) => renderDebtRow(row, columns))];
@@ -736,7 +742,10 @@ function snapshotCore(view, context, options) {
         ...(options.showAllowed === true ? [`allowed  ${view.status.allowed.join(", ") || "none"}`] : []),
         ...(view.status.cwd === undefined ? [] : [safeText(view.status.cwd)]),
     ];
-    const facts = [...contractFacts(view.contract), ...(options.facts ?? [])];
+    const facts = [
+        ...contractFacts(view.contract, context.columns - SUBORDINATE_INDENT.length),
+        ...(options.facts ?? []),
+    ];
     return {
         activity,
         head: panelHead(view.status.id, options.alias, view.contract, contextFacts),
@@ -803,7 +812,7 @@ export function historyRawAnswer(result, historyId) {
     if (historyId === undefined || result.kind !== "exact")
         return undefined;
     const outcome = result.outcome.outcome;
-    return outcome.kind === "answered" ? outcome.answer : outcome.diagnostic;
+    return outcome.kind === "answered" ? outcome.answer : outcome.kind === "canceled" ? "canceled" : outcome.diagnostic;
 }
 /** One compact wait result line: an observed life mark, the complete identity, a bounded summary. */
 const WAIT_SUMMARY_SEPARATOR = " — ";
@@ -844,7 +853,9 @@ function waitSummary(status) {
                 ? { mark: "✓", state: "completed" }
                 : outcome.kind === "answered"
                     ? { mark: "✓", state: preview(outcome.answer, "answered") }
-                    : { mark: "!", state: preview(outcome.diagnostic, "failed") });
+                    : outcome.kind === "canceled"
+                        ? { mark: "○", state: "canceled" }
+                        : { mark: "!", state: preview(outcome.diagnostic, "failed") });
     return {
         ...observed,
         summary: [
@@ -875,7 +886,9 @@ export function historyText(result, presentation, context) {
             return `${result.kind === "unknown-history" ? result.historyId : "unknown"} has no matching retained outcome`;
         return result.outcome.outcome.kind === "answered"
             ? result.outcome.outcome.answer
-            : result.outcome.outcome.diagnostic;
+            : result.outcome.outcome.kind === "canceled"
+                ? "canceled"
+                : result.outcome.outcome.diagnostic;
     }
     if (presentation.last === true)
         return result.kind === "last" ? result.answer : "no answer retained";
@@ -945,14 +958,11 @@ export function tellText(result, alias, context) {
     if (wake.kind !== "failed")
         return verdict;
     const child = "child" in wake ? wake.child : undefined;
-    const failure = `! tell delivery failed · ${safeText(wake.diagnostic)}${child === undefined ? "" : ` · log ${child.log.path} ${child.log.from}..${child.log.to}`}`;
     return [
         verdict,
-        ...subordinateLines(renderBoundedTextBlock(failure, {
-            first: "",
-            continuation: "",
-            columns: context.columns - SUBORDINATE_INDENT.length,
-            lines: Number.MAX_SAFE_INTEGER,
+        ...subordinateLines(diagnosticLines("tell delivery", wake.diagnostic, context.columns - SUBORDINATE_INDENT.length, {
+            state: "failed",
+            suffix: child === undefined ? "" : ` · log ${child.log.path} ${child.log.from}..${child.log.to}`,
         })),
     ].join("\n");
 }

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

@@ -31,6 +31,11 @@ export declare function renderBoundedTextBlock(value: string, input: Readonly<{
     lines?: number;
     truncated?: boolean;
 }>): readonly string[];
+/** A tool diagnostic names its subject first; only its bounded payload carries the cause. */
+export declare function diagnosticLines(subject: string, cause: string, columns: number, options?: Readonly<{
+    state?: "unavailable" | "failed";
+    suffix?: string;
+}>): readonly string[];
 type BoundedPayload = Readonly<{
     text: string;
     first: string;

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

@@ -168,6 +168,13 @@ export function renderBoundedTextBlock(value, input) {
     }
     return lines.length === 0 ? [input.first.trimEnd()] : lines;
 }
+/** A tool diagnostic names its subject first; only its bounded payload carries the cause. */
+export function diagnosticLines(subject, cause, columns, options = {}) {
+    return [
+        `! ${safeText(subject)} ${options.state ?? "unavailable"}${safeText(options.suffix ?? "")}`,
+        ...renderBoundedTextBlock(cause, { first: "  ", continuation: "  ", columns }),
+    ];
+}
 export function renderBoundedPayload(input) {
     return input.preserveLines === true ? renderPreservedPayload(input) : renderFoldedPayload(input);
 }

package/build/src/cli/runtime.js

@@ -7,6 +7,7 @@ import { isParsedAkumaCommand, runAkumaCommand } from "./commands/akuma.js";
 import { admitBindMarkdown, runContractCommand, runContractHistoryCommand } from "./commands/contract.js";
 import { installOutcome, installHarnesses, renderInstallText } from "./commands/install.js";
 import { runDebtCommand } from "./commands/debt.js";
+import { runReport } from "./commands/report.js";
 import { runWhoami } from "./commands/whoami.js";
 import { resolveInvocationCoordinates } from "./coordinates.js";
 import { BindDraftError } from "./draft.js";
@@ -167,7 +168,7 @@ async function runCommand(invocation, input) {
     try {
         const runtime = {
             environment,
-            execution: command.command === "whoami"
+            execution: ["whoami", "report"].includes(command.command)
                 ? localExecutionContext()
                 : await executionForEnvironment(environment, cancellation.signal),
             ...(home === undefined ? {} : { home }),
@@ -187,6 +188,8 @@ async function runCommand(invocation, input) {
                 ...(invocation.cwd === undefined ? {} : { cwd: invocation.cwd }),
             });
         }
+        if (command.command === "report")
+            return await runReport(command, runtime);
         const coordinates = await invocationCoordinates(invocation, input, environment);
         if (command.command === "whoami")
             return await runWhoami(command, coordinates, environment);

package/build/src/index.d.ts

@@ -8,6 +8,8 @@
  * Settings, and Plugin surfaces. Internal composition, execution, and
  * configuration helpers stay off this entry; only CLI and Body import them.
  */
+export { AkumaHost } from "./body-host.js";
+export type { AkumaHostScope } from "./body-host.js";
 export { AuthorityCorruptionError } from "./core/facts/errors.js";
 /**
  * The package root: the curated Contract, Akuma, Akumas, Debt, Kanshi, World,
@@ -46,7 +48,7 @@ export { actorId } from "./core/facts/types.js";
  */
 export { z } from "zod";
 export { ALLOWED_ACTIONS, Akuma, AkumaArchetypeError, AkumaBusyError, AkumaDecodeError, AkumaNotBornError, AkumaProviderError, Schema, listArchetypeDefinitions, } from "./akuma/index.js";
-export type { AkumaCaller, AkumaOrigin, ActivityHistory, ActivityRow, AkuId, AkumaAskObservation, AkumaAskOptions, AkumaAskResult, AkumaBirthInput, AkumaHistoryOptions, AkumaHostOptions, AkumaIdleOptions, AkumaIdleResult, AkumaSignalOptions, AkumaStatus, AkumaStreamSnapshot, AkumaTellOptions, AkumaTellResult, AllowedAction, AllowedActions, ArchetypeCatalog, ArchetypeCatalogInput, ArchetypeCatalogRow, InterruptReceipt, JsonSchema, JsonSchemaDocument, KillEvidence, SchemaLike, StandardSchemaV1, } from "./akuma/index.js";
+export type { AkumaCaller, AkumaOrigin, ActivityHistory, ActivityRow, AkuId, AkumaAskObservation, AkumaAskOptions, AkumaAskResult, AkumaBirthInput, AkumaHistoryOptions, AkumaHostOptions, AkumaIdleOptions, AkumaIdleResult, AkumaReportOptions, AkumaReportResult, AkumaSignalOptions, AkumaStatus, AkumaStreamSnapshot, AkumaTellOptions, AkumaTellResult, AllowedAction, AllowedActions, ArchetypeCatalog, ArchetypeCatalogInput, ArchetypeCatalogRow, InterruptReceipt, JsonSchema, JsonSchemaDocument, KillEvidence, SchemaLike, StandardSchemaV1, } from "./akuma/index.js";
 export type { ActorId, ChangeId, ContractHead, ContractId, ContractState, JournalEntry as Fact, FactKind, SnapshotId, } from "./core/facts/types.js";
 export { kanshi, kanshiCategory, observeKanshi, selectKanshi, selectRegion } from "./kanshi/index.js";
 export type { AkumaKanshiRow, AkumaKanshiWorld, ContractEndpointObservation, ContractHolderObservation, ContractKanshiBoard, ContractKanshiRow, KanshiCategoryInput, KanshiCategoryReport, KanshiInput, KanshiRegionSelection, KanshiReport, KanshiSelection, RegionDeclaration, RegionRead, Section, DebtKanshiRow, DebtKanshiWorld, } from "./kanshi/index.js";

package/build/src/index.js

@@ -8,6 +8,7 @@
  * Settings, and Plugin surfaces. Internal composition, execution, and
  * configuration helpers stay off this entry; only CLI and Body import them.
  */
+export { AkumaHost } from "./body-host.js";
 export { AuthorityCorruptionError } from "./core/facts/errors.js";
 /**
  * The package root: the curated Contract, Akuma, Akumas, Debt, Kanshi, World,

package/build/src/library/akuma-creation.d.ts

@@ -1,11 +1,12 @@
 import { type AkumaCaller } from "../akuma/caller.js";
 import { type ForkReceipt } from "../akuma/akuma-owner.js";
+import type { BodyLauncher } from "../akuma/body-launch.js";
 import { type AskObserver } from "../akuma/akuma-selection-execution.js";
 import type { AkumaStatus } from "../akuma/akuma.js";
 import type { AllowedAction } from "../akuma/allowed.js";
 import type { TellResult } from "../akuma/body.js";
 import { type AkuId } from "../akuma/identity.js";
-import { type ExecutionContext } from "../akuma/requests.js";
+import type { ExecutionContext } from "../akuma/requests.js";
 import { type Schema } from "../akuma/schema.js";
 import type { AkumaAskResult } from "../akuma/selection-observation.js";
 import { type AliasBinding } from "../alias/index.js";
@@ -62,6 +63,8 @@ export type CallInput = Readonly<{
     contract?: Keiyaku;
     alias?: AkumaAlias;
     allowed?: readonly AllowedAction[];
+    writableDirectories?: readonly string[];
+    bare?: boolean;
     schema?: Schema<unknown>;
     initiator?: string;
     caller?: AkumaCaller;
@@ -99,6 +102,7 @@ export type CallResult = Readonly<{
 export type ForkInput = Readonly<{
     akuma: string;
     at: string;
+    bare?: boolean;
     repo?: Repo;
     caller?: AkumaCaller;
     initiator?: string;
@@ -116,8 +120,8 @@ export type ForkResult = Readonly<{
 }>);
 export declare function callAkumas(input: CallInput & Readonly<{
     path: WorldRoot;
-}>, execution?: ExecutionContext, reportDiagnostic?: (message: string) => void): Promise<CallResult>;
+}>, execution: ExecutionContext, spawn: BodyLauncher, reportDiagnostic?: (message: string) => void): Promise<CallResult>;
 export declare function forkAkumas(input: ForkInput & Readonly<{
     path: WorldRoot;
-}>): Promise<ForkResult>;
+}>, spawn: BodyLauncher): Promise<ForkResult>;
 export {};

package/build/src/library/akuma-creation.js

@@ -5,9 +5,8 @@ import { decodeAkumaCaller } from "../akuma/caller.js";
 import { admitAkumaCall } from "../akuma/akuma-call.js";
 import { AkumaOwner } from "../akuma/akuma-owner.js";
 import { decodeAskObservation, observeAdmittedAskAkuma } from "../akuma/akuma-selection-execution.js";
-import { canonicalBirthCwd } from "../akuma/call-input.js";
+import { bareOption, canonicalBirthCwd } from "../akuma/call-input.js";
 import { pathsForAkuId } from "../akuma/identity.js";
-import { localExecutionContext } from "../akuma/requests.js";
 import { schemaJsonText } from "../akuma/schema.js";
 import { moveAlias } from "../alias/index.js";
 import { AuthorityCorruptionError } from "../core/facts/errors.js";
@@ -180,6 +179,8 @@ const CALL_INPUT_KEYS = [
     "contract",
     "alias",
     "allowed",
+    "writableDirectories",
+    "bare",
     "schema",
     "initiator",
     "caller",
@@ -194,6 +195,7 @@ async function parseCallInput(input) {
     const body = callBody(values.body);
     const initiator = values.initiator === undefined ? undefined : text(values.initiator, "initiator");
     const caller = decodeAkumaCaller(values.caller);
+    const bare = bareOption(values.bare);
     const cwd = values.cwd === undefined ? undefined : nonblank(values.cwd, "cwd");
     const mode = callMode(values.mode);
     validateCallBodyOptions(body, values, mode);
@@ -211,8 +213,7 @@ async function parseCallInput(input) {
         : {
             tellId: randomUUID(),
             body,
-            ...(schemaJson === undefined ? {} : { schemaJson }),
-            ...(schema === undefined ? {} : { schema }),
+            ...(schema === undefined ? {} : { schema, schemaJson: schemaJson }),
             ...(initiator === undefined ? {} : { initiator }),
         };
     return {
@@ -226,6 +227,10 @@ async function parseCallInput(input) {
         ...(settings === undefined ? {} : { settings }),
         ...(alias === undefined ? {} : { alias }),
         ...(values.allowed === undefined ? {} : { allowed: values.allowed }),
+        ...(values.writableDirectories === undefined
+            ? {}
+            : { writableDirectories: values.writableDirectories }),
+        ...(bare === undefined ? {} : { bare }),
         seat,
         ...(caller === undefined ? {} : { caller }),
         ...(initiator === undefined ? {} : { initiator }),
@@ -256,6 +261,8 @@ function callAdmissionInput(input, execution) {
                 },
             }),
         ...(input.allowed === undefined ? {} : { allowed: input.allowed }),
+        ...(input.writableDirectories === undefined ? {} : { writableDirectories: input.writableDirectories }),
+        ...(input.bare === undefined ? {} : { bare: input.bare }),
         ...(execution === undefined ? {} : { cwd: execution.cwd }),
         ...(input.signal === undefined ? {} : { signal: input.signal }),
     };
@@ -320,13 +327,16 @@ async function observeCall(input, reportDiagnostic) {
     }
     catch (error) {
         if (input.signal?.aborted)
-            throw error;
+            throw knownChildFailure(error, input.akuma);
         return failedCall(input.result, input.initialTell.tellId, error, input.receipt);
     }
 }
 /** One failure that still names the child the invocation durably admitted. */
 function knownChildFailure(reason, akuma) {
-    const error = reason instanceof Error ? reason : new Error(reason === undefined ? "call aborted" : String(reason));
+    const cause = reason instanceof Error ? reason : new Error(reason === undefined ? "call aborted" : String(reason));
+    // One AbortSignal may cancel several parallel calls. Never overwrite another
+    // invocation's leading birth on its shared reason object.
+    const error = Object.isExtensible(cause) && !Object.hasOwn(cause, "akuma") ? cause : new Error(cause.message, { cause });
     Object.defineProperty(error, "akuma", { value: akuma, enumerable: false });
     return error;
 }
@@ -334,14 +344,14 @@ function knownChildFailure(reason, akuma) {
 function asError(failure) {
     return failure instanceof Error ? failure : new Error(failure === undefined ? "call failed" : String(failure));
 }
-export async function callAkumas(input, execution = localExecutionContext(), reportDiagnostic) {
+export async function callAkumas(input, execution, spawn, reportDiagnostic) {
     const parsed = await parseCallInput(input);
     const selectedExecution = await resolveCallExecution(parsed.cwd === undefined ? {} : { cwd: parsed.cwd });
     const seat = parsed.seat;
     const admitted = await admitAkumaCall(parsed.path, callConfiguration(parsed, execution), {
         ...callAdmissionInput(parsed, selectedExecution),
         ...(seat === undefined ? {} : { contractId: seat.id }),
-    }, selectedExecution === undefined ? {} : { cwdCanonical: true });
+    }, selectedExecution === undefined ? {} : { cwdCanonical: true }, spawn);
     const dispatch = seat === undefined
         ? { kind: "none" }
         : await dispatchStage({ repository: seat.scope, akuId: admitted.id, contractId: seat.id });
@@ -380,9 +390,10 @@ export async function callAkumas(input, execution = localExecutionContext(), rep
             ...(parsed.observe === undefined ? {} : { observe: parsed.observe }),
         }, reportDiagnostic);
 }
-export async function forkAkumas(input) {
+export async function forkAkumas(input, spawn) {
     const values = requireInput(input, "Akumas.fork input");
-    onlyKeys(values, ["path", "akuma", "at", "repo", "caller", "initiator"], "Akumas.fork input");
+    onlyKeys(values, ["path", "akuma", "at", "bare", "repo", "caller", "initiator"], "Akumas.fork input");
+    const bare = bareOption(values.bare);
     const caller = decodeAkumaCaller(values.caller);
     const initiator = values.initiator === undefined ? undefined : text(values.initiator, "initiator");
     const at = nonblank(values.at, "at");
@@ -391,9 +402,10 @@ export async function forkAkumas(input) {
     const repository = values.repo === undefined ? undefined : scopeForRepo(values.repo);
     const receipt = await new AkumaOwner(akuma, path).fork({
         at,
+        ...(bare === undefined ? {} : { bare }),
         ...(caller === undefined ? {} : { caller }),
         ...(initiator === undefined ? {} : { initiator }),
-    });
+    }, spawn);
     if (receipt.kind !== "forked")
         return { ...receipt, parent: akuma };
     const dispatch = repository === undefined

package/build/src/library/akumas.d.ts

@@ -3,6 +3,7 @@ import { type AkumaHostOptions } from "../akuma/akuma-instance.js";
 import type { AkumaList, AkumaListInput } from "../akuma/akuma.js";
 import type { TellResult, TellWake } from "../akuma/body.js";
 import { type ExecutionContext } from "../akuma/requests.js";
+import type { BodyLauncher } from "../akuma/body-launch.js";
 import type { DispatchAssociation } from "../akuma/dispatch-association.js";
 import type { CreatedDebtObservation } from "../debt/created-observation.js";
 import { type WorldRoot } from "../world.js";
@@ -18,7 +19,7 @@ export type { AkumaAskResult, AkumaHistoryResult, AkumaKillResult, AkumaList, Ak
 export type Akumas = AkumasHandle;
 declare class AkumasHandle {
     #private;
-    constructor(world: WorldRoot, execution: ExecutionContext, host?: AkumaHostOptions);
+    constructor(world: WorldRoot, execution: ExecutionContext, spawn: BodyLauncher, host?: AkumaHostOptions);
     list(input?: AkumaListInput): Promise<AkumaList>;
     call(input: CallInput): Promise<CallResult>;
     fork(input: ForkInput): Promise<ForkResult>;
@@ -43,6 +44,8 @@ declare class AkumasHandle {
  * internal channel through `akumasWithExecution` instead of a second constructor.
  */
 export declare function akumasWithExecution(world: WorldRoot, execution: ExecutionContext, host?: AkumaHostOptions): Akumas;
+/** Internal host composition, independent of the captured request route. */
+export declare function akumasWithLauncher(world: WorldRoot, execution: ExecutionContext, spawn: BodyLauncher, host?: AkumaHostOptions): Akumas;
 export declare const Akumas: Readonly<{
     of(world: WorldRoot, host?: AkumaHostOptions): Akumas;
 }>;

package/build/src/library/akumas.js

@@ -2,6 +2,7 @@
 import { captureAkumaHostDiagnostic } from "../akuma/akuma-instance.js";
 import { readAkumaRoster } from "../akuma/akuma.js";
 import { localExecutionContext } from "../akuma/requests.js";
+import { captureAkumaHost } from "../body-host.js";
 import { readAliases } from "../alias/index.js";
 import { World } from "../world.js";
 import { sweepInactiveAkumas } from "./akuma-retention.js";
@@ -12,15 +13,17 @@ export { AkumaAddressError, AkumaWorldScopeError } from "./address.js";
 class AkumasHandle {
     #world;
     #execution;
+    #spawn;
     #selection;
     #reportDiagnostic;
     #maintenance;
-    constructor(world, execution, host) {
+    constructor(world, execution, spawn, host) {
         this.#world = world;
         this.#execution = execution;
+        this.#spawn = spawn;
         // One typed route seam captured at construction: no operation re-derives it.
         this.#reportDiagnostic = captureAkumaHostDiagnostic(host);
-        this.#selection = selectionSeam(execution, this.#reportDiagnostic);
+        this.#selection = selectionSeam(execution, spawn, this.#reportDiagnostic);
         Object.freeze(this);
     }
     async list(input) {
@@ -31,14 +34,14 @@ class AkumasHandle {
         return withRosterAliases(roster, await readAliases(path));
     }
     call(input) {
-        const pending = callAkumas(this.withWorld(input, "Akumas.call input"), this.#execution, this.#reportDiagnostic);
+        const pending = callAkumas(this.withWorld(input, "Akumas.call input"), this.#execution, this.#spawn, this.#reportDiagnostic);
         return pending.then(async (result) => {
             await this.maintain(this.#world);
             return result;
         });
     }
     fork(input) {
-        const pending = forkAkumas(this.withWorld(input, "Akumas.fork input"));
+        const pending = forkAkumas(this.withWorld(input, "Akumas.fork input"), this.#spawn);
         return pending.then(async (result) => {
             if (result.kind === "forked")
                 await this.maintain(this.#world);
@@ -117,9 +120,14 @@ function withRosterAliases(roster, bindings) {
  * internal channel through `akumasWithExecution` instead of a second constructor.
  */
 export function akumasWithExecution(world, execution, host) {
+    const { spawn, reportDiagnostic } = captureAkumaHost(host);
+    return akumasWithLauncher(world, execution, spawn, reportDiagnostic === undefined ? undefined : { reportDiagnostic });
+}
+/** Internal host composition, independent of the captured request route. */
+export function akumasWithLauncher(world, execution, spawn, host) {
     if (typeof world !== "string")
         throw new TypeError("Akumas.of world must be a WorldRoot");
-    return new AkumasHandle(world, execution, host);
+    return new AkumasHandle(world, execution, spawn, host);
 }
 export const Akumas = Object.freeze({
     of(world, host) {

package/build/src/library/selection.d.ts

@@ -1,3 +1,4 @@
+import type { BodyLauncher } from "../akuma/body-launch.js";
 import { type AskObserver } from "../akuma/akuma-selection-execution.js";
 import { type AkumaStatus } from "../akuma/akuma.js";
 import { type ActivityHistory, type OutcomeRow } from "../akuma/projection.js";
@@ -32,7 +33,7 @@ export type SelectionSeam = Readonly<{
     tell(addressed: AddressedAkuma, input: AkumaTellInput, signal?: AbortSignal): Promise<AkumaTellResult>;
     ask<T>(addressed: AddressedAkuma, input: AkumaAskInput<T>, signal?: AbortSignal): Promise<AkumaAskResult<T>>;
 }>;
-export declare function selectionSeam(execution: ExecutionContext, reportDiagnostic?: (message: string) => void): SelectionSeam;
+export declare function selectionSeam(execution: ExecutionContext, spawn: BodyLauncher, reportDiagnostic?: (message: string) => void): SelectionSeam;
 export type AkumaWaitInput = AkumaSetAddressInput & Readonly<{
     completion?: "any" | "all";
     timeoutMs?: number;

package/build/src/library/selection.js

@@ -17,11 +17,11 @@ import { outcomePluginObserver, stderrPluginDiagnostic, withAkumaWaitDeferrals }
 import { addressAkuma, addressAkumaSet, resolveAkuma, resolveAkumaSet, } from "./address.js";
 import { requireInput } from "./input.js";
 import { scopeForRepo } from "./repo.js";
-export function selectionSeam(execution, reportDiagnostic = stderrPluginDiagnostic) {
+export function selectionSeam(execution, spawn, reportDiagnostic = stderrPluginDiagnostic) {
     const channel = executionChannel(execution);
     const routed = channel.kind === "body-request"
         ? forwardedSelection(channel.directory, reportDiagnostic)
-        : localSelection(reportDiagnostic);
+        : localSelection(spawn, reportDiagnostic);
     return {
         ...routed,
         wait: async (addressed, mode) => await withAkumaWaitDeferrals({ world: addressed.path, reportDiagnostic }, addressed.orderedIds, mode.signal, async () => {
@@ -68,17 +68,19 @@ function forwardedSelection(directory, reportDiagnostic) {
         },
     };
 }
-function localSelection(reportDiagnostic) {
+function localSelection(spawn, reportDiagnostic) {
     return {
         addressOne: addressAkuma,
         addressSet: addressAkumaSet,
         wait: async (addressed, mode) => await localWait(addressed, mode),
         kill: async (addressed, abort) => await executeKillAkuma({
+            spawn,
             path: addressed.path,
             ids: addressed.orderedIds,
             ...(abort === undefined ? {} : { signal: abort }),
         }),
         tell: async (addressed, input, abort) => await executeTellAkuma({
+            spawn,
             path: addressed.path,
             id: addressed.id,
             body: input.body,
@@ -88,6 +90,7 @@ function localSelection(reportDiagnostic) {
         }),
         ask: async (addressed, input, abort) => {
             const result = await executeAskAkuma({
+                spawn,
                 path: addressed.path,
                 id: addressed.id,
                 outcomeObserved: outcomePluginObserver({ world: addressed.path, reportDiagnostic }),

package/build/src/plugin/public.d.ts

@@ -13,6 +13,8 @@ export type PluginOutcome = Readonly<{
 }> | Readonly<{
     kind: "failed";
     reason: string;
+}> | Readonly<{
+    kind: "canceled";
 }>;
 export type PluginBodyEnd = "exited" | "broke-off" | "put-down" | "hung";
 export type PluginAkumaOrigin = Readonly<{
@@ -54,6 +56,15 @@ export type PluginSignalMap = Readonly<{
         historyId: string;
         observer?: string;
     }>;
+    "akuma.reported": Readonly<{
+        akumaId: string;
+        bodySequence: number;
+        turnSequence: number;
+        reportSequence: number;
+        text: string;
+        at: string;
+        initiator?: string;
+    }>;
     "akuma.turn-started": Readonly<{
         akumaId: string;
         turnSequence: number;

package/build/src/plugin/runtime.js

@@ -206,6 +206,7 @@ const SIGNAL_KINDS = Object.freeze({
     "akuma.initiating": true,
     "akuma.born": true,
     "akuma.outcome-observed": true,
+    "akuma.reported": true,
     "akuma.turn-started": true,
     "akuma.turn-outcome": true,
     "akuma.body-ended": true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrosheep/keiyaku",
-  "version": "4.6.19",
+  "version": "4.6.21",
   "workspaces": [
     "plugins/square",
     "plugins/paseo/forwarder"
@@ -81,8 +81,8 @@
   "dependencies": {
     "@agentclientprotocol/sdk": "^1.3.0",
     "@anthropic-ai/claude-agent-sdk": "^0.3.226",
-    "@astrosheep/keiyaku-plugin-square": "0.1.13",
-    "@astrosheep/square": "latest",
+    "@astrosheep/keiyaku-plugin-square": "0.1.15",
+    "@astrosheep/square": "^0.3.98",
     "@getpaseo/client": "0.11.2",
     "@getpaseo/protocol": "0.11.2",
     "@opencode/client": "2.0.20",

package/plugins/paseo/plugin/server/keiyaku.ts

@@ -24,6 +24,7 @@ const row = z.union([
     z.object({ kind: z.literal("answered"), historyId: z.string().optional(), answer: z.string(),
       foldedSaidSequence: count.optional() }),
     z.object({ kind: z.literal("failed"), historyId: z.string().optional(), diagnostic: z.string() }),
+    z.object({ kind: z.literal("canceled"), historyId: z.string().optional() }),
   ]) }),
   base.extend({ kind: z.literal("tool"), ...turnFields, name: z.string(), toolId: z.string().optional(), call,
     state: z.union([z.enum(["active", "unsettled"]), z.object({ status: z.enum(["ok", "error"]),

package/plugins/paseo/plugin/server/mirror.ts

@@ -170,11 +170,11 @@ export function createMirror(sessionId: string, emit: Emit) {
         } else if (row.kind === "note") {
           item({ type: "notification", id: `keiyaku:note/${row.sequence}`, level: "info", message: row.text }, row.at);
         } else if (row.kind === "outcome") {
-          item(row.outcome.kind === "answered"
+          if (row.outcome.kind !== "canceled") item(row.outcome.kind === "answered"
             ? { type: "assistant_message", id: row.outcome.foldedSaidSequence === undefined
               ? `keiyaku:turn/${row.turnSequence}` : `keiyaku:said/${row.outcome.foldedSaidSequence}`, text: row.outcome.answer }
             : { type: "error", id: `keiyaku:turn/${row.turnSequence}`, message: row.outcome.diagnostic }, row.at);
-          finish(openTurns.get(row.turnSequence), row.outcome.kind === "answered" ? "completed" : "failed",
+          finish(openTurns.get(row.turnSequence), row.outcome.kind === "answered" ? "completed" : row.outcome.kind,
             row.outcome.kind === "failed" ? row.outcome.diagnostic : undefined);
         }
       }