@aeolus-fleet/gateway 0.36.1 → 0.36.3

package/dist/core/party-grants/listing-connection.js

@@ -8,10 +8,10 @@
 export function createListingConnectionOf(deps) {
     return async (server) => {
         if (server.credential.kind !== 'personSignIn') {
-            return { url: server.url, credential: server.credential };
+            return { url: server.url, credential: server.credential, party: { fleetId: server.fleetId, name: server.name } };
         }
         const grant = await deps.grants.usable(server.fleetId, { party: server.name, now: deps.clock.now() });
-        return grant === undefined ? undefined : { url: server.url, credential: { kind: 'bearer', token: grant.accessToken } };
+        return grant === undefined ? undefined : { url: server.url, credential: { kind: 'bearer', token: grant.accessToken }, party: { fleetId: server.fleetId, name: server.name } };
     };
 }
 //# sourceMappingURL=listing-connection.js.map

package/dist/core/party-grants/listing-connection.js.map

@@ -1 +1 @@
-{"version":3,"file":"listing-connection.js","sourceRoot":"","sources":["../../../src/core/party-grants/listing-connection.ts"],"names":[],"mappings":"AAuBA;;;;;;GAMG;AACH,MAAM,UAAU,yBAAyB,CAAC,IAA2D;IACnG,OAAO,KAAK,EAAE,MAAM,EAAE,EAAE;QACtB,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;YAC9C,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC;QAC5D,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACtG,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;IACzH,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"listing-connection.js","sourceRoot":"","sources":["../../../src/core/party-grants/listing-connection.ts"],"names":[],"mappings":"AAuBA;;;;;;GAMG;AACH,MAAM,UAAU,yBAAyB,CAAC,IAA2D;IACnG,OAAO,KAAK,EAAE,MAAM,EAAE,EAAE;QACtB,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;YAC9C,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;QACnH,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACtG,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;IAChL,CAAC,CAAC;AACJ,CAAC"}

package/dist/core/party-grants/tell-sign-in-needed.d.ts

@@ -1,6 +1,7 @@
 import type { FleetId, ShipId } from '@aeolus-fleet/common';
 import type { ConnectionStore } from '../connection/ports.js';
 import type { CallSender } from '../mcp-in/ports.js';
+import type { PartyStore } from '../parties/ports.js';
 import type { GrantLost } from './party-grant.js';
 import type { SignInNotices } from './ports.js';
 /** Tells a person a call needs their sign-in to a party, or that their grant of it was lost, unless they were told since their last sign-in. */
@@ -26,6 +27,7 @@ export type PageUrlOf = (fleetId: FleetId, party: string) => string;
 export declare function createTellSignInNeeded(deps: {
     notices: SignInNotices;
     connections: Pick<ConnectionStore, 'find'>;
+    parties: Pick<PartyStore, 'find'>;
     sender: CallSender;
     newNoticeId: () => string;
     pageUrlOf: PageUrlOf;

package/dist/core/party-grants/tell-sign-in-needed.js

@@ -1,16 +1,26 @@
 import { STEP_CONTENT_TYPE } from '../people/item-job.js';
+/**
+ * The step's title: the server's own title first where the gateway keeps
+ * one, then the party's name (aeolus-fleet#1535); without one, the party's
+ * name alone.
+ */
+function titleOf({ party, displayName, lost }) {
+    const again = lost === null ? '' : ' again';
+    return displayName === null ? `Sign in to the outside party ${party}${again}` : `Sign in to ${displayName}${again} for the outside party ${party}`;
+}
 /** The step that asks the person to sign in (Bridge, CC14): the notice's uuid its own, why it is needed, and the page to sign in on as its link. */
-function stepOf({ noticeId, party, lost }, pageUrl) {
+function stepOf({ noticeId, party, displayName, lost }, pageUrl) {
+    const title = titleOf({ party, displayName, lost });
     return JSON.stringify(lost === null
         ? {
             id: noticeId,
-            title: `Sign in to ${party}`,
+            title,
             why: `A ship of yours called ${party}, which calls under each person's own sign-in, and you are not signed in to it. Until you sign in, your ships' calls to ${party} are refused.`,
             link: pageUrl,
         }
         : {
             id: noticeId,
-            title: `Sign in to ${party} again`,
+            title,
             why: `Your sign-in to ${party} ended: ${party} refused to refresh it (${lost.why}). Until you sign in again, your ships' calls to ${party} are refused.`,
             link: pageUrl,
         });
@@ -34,7 +44,9 @@ export function createTellSignInNeeded(deps) {
             return;
         }
         const { noticeId } = notice;
-        const sent = await deps.sender.send(gateway.crewToken, { to: personShipId, contentType: STEP_CONTENT_TYPE, payload: stepOf({ noticeId, party, lost }, deps.pageUrlOf(fleetId, party)), idempotencyKey: `party-sign-in:${noticeId}` });
+        const server = await deps.parties.find(fleetId, party);
+        const displayName = server?.kind === 'mcpServer' ? server.displayName : null;
+        const sent = await deps.sender.send(gateway.crewToken, { to: personShipId, contentType: STEP_CONTENT_TYPE, payload: stepOf({ noticeId, party, displayName, lost }, deps.pageUrlOf(fleetId, party)), idempotencyKey: `party-sign-in:${noticeId}` });
         if (sent.isOk || sent.error.code !== 'UNAVAILABLE') {
             await deps.notices.markTold(fleetId, { party, personShipId, stepMessageId: sent.isOk ? sent.value.messageId : null });
         }

package/dist/core/party-grants/tell-sign-in-needed.js.map

@@ -1 +1 @@
-{"version":3,"file":"tell-sign-in-needed.js","sourceRoot":"","sources":["../../../src/core/party-grants/tell-sign-in-needed.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAU1D,oJAAoJ;AACpJ,SAAS,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAA+D,EAAE,OAAe;IACrH,OAAO,IAAI,CAAC,SAAS,CACnB,IAAI,KAAK,IAAI;QACX,CAAC,CAAC;YACE,EAAE,EAAE,QAAQ;YACZ,KAAK,EAAE,cAAc,KAAK,EAAE;YAC5B,GAAG,EAAE,0BAA0B,KAAK,2HAA2H,KAAK,eAAe;YACnL,IAAI,EAAE,OAAO;SACd;QACH,CAAC,CAAC;YACE,EAAE,EAAE,QAAQ;YACZ,KAAK,EAAE,cAAc,KAAK,QAAQ;YAClC,GAAG,EAAE,mBAAmB,KAAK,WAAW,KAAK,2BAA2B,IAAI,CAAC,GAAG,oDAAoD,KAAK,eAAe;YACxJ,IAAI,EAAE,OAAO;SACd,CACN,CAAC;AACJ,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,sBAAsB,CAAC,IAAiJ;IACtL,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE;QACtD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QACvG,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACrD,IAAI,MAAM,CAAC,MAAM,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC3C,OAAO;QACT,CAAC;QACD,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;QAC5B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,WAAW,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,EAAE,cAAc,EAAE,iBAAiB,QAAQ,EAAE,EAAE,CAAC,CAAC;QACtO,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;YACnD,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QACxH,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"tell-sign-in-needed.js","sourceRoot":"","sources":["../../../src/core/party-grants/tell-sign-in-needed.ts"],"names":[],"mappings":"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"}

package/dist/core/people/act-in-place.d.ts

@@ -0,0 +1,42 @@
+/**
+ * What an item's row in Bridge does in place, beside Open (Bridge mockups,
+ * home; aeolus-fleet#1535): a question still new puts its asker's pick in
+ * the basket; a step leads to its link, shown with its host; the gateway's
+ * own step (CC14) is its own action, in the gateway's words, where the
+ * gateway finishes it.
+ */
+import type { ShipId } from '@aeolus-fleet/common';
+import type { ItemJob } from './item-job.js';
+import type { ItemState } from './item-state.js';
+import type { Stale } from './stale-item.js';
+export type ActInPlace = {
+    readonly kind: 'putPick';
+    readonly option: number;
+} | {
+    readonly kind: 'openLink';
+    readonly href: string;
+    readonly host: string;
+} | {
+    readonly kind: 'ownStep';
+    readonly href: string;
+    readonly label: string;
+};
+/** The gateway's own words for the action of a step of its own, by the step's link; none where it has none, and the step's title says it. */
+export type OwnStepActionOf = (href: string) => string | undefined;
+/** The party a step of the gateway's own asks the person to sign in to, by the step's link; none for any other step. */
+export type OwnStepPartyOf = (href: string) => string | undefined;
+/** What a row knows of its item to act on it in place. */
+export interface ActingItem {
+    readonly job: ItemJob;
+    readonly state: ItemState;
+    readonly stale: Stale | null;
+    readonly senderShipId: ShipId;
+    readonly title: string;
+    readonly pick: number | null;
+    readonly stepLink: string | null;
+}
+/** What the row does in place; nothing for a question opened, a question or step stale, a step without a link, or any other item. */
+export declare function actInPlaceOf(item: ActingItem, own: {
+    gatewayShipId: ShipId | undefined;
+    actionOf: OwnStepActionOf;
+}): ActInPlace | null;

package/dist/core/people/act-in-place.js

@@ -0,0 +1,26 @@
+/** The host a link leads to; none for one that does not read as a URL. */
+function hostOf(href) {
+    return URL.canParse(href) ? new URL(href).host : undefined;
+}
+/** What the row does in place; nothing for a question opened, a question or step stale, a step without a link, or any other item. */
+export function actInPlaceOf(item, own) {
+    switch (item.job) {
+        case 'decide':
+            return item.state === 'new' && item.stale === null && item.pick !== null ? { kind: 'putPick', option: item.pick } : null;
+        case 'do': {
+            if (item.stale !== null) {
+                return null;
+            }
+            const href = item.stepLink;
+            const host = href === null ? undefined : hostOf(href);
+            if (href === null || host === undefined) {
+                return null;
+            }
+            return item.senderShipId === own.gatewayShipId ? { kind: 'ownStep', href, label: own.actionOf(href) ?? item.title } : { kind: 'openLink', href, host };
+        }
+        case 'stay-aware':
+        case 'everything-else':
+            return null;
+    }
+}
+//# sourceMappingURL=act-in-place.js.map

package/dist/core/people/act-in-place.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"act-in-place.js","sourceRoot":"","sources":["../../../src/core/people/act-in-place.ts"],"names":[],"mappings":"AAmCA,0EAA0E;AAC1E,SAAS,MAAM,CAAC,IAAY;IAC1B,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7D,CAAC;AAED,qIAAqI;AACrI,MAAM,UAAU,YAAY,CAAC,IAAgB,EAAE,GAAqE;IAClH,QAAQ,IAAI,CAAC,GAAG,EAAE,CAAC;QACjB,KAAK,QAAQ;YACX,OAAO,IAAI,CAAC,KAAK,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAC3H,KAAK,IAAI,CAAC,CAAC,CAAC;YACV,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;gBACxB,OAAO,IAAI,CAAC;YACd,CAAC;YACD,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC;YAC3B,MAAM,IAAI,GAAG,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACtD,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;gBACxC,OAAO,IAAI,CAAC;YACd,CAAC;YACD,OAAO,IAAI,CAAC,YAAY,KAAK,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QACzJ,CAAC;QACD,KAAK,YAAY,CAAC;QAClB,KAAK,iBAAiB;YACpB,OAAO,IAAI,CAAC;IAChB,CAAC;AACH,CAAC"}

package/dist/core/people/answer-delivery.js

@@ -16,6 +16,18 @@ function optionOf({ contentType, payload }) {
         return null;
     }
 }
+/** The note an answer carries: an answer's own, or a reply as plain text, whole; none for an answer without one. */
+function noteOfAnswer({ contentType, payload }) {
+    if (!isAnswerContentType(contentType)) {
+        return payload.trim() === '' ? null : payload;
+    }
+    try {
+        return answerChoiceSchema.safeParse(JSON.parse(payload)).data?.note ?? null;
+    }
+    catch {
+        return null;
+    }
+}
 /**
  * Use case: a person answers a delivery they opened (Q20): a reply to its
  * sender, in reply to its message, then it is handled, answered where they
@@ -39,7 +51,7 @@ export function createAnswerDelivery(deps) {
         if (!sent.value.value.isOk) {
             return refuse('SEND_REFUSED', `The fleet did not take your answer: ${sent.value.value.error.message}`);
         }
-        return handledOf(deps, { caller, delivery, as: { place, kind: 'answered', option: optionOf({ contentType, payload }) } });
+        return handledOf(deps, { caller, delivery, as: { place, kind: 'answered', option: optionOf({ contentType, payload }), note: noteOfAnswer({ contentType, payload }) } });
     };
 }
 //# sourceMappingURL=answer-delivery.js.map

package/dist/core/people/answer-delivery.js.map

@@ -1 +1 @@
-{"version":3,"file":"answer-delivery.js","sourceRoot":"","sources":["../../../src/core/people/answer-delivery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAE/E,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAE/D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAA8C,MAAM,gBAAgB,CAAC;AACjG,OAAO,EAAE,YAAY,EAAE,cAAc,EAAqB,MAAM,kBAAkB,CAAC;AAInF,2FAA2F;AAC3F,SAAS,QAAQ,CAAC,EAAE,WAAW,EAAE,OAAO,EAA4C;IAClF,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,EAAE,CAAC;QACtC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,kBAAkB,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;QACtE,OAAO,MAAM,KAAK,SAAS,IAAI,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3E,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,oBAAoB,CAAC,IAAc;IACjD,OAAO,KAAK,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,EAAE;QACnE,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;QAC5D,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACjB,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC;QAC9B,MAAM,KAAK,GAAG,EAAE,EAAE,EAAE,QAAQ,CAAC,YAAY,EAAE,SAAS,EAAE,QAAQ,CAAC,SAAS,EAAE,WAAW,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,CAAC,eAAe,KAAK,IAAI,CAAC,CAAC,CAAC,UAAU,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,UAAU,EAAE,QAAQ,CAAC,eAAe,EAAE,CAAC,EAAE,CAAC;QAC9O,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;QACzH,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAC3B,OAAO,MAAM,CAAC,cAAc,EAAE,uCAAuC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QACzG,CAAC;QACD,OAAO,SAAS,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAC5H,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"answer-delivery.js","sourceRoot":"","sources":["../../../src/core/people/answer-delivery.ts"],"names":[],"mappings":"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"}

package/dist/core/people/basket.d.ts

@@ -9,9 +9,9 @@
  */
 import type { DeliveryId, FleetId, MessageId, ShipId } from '@aeolus-fleet/common';
 import type { ItemOutcome, Place } from './item-outcome.js';
-import type { Stale } from './stale-question.js';
-/** Where an entry is: waiting for Send, stored as sending, or refused by the fleet, not sent. */
-export type BasketEntryState = 'waiting' | 'sending' | 'refused';
+import type { Asking, Stale } from './stale-item.js';
+/** Where an entry is: waiting for Send, stored as sending, sent and stored by the fleet, or refused by the fleet, not sent. */
+export type BasketEntryState = 'waiting' | 'sending' | 'sent' | 'refused';
 export interface BasketEntry {
     readonly fleetId: FleetId;
     readonly shipId: ShipId;
@@ -25,14 +25,21 @@ export interface BasketEntry {
     readonly title: string;
     /** When the question was asked. */
     readonly sentAt: Date;
-    readonly option: number;
+    /** The option picked; none for a note alone (decision 0038). */
+    readonly option: number | null;
+    /** The option's label, as the question shows it, so the basket names the answer; none for a note alone. */
+    readonly optionLabel: string | null;
     /** The note that goes with the answer; none when the person wrote none. */
     readonly note: string | null;
     /** When it was put in the basket: entries are sent in this order, and changing one keeps its place. */
     readonly addedAt: Date;
     readonly state: BasketEntryState;
-    /** Why the fleet refused it, while refused. */
+    /** Why the fleet refused it, in words, while refused. */
     readonly refusal: string | null;
+    /** Whether the fleet did not answer its last send: it is sent again under the same key until stored. */
+    readonly isUnanswered: boolean;
+    /** When the fleet stored its answer, once sent: it stays in the basket, not counted, until the next Put or Send clears it. */
+    readonly storedAt: Date | null;
 }
 /** Outbound port: the basket of each person ship, by fleet, person ship and question. */
 export interface BasketEntries {
@@ -44,8 +51,6 @@ export interface BasketEntries {
     }): Promise<BasketEntry | undefined>;
     /** The person ship's, in the order added. */
     list(fleetId: FleetId, shipId: ShipId): Promise<BasketEntry[]>;
-    /** How many entries the person ship's basket holds. */
-    count(fleetId: FleetId, shipId: ShipId): Promise<number>;
     remove(fleetId: FleetId, removed: {
         shipId: ShipId;
         questionId: string;
@@ -65,21 +70,28 @@ export interface BasketEntries {
 /**
  * What an entry stands as now: as kept (waiting, sending, refused with
  * why); its question withdrawn or replaced by its asker (section 9, rule
- * 5); or dealt with elsewhere, as when Slack or a chat answered it first
+ * 5), with when and, for a replacement, its title; or dealt with elsewhere, as when Slack or a chat answered it first
  * (rule 6): either is not sent.
  */
 export type BasketStanding = {
     readonly kind: 'waiting';
 } | {
     readonly kind: 'sending';
+    readonly isUnanswered: boolean;
+} | {
+    readonly kind: 'sent';
+    readonly at: string;
 } | {
     readonly kind: 'refused';
     readonly reason: string;
 } | {
     readonly kind: 'withdrawn';
+    readonly at: string;
 } | {
     readonly kind: 'replaced';
     readonly replacementId: DeliveryId | null;
+    readonly at: string;
+    readonly replacementTitle: string | null;
 } | {
     readonly kind: 'dealtElsewhere';
     readonly place: Place;
@@ -94,10 +106,20 @@ export declare function standingOf(entry: BasketEntry, known: {
     outcome: ItemOutcome | undefined;
     stale: Stale | null;
 }): BasketStanding;
-/** The answer an entry sends (decision 0038): its question's uuid, its option, and its note if any. */
+/**
+ * How many answers the basket counts (the basket mockup, basket-3 to
+ * basket-7): what is or will be sent by the send, the entries waiting and
+ * sending, and the ones sent while any is still sending; never one the
+ * fleet refused, nor one withdrawn, replaced or answered elsewhere. Once
+ * none is sending, the sent ones are out of the count.
+ */
+export declare function basketCountOf(standings: readonly BasketStanding[]): number;
+/** The question an entry answers, as a withdrawal or a replacement names it. */
+export declare function askingOfEntry(entry: BasketEntry): Asking;
+/** The answer an entry sends (decision 0038): its question's uuid, its option if any, and its note if any. */
 export declare function answerOf(entry: Pick<BasketEntry, 'questionId' | 'option' | 'note'>): {
     questionId: string;
-    option: number;
+    option?: number;
     note?: string;
 };
 /** The key an entry's answer is sent under: the question's, so it is stored once however often it is sent (section 9). */

package/dist/core/people/basket.js

@@ -5,12 +5,15 @@
  */
 export function standingOf(entry, known) {
     const { outcome, stale } = known;
+    if (entry.state === 'sent') {
+        return { kind: 'sent', at: (entry.storedAt ?? entry.addedAt).toISOString() };
+    }
     if (outcome !== undefined) {
         switch (outcome.kind) {
             case 'withdrawn':
-                return { kind: 'withdrawn' };
+                return { kind: 'withdrawn', at: outcome.at.toISOString() };
             case 'replaced':
-                return { kind: 'replaced', replacementId: null };
+                return { kind: 'replaced', replacementId: null, at: outcome.at.toISOString(), replacementTitle: null };
             case 'seen':
             case 'answered':
             case 'done':
@@ -21,19 +24,34 @@ export function standingOf(entry, known) {
     }
     switch (entry.state) {
         case 'sending':
-            return { kind: 'sending' };
+            return { kind: 'sending', isUnanswered: entry.isUnanswered };
         case 'refused':
             return { kind: 'refused', reason: entry.refusal ?? 'The fleet refused it' };
         case 'waiting':
             if (stale === null) {
                 return { kind: 'waiting' };
             }
-            return stale.kind === 'withdrawn' ? { kind: 'withdrawn' } : { kind: 'replaced', replacementId: stale.replacementId };
+            return stale.kind === 'withdrawn' ? { kind: 'withdrawn', at: stale.at } : { kind: 'replaced', replacementId: stale.replacementId, at: stale.at, replacementTitle: stale.replacementTitle };
     }
 }
-/** The answer an entry sends (decision 0038): its question's uuid, its option, and its note if any. */
+/**
+ * How many answers the basket counts (the basket mockup, basket-3 to
+ * basket-7): what is or will be sent by the send, the entries waiting and
+ * sending, and the ones sent while any is still sending; never one the
+ * fleet refused, nor one withdrawn, replaced or answered elsewhere. Once
+ * none is sending, the sent ones are out of the count.
+ */
+export function basketCountOf(standings) {
+    const isSending = standings.some(({ kind }) => kind === 'sending');
+    return standings.filter(({ kind }) => kind === 'waiting' || kind === 'sending' || (kind === 'sent' && isSending)).length;
+}
+/** The question an entry answers, as a withdrawal or a replacement names it. */
+export function askingOfEntry(entry) {
+    return { deliveryId: entry.deliveryId, senderShipId: entry.senderShipId, sentAt: entry.sentAt, title: entry.title, askedQuestionId: entry.questionId, withdrawnQuestionId: null, stepId: null, withdrawnStepId: null };
+}
+/** The answer an entry sends (decision 0038): its question's uuid, its option if any, and its note if any. */
 export function answerOf(entry) {
-    return { questionId: entry.questionId, option: entry.option, ...(entry.note === null ? {} : { note: entry.note }) };
+    return { questionId: entry.questionId, ...(entry.option === null ? {} : { option: entry.option }), ...(entry.note === null ? {} : { note: entry.note }) };
 }
 /** The key an entry's answer is sent under: the question's, so it is stored once however often it is sent (section 9). */
 export function answerKeyOf(entry) {

package/dist/core/people/basket.js.map

@@ -1 +1 @@
-{"version":3,"file":"basket.js","sourceRoot":"","sources":["../../../src/core/people/basket.ts"],"names":[],"mappings":"AAoEA;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,KAAkB,EAAE,KAAgE;IAC7G,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;IACjC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;YACrB,KAAK,WAAW;gBACd,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;YAC/B,KAAK,UAAU;gBACb,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;YACnD,KAAK,MAAM,CAAC;YACZ,KAAK,UAAU,CAAC;YAChB,KAAK,MAAM,CAAC;YACZ,KAAK,QAAQ,CAAC;YACd,KAAK,SAAS;gBACZ,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC;QACpF,CAAC;IACH,CAAC;IACD,QAAQ,KAAK,CAAC,KAAK,EAAE,CAAC;QACpB,KAAK,SAAS;YACZ,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC7B,KAAK,SAAS;YACZ,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,OAAO,IAAI,sBAAsB,EAAE,CAAC;QAC9E,KAAK,SAAS;YACZ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACnB,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;YAC7B,CAAC;YACD,OAAO,KAAK,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,KAAK,CAAC,aAAa,EAAE,CAAC;IACzH,CAAC;AACH,CAAC;AAED,uGAAuG;AACvG,MAAM,UAAU,QAAQ,CAAC,KAA0D;IACjF,OAAO,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;AACtH,CAAC;AAED,0HAA0H;AAC1H,MAAM,UAAU,WAAW,CAAC,KAAsC;IAChE,OAAO,UAAU,KAAK,CAAC,UAAU,EAAE,CAAC;AACtC,CAAC"}
+{"version":3,"file":"basket.js","sourceRoot":"","sources":["../../../src/core/people/basket.ts"],"names":[],"mappings":"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"}

package/dist/core/people/count-basket.d.ts

@@ -1,5 +1,5 @@
 import { type Result } from '../shared/result.js';
-import type { BasketEntries } from './basket.js';
+import { type BasketEntries } from './basket.js';
 import type { CrewPersonShip } from './crew-person-ship.js';
 import { type PersonCaller, type PersonCrewError } from './person-crew.js';
 export type CountBasket = (caller: PersonCaller) => Promise<Result<{
@@ -7,8 +7,9 @@ export type CountBasket = (caller: PersonCaller) => Promise<Result<{
 }, PersonCrewError>>;
 /**
  * Use case: how many answers the person's basket holds, for Bridge's
- * navigation on every page (section 9, rule 2): counted in the gateway's
- * database, nothing read from the fleet.
+ * navigation on every page (section 9, rule 2): counted as the basket
+ * counts, from the gateway's database, nothing read from the fleet, so an
+ * entry withdrawn or replaced counts until Send or Remove takes it out.
  */
 export declare function createCountBasket(deps: {
     crewPersonShip: CrewPersonShip;

package/dist/core/people/count-basket.js

@@ -1,14 +1,20 @@
 import { ok } from '../shared/result.js';
+import { basketCountOf, standingOf } from './basket.js';
 import { personCrewOf } from './person-crew.js';
 /**
  * Use case: how many answers the person's basket holds, for Bridge's
- * navigation on every page (section 9, rule 2): counted in the gateway's
- * database, nothing read from the fleet.
+ * navigation on every page (section 9, rule 2): counted as the basket
+ * counts, from the gateway's database, nothing read from the fleet, so an
+ * entry withdrawn or replaced counts until Send or Remove takes it out.
  */
 export function createCountBasket(deps) {
     return async (caller) => {
         const crew = await personCrewOf(deps.crewPersonShip, caller);
-        return crew.isOk ? ok({ count: await deps.entries.count(caller.fleetId, crew.value.shipId) }) : crew;
+        if (!crew.isOk) {
+            return crew;
+        }
+        const entries = await deps.entries.list(caller.fleetId, crew.value.shipId);
+        return ok({ count: basketCountOf(entries.map((entry) => standingOf(entry, { outcome: undefined, stale: null }))) });
     };
 }
 //# sourceMappingURL=count-basket.js.map

package/dist/core/people/count-basket.js.map

@@ -1 +1 @@
-{"version":3,"file":"count-basket.js","sourceRoot":"","sources":["../../../src/core/people/count-basket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EAAE,YAAY,EAA2C,MAAM,kBAAkB,CAAC;AAIzF;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAgE;IAChG,OAAO,KAAK,EAAE,MAAM,EAAE,EAAE;QACtB,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QAC7D,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACvG,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"count-basket.js","sourceRoot":"","sources":["../../../src/core/people/count-basket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,UAAU,EAAsB,MAAM,aAAa,CAAC;AAE5E,OAAO,EAAE,YAAY,EAA2C,MAAM,kBAAkB,CAAC;AAIzF;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAgE;IAChG,OAAO,KAAK,EAAE,MAAM,EAAE,EAAE;QACtB,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QAC7D,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3E,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACtH,CAAC,CAAC;AACJ,CAAC"}

package/dist/core/people/done-delivery.js

@@ -33,7 +33,7 @@ export function createDoneDelivery(deps) {
         if (!sent.value.value.isOk) {
             return refuse('SEND_REFUSED', `The fleet did not take your outcome: ${sent.value.value.error.message}`);
         }
-        return handledOf(deps, { caller, delivery, as: { place, kind: outcome, option: null } });
+        return handledOf(deps, { caller, delivery, as: { place, kind: outcome, option: null, note: noteOf(note) } });
     };
 }
 //# sourceMappingURL=done-delivery.js.map

package/dist/core/people/done-delivery.js.map

@@ -1 +1 @@
-{"version":3,"file":"done-delivery.js","sourceRoot":"","sources":["../../../src/core/people/done-delivery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAG/D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAA8C,MAAM,gBAAgB,CAAC;AACjG,OAAO,EAAE,YAAY,EAAE,cAAc,EAAqB,MAAM,kBAAkB,CAAC;AACnF,OAAO,EAAE,MAAM,EAAE,yBAAyB,EAAE,oBAAoB,EAAwB,MAAM,mBAAmB,CAAC;AAYlH;;;;;;;;GAQG;AACH,MAAM,UAAU,kBAAkB,CAAC,IAAc;IAC/C,OAAO,KAAK,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,GAAG,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE;QACrE,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;QAC5D,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACjB,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC;QAC9B,MAAM,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;QAC5B,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YACpB,IAAI,OAAO,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;gBAClD,OAAO,MAAM,CAAC,YAAY,EAAE,GAAG,QAAQ,CAAC,KAAK,2FAA2F,CAAC,CAAC;YAC5I,CAAC;YACD,OAAO,SAAS,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QAC1F,CAAC;QACD,MAAM,KAAK,GAAG,EAAE,EAAE,EAAE,QAAQ,CAAC,YAAY,EAAE,SAAS,EAAE,QAAQ,CAAC,SAAS,EAAE,WAAW,EAAE,yBAAyB,EAAE,OAAO,EAAE,oBAAoB,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,cAAc,EAAE,gBAAgB,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC;QACxP,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;QACzH,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAC3B,OAAO,MAAM,CAAC,cAAc,EAAE,wCAAwC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAC1G,CAAC;QACD,OAAO,SAAS,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IAC3F,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"done-delivery.js","sourceRoot":"","sources":["../../../src/core/people/done-delivery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAG/D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAA8C,MAAM,gBAAgB,CAAC;AACjG,OAAO,EAAE,YAAY,EAAE,cAAc,EAAqB,MAAM,kBAAkB,CAAC;AACnF,OAAO,EAAE,MAAM,EAAE,yBAAyB,EAAE,oBAAoB,EAAwB,MAAM,mBAAmB,CAAC;AAYlH;;;;;;;;GAQG;AACH,MAAM,UAAU,kBAAkB,CAAC,IAAc;IAC/C,OAAO,KAAK,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,GAAG,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE;QACrE,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;QAC5D,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACjB,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC;QAC9B,MAAM,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;QAC5B,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YACpB,IAAI,OAAO,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;gBAClD,OAAO,MAAM,CAAC,YAAY,EAAE,GAAG,QAAQ,CAAC,KAAK,2FAA2F,CAAC,CAAC;YAC5I,CAAC;YACD,OAAO,SAAS,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QAC1F,CAAC;QACD,MAAM,KAAK,GAAG,EAAE,EAAE,EAAE,QAAQ,CAAC,YAAY,EAAE,SAAS,EAAE,QAAQ,CAAC,SAAS,EAAE,WAAW,EAAE,yBAAyB,EAAE,OAAO,EAAE,oBAAoB,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,cAAc,EAAE,gBAAgB,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC;QACxP,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;QACzH,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAC3B,OAAO,MAAM,CAAC,cAAc,EAAE,wCAAwC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAC1G,CAAC;QACD,OAAO,SAAS,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;IAC/G,CAAC,CAAC;AACJ,CAAC"}

package/dist/core/people/finish-own-step.js

@@ -1,4 +1,4 @@
-import { INBOX_LIST_MAX } from './read-inbox.js';
+import { RECEIVE_MAX_UPPER_BOUND } from '@aeolus-fleet/common';
 function finishingOf(state) {
     switch (state) {
         case 'pending':
@@ -36,7 +36,7 @@ export function createFinishOwnStep(deps) {
             case 'handledOnly':
                 return true;
             case 'takeFirst': {
-                const taken = await deps.door.pushReceive(crewToken, { max: INBOX_LIST_MAX });
+                const taken = await deps.door.pushReceive(crewToken, { max: RECEIVE_MAX_UPPER_BOUND });
                 return taken.isOk && taken.value.some(({ deliveryId }) => deliveryId === delivery.deliveryId) && (await deps.door.ack(crewToken, delivery.deliveryId)).isOk;
             }
             case 'acknowledgeFirst':

package/dist/core/people/finish-own-step.js.map

@@ -1 +1 @@
-{"version":3,"file":"finish-own-step.js","sourceRoot":"","sources":["../../../src/core/people/finish-own-step.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"finish-own-step.js","sourceRoot":"","sources":["../../../src/core/people/finish-own-step.ts"],"names":[],"mappings":"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"}

package/dist/core/people/inbox-entry.d.ts

@@ -1,4 +1,5 @@
-import { type DeliveryId } from '@aeolus-fleet/common';
+import { type DeliveryId, type Question } from '@aeolus-fleet/common';
+import { type ItemJob } from './item-job.js';
 import type { OpenedDelivery, PersonDelivery } from './ports.js';
 /** The longest title an inbox shows, as a message's headline is at most 80 characters. */
 export declare const TITLE_MAX_LENGTH = 80;
@@ -13,3 +14,18 @@ export interface InboxEntry {
 export declare function titleOf(delivery: PersonDelivery): string;
 export declare function inboxEntryOf(delivery: PersonDelivery): InboxEntry;
 export declare function openedEntryOf(opened: OpenedDelivery): InboxEntry;
+/** The option the asker of a question would pick, and why. */
+export interface AskerPick {
+    readonly option: number;
+    readonly why: string;
+}
+/** An inbox entry as a chat lists it: with its job (Bridge, section 6), and for a question the asker's pick, so the chat can say what waits without opening (and so acknowledging) it. */
+export interface ChatInboxEntry extends InboxEntry {
+    readonly job: ItemJob;
+    readonly pick: AskerPick | null;
+}
+/** The question a delivery asks: a question's own, or the new question a replacement asks; none for any other delivery or a payload that is no question. */
+export declare function askedQuestionOf(delivery: Pick<PersonDelivery, 'contentType' | 'payload'>): Question | null;
+export declare function chatInboxEntryOf(delivery: PersonDelivery): ChatInboxEntry;
+/** An opened delivery is kept without its payload, so it carries no pick; one opened before the gateway kept its content type is everything else. */
+export declare function chatOpenedEntryOf(opened: OpenedDelivery): ChatInboxEntry;

package/dist/core/people/inbox-entry.js

@@ -1,4 +1,5 @@
-import { MEETING_ADDED_CONTENT_TYPE, MEETING_ENDED_CONTENT_TYPE, MEETING_MIC_CONTENT_TYPE } from '@aeolus-fleet/common';
+import { MEETING_ADDED_CONTENT_TYPE, MEETING_ENDED_CONTENT_TYPE, MEETING_MIC_CONTENT_TYPE, QUESTION_CONTENT_TYPE, REPLACEMENT_CONTENT_TYPE, questionSchema, replacementSchema } from '@aeolus-fleet/common';
+import { essenceOf, jobOf } from './item-job.js';
 /** The longest title an inbox shows, as a message's headline is at most 80 characters. */
 export const TITLE_MAX_LENGTH = 80;
 /** The title of each meeting notice (decision 0061, M11), whose payload only names the meeting. */
@@ -18,4 +19,30 @@ export function inboxEntryOf(delivery) {
 export function openedEntryOf(opened) {
     return { deliveryId: opened.deliveryId, from: opened.from, title: opened.title, sentAt: opened.sentAt.toISOString() };
 }
+/** The question a delivery asks: a question's own, or the new question a replacement asks; none for any other delivery or a payload that is no question. */
+export function askedQuestionOf(delivery) {
+    const essence = essenceOf(delivery.contentType);
+    if (essence !== QUESTION_CONTENT_TYPE && essence !== REPLACEMENT_CONTENT_TYPE) {
+        return null;
+    }
+    let parsed;
+    try {
+        parsed = JSON.parse(delivery.payload);
+    }
+    catch {
+        return null;
+    }
+    return (essence === QUESTION_CONTENT_TYPE ? questionSchema.safeParse(parsed).data : replacementSchema.safeParse(parsed).data?.question) ?? null;
+}
+/** The asker's pick of a question, or of the new question a replacement asks; none for any other delivery or a payload that is no question. */
+function pickOf(delivery) {
+    return askedQuestionOf(delivery)?.pick ?? null;
+}
+export function chatInboxEntryOf(delivery) {
+    return { ...inboxEntryOf(delivery), job: jobOf(delivery.contentType), pick: pickOf(delivery) };
+}
+/** An opened delivery is kept without its payload, so it carries no pick; one opened before the gateway kept its content type is everything else. */
+export function chatOpenedEntryOf(opened) {
+    return { ...openedEntryOf(opened), job: jobOf(opened.contentType ?? ''), pick: null };
+}
 //# sourceMappingURL=inbox-entry.js.map

package/dist/core/people/inbox-entry.js.map

@@ -1 +1 @@
-{"version":3,"file":"inbox-entry.js","sourceRoot":"","sources":["../../../src/core/people/inbox-entry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,0BAA0B,EAAE,wBAAwB,EAAmB,MAAM,sBAAsB,CAAC;AAIzI,0FAA0F;AAC1F,MAAM,CAAC,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAUnC,mGAAmG;AACnG,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAC;IACpC,CAAC,0BAA0B,EAAE,6BAA6B,CAAC;IAC3D,CAAC,wBAAwB,EAAE,+BAA+B,CAAC;IAC3D,CAAC,0BAA0B,EAAE,kCAAkC,CAAC;CACjE,CAAC,CAAC;AAEH,qHAAqH;AACrH,MAAM,UAAU,OAAO,CAAC,QAAwB;IAC9C,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,IAAI,qBAAqB,CAAC,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAC/H,OAAO,KAAK,CAAC,MAAM,GAAG,gBAAgB,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,gBAAgB,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC;AAC9F,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,QAAwB;IACnD,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC,UAAU,EAAE,IAAI,EAAE,QAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;AACzI,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,MAAsB;IAClD,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;AACxH,CAAC"}
+{"version":3,"file":"inbox-entry.js","sourceRoot":"","sources":["../../../src/core/people/inbox-entry.ts"],"names":[],"mappings":"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"}

package/dist/core/people/item-job.d.ts

@@ -1,5 +1,7 @@
-/** The step and notice content types (CC14, CC15), as common names them from its release after 0.35.0; they move to common's constants then. */
+/** The step, its withdrawal and replacement, and notice content types (CC14, CC15), as common names them from its release after 0.35.0; they move to common's constants then. */
 export declare const STEP_CONTENT_TYPE = "application/vnd.aeolus.step+json";
+export declare const STEP_WITHDRAWAL_CONTENT_TYPE = "application/vnd.aeolus.step-withdrawal+json";
+export declare const STEP_REPLACEMENT_CONTENT_TYPE = "application/vnd.aeolus.step-replacement+json";
 export declare const NOTICE_CONTENT_TYPE = "application/vnd.aeolus.notice+json";
 export type ItemJob = 'decide' | 'do' | 'stay-aware' | 'everything-else';
 /** A content type's essence: media types compare without case and without their parameters (RFC 9110). */

package/dist/core/people/item-job.js

@@ -5,14 +5,18 @@
  * count; everything else is in the record only.
  */
 import { ALERT_CONTENT_TYPE, QUESTION_CONTENT_TYPE, REPLACEMENT_CONTENT_TYPE } from '@aeolus-fleet/common';
-/** The step and notice content types (CC14, CC15), as common names them from its release after 0.35.0; they move to common's constants then. */
+/** The step, its withdrawal and replacement, and notice content types (CC14, CC15), as common names them from its release after 0.35.0; they move to common's constants then. */
 export const STEP_CONTENT_TYPE = 'application/vnd.aeolus.step+json';
+export const STEP_WITHDRAWAL_CONTENT_TYPE = 'application/vnd.aeolus.step-withdrawal+json';
+export const STEP_REPLACEMENT_CONTENT_TYPE = 'application/vnd.aeolus.step-replacement+json';
 export const NOTICE_CONTENT_TYPE = 'application/vnd.aeolus.notice+json';
 const JOBS = new Map([
     [QUESTION_CONTENT_TYPE, 'decide'],
     // A replacement asks its new question: it is a new item to decide (Bridge, section 9).
     [REPLACEMENT_CONTENT_TYPE, 'decide'],
     [STEP_CONTENT_TYPE, 'do'],
+    // A step replacement asks its new step: a new item to do, as a question's (Bridge, CC14).
+    [STEP_REPLACEMENT_CONTENT_TYPE, 'do'],
     [ALERT_CONTENT_TYPE, 'stay-aware'],
     [NOTICE_CONTENT_TYPE, 'stay-aware'],
 ]);

package/dist/core/people/item-job.js.map

@@ -1 +1 @@
-{"version":3,"file":"item-job.js","sourceRoot":"","sources":["../../../src/core/people/item-job.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAE3G,gJAAgJ;AAChJ,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,mBAAmB,GAAG,oCAAoC,CAAC;AAIxE,MAAM,IAAI,GAAG,IAAI,GAAG,CAAkB;IACpC,CAAC,qBAAqB,EAAE,QAAQ,CAAC;IACjC,uFAAuF;IACvF,CAAC,wBAAwB,EAAE,QAAQ,CAAC;IACpC,CAAC,iBAAiB,EAAE,IAAI,CAAC;IACzB,CAAC,kBAAkB,EAAE,YAAY,CAAC;IAClC,CAAC,mBAAmB,EAAE,YAAY,CAAC;CACpC,CAAC,CAAC;AAEH,0GAA0G;AAC1G,MAAM,UAAU,SAAS,CAAC,WAAmB;IAC3C,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC9C,OAAO,OAAO,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,KAAK,CAAC,WAAmB;IACvC,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,iBAAiB,CAAC;AAC/D,CAAC;AAED,6EAA6E;AAC7E,MAAM,UAAU,SAAS,CAAC,GAAY;IACpC,QAAQ,GAAG,EAAE,CAAC;QACZ,KAAK,QAAQ,CAAC;QACd,KAAK,IAAI;YACP,OAAO,IAAI,CAAC;QACd,KAAK,YAAY,CAAC;QAClB,KAAK,iBAAiB;YACpB,OAAO,KAAK,CAAC;IACjB,CAAC;AACH,CAAC"}
+{"version":3,"file":"item-job.js","sourceRoot":"","sources":["../../../src/core/people/item-job.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAE3G,iLAAiL;AACjL,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,4BAA4B,GAAG,6CAA6C,CAAC;AAC1F,MAAM,CAAC,MAAM,6BAA6B,GAAG,8CAA8C,CAAC;AAC5F,MAAM,CAAC,MAAM,mBAAmB,GAAG,oCAAoC,CAAC;AAIxE,MAAM,IAAI,GAAG,IAAI,GAAG,CAAkB;IACpC,CAAC,qBAAqB,EAAE,QAAQ,CAAC;IACjC,uFAAuF;IACvF,CAAC,wBAAwB,EAAE,QAAQ,CAAC;IACpC,CAAC,iBAAiB,EAAE,IAAI,CAAC;IACzB,0FAA0F;IAC1F,CAAC,6BAA6B,EAAE,IAAI,CAAC;IACrC,CAAC,kBAAkB,EAAE,YAAY,CAAC;IAClC,CAAC,mBAAmB,EAAE,YAAY,CAAC;CACpC,CAAC,CAAC;AAEH,0GAA0G;AAC1G,MAAM,UAAU,SAAS,CAAC,WAAmB;IAC3C,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC9C,OAAO,OAAO,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,KAAK,CAAC,WAAmB;IACvC,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,iBAAiB,CAAC;AAC/D,CAAC;AAED,6EAA6E;AAC7E,MAAM,UAAU,SAAS,CAAC,GAAY;IACpC,QAAQ,GAAG,EAAE,CAAC;QACZ,KAAK,QAAQ,CAAC;QACd,KAAK,IAAI;YACP,OAAO,IAAI,CAAC;QACd,KAAK,YAAY,CAAC;QAClB,KAAK,iBAAiB;YACpB,OAAO,KAAK,CAAC;IACjB,CAAC;AACH,CAAC"}