@astrosheep/keiyaku 4.5.8 → 4.5.9

package/build/src/library/contract-forwarding-result.js

@@ -470,7 +470,7 @@ export const auditReportSchema = z
         .optional(),
 })
     .strict()
-    .transform(({ delivery, ...report }) => delivery === undefined ? report : { ...report, delivery });
+    .transform(({ delivery, ...report }) => (delivery === undefined ? report : { ...report, delivery }));
 const mutationResultSchema = (value) => z
     .object({
     facts: z.array(journalFactSchema),

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

@@ -1,19 +1,18 @@
-import { type ContractId } from "../core/facts/types.js";
+import type { ActorId, ContractId } from "../core/facts/types.js";
 import { type IntegrationConflictMaterialized } from "../protocol/deliver.js";
 import type { RepositoryScope } from "../protocol/operations.js";
-import { type AuditInput } from "./audit.js";
+import { type AuditComposition } from "./audit.js";
 import type { AuditReport } from "../protocol/audit.js";
 import type { WorktreeHooks } from "./configuration.js";
 import type { DeliveryValue } from "./delivery.js";
-import { actorOption } from "./input.js";
 import { type MutationResult } from "./mutation.js";
-import { type Review } from "./contract-forwarding-result.js";
+import type { Review } from "./contract-forwarding-result.js";
 export type { Review } from "./contract-forwarding-result.js";
 import { Repo } from "./repo.js";
 export type DeliveryExecutionInput = Readonly<{
     scope: RepositoryScope;
     contractId: ContractId;
-    actor?: ReturnType<typeof actorOption>["actor"];
+    actor?: ActorId;
     message?: string;
     requireBranchesToBeUpToDate: boolean;
     includeDirty: boolean;
@@ -25,7 +24,7 @@ export type AttestationVerdict = "satisfied" | "unsatisfied";
 export type ReviewExecutionInput = Readonly<{
     scope: RepositoryScope;
     contractId: ContractId;
-    actor?: ReturnType<typeof actorOption>["actor"];
+    actor?: ActorId;
     verdict: AttestationVerdict;
     summary?: string;
     hooks: WorktreeHooks;
@@ -34,8 +33,8 @@ export declare function executeLocalDelivery(input: DeliveryExecutionInput): Pro
 export declare function executeLocalReview(input: ReviewExecutionInput): Promise<MutationResult<Review>>;
 export declare function executeForwardedDeliver(input: Readonly<{
     repo: Repo;
-    contractId: string;
-    requester: string;
+    contractId: ContractId;
+    requester: ActorId;
     message?: string;
     includeDirty: boolean;
     materializeConflict: boolean;
@@ -48,8 +47,8 @@ export declare function executeForwardedDeliver(input: Readonly<{
 }>>;
 export declare function executeForwardedReview(input: Readonly<{
     repo: Repo;
-    contractId: string;
-    requester: string;
+    contractId: ContractId;
+    requester: ActorId;
     verdict: AttestationVerdict;
     summary?: string;
     hooks: Parameters<typeof executeLocalReview>[0]["hooks"];
@@ -59,12 +58,12 @@ export declare function executeForwardedReview(input: Readonly<{
 }>>;
 export declare function executeForwardedAudit(input: Readonly<{
     repo: Repo;
-    contractId: string;
-    requester: string;
+    contractId: ContractId;
+    requester: ActorId;
     includeDirty: boolean;
     showDiff: boolean;
     requireBranchesToBeUpToDate: boolean;
-    hooks: AuditInput["hooks"];
+    hooks: NonNullable<AuditComposition["hooks"]>;
     signal?: AbortSignal;
 }>): Promise<Readonly<{
     result: MutationResult<AuditReport>;

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

@@ -1,14 +1,12 @@
 import { decodeContractDocument } from "../body/decode.js";
-import { contractId } from "../core/facts/types.js";
 import { withGitDecodeChannel } from "../git/read-observation.js";
 import { deliverOperation } from "../protocol/deliver.js";
 import { reviewOperation } from "../protocol/review.js";
 import { auditContract } from "./audit.js";
 import { continueAcceptedCompletion } from "./continuation.js";
-import { actorOption, documentDerivation, invalidInput, optionalNonblank } from "./input.js";
+import { documentDerivation } from "./input.js";
 import { completionInput, completeMutation } from "./mutation.js";
 import { requireAccepted } from "./refusal.js";
-import { auditReportSchema, auditResultSchema, deliveryResultSchema, reviewResultSchema, } from "./contract-forwarding-result.js";
 import { scopeForRepo } from "./repo.js";
 function derivedDocument(state) {
     return documentDerivation(decodeContractDocument(state.terms.document.bytes), state.terms.gates, state.id);
@@ -65,14 +63,11 @@ export async function executeLocalReview(input) {
     });
 }
 export async function executeForwardedDeliver(input) {
-    const id = contractId(input.contractId);
-    const actor = actorOption(input.requester).actor;
-    const message = optionalNonblank(input.message, "deliver message");
     const result = await executeLocalDelivery({
         scope: scopeForRepo(input.repo),
-        contractId: id,
-        ...(actor === undefined ? {} : { actor }),
-        ...(message === undefined ? {} : { message }),
+        contractId: input.contractId,
+        actor: input.requester,
+        ...(input.message === undefined ? {} : { message: input.message }),
         requireBranchesToBeUpToDate: input.requireBranchesToBeUpToDate,
         includeDirty: input.includeDirty,
         materializeConflict: input.materializeConflict,
@@ -80,46 +75,40 @@ export async function executeForwardedDeliver(input) {
         hooks: input.hooks,
     });
     if (!("facts" in result))
-        return { result: deliveryResultSchema.parse(result) };
+        return { result };
     const delivery = result.facts.find((fact) => fact.kind === "deliver");
     if (delivery === undefined)
         throw new Error("accepted delivery is missing its journal fact");
-    return { result: deliveryResultSchema.parse(result), deliveryFactId: delivery.entry };
+    return { result, deliveryFactId: delivery.entry };
 }
 export async function executeForwardedReview(input) {
-    const id = contractId(input.contractId);
-    const actor = actorOption(input.requester).actor;
-    if (input.verdict !== "satisfied" && input.verdict !== "unsatisfied") {
-        invalidInput("verdict must be satisfied or unsatisfied");
-    }
-    const summary = optionalNonblank(input.summary, "review summary");
     const result = await executeLocalReview({
         scope: scopeForRepo(input.repo),
-        contractId: id,
-        ...(actor === undefined ? {} : { actor }),
+        contractId: input.contractId,
+        actor: input.requester,
         verdict: input.verdict,
-        ...(summary === undefined ? {} : { summary }),
+        ...(input.summary === undefined ? {} : { summary: input.summary }),
         hooks: input.hooks,
     });
     const review = result.facts.find((fact) => fact.kind === "attestation");
     if (review === undefined)
         throw new Error("accepted review is missing its journal fact");
-    return { result: reviewResultSchema.parse(result), reviewFactId: review.entry };
+    return { result, reviewFactId: review.entry };
 }
 export async function executeForwardedAudit(input) {
-    const id = contractId(input.contractId);
-    const actor = actorOption(input.requester).actor;
     const result = await auditContract({
         scope: scopeForRepo(input.repo),
-        contractId: id,
+        contractId: input.contractId,
         input: {
-            ...(actor === undefined ? {} : { actor }),
             includeDirty: input.includeDirty,
             showDiff: input.showDiff,
-            requireBranchesToBeUpToDate: input.requireBranchesToBeUpToDate,
-            ...(input.hooks === undefined ? {} : { hooks: input.hooks }),
             ...(input.signal === undefined ? {} : { signal: input.signal }),
         },
+        composition: {
+            actor: input.requester,
+            hooks: input.hooks,
+            requireBranchesToBeUpToDate: input.requireBranchesToBeUpToDate,
+        },
     });
-    return { result: auditResultSchema.parse(result), auditReport: auditReportSchema.parse(result.value) };
+    return { result, auditReport: result.value };
 }

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

@@ -9,12 +9,14 @@ import { Delivery } from "./delivery.js";
 import { type MutationResult } from "./mutation.js";
 import type { AbandonInput, AmendInput, AmendResult, ArcInput, DeliverInput, ReconcileReport, ReviewInput, ContractHistory } from "./contract-types.js";
 import { type Review as OperationReview } from "./contract-operations.js";
+import type { LocalContractCompositionCapture } from "./contract.js";
 type Review = OperationReview;
 export declare class KeiyakuHandle {
     private readonly id;
     private readonly scope;
     private readonly execution;
-    constructor(id: ContractId, scope: RepositoryScope, execution?: ExecutionContext);
+    private readonly composition;
+    constructor(id: ContractId, scope: RepositoryScope, execution: ExecutionContext | undefined, composition: LocalContractCompositionCapture);
     state(): Promise<ContractState>;
     history(): Promise<ContractHistory>;
     guidance(): Promise<string>;

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

@@ -28,10 +28,12 @@ export class KeiyakuHandle {
     id;
     scope;
     execution;
-    constructor(id, scope, execution = localExecutionContext()) {
+    composition;
+    constructor(id, scope, execution = localExecutionContext(), composition) {
         this.id = id;
         this.scope = scope;
         this.execution = execution;
+        this.composition = composition;
         KEIYAKU_SEATS.set(this, { id, scope });
     }
     async state() {
@@ -147,26 +149,25 @@ export class KeiyakuHandle {
         };
     }
     async deliver(input) {
-        const values = input === undefined ? undefined : requireInput(input, "deliver input");
-        const hooks = worktreeHooksOption(values?.hooks);
+        const values = input === undefined
+            ? undefined
+            : requireInput(input, "deliver input", ["message", "includeDirty", "materializeConflict", "signal"]);
         const message = optionalNonblank(values?.message, "deliver message");
-        const requireBranchesToBeUpToDate = optionalBoolean(values?.requireBranchesToBeUpToDate, "requireBranchesToBeUpToDate") ?? false;
         const includeDirty = optionalBoolean(values?.includeDirty, "includeDirty") ?? false;
         const materializeConflict = optionalBoolean(values?.materializeConflict, "materializeConflict") ?? false;
-        const actor = actorOption(values?.actor);
         const signal = optionalSignal(values?.signal);
         const channel = executionChannel(this.execution);
         const result = channel.kind === "local"
             ? await executeLocalDelivery({
                 scope: this.scope,
                 contractId: this.id,
-                ...actor,
+                ...(this.composition.actor === undefined ? {} : { actor: this.composition.actor }),
                 ...(message === undefined ? {} : { message }),
-                requireBranchesToBeUpToDate,
+                requireBranchesToBeUpToDate: this.composition.requireBranchesToBeUpToDate,
                 includeDirty,
                 materializeConflict,
                 ...(signal === undefined ? {} : { signal }),
-                hooks,
+                hooks: this.composition.hooks,
             })
             : await requestForwardedContractLive({
                 directory: channel.directory,
@@ -184,14 +185,12 @@ export class KeiyakuHandle {
         return "facts" in result ? { ...result, value: this.deliveryHandle(result.value) } : result;
     }
     async review(input) {
-        const values = requireInput(input, "review input");
-        const hooks = worktreeHooksOption(values.hooks);
+        const values = requireInput(input, "review input", ["verdict", "summary"]);
         const verdict = values.verdict;
         if (verdict !== "satisfied" && verdict !== "unsatisfied") {
             return invalidInput("verdict must be satisfied or unsatisfied");
         }
         const summary = optionalNonblank(values.summary, "review summary");
-        const actor = actorOption(values.actor);
         const channel = executionChannel(this.execution);
         if (channel.kind === "body-request") {
             return await requestForwardedContractLive({
@@ -209,10 +208,10 @@ export class KeiyakuHandle {
         return await executeLocalReview({
             scope: this.scope,
             contractId: this.id,
-            ...actor,
+            ...(this.composition.actor === undefined ? {} : { actor: this.composition.actor }),
             verdict,
             ...(summary === undefined ? {} : { summary }),
-            hooks,
+            hooks: this.composition.hooks,
         });
     }
     async abandon(input) {
@@ -258,15 +257,17 @@ export class KeiyakuHandle {
         });
     }
     async audit(input) {
+        const values = input === undefined ? undefined : requireInput(input, "audit input", ["includeDirty", "showDiff", "signal"]);
+        const includeDirty = optionalBoolean(values?.includeDirty, "includeDirty") ?? false;
+        const showDiff = optionalBoolean(values?.showDiff, "showDiff") ?? false;
+        const signal = optionalSignal(values?.signal);
+        const auditInput = {
+            includeDirty,
+            showDiff,
+            ...(signal === undefined ? {} : { signal }),
+        };
         const channel = executionChannel(this.execution);
         if (channel.kind === "body-request") {
-            const values = input === undefined ? undefined : requireInput(input, "audit input");
-            worktreeHooksOption(values?.hooks);
-            actorOption(values?.actor);
-            const includeDirty = optionalBoolean(values?.includeDirty, "includeDirty") ?? false;
-            const showDiff = optionalBoolean(values?.showDiff, "showDiff") ?? false;
-            const requireBranchesToBeUpToDate = optionalBoolean(values?.requireBranchesToBeUpToDate, "requireBranchesToBeUpToDate") ?? false;
-            const signal = optionalSignal(values?.signal);
             return await requestForwardedContractLive({
                 directory: channel.directory,
                 action: "contract.audit",
@@ -276,7 +277,6 @@ export class KeiyakuHandle {
                     contractId: this.id,
                     includeDirty,
                     showDiff,
-                    requireBranchesToBeUpToDate,
                 },
                 ...(signal === undefined ? {} : { signal }),
             });
@@ -284,7 +284,8 @@ export class KeiyakuHandle {
         return auditContract({
             scope: this.scope,
             contractId: this.id,
-            ...(input === undefined ? {} : { input }),
+            input: auditInput,
+            composition: this.composition,
         });
     }
     async reconcile(input) {