@aeolus-fleet/gateway 0.36.1 → 0.36.3

package/dist/core/slack/slack-post-of.js

@@ -1,22 +1,62 @@
-import { QUESTION_CONTENT_TYPE, questionSchema } from '@aeolus-fleet/common';
-import { jobOf } from '../people/item-job.js';
+import { ALERT_CONTENT_TYPE, QUESTION_CONTENT_TYPE, questionSchema } from '@aeolus-fleet/common';
+import { z } from 'zod';
+import { essenceOf, jobOf, NOTICE_CONTENT_TYPE, STEP_CONTENT_TYPE, STEP_REPLACEMENT_CONTENT_TYPE } from '../people/item-job.js';
 /** The most a Slack message shows in full. */
 export const MESSAGE_MAX_LENGTH = 40_000;
 /** The most one block of a Slack message shows. */
 export const BLOCK_MAX_LENGTH = 3_000;
+/** The most characters Slack takes in a button's text: it refuses the whole post for one longer. */
+export const BUTTON_TEXT_MAX_LENGTH = 75;
+/** About the most characters of a button's text Slack shows on a phone before it cuts the rest: a question with a longer one lists its options in full. */
+const BUTTON_TEXT_SHOWN_LENGTH = 30;
+const ELLIPSIS = '…';
+/** How an option listed in full under a question's context begins: its number, bold. */
+const LISTED_OPTION_PREFIX = (key) => `*${String(key)}.* `;
+/**
+ * The option as its question's post lists it in full, in Slack's markup,
+ * numbered as its button is: so an edit names it whole from the post alone,
+ * though its button cut it. None when the post lists no options: then every
+ * button's text is short enough to be whole.
+ */
+export function listedOptionOf(body, key) {
+    const prefix = LISTED_OPTION_PREFIX(key);
+    const line = body?.split('\n').find((each) => each.startsWith(prefix));
+    return line === undefined ? undefined : `${String(key)}. ${line.slice(prefix.length)}`;
+}
 /** The button under an item with no other: seeing it is what it asks, or all the person does with it in Slack (Bridge, section 6). */
 export const SEEN = { text: 'Seen', isSeen: true };
+/** The button under a step that marks it done (Bridge, CC14). */
+export const DONE = { text: 'Done', isDone: true };
+/** What an item is called in its post's heading, by its content type, with its job's name (Bridge, section 6). */
+const ITEMS = new Map([
+    [QUESTION_CONTENT_TYPE, { noun: 'Question', job: 'Decide' }],
+    [STEP_CONTENT_TYPE, { noun: 'Step', job: 'Do' }],
+    [STEP_REPLACEMENT_CONTENT_TYPE, { noun: 'Step', job: 'Do' }],
+    [ALERT_CONTENT_TYPE, { noun: 'Alert', job: 'Stay aware' }],
+    [NOTICE_CONTENT_TYPE, { noun: 'Notice', job: 'Stay aware' }],
+]);
+/** What Slack reads of a step, as common's stepSchema words it from its release after 0.35.0 (Bridge B2); it moves to common's then. */
+const stepSchema = z.object({ why: z.string(), link: z.url({ protocol: /^https?$/ }).optional() });
+/** The step a delivery asks: a step's own, or the new step a step replacement asks. */
+const STEP_SCHEMAS = new Map([
+    [STEP_CONTENT_TYPE, stepSchema],
+    [STEP_REPLACEMENT_CONTENT_TYPE, z.object({ step: stepSchema }).transform(({ step }) => step)],
+]);
+function parsedOf(schema, payload) {
+    try {
+        return schema.safeParse(JSON.parse(payload)).data;
+    }
+    catch {
+        return undefined;
+    }
+}
 /** The buttons of an item that shows no option: Seen, but for a question or a step, which seeing does not end. */
 function seenOf(contentType) {
     const job = jobOf(contentType);
     return job === 'stay-aware' || job === 'everything-else' ? [SEEN] : [];
 }
-/** The content type's essence, its parameters gone. */
-function essenceOf(contentType) {
-    return (contentType.split(';')[0] ?? '').trim().toLowerCase();
-}
 /** Text as Slack shows it as it is: its control characters escaped. */
-function escaped(text) {
+export function escaped(text) {
     return text.replaceAll('&', '&amp;').replaceAll('<', '&lt;').replaceAll('>', '&gt;');
 }
 /** Markdown in Slack's markup: bold, strike, links and headings; italics, code and lists read the same. */
@@ -28,22 +68,81 @@ function slackMarkupOf(markdown) {
         .replaceAll(/~~([^~\n]+)~~/g, '~$1~')
         .replaceAll(/^#{1,6} +(.+)$/gm, '*$1*');
 }
+/** What a question, a step, an alert or a notice asks with in Slack; none when its payload does not read. */
+function askingOf(delivery, bridgeUrl) {
+    const { senderName, payload } = delivery;
+    const essence = essenceOf(delivery.contentType);
+    const openInBridge = `<${bridgeUrl}|Open in Bridge>`;
+    if (essence === QUESTION_CONTENT_TYPE) {
+        const question = parsedOf(questionSchema, payload);
+        if (question === undefined) {
+            return undefined;
+        }
+        const options = question.options.map(({ key, label }) => ({ key, label, text: `${String(key)}. ${label}` }));
+        // Slack cuts a long button's text where it shows it, and refuses a post for one over its limit: such options read in full in the body.
+        const isAnyCut = options.some(({ text }) => text.length > BUTTON_TEXT_SHOWN_LENGTH);
+        const listed = isAnyCut ? `\n\n${options.map(({ key, label }) => `${LISTED_OPTION_PREFIX(key)}${escaped(label)}`).join('\n')}` : '';
+        return {
+            body: `${slackMarkupOf(question.context)}${listed}`,
+            aside: `${escaped(senderName)} picks ${String(question.pick.option)}: ${escaped(question.pick.why)}`,
+            footer: `${openInBridge} · reply in the thread to add a note`,
+            buttons: options.map(({ key, text }) => ({ text: text.length > BUTTON_TEXT_MAX_LENGTH ? `${text.slice(0, BUTTON_TEXT_MAX_LENGTH - ELLIPSIS.length)}${ELLIPSIS}` : text, option: key, isPicked: key === question.pick.option })),
+        };
+    }
+    const stepSchemaOf = STEP_SCHEMAS.get(essence);
+    if (stepSchemaOf !== undefined) {
+        const step = parsedOf(stepSchemaOf, payload);
+        if (step === undefined) {
+            return undefined;
+        }
+        const open = step.link === undefined ? [] : [{ text: `Open ${new URL(step.link).host}`, url: step.link }];
+        return { body: slackMarkupOf(step.why), aside: null, footer: openInBridge, buttons: [...open, DONE] };
+    }
+    return { body: null, aside: null, footer: null, buttons: [SEEN] };
+}
+/**
+ * An item as its post shows it (Bridge, views.html): headed by its asker
+ * and job, its title, then what it asks with. A question: its context, the
+ * asker's pick, a button per option numbered with the pick's filled, its
+ * text cut at Slack's limit, the options listed in full under the context
+ * once a button's text is longer than Slack shows on a phone, and Open in
+ * Bridge with a thread reply as a note; a step: its why, Open on its
+ * link and Done; an alert or a notice: its headline and Seen. None for any
+ * other message, one with no headline, or one whose payload does not read.
+ */
+function itemPostOf(delivery, bridgeUrl) {
+    const essence = essenceOf(delivery.contentType);
+    const named = ITEMS.get(essence);
+    const asking = named === undefined || delivery.headline === null ? undefined : askingOf(delivery, bridgeUrl);
+    if (named === undefined || delivery.headline === null || asking === undefined) {
+        return undefined;
+    }
+    const { body, aside, footer, buttons } = asking;
+    const asker = escaped(delivery.senderName);
+    const title = escaped(delivery.headline);
+    const isAware = jobOf(delivery.contentType) === 'stay-aware';
+    const item = { asker: delivery.senderName, heading: `${named.noun} from ${asker} · ${named.job}`, title, body, aside, footer, tone: isAware ? 'aware' : 'asking' };
+    const isInBlocks = [item.heading, title, body ?? '', aside ?? '', footer ?? ''].every((block) => block.length <= BLOCK_MAX_LENGTH);
+    return isInBlocks ? { kind: 'shown', text: `${named.noun} from ${asker}: ${title}`, item, buttons } : undefined;
+}
 /**
- * What a delivery shows as in Slack (gateway scopes 9.5 step 2): text and
- * Markdown as text, Markdown in Slack's markup; a question as its title and
- * context, one button per option; JSON as a code block. Another content
- * type, or more than Slack shows in full (40,000 characters, a block 3,000),
- * goes as a link to the gateway's pages. The gateway's own bot heads it
- * with the sender's name. An item with no other button, an alert, a notice
- * or any other message, gets Seen.
+ * What a delivery shows as in Slack (gateway scopes 9.5 step 2): an item,
+ * a question, a step, an alert or a notice, as views.html draws it; text and
+ * Markdown as text, Markdown in Slack's markup; JSON as a code block.
+ * Another content type, or more than Slack shows in full (40,000
+ * characters, a block 3,000), goes as a link to the gateway's pages. The
+ * gateway's own bot heads a message that is no item with the sender's name.
+ * An item with no other button, an alert, a notice or any other message,
+ * gets Seen.
  */
 export function slackPostOf(delivery, shown) {
     const { senderName, contentType, payload } = delivery;
-    const link = { kind: 'link', text: `${escaped(senderName)} sent you a message Slack does not show in full: <${shown.bridgeUrl}|open it in the gateway>`, buttons: seenOf(contentType) };
-    const headed = (text) => (shown.isHeadedBySender ? `*${escaped(senderName)}*\n${text}` : text);
+    const link = { kind: 'link', text: `${escaped(senderName)} sent you a message Slack does not show in full: <${shown.bridgeUrl}|open it in the gateway>`, item: null, buttons: seenOf(contentType) };
+    if (ITEMS.has(essenceOf(contentType))) {
+        return itemPostOf(delivery, shown.bridgeUrl) ?? link;
+    }
     const essence = essenceOf(contentType);
     let text;
-    let buttons = seenOf(contentType);
     if (essence === 'text/plain') {
         text = escaped(payload);
     }
@@ -53,28 +152,10 @@ export function slackPostOf(delivery, shown) {
     else if (essence === 'application/json') {
         text = `\`\`\`${payload}\`\`\``;
     }
-    else if (essence === QUESTION_CONTENT_TYPE) {
-        let parsed;
-        try {
-            parsed = JSON.parse(payload);
-        }
-        catch {
-            return link;
-        }
-        const question = questionSchema.safeParse(parsed);
-        if (!question.success) {
-            return link;
-        }
-        text = `*${escaped(question.data.title)}*\n${escaped(question.data.context)}`;
-        buttons = question.data.options.map(({ key, label }) => ({ text: label, option: key }));
-        if (headed(text).length > BLOCK_MAX_LENGTH) {
-            return link;
-        }
-    }
     else {
         return link;
     }
-    const full = headed(text);
-    return full.length > MESSAGE_MAX_LENGTH ? link : { kind: 'shown', text: full, buttons };
+    const full = shown.isHeadedBySender ? `*${escaped(senderName)}*\n${text}` : text;
+    return full.length > MESSAGE_MAX_LENGTH ? link : { kind: 'shown', text: full, item: null, buttons: seenOf(contentType) };
 }
 //# sourceMappingURL=slack-post-of.js.map

package/dist/core/slack/slack-post-of.js.map

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

package/dist/core/slack/slack-post.d.ts

@@ -31,8 +31,20 @@ export interface PostToEdit {
         readonly deliveryId: DeliveryId;
         readonly ts: string;
     };
-    readonly outcome: Pick<ItemOutcome, 'place' | 'kind' | 'option'>;
+    readonly outcome: Pick<ItemOutcome, 'place' | 'kind' | 'option' | 'at'>;
 }
+/**
+ * Whether the post is in the conversation, through the bot's app. A post
+ * to a person's direct messages goes by their user id, and Slack names the
+ * conversation by an id of its own only once it answers: until then, the
+ * post kept by a user id is in the direct messages of its person ship's
+ * person with that bot, the only ones a person ship's posts go to by user
+ * id (aeolus-fleet#1573).
+ */
+export declare function isPostIn(post: SlackPost, conversation: {
+    appId: string;
+    channel: string;
+}): boolean;
 /**
  * Whether the post is a delivery not yet in Slack that starts a thread in
  * the conversation: a reply in a thread there that matches no post may be

package/dist/core/slack/slack-post.js

@@ -1,10 +1,25 @@
+/** How Slack's ids begin: a person's user id, and the conversation id of direct messages. */
+const USER_ID = /^[UW]/;
+const DIRECT_MESSAGES_PREFIX = 'D';
+/**
+ * Whether the post is in the conversation, through the bot's app. A post
+ * to a person's direct messages goes by their user id, and Slack names the
+ * conversation by an id of its own only once it answers: until then, the
+ * post kept by a user id is in the direct messages of its person ship's
+ * person with that bot, the only ones a person ship's posts go to by user
+ * id (aeolus-fleet#1573).
+ */
+export function isPostIn(post, conversation) {
+    const isInDirectMessages = USER_ID.test(post.channel) && conversation.channel.startsWith(DIRECT_MESSAGES_PREFIX);
+    return post.appId === conversation.appId && (post.channel === conversation.channel || isInDirectMessages);
+}
 /**
  * Whether the post is a delivery not yet in Slack that starts a thread in
  * the conversation: a reply in a thread there that matches no post may be
  * under it, before the gateway keeps its Slack message.
  */
 export function isAwaitingSlackIn(post, conversation) {
-    return post.deliveryId !== null && post.ts === null && post.threadTs === null && post.appId === conversation.appId && post.channel === conversation.channel;
+    return post.deliveryId !== null && post.ts === null && post.threadTs === null && isPostIn(post, conversation);
 }
 /** Whether the post is a delivery the gateway did not finish: not yet in Slack. */
 export function isUnfinished(post) {

package/dist/core/slack/slack-post.js.map

@@ -1 +1 @@
-{"version":3,"file":"slack-post.js","sourceRoot":"","sources":["../../../src/core/slack/slack-post.ts"],"names":[],"mappings":"AAoCA;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAe,EAAE,YAAgD;IACjG,OAAO,IAAI,CAAC,UAAU,KAAK,IAAI,IAAI,IAAI,CAAC,EAAE,KAAK,IAAI,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,IAAI,IAAI,CAAC,KAAK,KAAK,YAAY,CAAC,KAAK,IAAI,IAAI,CAAC,OAAO,KAAK,YAAY,CAAC,OAAO,CAAC;AAC9J,CAAC;AAED,mFAAmF;AACnF,MAAM,UAAU,YAAY,CAAC,IAAe;IAC1C,OAAO,IAAI,CAAC,UAAU,KAAK,IAAI,IAAI,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC;AACtD,CAAC"}
+{"version":3,"file":"slack-post.js","sourceRoot":"","sources":["../../../src/core/slack/slack-post.ts"],"names":[],"mappings":"AAoCA,6FAA6F;AAC7F,MAAM,OAAO,GAAG,OAAO,CAAC;AACxB,MAAM,sBAAsB,GAAG,GAAG,CAAC;AAEnC;;;;;;;GAOG;AACH,MAAM,UAAU,QAAQ,CAAC,IAAe,EAAE,YAAgD;IACxF,MAAM,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,sBAAsB,CAAC,CAAC;IACjH,OAAO,IAAI,CAAC,KAAK,KAAK,YAAY,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,OAAO,KAAK,YAAY,CAAC,OAAO,IAAI,kBAAkB,CAAC,CAAC;AAC5G,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAe,EAAE,YAAgD;IACjG,OAAO,IAAI,CAAC,UAAU,KAAK,IAAI,IAAI,IAAI,CAAC,EAAE,KAAK,IAAI,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,IAAI,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;AAChH,CAAC;AAED,mFAAmF;AACnF,MAAM,UAAU,YAAY,CAAC,IAAe;IAC1C,OAAO,IAAI,CAAC,UAAU,KAAK,IAAI,IAAI,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC;AACtD,CAAC"}

package/dist/core/slack/slack-press.d.ts

@@ -5,7 +5,7 @@ import { type Result } from '../shared/result.js';
 import type { SlackApps, SlackLinks, SlackPosts, SlackSignatures } from './ports.js';
 import type { SlackApp } from './slack-app.js';
 import { type SignedRequest } from './slack-request.js';
-import type { SlackPost } from './slack-post.js';
+import { type SlackPost } from './slack-post.js';
 /** A press of a button under a post of the gateway's: the app, who pressed it, the Slack message it is under, and the fleet message its buttons name. */
 export interface SlackPress extends SignedRequest {
     readonly appId: string;

package/dist/core/slack/slack-press.js

@@ -1,5 +1,6 @@
 import { err, ok } from '../shared/result.js';
 import { isSignedBy } from './slack-request.js';
+import { isPostIn } from './slack-post.js';
 /**
  * What a press acts on, signed as an event is, by the person the delivery
  * was posted to, in the conversation it was posted in; none for anything
@@ -15,7 +16,7 @@ export async function pressedOf(deps, press) {
     }
     const link = await deps.links.find(app.fleetId, { teamId, userId });
     const kept = link?.stoppedAt === null ? await deps.posts.ofMessage(app.fleetId, { personShipId: link.personShipId, messageId }) : undefined;
-    const post = kept?.appId === appId && kept.channel === channel ? kept : undefined;
+    const post = kept !== undefined && isPostIn(kept, { appId, channel }) ? kept : undefined;
     const crew = post === undefined ? undefined : await deps.crews.find(app.fleetId, post.personShipId);
     const { bot } = app;
     if (post === undefined || post.deliveryId === null || post.senderShipId === null || crew === undefined || bot === null) {

package/dist/core/slack/slack-press.js.map

@@ -1 +1 @@
-{"version":3,"file":"slack-press.js","sourceRoot":"","sources":["../../../src/core/slack/slack-press.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,GAAG,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAG3D,OAAO,EAAE,UAAU,EAAsB,MAAM,oBAAoB,CAAC;AAoBpE;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,IAAkM,EAClM,KAAiB;IAEjB,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IACxF,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAC/C,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC;QAClH,OAAO,GAAG,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;IACpC,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACpE,MAAM,IAAI,GAAG,IAAI,EAAE,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5I,MAAM,IAAI,GAAG,IAAI,EAAE,KAAK,KAAK,KAAK,IAAI,IAAI,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAClF,MAAM,IAAI,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IACpG,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;IACpB,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,UAAU,KAAK,IAAI,IAAI,IAAI,CAAC,YAAY,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QACvH,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;IACD,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,GAAG,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;AAC7H,CAAC"}
+{"version":3,"file":"slack-press.js","sourceRoot":"","sources":["../../../src/core/slack/slack-press.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,GAAG,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAG3D,OAAO,EAAE,UAAU,EAAsB,MAAM,oBAAoB,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAkB,MAAM,iBAAiB,CAAC;AAmB3D;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,IAAkM,EAClM,KAAiB;IAEjB,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IACxF,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAC/C,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC;QAClH,OAAO,GAAG,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;IACpC,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACpE,MAAM,IAAI,GAAG,IAAI,EAAE,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5I,MAAM,IAAI,GAAG,IAAI,KAAK,SAAS,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IACzF,MAAM,IAAI,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IACpG,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;IACpB,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,UAAU,KAAK,IAAI,IAAI,IAAI,CAAC,YAAY,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QACvH,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;IACD,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,GAAG,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;AAC7H,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeolus-fleet/gateway",
-  "version": "0.36.1",
+  "version": "0.36.3",
   "description": "Aeolus gateway: outside MCP servers and clients join a fleet as ships, through one gateway beside core.",
   "keywords": [
     "ai-agents",
@@ -47,7 +47,8 @@
   },
   "dependencies": {
     "@a2a-js/sdk": "1.3.0",
-    "@aeolus-fleet/common": "^0.35.0",
+    "@aeolus-fleet/common": "^0.36.1",
+    "@aeolus-fleet/ui": "^0.36.1",
     "@base-ui/react": "^1.9.0",
     "@fastify/websocket": "^11.3.4",
     "@modelcontextprotocol/client": "^2.3.1",
@@ -65,6 +66,7 @@
     "prisma": "^7.10.1",
     "react": "^19.3.1",
     "react-dom": "^19.3.1",
+    "react-markdown": "^10.1.0",
     "tailwind-merge": "^3.7.0",
     "web-push": "^3.6.7",
     "zod": "^4.6.5"

package/src/adapters/prisma/migrations/20261104090000_basket_entries_note_alone/migration.sql

@@ -0,0 +1,2 @@
+-- A basket entry may answer with a note alone, with no option.
+ALTER TABLE "basket_entries" ALTER COLUMN "option" DROP NOT NULL;

package/src/adapters/prisma/migrations/20261105090000_slack_link_steps/migration.sql

@@ -0,0 +1,10 @@
+-- CreateTable
+CREATE TABLE "slack_link_steps" (
+    "fleet_id" TEXT NOT NULL,
+    "person_ship_id" TEXT NOT NULL,
+    "step_id" TEXT NOT NULL,
+    "is_told" BOOLEAN NOT NULL DEFAULT false,
+    "step_message_id" TEXT,
+
+    CONSTRAINT "slack_link_steps_pkey" PRIMARY KEY ("fleet_id","person_ship_id")
+);

package/src/adapters/prisma/migrations/20261106090000_opened_deliveries_withdrawn_steps/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "opened_deliveries" ADD COLUMN "withdrawn_step_id" TEXT;

package/src/adapters/prisma/migrations/20261107090000_opened_deliveries_step_link/migration.sql

@@ -0,0 +1,2 @@
+-- The link where a step is done, kept once the step is opened, so its row in Bridge leads there (aeolus-fleet#1535).
+ALTER TABLE "opened_deliveries" ADD COLUMN "step_link" TEXT;

package/src/adapters/prisma/migrations/20261107100000_opened_deliveries_opened_in/migration.sql

@@ -0,0 +1,2 @@
+-- Where the person opened a delivery, so its row in Bridge says Seen in Bridge (aeolus-fleet#1535).
+ALTER TABLE "opened_deliveries" ADD COLUMN "opened_in" TEXT;

package/src/adapters/prisma/migrations/20261108090000_item_outcomes_note_and_seen/migration.sql

@@ -0,0 +1,4 @@
+-- The note the person sent with an outcome, and where and when they first saw the item, so Done tells its history (aeolus-fleet#1543).
+ALTER TABLE "item_outcomes" ADD COLUMN "note" TEXT;
+ALTER TABLE "item_outcomes" ADD COLUMN "seen_in" TEXT;
+ALTER TABLE "item_outcomes" ADD COLUMN "seen_at" TIMESTAMPTZ(3);

package/src/adapters/prisma/migrations/20261108090000_parties_display_name/migration.sql

@@ -0,0 +1,2 @@
+-- An MCP server's display name: its serverInfo title on the last connect.
+ALTER TABLE "parties" ADD COLUMN "display_name" TEXT;

package/src/adapters/prisma/migrations/20261109090000_argo_accounts/migration.sql

@@ -0,0 +1,8 @@
+-- The accounts allowed as argo in each fleet, from each account's latest account token (argo's inbox, AI9).
+CREATE TABLE "argo_accounts" (
+    "fleet_id" TEXT NOT NULL,
+    "account_id" TEXT NOT NULL,
+    "person_ship_id" TEXT NOT NULL,
+
+    CONSTRAINT "argo_accounts_pkey" PRIMARY KEY ("fleet_id","account_id")
+);

package/src/adapters/prisma/migrations/20261109090000_basket_entries_option_label/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "basket_entries" ADD COLUMN "option_label" TEXT;

package/src/adapters/prisma/migrations/20261109100000_basket_entries_sent/migration.sql

@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE "basket_entries" ADD COLUMN "is_unanswered" BOOLEAN NOT NULL DEFAULT false,
+ADD COLUMN "stored_at" TIMESTAMPTZ(3);

package/src/adapters/prisma/migrations/20261110090000_argo_slack_posts/migration.sql

@@ -0,0 +1,12 @@
+-- The messages open at argo as they are in Slack, for the person ships of accounts allowed as argo (argo's inbox, AI4).
+CREATE TABLE "argo_slack_posts" (
+    "fleet_id" TEXT NOT NULL,
+    "person_ship_id" TEXT NOT NULL,
+    "message_id" TEXT NOT NULL,
+    "app_id" TEXT NOT NULL,
+    "channel" TEXT NOT NULL,
+    "ts" TEXT,
+    "is_given_up" BOOLEAN NOT NULL DEFAULT false,
+
+    CONSTRAINT "argo_slack_posts_pkey" PRIMARY KEY ("fleet_id","person_ship_id","message_id")
+);

package/src/adapters/prisma/migrations/20261110090000_connected_chats_indexes/migration.sql

@@ -0,0 +1,5 @@
+-- CreateIndex
+CREATE INDEX "issued_tokens_fleet_id_grant_id_state_idx" ON "issued_tokens"("fleet_id", "grant_id", "state");
+
+-- CreateIndex
+CREATE INDEX "account_grants_fleet_id_person_ship_id_idx" ON "account_grants"("fleet_id", "person_ship_id");

package/src/adapters/prisma/migrations/20261110100000_argo_wakes/migration.sql

@@ -0,0 +1,18 @@
+-- The messages to argo a wake or a page in focus covered for each person ship allowed as argo (argo's inbox, AI5).
+CREATE TABLE "argo_messages_covered" (
+    "fleet_id" TEXT NOT NULL,
+    "ship_id" TEXT NOT NULL,
+    "message_id" TEXT NOT NULL,
+
+    CONSTRAINT "argo_messages_covered_pkey" PRIMARY KEY ("fleet_id","ship_id","message_id")
+);
+
+-- When each channel last woke each person ship for what waits at argo, apart from its own wakes (argo's inbox, AI5).
+CREATE TABLE "argo_wakes_sent" (
+    "fleet_id" TEXT NOT NULL,
+    "ship_id" TEXT NOT NULL,
+    "channel" TEXT NOT NULL,
+    "sent_at" TIMESTAMPTZ(3) NOT NULL,
+
+    CONSTRAINT "argo_wakes_sent_pkey" PRIMARY KEY ("fleet_id","ship_id","channel")
+);

package/src/adapters/prisma/schema.prisma

@@ -80,6 +80,8 @@ model Party {
   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 server's display name: the title its serverInfo gave on the gateway's last connect, none if it gave none.
+  displayName              String?  @map("display_name")
   /// The scopes a calling ship needs (gateway scopes, 4.2): the party's set and each tool's, by scope text and tool name; none set yet needs nothing.
   scopeRequirements        Json?    @map("scope_requirements")
   /// The version the requirements were last changed to, so a change made on an older one is refused.
@@ -217,6 +219,7 @@ model IssuedToken {
   @@index([fleetId])
   @@index([familyId])
   @@index([codeHash])
+  @@index([fleetId, grantId, state])
   @@map("issued_tokens")
 }
 
@@ -327,6 +330,7 @@ model AccountGrant {
   accountTokenExpiresAt DateTime @map("account_token_expires_at") @db.Timestamptz(3)
 
   @@index([fleetId])
+  @@index([fleetId, personShipId])
   @@map("account_grants")
 }
 
@@ -382,8 +386,14 @@ model OpenedDelivery {
   askedQuestionId     String?  @map("asked_question_id")
   /// The uuid of the question it withdraws or replaces; null otherwise.
   withdrawnQuestionId String?  @map("withdrawn_question_id")
-  /// The uuid of the step it asks (Bridge, CC14); null otherwise.
+  /// The uuid of the step it asks (Bridge, CC14): a step's own, a step replacement's new one; null otherwise.
   stepId              String?  @map("step_id")
+  /// The uuid of the step it withdraws or replaces; null otherwise.
+  withdrawnStepId     String?  @map("withdrawn_step_id")
+  /// The link where the step it asks is done (Bridge, CC14), so its row leads there once opened; null for a step without one, one opened before the gateway kept it, or any other message.
+  stepLink            String?  @map("step_link")
+  /// Where the person opened it (bridge, chat, slack), so a row says Seen in Bridge; null for one opened before the gateway kept it.
+  openedIn            String?  @map("opened_in")
   sentAt              DateTime @map("sent_at") @db.Timestamptz(3)
   openedAt            DateTime @map("opened_at") @db.Timestamptz(3)
 
@@ -391,7 +401,7 @@ model OpenedDelivery {
   @@map("opened_deliveries")
 }
 
-/// An answer in a person's basket (Bridge, section 9; CC21): picked in Bridge and not sent yet, one per question, sent in the order added.
+/// An answer in a person's basket (Bridge, section 9; CC21): picked in Bridge, one per question, sent in the order added; kept as sent until the next Put or Send.
 /// The person ships with an entry stored as sending are found by the partial index basket_entries_sending, in its migration.
 model BasketEntry {
   fleetId      String   @map("fleet_id")
@@ -404,13 +414,20 @@ model BasketEntry {
   from         String
   title        String
   sentAt       DateTime @map("sent_at") @db.Timestamptz(3)
-  option       Int
+  /// None for a note alone.
+  option       Int?
+  /// The option's label, as the question shows it; none for a note alone.
+  optionLabel  String?  @map("option_label")
   note         String?
   addedAt      DateTime @map("added_at") @db.Timestamptz(3)
-  /// waiting, sending or refused.
+  /// waiting, sending, sent or refused.
   state        String
-  /// Why the fleet refused it, while refused.
+  /// Why the fleet refused it, in words, while refused.
   refusal      String?
+  /// Whether the fleet did not answer its last send.
+  isUnanswered Boolean   @default(false) @map("is_unanswered")
+  /// When the fleet stored its answer, once sent.
+  storedAt     DateTime? @map("stored_at") @db.Timestamptz(3)
 
   @@id([fleetId, shipId, questionId])
   @@index([fleetId, shipId, addedAt])
@@ -567,6 +584,19 @@ model SlackLink {
   @@map("slack_links")
 }
 
+/// A person's open ask to link Slack (Bridge, BG7): one per person ship while open, its uuid the step's and keying the message; a link closes it.
+model SlackLinkStep {
+  fleetId       String  @map("fleet_id")
+  personShipId  String  @map("person_ship_id")
+  stepId        String  @map("step_id")
+  isTold        Boolean @default(false) @map("is_told")
+  /// The message of the step that asked the person; null until told, or when the fleet refused it.
+  stepMessageId String? @map("step_message_id")
+
+  @@id([fleetId, personShipId])
+  @@map("slack_link_steps")
+}
+
 /// A linked person's Slack message, kept by Slack's event id until core takes it (gateway scopes 9.4 step 3); then only its id, for an hour.
 model SlackEvent {
   fleetId      String    @map("fleet_id")
@@ -668,8 +698,60 @@ model ItemOutcome {
   kind       String
   /// The option of a question answered with one; null otherwise.
   option     Int?
-  at         DateTime @db.Timestamptz(3)
+  /// The note the person sent with it; null when they wrote none.
+  note       String?
+  /// Where (bridge, chat, slack) and when the person first saw the item; null where the gateway did not see it seen.
+  seenIn     String?   @map("seen_in")
+  seenAt     DateTime? @map("seen_at") @db.Timestamptz(3)
+  at         DateTime  @db.Timestamptz(3)
 
   @@id([fleetId, shipId, deliveryId])
   @@map("item_outcomes")
 }
+
+/// An account allowed as argo in a fleet, as its latest account token said, with the person ship it is reached at (argo's inbox, AI9).
+model ArgoAccount {
+  fleetId      String @map("fleet_id")
+  accountId    String @map("account_id")
+  personShipId String @map("person_ship_id")
+
+  @@id([fleetId, accountId])
+  @@map("argo_accounts")
+}
+
+/// A message open at argo as it is in Slack, for a person ship of an account allowed as argo (argo's inbox, AI4): kept before Slack is asked, forgotten once done at argo and its post edited.
+model ArgoSlackPost {
+  fleetId      String  @map("fleet_id")
+  personShipId String  @map("person_ship_id")
+  messageId    String  @map("message_id")
+  appId        String  @map("app_id")
+  channel      String
+  /// The Slack message, once Slack took the post.
+  ts           String?
+  /// Slack refused the post: it is never posted again.
+  isGivenUp    Boolean @default(false) @map("is_given_up")
+
+  @@id([fleetId, personShipId, messageId])
+  @@map("argo_slack_posts")
+}
+
+/// A message to argo a wake or a page in focus covered for a person ship allowed as argo, so it wakes that person once (argo's inbox, AI5).
+model ArgoMessageCovered {
+  fleetId   String @map("fleet_id")
+  shipId    String @map("ship_id")
+  messageId String @map("message_id")
+
+  @@id([fleetId, shipId, messageId])
+  @@map("argo_messages_covered")
+}
+
+/// When a channel last woke a person ship for what waits at argo, apart from its own wakes, so it sends at most one per its window (argo's inbox, AI5).
+model ArgoWakeSent {
+  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("argo_wakes_sent")
+}

package/web/.next/BUILD_ID

@@ -1 +1 @@
-CMppMkysNciqc8k4TWwia
+79SqN0pBIJ0D-DK1jZmK6