@aeolus-fleet/gateway 0.31.0 → 0.32.0

package/dist/core/parties/set-scope-requirements.d.ts

@@ -0,0 +1,45 @@
+import type { StateA2aAgent } from '../a2a-out/state-a2a-agent.js';
+import type { Actor } from '../actors/authenticate-actor.js';
+import type { ActorCredential, CredentialOf } from '../actors/credential-of.js';
+import type { ConnectionStore, FleetDoor } from '../connection/ports.js';
+import type { StateParty } from '../mcp-out/state-party.js';
+import { type DomainError } from '../shared/errors.js';
+import { type Result } from '../shared/result.js';
+import type { PartyStore, ProxyShipsAsActor, ScopeRequirementsStore } from './ports.js';
+import type { ScopeRequirements } from './scope-requirements.js';
+export type SetScopeRequirementsRefusal = DomainError<'NOT_AN_APPROVER' | 'NO_SUCH_PARTY' | 'PARTY_NOT_COMMISSIONED' | 'NOT_REACHABLE' | 'NO_SUCH_TOOL' | 'NOT_CONNECTED' | 'FLEET_UNAVAILABLE' | 'SCOPE_NOT_LISTED' | 'CONFLICT'>;
+export type SetScopeRequirements = (input: {
+    actor: Actor;
+    as: ActorCredential;
+    name: string;
+    /** The requirements' version the change was made on, as the approver read them. */
+    version: number;
+    party?: readonly string[];
+    tools: ReadonlyMap<string, readonly string[]>;
+}) => Promise<Result<{
+    requirements: ScopeRequirements; /** Why the proxy ship's statement waits for its next one; none when the fleet sees the change now. */
+    statementRefusal: string | null;
+}, SetScopeRequirementsRefusal>>;
+/**
+ * Use case: an approver sets which scopes a calling ship needs (design
+ * gateway-scopes, 4.2, A2): for an outside MCP server the party's set and
+ * any tool's, for an outside A2A agent its set as a whole. The fleet, asked
+ * as the approver, must answer that it manages the proxy ship before
+ * anything changes, clearing included; it records a refusal. Every scope must
+ * be one the fleet lists now, core's, a plugin's or the fleet's own: any may
+ * be required (0016). The change is made only on the version the approver
+ * read, so two approvers never overwrite each other unseen. The change is
+ * kept first, so the check holds at once, then the proxy ship is stated
+ * anew with what each capability needs (P1); while it cannot be, the
+ * statement waits for its next one.
+ */
+export declare function createSetScopeRequirements(deps: {
+    parties: PartyStore;
+    requirements: ScopeRequirementsStore;
+    connections: Pick<ConnectionStore, 'find'>;
+    door: Pick<FleetDoor, 'listScopes'>;
+    stateParty: StateParty;
+    stateA2aAgent: StateA2aAgent;
+    fleet: Pick<ProxyShipsAsActor, 'checkManage'>;
+    credentialOf: CredentialOf;
+}): SetScopeRequirements;

package/dist/core/parties/set-scope-requirements.js

@@ -0,0 +1,48 @@
+import { refuse } from '../shared/errors.js';
+import { ok } from '../shared/result.js';
+import { approvedParty } from './check-approving.js';
+const unique = (scopes) => [...new Set(scopes)];
+/**
+ * Use case: an approver sets which scopes a calling ship needs (design
+ * gateway-scopes, 4.2, A2): for an outside MCP server the party's set and
+ * any tool's, for an outside A2A agent its set as a whole. The fleet, asked
+ * as the approver, must answer that it manages the proxy ship before
+ * anything changes, clearing included; it records a refusal. Every scope must
+ * be one the fleet lists now, core's, a plugin's or the fleet's own: any may
+ * be required (0016). The change is made only on the version the approver
+ * read, so two approvers never overwrite each other unseen. The change is
+ * kept first, so the check holds at once, then the proxy ship is stated
+ * anew with what each capability needs (P1); while it cannot be, the
+ * statement waits for its next one.
+ */
+export function createSetScopeRequirements(deps) {
+    return async ({ actor, as, name, version, party, tools }) => {
+        const approved = await approvedParty(deps, { actor, as, name });
+        if (!approved.isOk) {
+            return approved;
+        }
+        const { party: kept, gateway } = approved.value;
+        if (kept.kind === 'a2aAgent' && tools.size > 0) {
+            return refuse('NO_SUCH_TOOL', `${name} is an outside A2A agent: its messages name no tool, so set the scopes it needs as a whole`);
+        }
+        const change = { ...(party === undefined ? {} : { party: unique(party) }), tools: new Map([...tools].map(([tool, scopes]) => [tool, unique(scopes)])) };
+        const required = unique([...(change.party ?? []), ...[...change.tools.values()].flat()]);
+        if (required.length > 0) {
+            const listed = await deps.door.listScopes(gateway.crewToken);
+            if (!listed.isOk) {
+                return refuse('FLEET_UNAVAILABLE', `The fleet did not say which scopes it lists: ${listed.error.message}`);
+            }
+            const unlisted = required.filter((scope) => !listed.value.some((each) => each.scope === scope));
+            if (unlisted.length > 0) {
+                return refuse('SCOPE_NOT_LISTED', `The fleet lists no scope ${unlisted.join(' or ')}: define it first, or pick a listed one`);
+            }
+        }
+        const changed = await deps.requirements.change({ fleetId: actor.fleetId, name }, { ...change, version });
+        if (changed === undefined) {
+            return refuse('CONFLICT', 'The requirements changed since you opened this page');
+        }
+        const stated = await (kept.kind === 'mcpServer' ? deps.stateParty : deps.stateA2aAgent)({ fleetId: actor.fleetId, name });
+        return ok({ requirements: changed, statementRefusal: stated.isOk ? null : stated.error.message });
+    };
+}
+//# sourceMappingURL=set-scope-requirements.js.map

package/dist/core/parties/set-scope-requirements.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"set-scope-requirements.js","sourceRoot":"","sources":["../../../src/core/parties/set-scope-requirements.ts"],"names":[],"mappings":"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"}

package/dist/core/parties/switch-tools.d.ts

@@ -0,0 +1,39 @@
+import type { Actor } from '../actors/authenticate-actor.js';
+import type { ActorCredential, CredentialOf } from '../actors/credential-of.js';
+import type { ConnectionStore } from '../connection/ports.js';
+import type { McpServers } from '../mcp-out/ports.js';
+import type { StateParty } from '../mcp-out/state-party.js';
+import { type DomainError } from '../shared/errors.js';
+import { type Result } from '../shared/result.js';
+import { type ApprovingRefusal } from './check-approving.js';
+import type { PartyStore, ProxyShipsAsActor } from './ports.js';
+export type SwitchToolsRefusal = ApprovingRefusal | DomainError<'SERVER_UNREACHABLE' | 'NO_SUCH_TOOL'>;
+export type SwitchTools = (input: {
+    actor: Actor;
+    as: ActorCredential;
+    name: string;
+    tools: readonly string[];
+    isOn: boolean;
+}) => Promise<Result<{
+    tools: string[];
+    isOn: boolean; /** Why the proxy ship's statement waits for its next one; none when the fleet sees the switches now. */
+    statementRefusal: string | null;
+}, SwitchToolsRefusal>>;
+/**
+ * Use case: an approver switches tools of an outside MCP server on or off
+ * (aeolus-fleet#1151), one or every one selected on its page (gateway scopes
+ * 4.3), for the party as a whole: every ship that may reach it reaches the
+ * same tools. The fleet, asked as the approver, must answer that it manages
+ * the proxy ship before anything changes (A2). The selection is kept in one change, all of it or none, so a
+ * call to a tool switched off is refused at once, then the proxy ship is
+ * stated anew once; while it cannot be, the switches wait for its next
+ * statement.
+ */
+export declare function createSwitchTools(deps: {
+    parties: PartyStore;
+    servers: McpServers;
+    stateParty: StateParty;
+    connections: Pick<ConnectionStore, 'find'>;
+    fleet: Pick<ProxyShipsAsActor, 'checkManage'>;
+    credentialOf: CredentialOf;
+}): SwitchTools;

package/dist/core/parties/switch-tools.js

@@ -0,0 +1,38 @@
+import { refuse } from '../shared/errors.js';
+import { ok } from '../shared/result.js';
+import { approvedParty } from './check-approving.js';
+/**
+ * Use case: an approver switches tools of an outside MCP server on or off
+ * (aeolus-fleet#1151), one or every one selected on its page (gateway scopes
+ * 4.3), for the party as a whole: every ship that may reach it reaches the
+ * same tools. The fleet, asked as the approver, must answer that it manages
+ * the proxy ship before anything changes (A2). The selection is kept in one change, all of it or none, so a
+ * call to a tool switched off is refused at once, then the proxy ship is
+ * stated anew once; while it cannot be, the switches wait for its next
+ * statement.
+ */
+export function createSwitchTools(deps) {
+    return async ({ actor, as, name, tools, isOn }) => {
+        const approved = await approvedParty(deps, { actor, as, name });
+        if (!approved.isOk) {
+            return approved;
+        }
+        const { party } = approved.value;
+        if (party.kind !== 'mcpServer') {
+            return refuse('NO_SUCH_PARTY', `There is no outside MCP server ${name}`);
+        }
+        const listed = await deps.servers.listTools({ url: party.url, credential: party.credential });
+        if (!listed.isOk) {
+            return refuse('SERVER_UNREACHABLE', `The MCP server of ${name} could not be listed: ${listed.error.reason}`);
+        }
+        const names = listed.value.map((each) => each.name);
+        const unlisted = tools.filter((tool) => !names.includes(tool));
+        if (unlisted.length > 0) {
+            return refuse('NO_SUCH_TOOL', `The MCP server of ${name} lists no tool ${unlisted.join(' or ')} now`);
+        }
+        await deps.parties.switchTools({ fleetId: actor.fleetId, name }, { listed: names, switched: new Map(tools.map((tool) => [tool, isOn])) });
+        const stated = await deps.stateParty({ fleetId: actor.fleetId, name });
+        return ok({ tools: [...tools], isOn, statementRefusal: stated.isOk ? null : stated.error.message });
+    };
+}
+//# sourceMappingURL=switch-tools.js.map

package/dist/core/parties/switch-tools.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"switch-tools.js","sourceRoot":"","sources":["../../../src/core/parties/switch-tools.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAyB,MAAM,sBAAsB,CAAC;AAS5E;;;;;;;;;GASG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAOjC;IACC,OAAO,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE;QAChD,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;QAChE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnB,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,MAAM,EAAE,KAAK,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC;QACjC,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YAC/B,OAAO,MAAM,CAAC,eAAe,EAAE,kCAAkC,IAAI,EAAE,CAAC,CAAC;QAC3E,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;QAC9F,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACjB,OAAO,MAAM,CAAC,oBAAoB,EAAE,qBAAqB,IAAI,yBAAyB,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QAC/G,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpD,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/D,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,OAAO,MAAM,CAAC,cAAc,EAAE,qBAAqB,IAAI,kBAAkB,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACxG,CAAC;QACD,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC1I,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QACvE,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,KAAK,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IACtG,CAAC,CAAC;AACJ,CAAC"}

package/dist/core/parties/tool-switches.d.ts

@@ -16,8 +16,10 @@ export declare const TOOL_NOT_ENABLED = "tool not enabled for this party";
 export interface SwitchedTool {
     name: string;
     description?: string;
-    /** Whether the server says the tool changes nothing (its readOnlyHint): a hint, never trusted on its own. */
-    isReadOnly: boolean;
+    /** Whether the server says the tool changes nothing, its readOnlyHint as it gives it: a hint, never trusted on its own; none when it says nothing. */
+    isReadOnly?: boolean;
+    /** Whether the server says the tool may destroy what it changes, its destructiveHint as it gives it; none when it says nothing. */
+    isDestructive?: boolean;
     isOn: boolean;
     isNew: boolean;
 }

package/dist/core/parties/tool-switches.js

@@ -9,7 +9,8 @@ export function switchedToolsOf(listed, switches) {
     return listed.map(({ name, description, annotations }) => ({
         name,
         ...(description === undefined ? {} : { description }),
-        isReadOnly: annotations?.readOnlyHint === true,
+        ...(annotations?.readOnlyHint === undefined ? {} : { isReadOnly: annotations.readOnlyHint }),
+        ...(annotations?.destructiveHint === undefined ? {} : { isDestructive: annotations.destructiveHint }),
         isOn: isToolOn(switches, name),
         isNew: switches !== null && !switches.has(name),
     }));

package/dist/core/parties/tool-switches.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-switches.js","sourceRoot":"","sources":["../../../src/core/parties/tool-switches.ts"],"names":[],"mappings":"AAcA,8FAA8F;AAC9F,MAAM,CAAC,MAAM,gBAAgB,GAAG,iCAAiC,CAAC;AAYlE,kGAAkG;AAClG,MAAM,UAAU,QAAQ,CAAC,QAA6B,EAAE,IAAY;IAClE,OAAO,QAAQ,KAAK,IAAI,IAAI,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;AAC1D,CAAC;AAED,4DAA4D;AAC5D,MAAM,UAAU,eAAe,CAAC,MAA8B,EAAE,QAA6B;IAC3F,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;QACzD,IAAI;QACJ,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC;QACrD,UAAU,EAAE,WAAW,EAAE,YAAY,KAAK,IAAI;QAC9C,IAAI,EAAE,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC;QAC9B,KAAK,EAAE,QAAQ,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC;KAChD,CAAC,CAAC,CAAC;AACN,CAAC"}
+{"version":3,"file":"tool-switches.js","sourceRoot":"","sources":["../../../src/core/parties/tool-switches.ts"],"names":[],"mappings":"AAcA,8FAA8F;AAC9F,MAAM,CAAC,MAAM,gBAAgB,GAAG,iCAAiC,CAAC;AAclE,kGAAkG;AAClG,MAAM,UAAU,QAAQ,CAAC,QAA6B,EAAE,IAAY;IAClE,OAAO,QAAQ,KAAK,IAAI,IAAI,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;AAC1D,CAAC;AAED,4DAA4D;AAC5D,MAAM,UAAU,eAAe,CAAC,MAA8B,EAAE,QAA6B;IAC3F,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;QACzD,IAAI;QACJ,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC;QACrD,GAAG,CAAC,WAAW,EAAE,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,WAAW,CAAC,YAAY,EAAE,CAAC;QAC5F,GAAG,CAAC,WAAW,EAAE,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,WAAW,CAAC,eAAe,EAAE,CAAC;QACrG,IAAI,EAAE,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC;QAC9B,KAAK,EAAE,QAAQ,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC;KAChD,CAAC,CAAC,CAAC;AACN,CAAC"}

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

@@ -123,9 +123,10 @@ export interface PersonShipDoor {
     }): Promise<Result<{
         waiting: number;
     }, FleetRefusal>>;
-    /** The ship's deliveries, up to max, its own held ones again first. */
+    /** The ship's deliveries, up to max, its own held ones again first; shouldSkipHanded leaves the handed ones out before the limit, so a new one is not shut out by held ones. */
     pushReceive(crewToken: string, take: {
         max: number;
+        shouldSkipHanded?: boolean;
     }): Promise<Result<PushedPersonDelivery[], FleetRefusal>>;
     /** Acknowledges a delivery the person opened: their own act confirms it (interop 5.1). */
     ack(crewToken: string, deliveryId: DeliveryId): Promise<Result<undefined, FleetRefusal>>;
@@ -208,8 +209,9 @@ export interface WakeChannel {
     readonly windowMs: number;
     /** Whether the person turned it on (W8): nothing is on by default. */
     isOn(ship: PersonShip): Promise<boolean>;
-    /** Sends the wake: whether it went out. */
+    /** Sends the wake: whether it went out. A refusal for good (refused) cannot be fixed by trying again; unavailable can succeed later. */
     wake(ship: PersonShip): Promise<Result<undefined, {
+        kind: 'refused' | 'unavailable';
         reason: string;
     }>>;
 }

package/dist/core/people/wake-person.d.ts

@@ -1,40 +1,52 @@
-import type { FleetRefusal } from '../connection/ports.js';
-import type { Clock } from '../shared/clock.js';
-import { type Result } from '../shared/result.js';
-import type { FocusedPages, PersonShip, PersonShipDoor, WakeChannel, WakesSent } from './ports.js';
+import type { FleetRefusal } from "../connection/ports.js";
+import type { Clock } from "../shared/clock.js";
+import { type Result } from "../shared/result.js";
+import type { FocusedPages, PersonShip, PersonShipDoor, WakeChannel, WakeChannelName, WakesSent } from "./ports.js";
 /**
  * What a wake came to: nothing left to wake (settled), a wake held back
  * until the earliest window of a channel turned on ends (inWindow), or no
  * channel sent it, so it is tried again (failed).
  */
 export type WakeOutcome = {
-    readonly kind: 'settled';
+    readonly kind: "settled";
 } | {
-    readonly kind: 'inWindow';
+    readonly kind: "inWindow";
     readonly until: Date;
 } | {
-    readonly kind: 'failed';
+    readonly kind: "failed";
 };
 export type WakePerson = (ship: PersonShip, crewToken: string) => Promise<Result<WakeOutcome, FleetRefusal>>;
 /**
  * Use case: wakes a person for what waits on their person ship (wake a
  * person, W3, W8). It takes the ship's deliveries with the gateway as their
- * waker; those never handed are fresh. Each channel the person turned on
+ * waker, leaving the handed ones out so ten held deliveries never shut a new
+ * one out; those never handed are fresh. Each channel the person turned on
  * whose window has passed sends one wake for all of them; each fresh
  * delivery is then handed no. 1, naming the first channel that went out, so
  * a delivery is woken once. A wake held back by a window, or that no
  * channel sent, hands nothing. Each channel's window is kept after the
  * hand-overs, so a gateway that stopped in between wakes again: one wake
- * more, nothing lost. While a page of the person is in focus, the page
+ * more, nothing lost. A fresh delivery sent before a channel's last wake
+ * that is still inside its window is one that wake covers: a hand-over the
+ * fleet refused is made again through that channel, never with a second
+ * wake. A channel that refused the wake for good ends the attempt, which is
+ * told, as asking again cannot help; while another channel's wake fails and is
+ * tried again, that channel is not asked again. While a page of the person is in focus, the page
  * shows what arrives (W6): each fresh delivery is handed through it and no
  * wake goes out.
  */
 export declare function createWakePerson(deps: {
-    door: Pick<PersonShipDoor, 'pushReceive' | 'handed'>;
+    door: Pick<PersonShipDoor, "pushReceive" | "handed">;
     channels: readonly WakeChannel[];
     wakesSent: WakesSent;
     focused: FocusedPages;
     /** How long a page counts in focus since it was last seen so. */
     focusFreshMs: number;
     clock: Clock;
+    /** Tells that a channel refused the wake for good, so the attempt ended. */
+    attemptEnded: (ended: {
+        ship: PersonShip;
+        channel: WakeChannelName;
+        reason: string;
+    }) => void;
 }): WakePerson;

package/dist/core/people/wake-person.js

@@ -1,64 +1,125 @@
-import { RECEIVE_MAX_UPPER_BOUND } from '@aeolus-fleet/common';
-import { err, ok } from '../shared/result.js';
+import { RECEIVE_MAX_UPPER_BOUND } from "@aeolus-fleet/common";
+import { err, ok } from "../shared/result.js";
 /**
  * Use case: wakes a person for what waits on their person ship (wake a
  * person, W3, W8). It takes the ship's deliveries with the gateway as their
- * waker; those never handed are fresh. Each channel the person turned on
+ * waker, leaving the handed ones out so ten held deliveries never shut a new
+ * one out; those never handed are fresh. Each channel the person turned on
  * whose window has passed sends one wake for all of them; each fresh
  * delivery is then handed no. 1, naming the first channel that went out, so
  * a delivery is woken once. A wake held back by a window, or that no
  * channel sent, hands nothing. Each channel's window is kept after the
  * hand-overs, so a gateway that stopped in between wakes again: one wake
- * more, nothing lost. While a page of the person is in focus, the page
+ * more, nothing lost. A fresh delivery sent before a channel's last wake
+ * that is still inside its window is one that wake covers: a hand-over the
+ * fleet refused is made again through that channel, never with a second
+ * wake. A channel that refused the wake for good ends the attempt, which is
+ * told, as asking again cannot help; while another channel's wake fails and is
+ * tried again, that channel is not asked again. While a page of the person is in focus, the page
  * shows what arrives (W6): each fresh delivery is handed through it and no
  * wake goes out.
  */
 export function createWakePerson(deps) {
-    return async (ship, crewToken) => {
+    /** Channels that refused for good during an attempt still failing, by person ship: a retry of that attempt does not ask them again. */
+    const refusedInAttempt = new Map();
+    const attemptKey = (ship) => `${ship.fleetId}/${ship.shipId}`;
+    const wakePerson = async (ship, crewToken) => {
         /** Hands each fresh delivery no. 1 through the channel, up to the first refusal: that refusal, or none. */
         const handEach = async (fresh, channel) => {
             for (const { deliveryId } of fresh) {
-                const handed = await deps.door.handed(crewToken, { deliveryId, handOverNumber: 1, channel });
+                const handed = await deps.door.handed(crewToken, {
+                    deliveryId,
+                    handOverNumber: 1,
+                    channel,
+                });
                 if (!handed.isOk) {
                     return handed.error;
                 }
             }
             return undefined;
         };
-        const taken = await deps.door.pushReceive(crewToken, { max: RECEIVE_MAX_UPPER_BOUND });
+        const taken = await deps.door.pushReceive(crewToken, {
+            max: RECEIVE_MAX_UPPER_BOUND,
+            shouldSkipHanded: true,
+        });
         if (!taken.isOk) {
             return taken;
         }
-        const fresh = taken.value.filter(({ handOverNumber }) => handOverNumber === null);
-        if (fresh.length === 0) {
-            return ok({ kind: 'settled' });
+        const allFresh = taken.value.filter(({ handOverNumber }) => handOverNumber === null);
+        if (allFresh.length === 0) {
+            return ok({ kind: "settled" });
         }
         if (await deps.focused.isAnyInFocus(ship, new Date(deps.clock.now().getTime() - deps.focusFreshMs))) {
-            const refused = await handEach(fresh, 'page');
-            return refused === undefined ? ok({ kind: 'settled' }) : err(refused);
+            const refused = await handEach(allFresh, "page");
+            return refused === undefined ? ok({ kind: "settled" }) : err(refused);
         }
-        const turnedOn = (await Promise.all(deps.channels.map(async (channel) => ((await channel.isOn(ship)) ? [channel] : [])))).flat();
+        const turnedOn = (await Promise.all(deps.channels.map(async (channel) => (await channel.isOn(ship)) ? [channel] : []))).flat();
         if (turnedOn.length === 0) {
-            return ok({ kind: 'settled' });
+            return ok({ kind: "settled" });
         }
         const now = deps.clock.now();
         const windows = await Promise.all(turnedOn.map(async (channel) => {
             const lastSentAt = await deps.wakesSent.lastSentAt(ship, channel.name);
-            return { channel, endsAt: lastSentAt === undefined ? now : new Date(lastSentAt.getTime() + channel.windowMs) };
+            return {
+                channel,
+                lastSentAt,
+                endsAt: lastSentAt === undefined
+                    ? now
+                    : new Date(lastSentAt.getTime() + channel.windowMs),
+            };
         }));
-        const due = windows.filter(({ endsAt }) => endsAt.getTime() <= now.getTime()).map(({ channel }) => channel);
+        // What a wake still inside its window covers was left unhanded by a refusal: hand it through that channel.
+        let fresh = allFresh;
+        for (const { channel, lastSentAt, endsAt } of windows) {
+            if (lastSentAt === undefined || endsAt.getTime() <= now.getTime()) {
+                continue;
+            }
+            const covered = fresh.filter(({ sentAt }) => sentAt.getTime() <= lastSentAt.getTime());
+            const refused = await handEach(covered, channel.name);
+            if (refused !== undefined) {
+                return err(refused);
+            }
+            fresh = fresh.filter((delivery) => !covered.includes(delivery));
+        }
+        if (fresh.length === 0) {
+            return ok({ kind: "settled" });
+        }
+        const refusedBefore = refusedInAttempt.get(attemptKey(ship)) ?? new Set();
+        const due = windows
+            .filter(({ channel, endsAt }) => endsAt.getTime() <= now.getTime() && !refusedBefore.has(channel.name))
+            .map(({ channel }) => channel);
         if (due.length === 0) {
-            return ok({ kind: 'inWindow', until: new Date(Math.min(...windows.map(({ endsAt }) => endsAt.getTime()))) });
+            const waiting = windows.filter(({ channel }) => !refusedBefore.has(channel.name));
+            return ok(waiting.length === 0
+                ? { kind: "settled" }
+                : {
+                    kind: "inWindow",
+                    until: new Date(Math.min(...waiting.map(({ endsAt }) => endsAt.getTime()))),
+                });
         }
         const wentOut = [];
+        let isRetryable = false;
         for (const channel of due) {
-            if ((await channel.wake(ship)).isOk) {
+            const woken = await channel.wake(ship);
+            if (woken.isOk) {
                 wentOut.push(channel.name);
             }
+            else if (woken.error.kind === "refused") {
+                refusedBefore.add(channel.name);
+                refusedInAttempt.set(attemptKey(ship), refusedBefore);
+                deps.attemptEnded({
+                    ship,
+                    channel: channel.name,
+                    reason: woken.error.reason,
+                });
+            }
+            else {
+                isRetryable = true;
+            }
         }
         const [firstOut] = wentOut;
         if (firstOut === undefined) {
-            return ok({ kind: 'failed' });
+            return ok(isRetryable ? { kind: "failed" } : { kind: "settled" });
         }
         const refused = await handEach(fresh, firstOut);
         // The window is kept only after the hand-overs: a gateway that stopped in between wakes again, as the design says. A refusal keeps it, so no second email follows at once.
@@ -68,7 +129,14 @@ export function createWakePerson(deps) {
         if (refused !== undefined) {
             return err(refused);
         }
-        return ok({ kind: 'settled' });
+        return ok({ kind: "settled" });
+    };
+    return async (ship, crewToken) => {
+        const woken = await wakePerson(ship, crewToken);
+        if (!woken.isOk || woken.value.kind !== "failed") {
+            refusedInAttempt.delete(attemptKey(ship));
+        }
+        return woken;
     };
 }
 //# sourceMappingURL=wake-person.js.map

package/dist/core/people/wake-person.js.map

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

package/dist/core/people/web-push-channel.js

@@ -28,7 +28,7 @@ export function createWebPushChannel(deps) {
                         break;
                 }
             }
-            return isTaken ? ok(undefined) : err({ reason: 'no push service took the wake' });
+            return isTaken ? ok(undefined) : err({ kind: 'unavailable', reason: 'no push service took the wake' });
         },
     };
 }

package/dist/core/people/web-push-channel.js.map

@@ -1 +1 @@
-{"version":3,"file":"web-push-channel.js","sourceRoot":"","sources":["../../../src/core/people/web-push-channel.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,qBAAqB,CAAC;AAG9C;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAAC,IAA4I;IAC/K,MAAM,WAAW,GAAG,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAc,EAAkC,EAAE,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC;IACxL,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC;QAC1D,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACnB,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACrD,IAAI,OAAO,GAAG,KAAK,CAAC;YACpB,KAAK,MAAM,YAAY,IAAI,MAAM,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;gBACnD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,SAAS,EAAE,YAAY,CAAC,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;gBACvG,QAAQ,IAAI,EAAE,CAAC;oBACb,KAAK,MAAM;wBACT,OAAO,GAAG,IAAI,CAAC;wBACf,MAAM;oBACR,KAAK,MAAM;wBACT,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;wBACpI,MAAM;oBACR,KAAK,QAAQ;wBACX,MAAM;gBACV,CAAC;YACH,CAAC;YACD,OAAO,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,+BAA+B,EAAE,CAAC,CAAC;QACpF,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"web-push-channel.js","sourceRoot":"","sources":["../../../src/core/people/web-push-channel.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,qBAAqB,CAAC;AAG9C;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAAC,IAA4I;IAC/K,MAAM,WAAW,GAAG,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAc,EAAkC,EAAE,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC;IACxL,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC;QAC1D,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACnB,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACrD,IAAI,OAAO,GAAG,KAAK,CAAC;YACpB,KAAK,MAAM,YAAY,IAAI,MAAM,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;gBACnD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,SAAS,EAAE,YAAY,CAAC,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;gBACvG,QAAQ,IAAI,EAAE,CAAC;oBACb,KAAK,MAAM;wBACT,OAAO,GAAG,IAAI,CAAC;wBACf,MAAM;oBACR,KAAK,MAAM;wBACT,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;wBACpI,MAAM;oBACR,KAAK,QAAQ;wBACX,MAAM;gBACV,CAAC;YACH,CAAC;YACD,OAAO,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,+BAA+B,EAAE,CAAC,CAAC;QACzG,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/core/shared/errors.d.ts

@@ -1,6 +1,6 @@
 import { type Err } from './result.js';
 /** Every reason the gateway's core refuses a request. */
-export type DomainErrorKind = 'ALREADY_CONNECTED' | 'SECRET_REFUSED' | 'OTHER_FLEET' | 'MISSING_SCOPES' | 'SCOPE_REFUSED' | 'NOT_THE_OPERATOR' | 'NOT_AN_ACTOR' | 'NOT_AN_APPROVER' | 'NO_SUCH_REQUEST' | 'ALREADY_DECIDED' | 'EXPIRED' | 'SCOPE_NOT_HELD' | 'SERVER_DETAILS_MISSING' | 'REQUEST_ID_USED' | 'FLEET_UNAVAILABLE' | 'NOT_CONNECTED' | 'PARTY_EXISTS' | 'COMMISSION_REFUSED' | 'NO_SUCH_PARTY' | 'NOT_AWAITING_CREW' | 'NOT_CREWED' | 'SERVER_UNREACHABLE' | 'STATEMENT_REFUSED' | 'INVALID_REDIRECT_URIS' | 'CLIENT_HAS_PARTY' | 'PARTY_NOT_CREWED' | 'NO_SUCH_TOOL' | 'INVALID_ARGUMENTS' | 'NOT_REACHABLE' | 'SEND_REFUSED' | 'NO_SUCH_CALL' | 'NOT_A_PERSON' | 'SIGNED_OUT' | 'NO_SUCH_DELIVERY' | 'NOT_A_NETWORKER' | 'OPEN_NETWORK' | 'OUTSIDE_PARTIES_OFF' | 'INVALID_SERVER_URL' | 'NOT_A_MANAGER' | 'RETIRE_REFUSED' | 'NOT_AN_ACCOUNT' | 'PARTY_NOT_COMMISSIONED' | 'CHANGE_REFUSED' | 'UNKNOWN_ALIAS' | 'PAYLOAD_TOO_LARGE' | 'TASK_NOT_FOUND' | 'TASK_TERMINAL' | 'WEBHOOK_REFUSED' | 'PUSH_CONFIG_NOT_FOUND' | 'CONTEXT_MISMATCH' | 'CARD_UNREACHABLE' | 'CARD_INVALID' | 'NOT_A_MESSAGE' | 'CHANNEL_NOT_OFFERED' | 'INVALID_SUBSCRIPTION' | 'NO_SUCH_MEETING' | 'MIC_REFUSED';
+export type DomainErrorKind = 'ALREADY_CONNECTED' | 'SECRET_REFUSED' | 'OTHER_FLEET' | 'MISSING_SCOPES' | 'SCOPE_REFUSED' | 'NOT_THE_OPERATOR' | 'NOT_AN_ACTOR' | 'NOT_AN_APPROVER' | 'NO_SUCH_REQUEST' | 'ALREADY_DECIDED' | 'EXPIRED' | 'SCOPE_NOT_HELD' | 'SERVER_DETAILS_MISSING' | 'REQUEST_ID_USED' | 'FLEET_UNAVAILABLE' | 'NOT_CONNECTED' | 'PARTY_EXISTS' | 'COMMISSION_REFUSED' | 'NO_SUCH_PARTY' | 'NOT_AWAITING_CREW' | 'NOT_CREWED' | 'SERVER_UNREACHABLE' | 'STATEMENT_REFUSED' | 'INVALID_REDIRECT_URIS' | 'CLIENT_HAS_PARTY' | 'PARTY_NOT_CREWED' | 'NO_SUCH_TOOL' | 'INVALID_ARGUMENTS' | 'NOT_REACHABLE' | 'SEND_REFUSED' | 'NO_SUCH_CALL' | 'NOT_A_PERSON' | 'SIGNED_OUT' | 'NO_SUCH_DELIVERY' | 'NOT_A_NETWORKER' | 'OPEN_NETWORK' | 'OUTSIDE_PARTIES_OFF' | 'INVALID_SERVER_URL' | 'NOT_A_MANAGER' | 'RETIRE_REFUSED' | 'NOT_AN_ACCOUNT' | 'PARTY_NOT_COMMISSIONED' | 'CHANGE_REFUSED' | 'UNKNOWN_ALIAS' | 'PAYLOAD_TOO_LARGE' | 'TASK_NOT_FOUND' | 'TASK_TERMINAL' | 'WEBHOOK_REFUSED' | 'PUSH_CONFIG_NOT_FOUND' | 'CONTEXT_MISMATCH' | 'CARD_UNREACHABLE' | 'CARD_INVALID' | 'NOT_A_MESSAGE' | 'CHANNEL_NOT_OFFERED' | 'INVALID_SUBSCRIPTION' | 'NO_SUCH_MEETING' | 'MIC_REFUSED' | 'SCOPE_NOT_LISTED' | 'CONFLICT';
 /** Why the core refused a request. Adapters map the kind to their own error shape; the message is safe to show. */
 export interface DomainError<K extends DomainErrorKind = DomainErrorKind> {
     readonly kind: K;

package/dist/core/shared/errors.js.map

@@ -1 +1 @@
-{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/core/shared/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAY,MAAM,aAAa,CAAC;AAoE5C,qDAAqD;AACrD,MAAM,UAAU,MAAM,CAA4B,IAAO,EAAE,OAAe;IACxE,OAAO,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;AAChC,CAAC"}
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/core/shared/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAY,MAAM,aAAa,CAAC;AAsE5C,qDAAqD;AACrD,MAAM,UAAU,MAAM,CAA4B,IAAO,EAAE,OAAe;IACxE,OAAO,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;AAChC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeolus-fleet/gateway",
-  "version": "0.31.0",
+  "version": "0.32.0",
   "description": "Aeolus gateway: outside MCP servers and clients join a fleet as ships, through one gateway beside core.",
   "keywords": [
     "ai-agents",
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "@a2a-js/sdk": "1.3.0",
-    "@aeolus-fleet/common": "^0.31.0",
+    "@aeolus-fleet/common": "^0.32.0",
     "@base-ui/react": "^1.9.0",
     "@fastify/websocket": "^11.3.4",
     "@modelcontextprotocol/client": "^2.3.1",
@@ -69,7 +69,7 @@
     "zod": "^4.6.5"
   },
   "devDependencies": {
-    "@aeolus-fleet/core": "^0.31.0",
+    "@aeolus-fleet/core": "^0.32.0",
     "@eslint/js": "^10.0.1",
     "@modelcontextprotocol/ext-tasks": "0.2.2",
     "@tailwindcss/postcss": "^4.3.3",

package/src/adapters/prisma/migrations/20261025140000_scope_requirements/migration.sql

@@ -0,0 +1,3 @@
+-- Gateway scopes (4.2): the scopes a calling ship needs, for the party as a whole and per tool, kept with the party, and the version they were last changed to.
+ALTER TABLE "parties" ADD COLUMN "scope_requirements" JSONB;
+ALTER TABLE "parties" ADD COLUMN "scope_requirements_version" INTEGER NOT NULL DEFAULT 0;