@astrosheep/keiyaku 4.6.6 → 4.6.8

package/build/src/library/akumas.js

@@ -1,3 +1,5 @@
+/** @architectureCompositionRoot */
+import { captureAkumaHostDiagnostic } from "../akuma/akuma-instance.js";
 import { readAkumaRoster } from "../akuma/akuma.js";
 import { localExecutionContext } from "../akuma/requests.js";
 import { readAliases } from "../alias/index.js";
@@ -10,11 +12,13 @@ class AkumasHandle {
     #world;
     #execution;
     #selection;
-    constructor(world, execution) {
+    #reportDiagnostic;
+    constructor(world, execution, host) {
         this.#world = world;
         this.#execution = execution;
         // One typed route seam captured at construction: no operation re-derives it.
-        this.#selection = selectionSeam(execution);
+        this.#reportDiagnostic = captureAkumaHostDiagnostic(host);
+        this.#selection = selectionSeam(execution, this.#reportDiagnostic);
         Object.freeze(this);
     }
     async list(input) {
@@ -25,13 +29,13 @@ class AkumasHandle {
         return withRosterAliases(roster, await readAliases(path));
     }
     call(input) {
-        return callAkumas(this.withWorld(input, "Akumas.call input"), this.#execution);
+        return callAkumas(this.withWorld(input, "Akumas.call input"), this.#execution, this.#reportDiagnostic);
     }
     fork(input) {
         return forkAkumas(this.withWorld(input, "Akumas.fork input"));
     }
     status(input) {
-        return statusAkuma(this.withWorld(input, "Akumas.status input"));
+        return statusAkuma(this.withWorld(input, "Akumas.status input"), this.#reportDiagnostic);
     }
     tell(input) {
         return tellAkumaOn(this.#selection, this.withWorld(input, "Akumas.tell input"));
@@ -46,7 +50,7 @@ class AkumasHandle {
         return killAkumaOn(this.#selection, this.withWorld(input, "Akumas.kill input"));
     }
     history(input) {
-        return historyAkuma(this.withWorld(input, "Akumas.history input"));
+        return historyAkuma(this.withWorld(input, "Akumas.history input"), this.#reportDiagnostic);
     }
     withWorld(input, label) {
         const values = requireInput(input, label);
@@ -72,13 +76,13 @@ function withRosterAliases(roster, bindings) {
  * The one Akumas composition. Public `of` fixes local execution; CLI and Body pass their captured
  * internal channel through `akumasWithExecution` instead of a second constructor.
  */
-export function akumasWithExecution(world, execution) {
+export function akumasWithExecution(world, execution, host) {
     if (typeof world !== "string")
         throw new TypeError("Akumas.of world must be a WorldRoot");
-    return new AkumasHandle(world, execution);
+    return new AkumasHandle(world, execution, host);
 }
 export const Akumas = Object.freeze({
-    of(world) {
-        return akumasWithExecution(world, localExecutionContext());
+    of(world, host) {
+        return akumasWithExecution(world, localExecutionContext(), host);
     },
 });

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

@@ -21,7 +21,7 @@ export declare function admitForkBindWithAppointment(input: Readonly<{
     scope: RepositoryScope;
     channel: GitDecodeChannel;
     sourceId: ContractId;
-    target?: string;
+    target?: string | null;
     progress?: ProtocolProgress;
     actor?: ActorId;
 }>): Promise<Readonly<{
@@ -35,7 +35,7 @@ export declare function prepareMarkdownBind(input: Readonly<{
     gates: readonly import("../core/facts/types.js").Gate[];
     after: readonly ContractId[];
     workspace: "worktree";
-    targetSelection?: BindTargetSelection;
+    targetSelection: BindTargetSelection;
     task?: TaskId;
     progress?: ProtocolProgress;
     actor?: ActorId;
@@ -45,16 +45,16 @@ export declare function prepareMarkdownBind(input: Readonly<{
         result: IntentOutcome<Readonly<{
             contractId: ContractId;
         }>, {
-            kind: "contract-exists" | "invalid-after" | "unknown-prerequisite";
-            contractId: ContractId;
-        } | {
             kind: "verification-declaration-invalid";
             contractId?: ContractId | undefined;
+        } | {
+            kind: "target-missing" | "unborn-head" | "invalid-target";
         } | {
             kind: "fork-source-moved";
             contractId: ContractId;
         } | {
-            kind: "unborn-head" | "target-missing" | "invalid-target";
+            kind: "contract-exists" | "invalid-after" | "unknown-prerequisite";
+            contractId: ContractId;
         } | {
             kind: "fork-source-missing" | "fork-source-unavailable";
             contractId: ContractId;
@@ -64,16 +64,16 @@ export declare function prepareMarkdownBind(input: Readonly<{
         result: IntentOutcome<Readonly<{
             contractId: ContractId;
         }>, {
-            kind: "contract-exists" | "invalid-after" | "unknown-prerequisite";
-            contractId: ContractId;
-        } | {
             kind: "verification-declaration-invalid";
             contractId?: ContractId | undefined;
+        } | {
+            kind: "target-missing" | "unborn-head" | "invalid-target";
         } | {
             kind: "fork-source-moved";
             contractId: ContractId;
         } | {
-            kind: "unborn-head" | "target-missing" | "invalid-target";
+            kind: "contract-exists" | "invalid-after" | "unknown-prerequisite";
+            contractId: ContractId;
         } | {
             kind: "fork-source-missing" | "fork-source-unavailable";
             contractId: ContractId;
@@ -84,16 +84,16 @@ export declare function prepareMarkdownBind(input: Readonly<{
     result: IntentOutcome<Readonly<{
         contractId: ContractId;
     }>, {
-        kind: "contract-exists" | "invalid-after" | "unknown-prerequisite";
-        contractId: ContractId;
-    } | {
         kind: "verification-declaration-invalid";
         contractId?: ContractId | undefined;
+    } | {
+        kind: "target-missing" | "unborn-head" | "invalid-target";
     } | {
         kind: "fork-source-moved";
         contractId: ContractId;
     } | {
-        kind: "unborn-head" | "target-missing" | "invalid-target";
+        kind: "contract-exists" | "invalid-after" | "unknown-prerequisite";
+        contractId: ContractId;
     } | {
         kind: "fork-source-missing" | "fork-source-unavailable";
         contractId: ContractId;

package/build/src/library/bind.js

@@ -12,6 +12,14 @@ import { KeiyakuError } from "./outcome.js";
 import { contractTerms, documentDerivation } from "./input.js";
 const CONTRACT_ID_CODE_POINTS = 32;
 const CONTRACT_ID_ATTEMPTS = 4;
+/** A fork with no target copies its source; `null` clears it and a string overrides it. */
+function forkTargetSelection(target, sourceTarget) {
+    if (target === null)
+        return { kind: "targetless" };
+    if (target !== undefined)
+        return { kind: "explicit", target };
+    return sourceTarget === undefined ? { kind: "targetless" } : { kind: "explicit", target: sourceTarget };
+}
 function drawContractSuffix() {
     return randomBytes(2).toString("hex");
 }
@@ -22,10 +30,10 @@ async function attempt(input, id) {
         terms: input.terms,
         verification: input.verification,
         workspace: input.workspace,
+        targetSelection: input.targetSelection,
         ...(input.coordinates === undefined ? {} : { coordinates: input.coordinates }),
         ...(input.source === undefined ? {} : { source: input.source }),
         contractId: id,
-        ...(input.targetSelection === undefined ? {} : { targetSelection: input.targetSelection }),
         ...(input.task === undefined
             ? {}
             : {
@@ -99,11 +107,7 @@ export async function admitForkBindWithAppointment(input) {
         terms,
         verification: documentDerivation(document, terms.gates).verification,
         workspace: "worktree",
-        targetSelection: input.target === undefined
-            ? source.coordinates.target === undefined
-                ? { kind: "targetless" }
-                : { kind: "explicit", target: source.coordinates.target }
-            : { kind: "explicit", target: input.target },
+        targetSelection: forkTargetSelection(input.target, source.coordinates.target),
         coordinates: { start: source.coordinates.start },
         source: {
             contractId: input.sourceId,
@@ -125,7 +129,7 @@ export async function prepareMarkdownBind(input) {
         terms,
         verification: documentDerivation(input.document, terms.gates).verification,
         workspace: input.workspace,
-        ...(input.targetSelection === undefined ? {} : { targetSelection: input.targetSelection }),
+        targetSelection: input.targetSelection,
         ...(input.task === undefined ? {} : { task: input.task }),
         ...(input.actor === undefined ? {} : { actor: input.actor }),
         ...(input.progress === undefined ? {} : { progress: input.progress }),

package/build/src/library/contract-address.d.ts

@@ -0,0 +1,9 @@
+import type { ContractRow } from "../protocol/read/status.js";
+import type { ContractResolution, ContractResolveInput } from "./contract-types.js";
+/** Pure Contract membership shared with mixed Address; no cross-family judgment. */
+export declare function matchContractCandidates(rows: readonly ContractRow[], selection: Readonly<{
+    selector: string;
+}> | Readonly<{
+    cwd: string;
+}>): readonly ContractRow[];
+export declare function resolveContract(input: ContractResolveInput): Promise<ContractResolution>;

package/build/src/library/contract-address.js

@@ -0,0 +1,71 @@
+import { realpath, stat } from "node:fs/promises";
+import { isAbsolute, normalize } from "node:path";
+import { contractId } from "../core/facts/types.js";
+import { withGitDecodeChannel } from "../git/read-observation.js";
+import { contractsOperation } from "../protocol/operations.js";
+import { requireInput } from "./input.js";
+import { readContractValue } from "./outcome.js";
+import { scopeForRepo } from "./repo.js";
+/** Pure Contract membership shared with mixed Address; no cross-family judgment. */
+export function matchContractCandidates(rows, selection) {
+    return rows.filter((row) => row.disposition === "active" &&
+        row.workspace === "worktree" &&
+        row.worktreePath !== null &&
+        ("selector" in selection
+            ? `@${row.id.slice("kei/".length)}` === selection.selector
+            : normalize(row.worktreePath) === selection.cwd));
+}
+export async function resolveContract(input) {
+    const values = requireInput(input, "Keiyaku.with().resolve input", ["repo", "selector", "cwd"]);
+    const scope = scopeForRepo(values.repo);
+    const selector = values.selector;
+    if (selector !== undefined && typeof selector !== "string")
+        throw new TypeError("selector must be a string");
+    const suppliedCwd = values.cwd;
+    if (suppliedCwd !== undefined && (typeof suppliedCwd !== "string" || !isAbsolute(suppliedCwd)))
+        throw new TypeError("cwd must be an absolute directory coordinate");
+    let cwd = scope.invocationWorktree;
+    if (typeof suppliedCwd === "string") {
+        try {
+            cwd = await realpath(suppliedCwd);
+            if (!(await stat(cwd)).isDirectory())
+                throw new TypeError("cwd must be a directory");
+        }
+        catch (cause) {
+            throw new TypeError("cwd must be an absolute directory coordinate", { cause });
+        }
+    }
+    if (selector !== undefined) {
+        if (selector.startsWith("@kei/"))
+            return { kind: "refused", refusal: { kind: "redundant-short-selector", selector } };
+        try {
+            const id = contractId(selector.startsWith("@") ? `kei/${selector.slice(1)}` : selector);
+            if (!selector.startsWith("@"))
+                return { kind: "resolved", id };
+        }
+        catch (error) {
+            return {
+                kind: "refused",
+                refusal: {
+                    kind: "invalid-selector",
+                    selector,
+                    diagnostic: error instanceof Error ? error.message : String(error),
+                },
+            };
+        }
+    }
+    const board = await readContractValue(() => withGitDecodeChannel(scope, (channel) => contractsOperation({ scope, channel })));
+    const candidates = matchContractCandidates(board.rows, selector === undefined ? { cwd } : { selector });
+    if (candidates.length === 1)
+        return { kind: "resolved", id: candidates[0].id };
+    if (selector === undefined) {
+        return {
+            kind: "refused",
+            refusal: candidates.length === 0 ? { kind: "no-contextual-match", cwd } : { kind: "ambiguous-selector", cwd },
+        };
+    }
+    return {
+        kind: "refused",
+        refusal: candidates.length === 0 ? { kind: "unknown-short-selector", selector } : { kind: "ambiguous-selector", selector },
+    };
+}

package/build/src/library/contract-composition.d.ts

@@ -1,9 +1,8 @@
 /** @architectureCompositionRoot */
 import { type LibraryExecution } from "../akuma/requests.js";
-import type { BindTargetSelection } from "../protocol/bind.js";
 import type { ContractObservation } from "../protocol/read/status.js";
 import type { BindOutcome } from "./contract-outcomes.js";
-import type { BindInput, ContractList, ContractListInput, ContractObservationInput, KeiyakuSelectInput, LocalContractComposition } from "./contract-types.js";
+import type { BindInput, ContractList, ContractListInput, ContractObservationInput, ContractResolveInput, ContractResolution, KeiyakuSelectInput, LocalContractComposition } from "./contract-types.js";
 import type { Keiyaku, createKeiyakuHandle } from "./keiyaku.js";
 import { type ReconcileCompletion, type RepoReconcileReport } from "./reconcile.js";
 import { type Repo } from "./repo.js";
@@ -24,6 +23,7 @@ interface KeiyakuLibraryReconcile {
 export type KeiyakuLibrary = Readonly<{
     bind(input: BindInput): Promise<BindOutcome>;
     select(input: KeiyakuSelectInput): Keiyaku;
+    resolve(input: ContractResolveInput): Promise<ContractResolution>;
     list(input: ContractListInput): Promise<ContractList>;
     observe(input: ContractObservationInput): Promise<ContractObservation>;
     reconcile: KeiyakuLibraryReconcile;
@@ -32,12 +32,9 @@ export type KeiyakuLibrary = Readonly<{
  * The one private Contract composition constructor. `Keiyaku.with` fixes local execution; CLI and
  * Body pass their captured internal channel explicitly here instead of a second constructor. The
  * carrier is a positional argument, never a field of the public construction input, so no runtime
- * value reaching the public surface can select a private channel. `omittedMarkdownTarget` is the
- * internal bind intent an edge supplies for a Markdown bind whose caller omitted the target; the
- * public package-root composition leaves it targetless.
+ * value reaching the public surface can select a private channel.
  */
-export declare function composeContractLibrary(execution: LibraryExecution, createHandle: typeof createKeiyakuHandle, input?: LocalContractComposition, omittedMarkdownTarget?: BindTargetSelection): KeiyakuLibrary;
+export declare function composeContractLibrary(execution: LibraryExecution, createHandle: typeof createKeiyakuHandle, input?: LocalContractComposition): KeiyakuLibrary;
 export declare function listKeiyaku(input: ContractListInput): Promise<ContractList>;
 export declare function observeKeiyaku(input: ContractObservationInput): Promise<ContractObservation>;
-export declare function readContractValue<Value>(operation: () => Promise<Value>): Promise<Value>;
 export {};

package/build/src/library/contract-composition.js

@@ -3,25 +3,25 @@ import { localExecutionContext } from "../akuma/requests.js";
 import { contractId } from "../core/facts/types.js";
 import { withGitDecodeChannel } from "../git/read-observation.js";
 import { contractCatalogueOperation, contractObservationOperation, contractsOperation, } from "../protocol/operations.js";
+import { resolveContract } from "./contract-address.js";
 import { bindKeiyaku } from "./contract-creation.js";
 import { captureLocalContractComposition, derivedHooks, } from "./contract-settings.js";
 import { requireInput } from "./input.js";
-import { KeiyakuError, errorCategory } from "./outcome.js";
+import { readContractValue } from "./outcome.js";
 import { completeReconcile, completeRepoReconcile, } from "./reconcile.js";
 import { scopeForRepo } from "./repo.js";
 /**
  * The one private Contract composition constructor. `Keiyaku.with` fixes local execution; CLI and
  * Body pass their captured internal channel explicitly here instead of a second constructor. The
  * carrier is a positional argument, never a field of the public construction input, so no runtime
- * value reaching the public surface can select a private channel. `omittedMarkdownTarget` is the
- * internal bind intent an edge supplies for a Markdown bind whose caller omitted the target; the
- * public package-root composition leaves it targetless.
+ * value reaching the public surface can select a private channel.
  */
-export function composeContractLibrary(execution, createHandle, input, omittedMarkdownTarget = { kind: "targetless" }) {
+export function composeContractLibrary(execution, createHandle, input) {
     const composition = captureLocalContractComposition(input);
     return Object.freeze({
-        bind: (operation) => bindKeiyaku(operation, createHandle, execution, composition, omittedMarkdownTarget),
+        bind: (operation) => bindKeiyaku(operation, createHandle, execution, composition),
         select: (operation) => selectKeiyaku(operation, createHandle, execution, composition),
+        resolve: resolveContract,
         list: (operation) => listKeiyaku(operation),
         observe: (operation) => observeKeiyaku(operation),
         reconcile: reconcileOperation(composition),
@@ -93,15 +93,3 @@ export async function observeKeiyaku(input) {
     }
     return readContractValue(() => withGitDecodeChannel(scope, (channel) => contractObservationOperation({ scope, channel, contractId: id })));
 }
-export async function readContractValue(operation) {
-    try {
-        return await operation();
-    }
-    catch (error) {
-        if (error instanceof KeiyakuError)
-            throw error;
-        throw new KeiyakuError(errorCategory(error), error instanceof Error ? error.message : String(error), {
-            cause: error,
-        });
-    }
-}

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

@@ -1,13 +1,11 @@
 /** @architectureCompositionRoot */
 import { type ExecutionContext } from "../akuma/requests.js";
-import type { BindTargetSelection } from "../protocol/bind.js";
 import type { BindOutcome } from "./contract-outcomes.js";
 import { type LocalContractCompositionCapture } from "./contract-settings.js";
 import type { BindInput } from "./contract-types.js";
 import type { createKeiyakuHandle } from "./keiyaku.js";
 /**
- * One Contract bind. `omittedMarkdownTarget` is the internal composition input an edge
- * supplies for a Markdown bind whose caller omitted the target: the public package-root
- * composition leaves it targetless, while the CLI names the invocation branch.
+ * One Contract bind. An omitted Markdown target names the current branch of the caller's explicit
+ * Repo worktree coordinate, `null` is deliberately targetless, and a string is that literal target.
  */
-export declare function bindKeiyaku(input: BindInput, createHandle: typeof createKeiyakuHandle, execution?: ExecutionContext, composition?: LocalContractCompositionCapture, omittedMarkdownTarget?: BindTargetSelection): Promise<BindOutcome>;
+export declare function bindKeiyaku(input: BindInput, createHandle: typeof createKeiyakuHandle, execution?: ExecutionContext, composition?: LocalContractCompositionCapture): Promise<BindOutcome>;

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

@@ -7,7 +7,7 @@ import { withGitDecodeChannel } from "../git/read-observation.js";
 import { executionStop, isOperationalFailure, isOperationalStop } from "../protocol/progress.js";
 import { readManagedWorktreeAppointment } from "../workspace-place.js";
 import { admitForkBindWithAppointment, prepareMarkdownBind } from "./bind.js";
-import { acceptedOutcome, conclusions, expected, retainAdmission } from "./contract-outcomes.js";
+import { acceptedOutcome, expected, retainAdmission } from "./contract-outcomes.js";
 import { captureLocalContractComposition, derivedGates, derivedHooks, gateNames, } from "./contract-settings.js";
 import { actorOption, normalizedList, requireInput, requireMarkdown, taskOption } from "./input.js";
 import { InvocationAccumulator } from "./invocation.js";
@@ -15,6 +15,12 @@ import { project, validated } from "./outcome.js";
 import { reconcileAffectedContracts } from "./reconcile.js";
 import { observeRegion } from "./region.js";
 import { scopeForRepo } from "./repo.js";
+/** The one place a caller's omitted target becomes product behavior. */
+function bindTargetSelection(target) {
+    if (target === undefined)
+        return { kind: "current-branch" };
+    return target === null ? { kind: "targetless" } : { kind: "explicit", target };
+}
 function bindInput(input, composition) {
     return validated(() => {
         const values = requireInput(input, "Keiyaku.bind input");
@@ -25,8 +31,8 @@ function bindInput(input, composition) {
         requireInput(input, "Keiyaku.bind input", allowed);
         if ((values.workspace ?? "worktree") !== "worktree")
             throw new TypeError("workspace must be worktree");
-        if (values.target !== undefined && typeof values.target !== "string")
-            throw new TypeError("target must be a string");
+        if (values.target !== undefined && values.target !== null && typeof values.target !== "string")
+            throw new TypeError("target must be a string or null");
         const actor = actorOption(values.actor);
         const document = forkOf === undefined ? parseMarkdown(requireMarkdown(values.markdown)) : undefined;
         if (forkOf !== undefined) {
@@ -47,11 +53,10 @@ function bindInput(input, composition) {
     });
 }
 /**
- * One Contract bind. `omittedMarkdownTarget` is the internal composition input an edge
- * supplies for a Markdown bind whose caller omitted the target: the public package-root
- * composition leaves it targetless, while the CLI names the invocation branch.
+ * One Contract bind. An omitted Markdown target names the current branch of the caller's explicit
+ * Repo worktree coordinate, `null` is deliberately targetless, and a string is that literal target.
  */
-export async function bindKeiyaku(input, createHandle, execution = localExecutionContext(), composition = captureLocalContractComposition(), omittedMarkdownTarget = { kind: "targetless" }) {
+export async function bindKeiyaku(input, createHandle, execution = localExecutionContext(), composition = captureLocalContractComposition()) {
     const prepared = bindInput(input, composition);
     const hooks = derivedHooks(composition);
     const { forkOf, scope, document, target, actor } = prepared;
@@ -84,7 +89,7 @@ export async function bindKeiyaku(input, createHandle, execution = localExecutio
                     }
                     if (document === undefined)
                         throw new Error("Markdown bind requires its prepared document");
-                    return await markdownBind(prepared, document, hooks, scope, channel, accumulator, handle, omittedMarkdownTarget);
+                    return await markdownBind(prepared, document, hooks, scope, channel, accumulator, handle);
                 })();
                 return completed;
             }, (error) => {
@@ -109,19 +114,16 @@ export async function bindKeiyaku(input, createHandle, execution = localExecutio
         throw projected.error;
     return projected.outcome;
 }
-function bindValue(keiyaku, region, warnings, workspace, appointmentLag) {
-    const base = {
+function bindValue(keiyaku, region, warnings) {
+    return {
         keiyaku,
-        ...(workspace === undefined ? {} : { workspace }),
         ...(warnings.length === 0 ? {} : { warnings }),
         ...region,
     };
-    void appointmentLag;
-    return base;
 }
 // eslint-disable-next-line max-params -- Keep this local operation's custody, admission, and policy witnesses explicit.
 async function bindComplete(accumulator, id, scope, channel, leading, hooks, value) {
-    retainAdmission(accumulator, id, leading, false);
+    retainAdmission(accumulator, id, leading);
     await reconcileAffectedContracts(accumulator, id, scope, channel, hooks);
     try {
         const appointment = await readManagedWorktreeAppointment(scope, id);
@@ -136,15 +138,15 @@ async function bindComplete(accumulator, id, scope, channel, leading, hooks, val
         accumulator.recordStop(executionStop(id, "reconciliation", error, scope.signal));
     }
     const built = { ...(await value()), ...accumulator.conclusions(id) };
-    accumulator.extendConclusions(id, conclusions(built));
+    accumulator.extendConclusions(id, built);
     return built;
 }
 // eslint-disable-next-line max-params -- Keep this local operation's custody, admission, and policy witnesses explicit.
-async function markdownBind(prepared, document, hooks, scope, channel, accumulator, handle, omittedMarkdownTarget) {
+async function markdownBind(prepared, document, hooks, scope, channel, accumulator, handle) {
     const { task, target, actor, gates, after } = prepared;
     if (gates === undefined || after === undefined)
         throw new Error("Markdown bind requires prepared terms");
-    const targetSelection = target !== undefined ? { kind: "explicit", target } : omittedMarkdownTarget;
+    const targetSelection = bindTargetSelection(target);
     const admission = await prepareMarkdownBind({
         scope,
         channel,

package/build/src/library/contract-execution.js

@@ -19,7 +19,7 @@ import { admitReviewOperation } from "../protocol/review.js";
 import { releaseTaskHolder, releaseTaskHolderWithFence, taskHolderObservationSelection } from "../settlement/holder.js";
 import { continueDeliveredDependents } from "./continuation.js";
 import { requestForwardedContractLive } from "./contract-operations.js";
-import { acceptedOutcome, admissionOf, conclusions, expected, retainAdmission } from "./contract-outcomes.js";
+import { acceptedOutcome, expected, retainAdmission } from "./contract-outcomes.js";
 import { derivedContractPolicy, derivedGates, derivedHooks, gateNames, } from "./contract-settings.js";
 import { deliveryForContract } from "./delivery.js";
 import { actorOption, contractTerms, documentDerivation, normalizedList, optionalBoolean, optionalNonblank, optionalSignal, requireInput, requireMarkdown, } from "./input.js";
@@ -66,7 +66,7 @@ export class ContractExecution {
         });
         let changedSections;
         return await this.local("amend", async (accumulator, channel, scope) => {
-            const admission = admissionOf(await amendOperation({
+            const admission = await amendOperation({
                 scope,
                 channel,
                 contractId: this.id,
@@ -87,20 +87,18 @@ export class ContractExecution {
                         : contractTerms(amended, gates ?? source.gates, prerequisites ?? source.after);
                     return { terms, verification: documentDerivation(amended, terms.gates, this.id).verification };
                 },
-            }));
+            });
             if (admission.kind !== "accepted")
                 return expected(this.id, admission);
-            const accepted = admission.accepted;
-            const changes = changedAmendTerms(accepted.value.source, accepted.value.terms);
-            const diff = documentDiff("before", "after", accepted.value.source.document.bytes, accepted.value.terms.document.bytes);
+            const changes = changedAmendTerms(admission.value.source, admission.value.terms);
+            const diff = documentDiff("before", "after", admission.value.source.document.bytes, admission.value.terms.document.bytes);
             accumulator.extendConclusions(this.id, { documentDiff: diff, changes });
-            const region = await observeChangedRegion(scope, this.id, changedSections, decodeContractDocument(accepted.value.terms.document.bytes).region);
+            const region = await observeChangedRegion(scope, this.id, changedSections, decodeContractDocument(admission.value.terms.document.bytes).region);
             const value = await this.conclude(accumulator, {
                 scope,
                 channel,
-                leading: accepted,
+                leading: admission,
                 hooks,
-                verificationResidueRecorded: false,
                 value: () => ({
                     documentDiff: diff,
                     changes,
@@ -247,7 +245,7 @@ export class ContractExecution {
         });
         const hooks = derivedHooks(this.composition);
         return await this.local("abandon", async (accumulator, channel, scope) => {
-            const admission = admissionOf((await releaseTaskHolderWithFence(scope, channel, this.id, () => abandonOperation({
+            const admission = (await releaseTaskHolderWithFence(scope, channel, this.id, () => abandonOperation({
                 scope,
                 channel,
                 contractId: this.id,
@@ -259,15 +257,14 @@ export class ContractExecution {
                     const companion = await releaseTaskHolder(channel, observation, owner);
                     return companion === null ? [] : [companion];
                 },
-            }))).result);
+            }))).result;
             if (admission.kind !== "accepted")
                 return expected(this.id, admission);
             await this.conclude(accumulator, {
                 scope,
                 channel,
-                leading: admission.accepted,
+                leading: admission,
                 hooks,
-                verificationResidueRecorded: false,
                 value: () => ({}),
             });
             return acceptedOutcome("abandon", this.id, accumulator, undefined);
@@ -283,22 +280,21 @@ export class ContractExecution {
         });
         const hooks = derivedHooks(this.composition);
         return await this.local("arc", async (accumulator, channel, scope) => {
-            const admission = admissionOf(await arcOperation({
+            const admission = await arcOperation({
                 scope,
                 channel,
                 contractId: this.id,
                 ...actor,
                 chapter,
                 progress: accumulator,
-            }));
+            });
             if (admission.kind !== "accepted")
                 return expected(this.id, admission);
             await this.conclude(accumulator, {
                 scope,
                 channel,
-                leading: admission.accepted,
+                leading: admission,
                 hooks,
-                verificationResidueRecorded: false,
                 value: () => ({}),
             });
             return acceptedOutcome("arc", this.id, accumulator, undefined);
@@ -327,7 +323,7 @@ export class ContractExecution {
             });
         const { hooks, requireBranchesToBeUpToDate } = derivedContractPolicy(this.composition);
         return await this.local("audit", async (accumulator, localChannel, scope) => {
-            const admission = admissionOf(await auditOperation({
+            const admission = await auditOperation({
                 scope,
                 channel: localChannel,
                 progress: accumulator,
@@ -338,15 +334,14 @@ export class ContractExecution {
                 requireBranchesToBeUpToDate,
                 ...(signal === undefined ? {} : { signal }),
                 ...(this.composition.actor === undefined ? {} : { actor: this.composition.actor }),
-            }));
+            });
             if (admission.kind !== "accepted")
                 return expected(this.id, admission);
             const report = await this.conclude(accumulator, {
                 scope,
                 channel: localChannel,
-                leading: admission.accepted,
+                leading: admission,
                 hooks,
-                verificationResidueRecorded: false,
                 value: (value) => value,
             });
             return acceptedOutcome("audit", this.id, accumulator, report);
@@ -380,9 +375,9 @@ export class ContractExecution {
         return projected.outcome;
     }
     async conclude(accumulator, input) {
-        retainAdmission(accumulator, this.id, input.leading, input.verificationResidueRecorded);
+        retainAdmission(accumulator, this.id, input.leading);
         const value = input.value(input.leading.value);
-        accumulator.extendConclusions(this.id, conclusions(value));
+        accumulator.extendConclusions(this.id, value);
         await reconcileAffectedContracts(accumulator, this.id, input.scope, input.channel, input.hooks);
         return value;
     }

package/build/src/library/contract-outcomes.d.ts

@@ -41,17 +41,6 @@ export type BindResult = BindOutcome;
 type AcceptedIntent<Value> = Extract<IntentOutcome<Value>, {
     kind: "accepted";
 }>;
-type Admission<Value, Refusal> = Readonly<{
-    kind: "accepted";
-    accepted: AcceptedIntent<Value>;
-}> | Readonly<{
-    kind: "refused";
-    refusal: Refusal;
-}> | Readonly<{
-    kind: "retry";
-    reason: IntentRetry;
-}>;
-export declare function admissionOf<Value, Refusal>(outcome: IntentOutcome<Value, Refusal>): Admission<Value, Refusal>;
 /** The refused/retry arms are value-agnostic, so every operation can return them unchanged. */
 type ExpectedProjection<Refusal> = Readonly<{
     kind: "refused";
@@ -62,10 +51,9 @@ type ExpectedProjection<Refusal> = Readonly<{
     contract?: ContractId;
     reason: IntentRetry;
 }>;
-export declare function expected<Refusal>(contract: ContractId | undefined, admission: Exclude<Admission<unknown, Refusal>, {
+export declare function expected<Refusal>(contract: ContractId | undefined, admission: Exclude<IntentOutcome<unknown, Refusal>, {
     kind: "accepted";
 }>): ExpectedProjection<Refusal>;
 export declare function acceptedOutcome<Operation extends ContractVerb, Value>(operation: Operation, contract: ContractId, accumulator: InvocationAccumulator, value: Value): OutcomeProjection<Operation, Value, never>;
-export declare function conclusions(value: object): Readonly<Record<string, unknown>>;
-export declare function retainAdmission<Value>(accumulator: InvocationAccumulator, contract: ContractId, leading: AcceptedIntent<Value>, verificationResidueRecorded: boolean): void;
+export declare function retainAdmission<Value>(accumulator: InvocationAccumulator, contract: ContractId, leading: AcceptedIntent<Value>): void;
 export {};