@aeolus-fleet/gateway 0.29.2 → 0.30.0

package/dist/party-workers.js

@@ -2,20 +2,37 @@ export function createPartyWorkers(deps) {
     const stop = new AbortController();
     /** Each running worker, by fleet and party, with what stops it. */
     const running = new Map();
-    const work = async ({ fleetId, name }, signal) => {
+    /** One run of the party's worker, as its crew token stands now: whether the fleet refused its crew token, and which. */
+    const workOnce = async ({ fleetId, name }, signal) => {
         if (!(await deps.servesOutsideParties(fleetId))) {
-            return;
+            return { refused: null };
         }
         const party = await deps.parties.find(fleetId, name);
         if (party?.state !== 'crewed' || signal.aborted) {
-            return;
+            return { refused: null };
         }
-        if (party.kind === 'mcpClient') {
+        if (party.kind === 'mcpClient' || party.kind === 'a2aClient') {
+            // Pushing needs no crew token: it ends with the replies, whatever ended them.
+            const isCollected = new AbortController();
+            const pushing = party.kind === 'a2aClient' ? deps.pushToWebhooks({ caller: { fleetId, party: name }, signal: AbortSignal.any([signal, isCollected.signal]) }) : Promise.resolve();
             const { ended } = await deps.collectReplies({ party, signal });
+            isCollected.abort();
+            await pushing;
             if (ended === 'crewRefused') {
                 deps.log.warn({ fleetId, party: name }, "the fleet refused the proxy ship's crew token: its calls get no replies");
             }
-            return;
+            return { refused: ended === 'crewRefused' ? party.crewToken : null };
+        }
+        if (party.kind === 'a2aAgent') {
+            const statedAgent = await deps.stateA2aAgent({ fleetId, name });
+            if (!statedAgent.isOk) {
+                deps.log.warn({ fleetId, party: name, reason: statedAgent.error.message }, 'proxy ship not stated: its last statement stays');
+            }
+            const { ended } = await deps.runA2aAgent({ party, signal });
+            if (ended === 'crewRefused') {
+                deps.log.warn({ fleetId, party: name }, "the fleet refused the proxy ship's crew token: its messages are not taken");
+            }
+            return { refused: ended === 'crewRefused' ? party.crewToken : null };
         }
         const stated = await deps.stateParty({ fleetId, name });
         if (!stated.isOk) {
@@ -26,6 +43,21 @@ export function createPartyWorkers(deps) {
         if (ended === 'crewRefused') {
             deps.log.warn({ fleetId, party: name }, 'the fleet refused the proxy ship\'s crew token: its calls are not taken');
         }
+        return { refused: ended === 'crewRefused' ? party.crewToken : null };
+    };
+    /**
+     * The party's worker until it is stopped. A crew token the fleet refused
+     * ends it, unless the party was crewed again meanwhile with another, as
+     * when its crew was released and a new secret crewed the same proxy ship
+     * (vendor platforms V8): then it works on with the new one.
+     */
+    const work = async (party, signal) => {
+        for (let run = await workOnce(party, signal); run.refused !== null && !signal.aborted; run = await workOnce(party, signal)) {
+            const kept = await deps.parties.find(party.fleetId, party.name);
+            if (kept?.state !== 'crewed' || kept.crewToken === run.refused) {
+                return;
+            }
+        }
     };
     return {
         start: (party) => {

package/dist/party-workers.js.map

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

package/dist/person-waiters.d.ts

@@ -0,0 +1,30 @@
+/**
+ * The gateway's waiters, one per person ship it crews, across its instances
+ * (wake a person, W7, W9): an instance runs a ship's waiter only while it
+ * holds the ship's lock. Each round it looks for crews whose waiter no
+ * instance runs, so the waiters of an instance that stopped, or lost its
+ * locks, are taken over; a ship crewed meanwhile is woken at once. A waiter
+ * that ends gives its lock back.
+ */
+import type { FastifyBaseLogger } from 'fastify';
+import type { Sleep } from './core/mcp-out/run-party.js';
+import type { PersonCrews, PersonShip, WaiterLocks } from './core/people/ports.js';
+import type { WaitOnPersonShip } from './core/people/wait-on-person-ship.js';
+export interface PersonWaiters {
+    /** Runs a round every interval until it stops. */
+    start(): void;
+    /** Starts the ship's waiter now, unless one runs: the gateway just crewed it. */
+    wake(ship: PersonShip): void;
+    /** The ships this instance waits on now. */
+    waitingOn(): PersonShip[];
+    /** Stops every waiter and gives its lock back. */
+    stop(): Promise<void>;
+}
+export declare function createPersonWaiters(deps: {
+    crews: PersonCrews;
+    locks: WaiterLocks;
+    waitOnPersonShip: WaitOnPersonShip;
+    sleep: Sleep;
+    roundMs: number;
+    log: FastifyBaseLogger;
+}): PersonWaiters;

package/dist/person-waiters.js

@@ -0,0 +1,89 @@
+/** How many crews a round reads at once. */
+const ROUND_PAGE = 100;
+export function createPersonWaiters(deps) {
+    const stopping = new AbortController();
+    /** Each ship this instance waits on, or takes the lock of, with what stops its waiter. */
+    const running = new Map();
+    let rounds = Promise.resolve();
+    const keyOf = ({ fleetId, shipId }) => `${fleetId}/${shipId}`;
+    const run = async (ship, stop) => {
+        if (!(await deps.locks.take(ship))) {
+            return;
+        }
+        const held = running.get(keyOf(ship));
+        if (held === undefined || stop.signal.aborted) {
+            await deps.locks.give(ship);
+            return;
+        }
+        held.isWaiting = true;
+        try {
+            const ended = await deps.waitOnPersonShip(ship, stop.signal);
+            if (ended.reason === 'crewEnded') {
+                deps.log.info(ship, "the person ship's crew no longer works: its waiter stopped and the crew was dropped");
+            }
+        }
+        finally {
+            await deps.locks.give(ship);
+        }
+    };
+    const wake = (ship) => {
+        const key = keyOf(ship);
+        if (running.has(key) || stopping.signal.aborted) {
+            return;
+        }
+        const stop = new AbortController();
+        const entry = { ship, isWaiting: false, stop, done: Promise.resolve() };
+        running.set(key, entry);
+        entry.done = run(ship, stop)
+            .catch((error) => {
+            deps.log.error({ err: error, ...ship }, 'person ship waiter failed');
+        })
+            .finally(() => running.delete(key));
+    };
+    const round = async () => {
+        try {
+            let after = null;
+            for (;;) {
+                const page = await deps.crews.crewed({ after, limit: ROUND_PAGE });
+                for (const ship of page) {
+                    wake(ship);
+                }
+                const last = page.at(-1);
+                if (page.length < ROUND_PAGE || last === undefined) {
+                    return;
+                }
+                after = last;
+            }
+        }
+        catch (error) {
+            deps.log.error({ err: error }, 'person ship waiters round failed');
+        }
+    };
+    // Every lock is lost at once: their waiters stop, and the next round takes the locks again where no instance holds them.
+    deps.locks.onLost(() => {
+        for (const entry of running.values()) {
+            entry.stop.abort();
+        }
+    });
+    return {
+        start: () => {
+            rounds = (async () => {
+                while (!stopping.signal.aborted) {
+                    await round();
+                    await deps.sleep(deps.roundMs, stopping.signal);
+                }
+            })();
+        },
+        wake,
+        waitingOn: () => [...running.values()].filter(({ isWaiting }) => isWaiting).map(({ ship }) => ship),
+        stop: async () => {
+            stopping.abort();
+            for (const entry of running.values()) {
+                entry.stop.abort();
+            }
+            await rounds;
+            await Promise.all([...running.values()].map(({ done }) => done));
+        },
+    };
+}
+//# sourceMappingURL=person-waiters.js.map

package/dist/person-waiters.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeolus-fleet/gateway",
-  "version": "0.29.2",
+  "version": "0.30.0",
   "description": "Aeolus gateway: outside MCP servers and clients join a fleet as ships, through one gateway beside core.",
   "keywords": [
     "ai-agents",
@@ -27,6 +27,7 @@
     "!web/.next/cache",
     "!web/.next/dev",
     "web/next.config.ts",
+    "web/public",
     "prisma.config.ts",
     "src/adapters/prisma/schema.prisma",
     "src/adapters/prisma/migrations"
@@ -44,7 +45,8 @@
     "db:migrate": "tsx --env-file-if-exists=.env src/bin/aeolus-gateway.ts migrate"
   },
   "dependencies": {
-    "@aeolus-fleet/common": "^0.29.1",
+    "@a2a-js/sdk": "1.3.0",
+    "@aeolus-fleet/common": "^0.30.0",
     "@base-ui/react": "^1.9.0",
     "@fastify/websocket": "^11.3.4",
     "@modelcontextprotocol/client": "^2.3.1",
@@ -63,10 +65,11 @@
     "react": "^19.3.1",
     "react-dom": "^19.3.1",
     "tailwind-merge": "^3.7.0",
+    "web-push": "^3.6.7",
     "zod": "^4.6.5"
   },
   "devDependencies": {
-    "@aeolus-fleet/core": "^0.29.1",
+    "@aeolus-fleet/core": "^0.30.0",
     "@eslint/js": "^10.0.1",
     "@modelcontextprotocol/ext-tasks": "0.2.2",
     "@tailwindcss/postcss": "^4.3.3",
@@ -75,6 +78,7 @@
     "@types/pg": "^8.23.1",
     "@types/react": "^19.3.0",
     "@types/react-dom": "^19.3.0",
+    "@types/web-push": "^3.6.4",
     "@types/ws": "^8.18.2",
     "eslint": "^10.11.0",
     "eslint-plugin-check-file": "^3.3.2",

package/src/adapters/prisma/migrations/20261023120000_party_bearer_hash/migration.sql

@@ -0,0 +1,4 @@
+-- An outside A2A client's party is named on every call by the hash of its bearer (decision 0060).
+ALTER TABLE "parties" ADD COLUMN "bearer_hash" TEXT;
+
+CREATE UNIQUE INDEX "parties_bearer_hash_key" ON "parties"("bearer_hash");

package/src/adapters/prisma/migrations/20261023130000_client_credentials/migration.sql

@@ -0,0 +1,5 @@
+-- A client party with no human at the authorize step signs in by client credentials (vendor platforms V4): an access token from no code, with no refresh token.
+ALTER TABLE "oauth_clients" ADD COLUMN "grant" TEXT NOT NULL DEFAULT 'authorizationCode';
+ALTER TABLE "issued_tokens" ALTER COLUMN "refresh_hash" DROP NOT NULL;
+ALTER TABLE "issued_tokens" ALTER COLUMN "refresh_expires_at" DROP NOT NULL;
+ALTER TABLE "issued_tokens" ALTER COLUMN "code_hash" DROP NOT NULL;

package/src/adapters/prisma/migrations/20261023200000_a2a_tasks/migration.sql

@@ -0,0 +1,20 @@
+-- A2A in (decision 0060): a call may match no capability, its delivery is read from the fleet, and an A2A call belongs to a task.
+ALTER TABLE "client_calls" ALTER COLUMN "capability" DROP NOT NULL;
+ALTER TABLE "client_calls" ADD COLUMN "delivery_state" TEXT;
+ALTER TABLE "client_calls" ADD COLUMN "delivery_since" TIMESTAMP(3);
+ALTER TABLE "client_calls" ADD COLUMN "task_id" TEXT;
+ALTER TABLE "client_calls" ADD COLUMN "task_message" TEXT;
+
+CREATE INDEX "client_calls_fleet_id_task_id_idx" ON "client_calls"("fleet_id", "task_id");
+
+CREATE TABLE "a2a_tasks" (
+    "fleet_id" TEXT NOT NULL,
+    "task_id" TEXT NOT NULL,
+    "party" TEXT NOT NULL,
+    "context_id" TEXT NOT NULL,
+    "created_at" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "a2a_tasks_pkey" PRIMARY KEY ("fleet_id","task_id")
+);
+
+CREATE INDEX "a2a_tasks_fleet_id_party_created_at_task_id_idx" ON "a2a_tasks"("fleet_id", "party", "created_at" DESC, "task_id" DESC);

package/src/adapters/prisma/migrations/20261023210000_tool_switches/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable: a server added before this has none kept, so every tool it lists stays on.
+ALTER TABLE "parties" ADD COLUMN "tool_switches" JSONB;

package/src/adapters/prisma/migrations/20261024090000_a2a_pushes/migration.sql

@@ -0,0 +1,37 @@
+-- A2A in, push to the client's webhook (slice 4): each task's push configs, and the pushes still to make.
+CREATE TABLE "a2a_push_configs" (
+    "fleet_id" TEXT NOT NULL,
+    "task_id" TEXT NOT NULL,
+    "id" TEXT NOT NULL,
+    "party" TEXT NOT NULL,
+    "url" TEXT NOT NULL,
+    "token" TEXT,
+    "authentication" JSONB,
+    "created_at" TIMESTAMP(3) NOT NULL,
+    "noticed_mark" TEXT NOT NULL,
+    "is_following" BOOLEAN NOT NULL,
+
+    CONSTRAINT "a2a_push_configs_pkey" PRIMARY KEY ("fleet_id","task_id","id")
+);
+
+CREATE INDEX "a2a_push_configs_fleet_id_party_is_following_idx" ON "a2a_push_configs"("fleet_id", "party", "is_following");
+
+CREATE TABLE "a2a_pushes" (
+    "push_id" SERIAL NOT NULL,
+    "fleet_id" TEXT NOT NULL,
+    "task_id" TEXT NOT NULL,
+    "config_id" TEXT NOT NULL,
+    "party" TEXT NOT NULL,
+    "body" TEXT NOT NULL,
+    "attempts" INTEGER NOT NULL,
+    "next_at" TIMESTAMP(3) NOT NULL,
+    "state" TEXT NOT NULL,
+    "reason" TEXT,
+    "settled_at" TIMESTAMP(3),
+
+    CONSTRAINT "a2a_pushes_pkey" PRIMARY KEY ("push_id")
+);
+
+CREATE INDEX "a2a_pushes_fleet_id_party_state_task_id_config_id_push_id_idx" ON "a2a_pushes"("fleet_id", "party", "state", "task_id", "config_id", "push_id");
+
+ALTER TABLE "a2a_pushes" ADD CONSTRAINT "a2a_pushes_fleet_id_task_id_config_id_fkey" FOREIGN KEY ("fleet_id", "task_id", "config_id") REFERENCES "a2a_push_configs"("fleet_id", "task_id", "id") ON DELETE CASCADE ON UPDATE CASCADE;

package/src/adapters/prisma/migrations/20261024100000_party_is_repeatable/migration.sql

@@ -0,0 +1,2 @@
+-- An A2A agent's mark (A9): whether a message that died unconfirmed may be handed again.
+ALTER TABLE "parties" ADD COLUMN "is_repeatable" BOOLEAN;

package/src/adapters/prisma/migrations/20261024110000_a2a_agent_calls/migration.sql

@@ -0,0 +1,29 @@
+-- The gateway's messages to outside A2A agents, by delivery, and which task each reply tells of (slice 6).
+CREATE TABLE "a2a_agent_calls" (
+    "delivery_id" TEXT NOT NULL,
+    "fleet_id" TEXT NOT NULL,
+    "party" TEXT NOT NULL,
+    "message_id" TEXT NOT NULL,
+    "sender_ship_id" TEXT NOT NULL,
+    "state" TEXT NOT NULL,
+    "task_id" TEXT,
+    "context_id" TEXT,
+    "deadline_at" TIMESTAMPTZ(3) NOT NULL,
+    "answer" JSONB,
+    "replied" TEXT[] DEFAULT ARRAY[]::TEXT[],
+    "chunk_places" JSONB NOT NULL DEFAULT '{}',
+
+    CONSTRAINT "a2a_agent_calls_pkey" PRIMARY KEY ("fleet_id", "delivery_id")
+);
+
+CREATE INDEX "a2a_agent_calls_fleet_id_party_state_idx" ON "a2a_agent_calls"("fleet_id", "party", "state");
+
+CREATE TABLE "a2a_agent_replies" (
+    "fleet_id" TEXT NOT NULL,
+    "party" TEXT NOT NULL,
+    "message_id" TEXT NOT NULL,
+    "task_id" TEXT NOT NULL,
+    "context_id" TEXT NOT NULL,
+
+    CONSTRAINT "a2a_agent_replies_pkey" PRIMARY KEY ("fleet_id", "party", "message_id")
+);

package/src/adapters/prisma/migrations/20261024115000_wakes/migration.sql

@@ -0,0 +1,17 @@
+-- What wakes a person (wake a person, W3, W8): the email channel they turned on, and when each channel last woke their person ship.
+CREATE TABLE "email_channels" (
+    "fleet_id" TEXT NOT NULL,
+    "ship_id" TEXT NOT NULL,
+    "turned_on_at" TIMESTAMPTZ(3) NOT NULL,
+
+    CONSTRAINT "email_channels_pkey" PRIMARY KEY ("fleet_id","ship_id")
+);
+
+CREATE TABLE "wakes_sent" (
+    "fleet_id" TEXT NOT NULL,
+    "ship_id" TEXT NOT NULL,
+    "channel" TEXT NOT NULL,
+    "sent_at" TIMESTAMPTZ(3) NOT NULL,
+
+    CONSTRAINT "wakes_sent_pkey" PRIMARY KEY ("fleet_id","ship_id","channel")
+);

package/src/adapters/prisma/migrations/20261024120000_focused_pages/migration.sql

@@ -0,0 +1,11 @@
+-- Wake a person (W6): a person's pages in focus, on any gateway instance.
+CREATE TABLE "focused_pages" (
+    "fleet_id" TEXT NOT NULL,
+    "page_id" TEXT NOT NULL,
+    "ship_id" TEXT NOT NULL,
+    "seen_at" TIMESTAMPTZ(3) NOT NULL,
+
+    CONSTRAINT "focused_pages_pkey" PRIMARY KEY ("fleet_id","page_id")
+);
+
+CREATE INDEX "focused_pages_fleet_id_ship_id_seen_at_idx" ON "focused_pages"("fleet_id", "ship_id", "seen_at");

package/src/adapters/prisma/migrations/20261024130000_web_push_subscriptions/migration.sql

@@ -0,0 +1,14 @@
+-- Wake a person (W8): the browsers a person turned web push on in.
+CREATE TABLE "web_push_subscriptions" (
+    "fleet_id" TEXT NOT NULL,
+    "ship_id" TEXT NOT NULL,
+    "endpoint" TEXT NOT NULL,
+    "p256dh" TEXT NOT NULL,
+    "auth" TEXT NOT NULL,
+    "browser" TEXT NOT NULL,
+    "fleet_name" TEXT NOT NULL,
+    "added_at" TIMESTAMPTZ(3) NOT NULL,
+    "gone_at" TIMESTAMPTZ(3),
+
+    CONSTRAINT "web_push_subscriptions_pkey" PRIMARY KEY ("fleet_id","ship_id","endpoint")
+);

package/src/adapters/prisma/schema.prisma

@@ -74,12 +74,18 @@ model Party {
   fleetId          String   @map("fleet_id")
   name             String
   kind             String
-  /// An MCP server's: its URL, its credential as JSON (a static bearer, or OAuth client credentials), and its calls at once.
+  /// An MCP server's: its URL, its credential as JSON (none, a static bearer, or OAuth client credentials), and its calls at once. An A2A agent's too, its card address as the URL.
   url              String?
   credential       Json?
   concurrencyLimit Int?     @map("concurrency_limit")
+  /// An MCP server's tool switches, by tool name (aeolus-fleet#1151); none kept yet means every tool it lists is on.
+  toolSwitches     Json?    @map("tool_switches")
   /// An MCP client's: its OAuth client id.
   clientId         String?  @map("client_id")
+  /// An A2A client's: the hash of the bearer it was shown once, which names it on every call; unique across fleets, as the bearer alone names the party (decision 0060).
+  bearerHash       String?  @unique @map("bearer_hash")
+  /// An A2A agent's: whether a message that died unconfirmed may be handed again, until an approver marks it not (A9).
+  isRepeatable     Boolean? @map("is_repeatable")
   state            String
   proxyShipId      String?  @map("proxy_ship_id")
   /// Kept only from the proxy ship's commission until the gateway crews it.
@@ -117,6 +123,41 @@ model Call {
   @@map("calls")
 }
 
+/// The gateway's messages to outside A2A agents, by delivery (slice 6): so a restart sends nothing again that may have run, and follows on each task the agent took.
+model A2aAgentCall {
+  deliveryId   String   @map("delivery_id")
+  fleetId      String   @map("fleet_id")
+  party        String
+  messageId    String   @map("message_id")
+  senderShipId String   @map("sender_ship_id")
+  state        String
+  taskId       String?  @map("task_id")
+  contextId    String?  @map("context_id")
+  deadlineAt   DateTime @map("deadline_at") @db.Timestamptz(3)
+  /// The reply to the agent's message answer or refusal, kept before the ack.
+  answer       Json?
+  /// The identity of each event the follow replied, so a restart replies none again.
+  replied      String[] @default([])
+  /// Where the next chunk of each artifact goes, as the replies so far leave it.
+  chunkPlaces  Json     @default("{}") @map("chunk_places")
+
+  @@id([fleetId, deliveryId])
+  @@index([fleetId, party, state])
+  @@map("a2a_agent_calls")
+}
+
+/// Which task each reply the gateway sent for an outside A2A agent tells of, by the reply's message id: an answer to it continues the task (slice 6).
+model A2aAgentReply {
+  fleetId   String @map("fleet_id")
+  party     String
+  messageId String @map("message_id")
+  taskId    String @map("task_id")
+  contextId String @map("context_id")
+
+  @@id([fleetId, party, messageId])
+  @@map("a2a_agent_replies")
+}
+
 /// MCP clients argo pre-registered; a confidential one's secret kept only as its hash.
 model OAuthClient {
   clientId     String   @id @map("client_id")
@@ -124,6 +165,8 @@ model OAuthClient {
   name         String
   redirectUris String[] @map("redirect_uris")
   secretHash   String?  @map("secret_hash")
+  /// How it signs in: authorizationCode, or clientCredentials with no redirect URI (vendor platforms V4).
+  grant        String   @default("authorizationCode")
 
   @@index([fleetId])
   @@map("oauth_clients")
@@ -151,9 +194,11 @@ model AuthorizationCode {
 /// The access and refresh tokens the gateway issued, kept only as hashes, a pair per row.
 model IssuedToken {
   accessHash       String   @id @map("access_hash")
-  refreshHash      String   @unique @map("refresh_hash")
+  /// None for a client signed in by client credentials, which asks again.
+  refreshHash      String?  @unique @map("refresh_hash")
   familyId         String   @map("family_id")
-  codeHash         String   @map("code_hash")
+  /// None for a token issued from client credentials.
+  codeHash         String?  @map("code_hash")
   fleetId          String   @map("fleet_id")
   clientId         String   @map("client_id")
   resource         String
@@ -162,7 +207,7 @@ model IssuedToken {
   party            String?
   grantId          String?  @map("grant_id")
   accessExpiresAt  DateTime @map("access_expires_at") @db.Timestamptz(3)
-  refreshExpiresAt DateTime @map("refresh_expires_at") @db.Timestamptz(3)
+  refreshExpiresAt DateTime? @map("refresh_expires_at") @db.Timestamptz(3)
   state            String
 
   @@index([fleetId])
@@ -178,16 +223,76 @@ model ClientCall {
   party      String
   handle     String
   shipId     String   @map("ship_id")
-  capability        String
+  /// None when an A2A message matched no capability, and then its first reply answers it (decision 0060).
+  capability        String?
   outputContentType String?  @map("output_content_type")
   sentAt            DateTime @map("sent_at")
   deadlineAt        DateTime? @map("deadline_at")
+  /// Where its delivery stands, as the gateway last read it from the fleet's sentMessage.
+  deliveryState     String?   @map("delivery_state")
+  deliverySince     DateTime? @map("delivery_since")
+  /// An A2A call's task, and the client's message as A2A JSON; none for an MCP call.
+  taskId            String?   @map("task_id")
+  taskMessage       String?   @map("task_message")
 
   @@id([fleetId, messageId])
   @@unique([fleetId, handle])
+  @@index([fleetId, taskId])
   @@map("client_calls")
 }
 
+/// An outside A2A client's task (decision 0060): its id, the HMAC of its first message, its party and its context.
+model A2aTask {
+  fleetId   String   @map("fleet_id")
+  taskId    String   @map("task_id")
+  party     String
+  contextId String   @map("context_id")
+  createdAt DateTime @map("created_at")
+
+  @@id([fleetId, taskId])
+  @@index([fleetId, party, createdAt(sort: Desc), taskId(sort: Desc)])
+  @@map("a2a_tasks")
+}
+
+/// A push config of an outside A2A client's task (slice 4): its webhook, and the vault of its token and authentication, never answered back; with the task as last noticed.
+model A2aPushConfig {
+  fleetId        String   @map("fleet_id")
+  taskId         String   @map("task_id")
+  id             String
+  party          String
+  url            String
+  token          String?
+  /// The scheme and credentials the webhook is called with, as JSON.
+  authentication Json?
+  createdAt      DateTime @map("created_at")
+  noticedMark    String   @map("noticed_mark")
+  isFollowing    Boolean  @map("is_following")
+  pushes         A2aPush[]
+
+  @@id([fleetId, taskId, id])
+  @@index([fleetId, party, isFollowing])
+  @@map("a2a_push_configs")
+}
+
+/// A push of one event of a config's task to its webhook (slice 4): pending until delivered or given up, kept over a restart; its id is its order.
+model A2aPush {
+  pushId    Int           @id @default(autoincrement()) @map("push_id")
+  fleetId   String        @map("fleet_id")
+  taskId    String        @map("task_id")
+  configId  String        @map("config_id")
+  party     String
+  body      String
+  attempts  Int
+  nextAt    DateTime      @map("next_at")
+  state     String
+  reason    String?
+  settledAt DateTime?     @map("settled_at")
+  config    A2aPushConfig @relation(fields: [fleetId, taskId, configId], references: [fleetId, taskId, id], onDelete: Cascade)
+
+  @@index([fleetId, party, state, taskId, configId, pushId])
+  @@map("a2a_pushes")
+}
+
 /// The replies naming an outside client's call, each kept once per delivery before it is acknowledged.
 model ClientCallReply {
   deliveryId     String   @id @map("delivery_id")
@@ -232,6 +337,27 @@ model PersonCrew {
   @@map("person_crews")
 }
 
+/// A person who turned email on to be woken for their person ship (wake a person, W8): a row while it is on; nothing is on by default.
+model EmailChannel {
+  fleetId    String   @map("fleet_id")
+  shipId     String   @map("ship_id")
+  turnedOnAt DateTime @map("turned_on_at") @db.Timestamptz(3)
+
+  @@id([fleetId, shipId])
+  @@map("email_channels")
+}
+
+/// When a channel last woke a person ship, so it sends at most one wake per its window (wake a person, W3).
+model WakeSent {
+  fleetId String   @map("fleet_id")
+  shipId  String   @map("ship_id")
+  channel String
+  sentAt  DateTime @map("sent_at") @db.Timestamptz(3)
+
+  @@id([fleetId, shipId, channel])
+  @@map("wakes_sent")
+}
+
 /// A delivery a person opened, kept until they deal with it, so their answer finds its message and sender and their inbox lists it (Q28 (a)).
 model OpenedDelivery {
   fleetId      String   @map("fleet_id")
@@ -311,3 +437,31 @@ model OwnerQuestion {
   @@id([fleetId, requestId])
   @@map("owner_questions")
 }
+
+/// A page of a person in focus, on any gateway instance, with when it was last seen so (wake a person, W6).
+model FocusedPage {
+  fleetId String   @map("fleet_id")
+  pageId  String   @map("page_id")
+  shipId  String   @map("ship_id")
+  seenAt  DateTime @map("seen_at") @db.Timestamptz(3)
+
+  @@id([fleetId, pageId])
+  @@index([fleetId, shipId, seenAt])
+  @@map("focused_pages")
+}
+
+/// A browser a person turned web push on in (wake a person, W8): its push service's endpoint and keys, and the fleet's name its wakes say. Gone once its push service answered 404 or 410.
+model WebPushSubscription {
+  fleetId   String    @map("fleet_id")
+  shipId    String    @map("ship_id")
+  endpoint  String
+  p256dh    String
+  auth      String
+  browser   String
+  fleetName String    @map("fleet_name")
+  addedAt   DateTime  @map("added_at") @db.Timestamptz(3)
+  goneAt    DateTime? @map("gone_at") @db.Timestamptz(3)
+
+  @@id([fleetId, shipId, endpoint])
+  @@map("web_push_subscriptions")
+}

package/web/.next/BUILD_ID

@@ -1 +1 @@
-ESz77-eaR5ViaU4LRqo0i
+Az1CqrzgGHMZVR4nw9717