@astrosheep/keiyaku 4.6.7 → 4.6.8

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 {};

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

@@ -1,10 +1,3 @@
-export function admissionOf(outcome) {
-    if (outcome.kind === "accepted")
-        return { kind: "accepted", accepted: outcome };
-    return outcome.kind === "refused"
-        ? { kind: "refused", refusal: outcome.refusal }
-        : { kind: "retry", reason: outcome.reason };
-}
 export function expected(contract, admission) {
     return admission.kind === "refused"
         ? {
@@ -21,12 +14,8 @@ export function acceptedOutcome(operation, contract, accumulator, value) {
         throw new Error("missing leading admission receipt");
     return { kind: "accepted", contract, head, value };
 }
-export function conclusions(value) {
-    return value;
-}
-export function retainAdmission(accumulator, contract, leading, verificationResidueRecorded) {
+export function retainAdmission(accumulator, contract, leading) {
     accumulator.recordPublication(contract, leading.head, leading.facts);
     accumulator.recordResidue(contract, leading);
-    if (!verificationResidueRecorded)
-        accumulator.recordVerification(contract, undefined, leading);
+    accumulator.recordVerification(contract, undefined, leading);
 }

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

@@ -26,7 +26,8 @@ type MarkdownBindInput = Readonly<{
     repo: Repo;
     markdown: string;
     task?: TaskId;
-    target?: string;
+    /** A literal target branch; `null` is deliberately targetless; omitted is the Repo worktree's current branch. */
+    target?: string | null;
     workspace?: "worktree";
     actor?: string;
     after?: readonly ContractId[];
@@ -35,7 +36,8 @@ type MarkdownBindInput = Readonly<{
 type ForkBindInput = Readonly<{
     repo: Repo;
     forkOf: ContractId;
-    target?: string;
+    /** A literal target branch; `null` clears the source target; omitted inherits it. */
+    target?: string | null;
     workspace?: "worktree";
     actor?: string;
 }>;
@@ -72,6 +74,38 @@ export type KeiyakuSelectInput = Readonly<{
     repo: Repo;
     id: ContractId;
 }>;
+export type ContractResolveInput = Readonly<{
+    repo: Repo;
+    selector?: string;
+    cwd?: string;
+}>;
+export type ContractSelectorRefusal = Readonly<{
+    kind: "invalid-selector";
+    selector: string;
+    diagnostic: string;
+}> | Readonly<{
+    kind: "redundant-short-selector";
+    selector: string;
+}> | Readonly<{
+    kind: "unknown-short-selector";
+    selector: string;
+}> | Readonly<{
+    kind: "ambiguous-selector";
+    selector: string;
+}> | Readonly<{
+    kind: "ambiguous-selector";
+    cwd: string;
+}> | Readonly<{
+    kind: "no-contextual-match";
+    cwd: string;
+}>;
+export type ContractResolution = Readonly<{
+    kind: "resolved";
+    id: ContractId;
+}> | Readonly<{
+    kind: "refused";
+    refusal: ContractSelectorRefusal;
+}>;
 export type ReviewInput = ActorOptions & Readonly<{
     verdict: AttestationData["verdict"];
     summary?: string;

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

@@ -544,8 +544,6 @@ type HandleType<T extends object> = Readonly<{
     [Symbol.hasInstance](value: unknown): boolean;
 }>;
 export declare const Delivery: HandleType<DeliveryHandle>;
-export declare function deliveryHandle(delivery: DeliveryValue, readDiff: () => Promise<string | null>): Delivery & DeliveryValue;
-export declare function deliveryHandle(delivery: Pick<DeliveryValue, "tenderSnapshot" | "integration" | "method" | "policy"> & Partial<DeliveryValue>, readDiff: () => Promise<string | null>): Delivery;
 export declare function deliveryForContract(scope: RepositoryScope, delivery: DeliveryValue): Delivery & DeliveryValue;
 export declare function deliveryForContract(scope: RepositoryScope, delivery: Pick<DeliveryValue, "tenderSnapshot" | "integration" | "method" | "policy">): Delivery;
 export {};

package/build/src/library/delivery.js

@@ -30,13 +30,10 @@ export const Delivery = Object.freeze({
     prototype: DeliveryHandle.prototype,
     [Symbol.hasInstance]: (value) => value instanceof DeliveryHandle,
 });
-export function deliveryHandle(delivery, readDiff) {
-    return new DeliveryHandle(delivery, readDiff, delivery);
-}
 export function deliveryForContract(scope, delivery) {
-    return deliveryHandle(delivery, () => deliveryDiffOperation({
+    return new DeliveryHandle(delivery, () => deliveryDiffOperation({
         scope,
         integrationPredecessor: delivery.integration.predecessor,
         integrationSnapshot: delivery.integration.snapshot,
-    }));
+    }), delivery);
 }

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

@@ -32,11 +32,6 @@ export declare class Keiyaku {
     abandon(input?: AbandonInput): Promise<AbandonOutcome>;
     arc(input: ArcInput): Promise<ArcOutcome>;
     audit(input?: AuditInput, options?: MutationObservation): Promise<AuditOutcome>;
-    /**
-     * Reads answer with a value or `null` for legitimate absence. Corrupt authority stays exceptional
-     * and keeps its original native cause instead of being disguised as a raw native exception.
-     */
-    private read;
 }
 /** Internal constructor capability; callers select a Contract through Keiyaku.with. */
 export declare function createKeiyakuHandle(id: ContractId, scope: RepositoryScope, execution: ExecutionContext, composition: LocalContractCompositionCapture): Keiyaku;

package/build/src/library/keiyaku.js

@@ -7,7 +7,8 @@ import { observeContractsForAdmissionInObservationAt } from "../git/observe.js";
 import { withGitDecodeChannel, withGitReadObservation } from "../git/read-observation.js";
 import { contractObservationOperation, deliveryOperation, stateOperation, } from "../protocol/operations.js";
 import { readManagedWorktreeAppointment } from "../workspace-place.js";
-import { composeContractLibrary, readContractValue } from "./contract-composition.js";
+import { composeContractLibrary } from "./contract-composition.js";
+import { readContractValue } from "./outcome.js";
 import { ContractExecution } from "./contract-execution.js";
 import { deliveryForContract } from "./delivery.js";
 const KEIYAKU_HANDLE = Symbol("Keiyaku handle");
@@ -41,10 +42,10 @@ export class Keiyaku {
         return { contract: this.id };
     }
     async state() {
-        return await this.read(() => withGitDecodeChannel(this.scope, (channel) => stateOperation({ scope: this.scope, channel, contractId: this.id })));
+        return await readContractValue(() => withGitDecodeChannel(this.scope, (channel) => stateOperation({ scope: this.scope, channel, contractId: this.id })));
     }
     async history() {
-        return await this.read(() => withGitDecodeChannel(this.scope, (channel) => withGitReadObservation(this.scope, channel, async (observation) => {
+        return await readContractValue(() => withGitDecodeChannel(this.scope, (channel) => withGitReadObservation(this.scope, channel, async (observation) => {
             const [journals, dispatches] = await Promise.all([
                 observeContractsForAdmissionInObservationAt(observation, [this.id]),
                 readDispatchesAt(observation),
@@ -84,7 +85,7 @@ export class Keiyaku {
         })));
     }
     async guidance() {
-        return await this.read(() => withGitDecodeChannel(this.scope, async (channel) => {
+        return await readContractValue(() => withGitDecodeChannel(this.scope, async (channel) => {
             const observed = await contractObservationOperation({ scope: this.scope, channel, contractId: this.id });
             if (observed.kind === "missing")
                 return null;
@@ -93,7 +94,7 @@ export class Keiyaku {
         }));
     }
     async delivery() {
-        const delivery = await this.read(() => withGitDecodeChannel(this.scope, (channel) => deliveryOperation({ scope: this.scope, channel, contractId: this.id })));
+        const delivery = await readContractValue(() => withGitDecodeChannel(this.scope, (channel) => deliveryOperation({ scope: this.scope, channel, contractId: this.id })));
         return delivery === null ? null : deliveryForContract(this.scope, delivery);
     }
     async amend(input) {
@@ -114,13 +115,6 @@ export class Keiyaku {
     async audit(input, options) {
         return await this.operations.audit(input, options);
     }
-    /**
-     * Reads answer with a value or `null` for legitimate absence. Corrupt authority stays exceptional
-     * and keeps its original native cause instead of being disguised as a raw native exception.
-     */
-    async read(operation) {
-        return await readContractValue(operation);
-    }
 }
 /** Internal constructor capability; callers select a Contract through Keiyaku.with. */
 export function createKeiyakuHandle(id, scope, execution, composition) {