@aeolus-fleet/core 0.24.0 → 0.25.0

package/dist/domain/messaging/overdue.js

@@ -0,0 +1,52 @@
+import { SYSTEM } from '../shared/events.js';
+const MINUTE_MS = 60_000;
+/** A delivery handed and not confirmed this long is overdue, whatever the turn. */
+export const NOT_CONFIRMED_MINUTES = 10;
+/** A delivery waiting this long while the session is idle is overdue. */
+export const IDLE_MINUTES = 10;
+/** A delivery waiting this long while the session is busy is overdue. */
+export const BUSY_MINUTES = 60;
+/**
+ * The crew's oldest waiting delivery whose clock ran out, if any. A handed
+ * delivery runs the 10 minute clock from its hand-over. A pending or received
+ * one runs 10 minutes while the session is idle and 60 while it is busy,
+ * counted from the latest of its state, the turn and the lease's push: a
+ * lease with no turn reported is idle since it was pushed.
+ */
+export function overdueDelivery(crew, now) {
+    const turn = crew.turn ?? { state: 'idle', at: crew.pushedAt };
+    const oldestFirst = crew.waiting.toSorted((first, second) => first.sentAt.getTime() - second.sentAt.getTime() || first.deliveryId.localeCompare(second.deliveryId));
+    for (const delivery of oldestFirst) {
+        const { clock, minutes, from } = clockOf(delivery, { turn, pushedAt: crew.pushedAt });
+        if (now.getTime() - from.getTime() >= minutes * MINUTE_MS) {
+            return { fleetId: crew.fleetId, shipId: crew.shipId, leaseId: crew.leaseId, delivery, clock, minutes };
+        }
+    }
+    return undefined;
+}
+function clockOf(delivery, crew) {
+    if (delivery.state === 'handed') {
+        return { clock: 'notConfirmed', minutes: NOT_CONFIRMED_MINUTES, from: delivery.since };
+    }
+    const from = new Date(Math.max(delivery.since.getTime(), crew.turn.at.getTime(), crew.pushedAt.getTime()));
+    switch (crew.turn.state) {
+        case 'idle':
+            return { clock: 'idle', minutes: IDLE_MINUTES, from };
+        case 'busy':
+            return { clock: 'busy', minutes: BUSY_MINUTES, from };
+    }
+}
+/** DeliveryOverdue: the fleet told argo, as the system, that the delivery's clock ran out. */
+export function overdueEvent(overdue, at) {
+    return {
+        fleetId: overdue.fleetId,
+        type: 'DeliveryOverdue',
+        occurredAt: at,
+        actor: SYSTEM,
+        shipId: overdue.shipId,
+        messageId: overdue.delivery.messageId,
+        deliveryId: overdue.delivery.deliveryId,
+        details: { leaseId: overdue.leaseId, clock: overdue.clock, minutes: overdue.minutes },
+    };
+}
+//# sourceMappingURL=overdue.js.map

package/dist/domain/messaging/overdue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"overdue.js","sourceRoot":"","sources":["../../../src/domain/messaging/overdue.ts"],"names":[],"mappings":"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"}

package/dist/domain/messaging/ports.d.ts

@@ -1,5 +1,6 @@
 import type { DeliveryId, FleetId, LeaseId, MessageId, ShipId } from '@aeolus-fleet/common';
 import type { Delivery, Message } from './message.js';
+import type { Overdue, PushedCrew } from './overdue.js';
 /** One sender's idempotency key, in its fleet. */
 export interface SenderKey {
     fleetId: FleetId;
@@ -116,3 +117,22 @@ export interface ReceiverWatch {
     /** Stops watching. */
     stop(): void;
 }
+/** Outbound port: the fleet's open pushed leases, for the 10 and 60 minute clocks. Read without a lock. */
+export interface PushedCrews {
+    /**
+     * Every open pushed lease of the fleet, with its turn and the deliveries
+     * waiting for it: pending for its ship or its type, or received or handed
+     * with the lease, each with when it entered its state.
+     */
+    waiting(fleetId: FleetId): Promise<PushedCrew[]>;
+}
+/** Outbound port: the deliveries argo was told are overdue, once per lease and delivery. */
+export interface OverdueDeliveryRepository {
+    /**
+     * Stores that argo is told the delivery is overdue on the lease, at `at`,
+     * only while the delivery is still in the state it was judged in and argo
+     * was not told of it on that lease before. Whether it stored it: two passes
+     * at once store it once.
+     */
+    tell(overdue: Overdue, at: Date): Promise<boolean>;
+}

package/dist/domain/messaging/public.d.ts

@@ -0,0 +1 @@
+export type { OverdueClock, WaitingState } from './overdue.js';

package/dist/domain/messaging/public.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=public.js.map

package/dist/domain/messaging/public.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"public.js","sourceRoot":"","sources":["../../../src/domain/messaging/public.ts"],"names":[],"mappings":""}

package/dist/domain/messaging/push-receive-deliveries.d.ts

@@ -0,0 +1,48 @@
+import type { IdGenerator } from '@aeolus-fleet/common';
+import { type HoldLeaseTx, type LeaseRepository } from '../registry/public.js';
+import type { Crew } from '../shared/caller.js';
+import type { Clock } from '../shared/clock.js';
+import { type EventLog } from '../shared/events.js';
+import { type Result } from '../shared/result.js';
+import type { UnitOfWork } from '../shared/unit-of-work.js';
+import type { DeliveryRepository, ReceiverWakeups } from './ports.js';
+import { type ReceivedDelivery, type ReceiveRefusal } from './receive-deliveries.js';
+export interface PushReceiveDeliveriesTx extends HoldLeaseTx {
+    leases: Pick<LeaseRepository, 'findOpenByIdForShare' | 'markPushed'>;
+    deliveries: DeliveryRepository;
+    events: EventLog;
+}
+/** One delivery a push receive took, as the computer side keeps it: where it stands, and its last hand-over number. */
+export interface PushReceivedDelivery extends ReceivedDelivery {
+    /** Received: not yet handed to the agent. Handed: handed already, its hand-over number reported. */
+    state: 'received' | 'handed';
+    /** The last hand-over number the crew reported; none while received, or when a plain receive handed it. */
+    handOverNumber: number | null;
+}
+export interface DeliveriesPushReceived {
+    /** None when the wait ended without a delivery. */
+    deliveries: PushReceivedDelivery[];
+}
+export type PushReceiveDeliveries = (crew: Crew, input: {
+    max?: number;
+}) => Promise<Result<DeliveriesPushReceived, ReceiveRefusal>>;
+/**
+ * Use case: the crew's computer side, the trierarch or the plugin watcher,
+ * receives for the agent (`pushReceive`, decision 0040), up to `max`, 1 to
+ * 10, one by default. Its scope (messages:receive) is checked before this
+ * runs. Each look is one unit of work (see `pushReceiptForCrew`). A pending
+ * delivery becomes received, in flight with the crew's ship and lease, and
+ * counts no attempt; the computer side reports handed once it hands it to
+ * the agent. Its own in flight comes again first, changing nothing, so a
+ * restart or a lost answer loses nothing. From its first push receive until
+ * it ends, the lease is pushed: the agent's plain receive answers nothing.
+ * When nothing is there it waits as a receive does, about 25 seconds.
+ */
+export declare function createPushReceiveDeliveries(deps: {
+    uow: UnitOfWork<PushReceiveDeliveriesTx>;
+    clock: Clock;
+    ids: IdGenerator;
+    wakeups: ReceiverWakeups;
+    /** How long a push receive waits on an empty inbox; about 25 seconds unless a test says otherwise. */
+    waitMs?: number;
+}): PushReceiveDeliveries;

package/dist/domain/messaging/push-receive-deliveries.js

@@ -0,0 +1,70 @@
+import { holdLease, markLeasePushed } from '../registry/public.js';
+import { recordEvent } from '../shared/events.js';
+import { ok } from '../shared/result.js';
+import { pushReceiveDelivery } from './delivery.js';
+import { RECEIVE_WAIT_MS, receivedDeliveryOf, waitForDeliveries, } from './receive-deliveries.js';
+import { receiveMax } from './receive-max.js';
+/**
+ * Takes up to `max` deliveries for the crew in one unit of work: marks its
+ * lease pushed (LeasePushed the first time), holds it, then takes its own in
+ * flight, received or handed,
+ * and then the oldest pending for its ship or its type, each received.
+ */
+async function pushReceiptForCrew(deps, receipt) {
+    const { tx, ids, at } = deps;
+    const { crew, max } = receipt;
+    await markLeasePushed({ tx, ids }, { fleetId: crew.fleetId, shipId: crew.shipId, leaseId: crew.leaseId, at });
+    const ship = await holdLease(tx, crew);
+    if (!ship.isOk) {
+        return ship;
+    }
+    const taken = await tx.deliveries.findClaimableForUpdate({
+        fleetId: crew.fleetId,
+        shipId: crew.shipId,
+        type: ship.value.type,
+        leaseId: crew.leaseId,
+        limit: max,
+        excluding: [],
+    });
+    const received = [];
+    for (const { delivery, message } of taken) {
+        const { delivery: changed, events } = pushReceiveDelivery(delivery, { crew, at });
+        await tx.deliveries.update(changed);
+        for (const event of events) {
+            await recordEvent({ events: tx.events, ids }, event);
+        }
+        const handedOut = await receivedDeliveryOf(tx, { delivery: changed, message });
+        if (!handedOut.isOk) {
+            return handedOut;
+        }
+        received.push({
+            ...handedOut.value,
+            state: changed.state === 'handed' ? 'handed' : 'received',
+            handOverNumber: changed.handOverNumber,
+        });
+    }
+    return ok({ ship: ship.value, deliveries: received });
+}
+/**
+ * Use case: the crew's computer side, the trierarch or the plugin watcher,
+ * receives for the agent (`pushReceive`, decision 0040), up to `max`, 1 to
+ * 10, one by default. Its scope (messages:receive) is checked before this
+ * runs. Each look is one unit of work (see `pushReceiptForCrew`). A pending
+ * delivery becomes received, in flight with the crew's ship and lease, and
+ * counts no attempt; the computer side reports handed once it hands it to
+ * the agent. Its own in flight comes again first, changing nothing, so a
+ * restart or a lost answer loses nothing. From its first push receive until
+ * it ends, the lease is pushed: the agent's plain receive answers nothing.
+ * When nothing is there it waits as a receive does, about 25 seconds.
+ */
+export function createPushReceiveDeliveries(deps) {
+    const waitMs = deps.waitMs ?? RECEIVE_WAIT_MS;
+    return async (crew, input) => {
+        const max = receiveMax(input.max);
+        if (!max.isOk) {
+            return max;
+        }
+        return waitForDeliveries({ clock: deps.clock, wakeups: deps.wakeups, waitMs }, { crew, look: () => deps.uow.run((tx) => pushReceiptForCrew({ tx, ids: deps.ids, at: deps.clock.now() }, { crew, max: max.value })) });
+    };
+}
+//# sourceMappingURL=push-receive-deliveries.js.map

package/dist/domain/messaging/push-receive-deliveries.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"push-receive-deliveries.js","sourceRoot":"","sources":["../../../src/domain/messaging/push-receive-deliveries.ts"],"names":[],"mappings":"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"}

package/dist/domain/messaging/receive-deliveries.d.ts

@@ -1,5 +1,5 @@
 import type { DeliveryId, IdGenerator, MessageId, ShipId } from '@aeolus-fleet/common';
-import { type HoldLeaseTx, type LeaseEnded } from '../registry/public.js';
+import { type FindShipTx, type HoldLeaseTx, type LeaseEnded, type LeaseRepository, type Ship } from '../registry/public.js';
 import type { Crew } from '../shared/caller.js';
 import type { Clock } from '../shared/clock.js';
 import type { DomainError } from '../shared/errors.js';
@@ -7,8 +7,10 @@ import { type EventLog } from '../shared/events.js';
 import { type Result } from '../shared/result.js';
 import type { Recipient } from '../shared/selector.js';
 import type { UnitOfWork } from '../shared/unit-of-work.js';
+import type { Delivery, Message } from './message.js';
 import type { DeliveryRepository, ReceiverWakeups } from './ports.js';
 export interface ReceiveDeliveriesTx extends HoldLeaseTx {
+    leases: Pick<LeaseRepository, 'findOpenByIdForShare' | 'isPushed'>;
     deliveries: DeliveryRepository;
     events: EventLog;
 }
@@ -28,7 +30,7 @@ export interface ReceivedDelivery {
     model: string | null;
     inReplyTo: MessageId | null;
     sentAt: Date;
-    /** How many times the delivery has been claimed, this time included. */
+    /** How many times the delivery has been handed over, this time included: its attempts. */
     attempts: number;
 }
 export interface DeliveriesReceived {
@@ -41,15 +43,25 @@ export type ReceiveDeliveries = (crew: Crew, input: {
 }) => Promise<Result<DeliveriesReceived, ReceiveRefusal>>;
 /** How long a receive waits for a delivery when none is there: about 25 seconds, then it returns empty. */
 export declare const RECEIVE_WAIT_MS = 25000;
+/**
+ * The delivery as its crew gets it: with its message, and its sender by id
+ * and by the name and type it has in Registry now.
+ */
+export declare function receivedDeliveryOf(tx: FindShipTx, held: {
+    delivery: Delivery;
+    message: Message;
+}): Promise<Result<ReceivedDelivery, DomainError<'SHIP_NOT_FOUND'>>>;
 /**
  * Use case: a crew receives its deliveries (`receive`), up to `max`, 1 to 10,
  * one by default. Its scope (messages:receive) is checked before this runs.
  * Each attempt is one unit of work (see `claimForCrew`): every delivery it
- * returns is in flight, claimed by the crew's ship and lease, until the ship
- * acknowledges it or the lease ends, and the crew's next receive returns it
- * again, counted as another claim, so a lost reply loses nothing. Its fifth
- * claim makes it undeliverable instead. Each delivery names its sender by id,
+ * returns is handed at once, in flight with the crew's ship and lease, until
+ * the ship acknowledges it or the lease ends, and the crew's next receive
+ * hands it again, counted as another attempt, so a lost reply loses nothing.
+ * Its fifth attempt makes it undeliverable instead. Each delivery names its sender by id,
  * and by the name and type the sender has now, so the crew can answer by name.
+ * On a pushed lease it hands nothing, its pending deliveries included: the
+ * computer side takes them with a push receive (decision 0040).
  *
  * When nothing is there it waits, about 25 seconds, for a wake-up for its ship
  * or its type (ADR 0003: LISTEN/NOTIFY after commit), then returns empty. It
@@ -66,3 +78,24 @@ export declare function createReceiveDeliveries(deps: {
     /** How long a receive waits on an empty inbox; about 25 seconds unless a test says otherwise. */
     waitMs?: number;
 }): ReceiveDeliveries;
+/**
+ * Looks for the crew's deliveries, one unit of work per `look`, and
+ * when there are none waits for a wake-up for its ship or its type, until
+ * `waitMs` has passed. It starts watching before it looks a second time, so a
+ * delivery that commits between its first look and its watch is found by that
+ * second look. A wake-up that brings nothing for it leaves it waiting for the
+ * rest of its time.
+ */
+export declare function waitForDeliveries<Found, Refusal>(deps: {
+    clock: Clock;
+    wakeups: ReceiverWakeups;
+    waitMs: number;
+}, wait: {
+    crew: Crew;
+    look: () => Promise<Result<{
+        ship: Ship;
+        deliveries: Found[];
+    }, Refusal>>;
+}): Promise<Result<{
+    deliveries: Found[];
+}, Refusal>>;

package/dist/domain/messaging/receive-deliveries.js

@@ -1,10 +1,36 @@
-import { findShip, holdLease } from '../registry/public.js';
+import { findShip, holdLease, isLeasePushed } from '../registry/public.js';
 import { recordEvent } from '../shared/events.js';
 import { ok } from '../shared/result.js';
-import { claimDelivery } from './delivery.js';
+import { handDelivery } from './delivery.js';
 import { receiveMax } from './receive-max.js';
 /** How long a receive waits for a delivery when none is there: about 25 seconds, then it returns empty. */
 export const RECEIVE_WAIT_MS = 25_000;
+/**
+ * The delivery as its crew gets it: with its message, and its sender by id
+ * and by the name and type it has in Registry now.
+ */
+export async function receivedDeliveryOf(tx, held) {
+    const { delivery, message } = held;
+    const sender = await findShip(tx, { fleetId: delivery.fleetId, shipId: message.senderShipId });
+    if (!sender.isOk) {
+        // A message's sender always exists: ships are never deleted, and the foreign key keeps the sender in its fleet.
+        return sender;
+    }
+    return ok({
+        deliveryId: delivery.id,
+        messageId: message.id,
+        senderShipId: message.senderShipId,
+        senderName: sender.value.name,
+        senderType: sender.value.type,
+        recipient: delivery.recipient,
+        payload: message.payload,
+        contentType: message.contentType,
+        model: message.model,
+        inReplyTo: message.inReplyToMessageId,
+        sentAt: message.createdAt,
+        attempts: delivery.attempts,
+    });
+}
 /**
  * Claims up to `max` deliveries for the crew in one unit of work: holds its
  * lease, then takes its own deliveries in flight, then the oldest pending ones
@@ -19,6 +45,10 @@ async function claimForCrew(deps, claim) {
     if (!ship.isOk) {
         return ship;
     }
+    if (await isLeasePushed(tx, crew)) {
+        // The computer side takes a pushed lease's deliveries; the agent's own receive never gets one (decision 0040).
+        return ok({ ship: ship.value, deliveries: [] });
+    }
     const handedOut = [];
     const claimed = [];
     let hasMore = true;
@@ -35,31 +65,17 @@ async function claimForCrew(deps, claim) {
         hasMore = claimable.length === limit;
         for (const { delivery, message } of claimable) {
             claimed.push(delivery.id);
-            const { outcome, delivery: changed, events } = claimDelivery(delivery, { crew, at });
+            const { outcome, delivery: changed, events } = handDelivery(delivery, { crew, at });
             await tx.deliveries.update(changed);
             for (const event of events) {
                 await recordEvent({ events: tx.events, ids }, event);
             }
-            if (outcome === 'claimed') {
-                const sender = await findShip(tx, { fleetId: crew.fleetId, shipId: message.senderShipId });
-                if (!sender.isOk) {
-                    // A message's sender always exists: ships are never deleted, and the foreign key keeps the sender in its fleet.
-                    return sender;
+            if (outcome === 'handed') {
+                const received = await receivedDeliveryOf(tx, { delivery: changed, message });
+                if (!received.isOk) {
+                    return received;
                 }
-                handedOut.push({
-                    deliveryId: changed.id,
-                    messageId: message.id,
-                    senderShipId: message.senderShipId,
-                    senderName: sender.value.name,
-                    senderType: sender.value.type,
-                    recipient: changed.recipient,
-                    payload: message.payload,
-                    contentType: message.contentType,
-                    model: message.model,
-                    inReplyTo: message.inReplyToMessageId,
-                    sentAt: message.createdAt,
-                    attempts: changed.attempts,
-                });
+                handedOut.push(received.value);
             }
         }
     }
@@ -69,11 +85,13 @@ async function claimForCrew(deps, claim) {
  * Use case: a crew receives its deliveries (`receive`), up to `max`, 1 to 10,
  * one by default. Its scope (messages:receive) is checked before this runs.
  * Each attempt is one unit of work (see `claimForCrew`): every delivery it
- * returns is in flight, claimed by the crew's ship and lease, until the ship
- * acknowledges it or the lease ends, and the crew's next receive returns it
- * again, counted as another claim, so a lost reply loses nothing. Its fifth
- * claim makes it undeliverable instead. Each delivery names its sender by id,
+ * returns is handed at once, in flight with the crew's ship and lease, until
+ * the ship acknowledges it or the lease ends, and the crew's next receive
+ * hands it again, counted as another attempt, so a lost reply loses nothing.
+ * Its fifth attempt makes it undeliverable instead. Each delivery names its sender by id,
  * and by the name and type the sender has now, so the crew can answer by name.
+ * On a pushed lease it hands nothing, its pending deliveries included: the
+ * computer side takes them with a push receive (decision 0040).
  *
  * When nothing is there it waits, about 25 seconds, for a wake-up for its ship
  * or its type (ADR 0003: LISTEN/NOTIFY after commit), then returns empty. It
@@ -89,31 +107,43 @@ export function createReceiveDeliveries(deps) {
         if (!max.isOk) {
             return max;
         }
-        const until = deps.clock.now().getTime() + waitMs;
-        let watch;
-        try {
-            for (;;) {
-                const attempt = await deps.uow.run((tx) => claimForCrew({ tx, ids: deps.ids, at: deps.clock.now() }, { crew, max: max.value }));
-                if (!attempt.isOk) {
-                    return attempt;
-                }
-                const { ship, deliveries } = attempt.value;
-                if (deliveries.length > 0) {
-                    return ok({ deliveries });
-                }
-                if (watch === undefined) {
-                    watch = deps.wakeups.watch({ fleetId: crew.fleetId, shipId: crew.shipId, type: ship.type });
-                    continue;
-                }
-                const remainingMs = until - deps.clock.now().getTime();
-                if (remainingMs <= 0 || (await watch.next(remainingMs)) === 'timedOut') {
-                    return ok({ deliveries: [] });
-                }
+        return waitForDeliveries({ clock: deps.clock, wakeups: deps.wakeups, waitMs }, { crew, look: () => deps.uow.run((tx) => claimForCrew({ tx, ids: deps.ids, at: deps.clock.now() }, { crew, max: max.value })) });
+    };
+}
+/**
+ * Looks for the crew's deliveries, one unit of work per `look`, and
+ * when there are none waits for a wake-up for its ship or its type, until
+ * `waitMs` has passed. It starts watching before it looks a second time, so a
+ * delivery that commits between its first look and its watch is found by that
+ * second look. A wake-up that brings nothing for it leaves it waiting for the
+ * rest of its time.
+ */
+export async function waitForDeliveries(deps, wait) {
+    const { crew, look } = wait;
+    const until = deps.clock.now().getTime() + deps.waitMs;
+    let watch;
+    try {
+        for (;;) {
+            const attempt = await look();
+            if (!attempt.isOk) {
+                return attempt;
+            }
+            const { ship, deliveries } = attempt.value;
+            if (deliveries.length > 0) {
+                return ok({ deliveries });
+            }
+            if (watch === undefined) {
+                watch = deps.wakeups.watch({ fleetId: crew.fleetId, shipId: crew.shipId, type: ship.type });
+                continue;
+            }
+            const remainingMs = until - deps.clock.now().getTime();
+            if (remainingMs <= 0 || (await watch.next(remainingMs)) === 'timedOut') {
+                return ok({ deliveries: [] });
             }
         }
-        finally {
-            watch?.stop();
-        }
-    };
+    }
+    finally {
+        watch?.stop();
+    }
 }
 //# sourceMappingURL=receive-deliveries.js.map

package/dist/domain/messaging/receive-deliveries.js.map

@@ -1 +1 @@
-{"version":3,"file":"receive-deliveries.js","sourceRoot":"","sources":["../../../src/domain/messaging/receive-deliveries.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"receive-deliveries.js","sourceRoot":"","sources":["../../../src/domain/messaging/receive-deliveries.ts"],"names":[],"mappings":"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"}

package/dist/domain/messaging/report-handled.d.ts

@@ -0,0 +1,22 @@
+import type { DeliveryId, IdGenerator } from '@aeolus-fleet/common';
+import type { Crew } from '../shared/caller.js';
+import type { Clock } from '../shared/clock.js';
+import type { Result } from '../shared/result.js';
+import type { UnitOfWork } from '../shared/unit-of-work.js';
+import { type ReportTurnEndRefusal, type ReportTurnEndTx } from './report-turn-end.js';
+export type ReportHandled = (crew: Crew, input: {
+    deliveryId: DeliveryId;
+}) => Promise<Result<undefined, ReportTurnEndRefusal>>;
+/**
+ * Use case: a pushed crew reports the turn that took an acknowledged
+ * delivery ended by itself (`handled`, decision 0040). Its scope
+ * (messages:receive) is checked before this runs. In one unit of work it
+ * holds the crew's lease, so a release waits for it, locks the delivery and
+ * moves it to handled with DeliveryHandled. Reporting it again is OK and
+ * changes nothing.
+ */
+export declare function createReportHandled(deps: {
+    uow: UnitOfWork<ReportTurnEndTx>;
+    clock: Clock;
+    ids: IdGenerator;
+}): ReportHandled;

package/dist/domain/messaging/report-handled.js

@@ -0,0 +1,13 @@
+import { reportTurnEnd } from './report-turn-end.js';
+/**
+ * Use case: a pushed crew reports the turn that took an acknowledged
+ * delivery ended by itself (`handled`, decision 0040). Its scope
+ * (messages:receive) is checked before this runs. In one unit of work it
+ * holds the crew's lease, so a release waits for it, locks the delivery and
+ * moves it to handled with DeliveryHandled. Reporting it again is OK and
+ * changes nothing.
+ */
+export function createReportHandled(deps) {
+    return (crew, input) => deps.uow.run((tx) => reportTurnEnd({ tx, clock: deps.clock, ids: deps.ids }, { crew, ...input, end: 'handled' }));
+}
+//# sourceMappingURL=report-handled.js.map

package/dist/domain/messaging/report-handled.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"report-handled.js","sourceRoot":"","sources":["../../../src/domain/messaging/report-handled.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAmD,MAAM,sBAAsB,CAAC;AAItG;;;;;;;GAOG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAA0E;IAC5G,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;AAC5I,CAAC"}

package/dist/domain/messaging/report-not-handled.d.ts

@@ -0,0 +1,22 @@
+import type { DeliveryId, IdGenerator } from '@aeolus-fleet/common';
+import type { Crew } from '../shared/caller.js';
+import type { Clock } from '../shared/clock.js';
+import type { Result } from '../shared/result.js';
+import type { UnitOfWork } from '../shared/unit-of-work.js';
+import { type ReportTurnEndRefusal, type ReportTurnEndTx } from './report-turn-end.js';
+export type ReportNotHandled = (crew: Crew, input: {
+    deliveryId: DeliveryId;
+}) => Promise<Result<undefined, ReportTurnEndRefusal>>;
+/**
+ * Use case: a pushed crew reports the turn a confirmed message was handed
+ * once more to died too (`notHandled`, decision 0040). Its scope
+ * (messages:receive) is checked before this runs. In one unit of work it
+ * holds the crew's lease, locks the delivery and moves it to not handled
+ * with DeliveryNotHandled, which puts it in Needs attention. Reporting it
+ * again is OK and changes nothing.
+ */
+export declare function createReportNotHandled(deps: {
+    uow: UnitOfWork<ReportTurnEndTx>;
+    clock: Clock;
+    ids: IdGenerator;
+}): ReportNotHandled;

package/dist/domain/messaging/report-not-handled.js

@@ -0,0 +1,13 @@
+import { reportTurnEnd } from './report-turn-end.js';
+/**
+ * Use case: a pushed crew reports the turn a confirmed message was handed
+ * once more to died too (`notHandled`, decision 0040). Its scope
+ * (messages:receive) is checked before this runs. In one unit of work it
+ * holds the crew's lease, locks the delivery and moves it to not handled
+ * with DeliveryNotHandled, which puts it in Needs attention. Reporting it
+ * again is OK and changes nothing.
+ */
+export function createReportNotHandled(deps) {
+    return (crew, input) => deps.uow.run((tx) => reportTurnEnd({ tx, clock: deps.clock, ids: deps.ids }, { crew, ...input, end: 'notHandled' }));
+}
+//# sourceMappingURL=report-not-handled.js.map

package/dist/domain/messaging/report-not-handled.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"report-not-handled.js","sourceRoot":"","sources":["../../../src/domain/messaging/report-not-handled.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAmD,MAAM,sBAAsB,CAAC;AAItG;;;;;;;GAOG;AACH,MAAM,UAAU,sBAAsB,CAAC,IAA0E;IAC/G,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,KAAK,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC;AAC/I,CAAC"}

package/dist/domain/messaging/report-turn-end.d.ts

@@ -0,0 +1,29 @@
+import type { DeliveryId, IdGenerator } from '@aeolus-fleet/common';
+import { type HoldLeaseTx, type LeaseEnded } from '../registry/public.js';
+import type { Crew } from '../shared/caller.js';
+import type { Clock } from '../shared/clock.js';
+import { type DomainError } from '../shared/errors.js';
+import { type EventLog } from '../shared/events.js';
+import { type Result } from '../shared/result.js';
+import { type TurnEnd, type TurnEndRefusal } from './delivery.js';
+import type { DeliveryRepository } from './ports.js';
+export interface ReportTurnEndTx extends HoldLeaseTx {
+    deliveries: Pick<DeliveryRepository, 'findForUpdate' | 'update'>;
+    events: EventLog;
+}
+export type ReportTurnEndRefusal = DomainError<'DELIVERY_NOT_FOUND'> | TurnEndRefusal | LeaseEnded;
+/**
+ * The unit of work of handled and not handled, which differ only in how the
+ * turn ended: hold the crew's lease, so a release waits for it and an ended
+ * lease is refused; lock the delivery, so two reports take turns; apply the
+ * report and write its event.
+ */
+export declare function reportTurnEnd(deps: {
+    tx: ReportTurnEndTx;
+    clock: Clock;
+    ids: IdGenerator;
+}, report: {
+    crew: Crew;
+    deliveryId: DeliveryId;
+    end: TurnEnd;
+}): Promise<Result<undefined, ReportTurnEndRefusal>>;