@mnemom/mnemom 0.17.34 → 0.17.36

package/dist/lib/scan/report.d.ts

@@ -1,13 +1,11 @@
-/**
- * Renders the scan preview report from values already in memory: the local PR scan plus the org's
- * Record totals. Pure (returns lines, prints nothing) and never persists anything. Totals are
- * labelled "last 30 days"; no other window number is invented. Money is integer millimu
- * (1 MU = 1000 mmu), formatted with BigInt so values above 2^53 stay exact.
- */
-import { type RecordOutcome } from "./record.js";
+import { type RecordCoverage, type RecordOutcome } from "./record.js";
 export declare const RECORD_NOT_AVAILABLE_NOTE = "Records not available for this org.";
 export declare const RECORD_UNAVAILABLE_NOTE = "Records could not be read right now; continuing without them.";
 export declare const RECORD_NO_ORG_NOTE = "Records skipped: pass --org <org_id> to include the org's Record totals.";
-/** "12.5 MU" from "12500". Caller guarantees a canonical mmu string. */
+/** "12.5 μ" from "12500". Caller guarantees a canonical mmu string. */
 export declare function formatMu(mmu: string): string;
+/** "$0.13 (12.5 μ)": dollars first, exact μ beside it. */
+export declare function describe(mmu: string): string;
 export declare function renderRecordSection(outcome: RecordOutcome): string[];
+/** The fixed partial-coverage sentence. */
+export declare function recordCoverageNote(c: RecordCoverage): string;

package/dist/lib/scan/report.js

@@ -1,19 +1,24 @@
 /**
  * Renders the scan preview report from values already in memory: the local PR scan plus the org's
  * Record totals. Pure (returns lines, prints nothing) and never persists anything. Totals are
- * labelled "last 30 days"; no other window number is invented. Money is integer millimu
- * (1 MU = 1000 mmu), formatted with BigInt so values above 2^53 stay exact.
+ * labelled "last 30 days"; no other window number is invented. Money is shown in dollars with the exact μ
+ * beside it (1 μ = 1 cent; the ledger unit is never printed), formatted with BigInt so values above 2^53 stay exact.
  */
+import { formatUsd } from "../conduct-receipt.js";
 import { RECORD_WINDOW_LABEL } from "./record.js";
 export const RECORD_NOT_AVAILABLE_NOTE = "Records not available for this org.";
 export const RECORD_UNAVAILABLE_NOTE = "Records could not be read right now; continuing without them.";
 export const RECORD_NO_ORG_NOTE = "Records skipped: pass --org <org_id> to include the org's Record totals.";
-/** "12.5 MU" from "12500". Caller guarantees a canonical mmu string. */
+/** "12.5 μ" from "12500". Caller guarantees a canonical mmu string. */
 export function formatMu(mmu) {
     const n = BigInt(mmu);
     const whole = (n / 1000n).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
     const frac = (n % 1000n).toString().padStart(3, "0").replace(/0+$/, "");
-    return `${whole}${frac ? `.${frac}` : ""} MU`;
+    return `${whole}${frac ? `.${frac}` : ""} μ`;
+}
+/** "$0.13 (12.5 μ)": dollars first, exact μ beside it. */
+export function describe(mmu) {
+    return `${formatUsd(BigInt(mmu))} (${formatMu(mmu)})`;
 }
 export function renderRecordSection(outcome) {
     if (outcome.status === "not_in_cohort")
@@ -21,10 +26,19 @@ export function renderRecordSection(outcome) {
     if (outcome.status === "unavailable")
         return [RECORD_UNAVAILABLE_NOTE];
     const t = outcome.totals;
+    const c = outcome.coverage;
+    // Partial totals are never labelled as the full window: the label and an explicit coverage line change.
+    const head = c.complete
+        ? [`Org Record (${RECORD_WINDOW_LABEL}, read from Mnemom; not stored):`]
+        : ["Org Record (partial, read from Mnemom; not stored):", `  ${recordCoverageNote(c)}`];
     return [
-        `Org Record (${RECORD_WINDOW_LABEL}, read from Mnemom; not stored):`,
-        `  Model cost: ${formatMu(t.model_cost_mmu)}`,
-        `  Charged: ${t.mu_charged_mmu === null ? "not charged" : formatMu(t.mu_charged_mmu)}`,
+        ...head,
+        `  Model cost: ${describe(t.model_cost_mmu)}`,
+        `  Charged: ${t.mu_charged_mmu === null ? "not charged" : describe(t.mu_charged_mmu)}`,
         `  Requests recorded: ${t.row_count}`,
     ];
 }
+/** The fixed partial-coverage sentence. */
+export function recordCoverageNote(c) {
+    return `Record totals cover ${c.days_covered} of ${c.days_total} days (some periods could not be read).`;
+}

package/dist/lib/scan/share.d.ts

@@ -1,10 +1,14 @@
 import type { ScanResult } from "./scan.js";
 export type ShareLevel = "summary" | "full" | "none";
+/** The level preselected at the prompt (Enter picks it). */
+export declare const DEFAULT_SHARE_LEVEL: ShareLevel;
 export declare const SHARE_OPTIONS: ReadonlyArray<{
     level: ShareLevel;
     label: string;
 }>;
-/** Asks the user. Anything but a recognised answer (cancel, EOF, noise) is "none": fail closed. */
+/** Shown just above the share prompt, so pressing Enter is an informed choice. */
+export declare const SHARE_DISCLOSURE: string;
+/** Asks the user, with Full preselected. Anything but a recognised answer (cancel, EOF, noise) is "none": fail closed. */
 export declare function promptShareLevel(): Promise<ShareLevel>;
 export declare function parseShareLevel(v: string | undefined): ShareLevel | null;
 /** Who receives the report. Sent only with a non-"none" share level. */

package/dist/lib/scan/share.js

@@ -1,16 +1,26 @@
 /**
  * Share level: what, if anything, may leave the machine. Asked before any output is built for sharing.
- * Default is summary metrics. "none" yields no payload at all.
+ * Full is the preselected choice (MNE-9619): pressing Enter at the prompt picks it. "none" yields no
+ * payload at all, and is what a cancelled, empty-piped or non-interactive prompt resolves to (fail closed).
  */
 import { askSelect } from "../prompt.js";
+/** The level preselected at the prompt (Enter picks it). */
+export const DEFAULT_SHARE_LEVEL = "full";
 export const SHARE_OPTIONS = [
-    { level: "summary", label: "Summary metrics only (counts and one estimate line; default)" },
-    { level: "full", label: "Full report (summary plus per-repo counts)" },
+    { level: "summary", label: "Summary metrics only (counts and one estimate line)" },
+    { level: "full", label: "Full report (summary plus per-repo counts; default)" },
     { level: "none", label: "Nothing (keep results on this machine)" },
 ];
-/** Asks the user. Anything but a recognised answer (cancel, EOF, noise) is "none": fail closed. */
+/** Shown just above the share prompt, so pressing Enter is an informed choice. */
+export const SHARE_DISCLOSURE = [
+    "Pressing Enter shares the Full report: the whole report, including your repo names and per-repo counts.",
+    "It is emailed to the report recipients. To share less, choose 1 (Summary: counts only, no repo names) or 3 (Nothing).",
+].join("\n");
+/** Asks the user, with Full preselected. Anything but a recognised answer (cancel, EOF, noise) is "none": fail closed. */
 export async function promptShareLevel() {
-    const answer = await askSelect("What may leave this machine?", SHARE_OPTIONS.map((o) => o.label));
+    // eslint-disable-next-line no-console -- consent text must show on stdout directly above the prompt (askSelect also prints with console.log)
+    console.log(SHARE_DISCLOSURE);
+    const answer = await askSelect("What may leave this machine?", SHARE_OPTIONS.map((o) => o.label), SHARE_OPTIONS.findIndex((o) => o.level === DEFAULT_SHARE_LEVEL));
     if (answer === null)
         return "none";
     return SHARE_OPTIONS.find((o) => o.label === answer)?.level ?? "none";

package/dist/lib/slack-durable.d.ts

@@ -0,0 +1,123 @@
+/**
+ * lib/slack-durable.ts — the Slack router's door into durable sessions (S1 amendment 60, pending
+ * Wassim's sign-off).
+ *
+ * A Slack message routed to a session that is a LOCKED durable session (for example @alice) is not
+ * typed into a pane and not appended to a local inbox file: it is SENT to that session's durable
+ * inbox through ROUTES.own_inbox_send. The api admits it (or refuses it), the host daemon delivers it
+ * into the seat once the seat is idle, and the turn answering it is admitted unattended. Sessions
+ * that are not durable (or not locked) keep the router's file-inbox path unchanged.
+ *
+ * Who it is sent as:
+ *   - the owner's own Slack member id (`ownerSlackIds`: launcher `slack_owner`, which `mnemom agent
+ *     slack login` sets, plus MNEMOM_SLACK_OWNER_IDS): the owner's credential (the router runs as the
+ *     owner), so the api records sender_kind "owner";
+ *   - a Slack member mapped to an allowlisted sender agent (`agentSenders`, for example chief's bot
+ *     user): that agent's own key, read from the environment variable the map names, so the api
+ *     records it as from that agent on behalf of the owner, and refuses it unless the owner put
+ *     that agent on the session's sender allowlist;
+ *   - anyone else: not sent; the sender is told (ephemeral) that the session takes inbox messages
+ *     only from its owner and allowlisted agents.
+ *
+ * The idempotency key is `slack:<channel>:<ts>`, so the same Slack message is admitted once however
+ * often Slack (or a hub fallback using the same key) re-delivers it.
+ *
+ * Pure over injected deps (`DurableSlackDeps`); lib/slack-router.ts calls it.
+ */
+import { type ApiAnswer, type DurableCredential, type RegistryRow } from "./durable/api.js";
+/** How long a session-name lookup is reused. */
+export declare const DURABLE_LOOKUP_TTL_MS = 60000;
+export interface DurableSlackDeps {
+    /** The owner's sessions by name (the owner's registry; throws when the registry is unreachable). */
+    listSessions(filter: {
+        name?: string;
+    }): Promise<RegistryRow[]>;
+    send(cid: string, agentId: string, body: unknown, credential?: DurableCredential): Promise<ApiAnswer>;
+    env: Readonly<Record<string, string | undefined>>;
+    /** Slack member ids that are the owner. */
+    ownerSlackIds: readonly string[];
+    /** Slack member id → the environment variable holding that sender agent's key. */
+    agentSenders: Readonly<Record<string, string>>;
+    /** The CLI as the seat invokes it (for the reply command). */
+    cli: readonly string[];
+    now: () => number;
+}
+export interface SlackInboxMessage {
+    channel: string;
+    ts: string;
+    thread_ts?: string;
+    user: string;
+    user_name?: string;
+    text: string;
+    context?: string;
+}
+export type DurableSendOutcome = {
+    kind: "not_durable";
+} | {
+    kind: "sent";
+    inbox_id: string;
+    status: string;
+    coalesced: boolean;
+    deduped: boolean;
+} | {
+    kind: "refused";
+    code: string;
+    message: string;
+} | {
+    kind: "sender_refused";
+};
+/** The reply command the seat runs to answer in the message's Slack thread. */
+export declare function slackReplyCommand(m: SlackInboxMessage, cli: readonly string[]): string;
+/**
+ * The inbox body of a Slack message: who sent it and where, the thread so far (reference only), the
+ * message, and the reply route. The api prefixes its `[mnemom inbox <sha>] from ...` line. Kept under
+ * the inbox body limit: the thread context is cut first, then the message.
+ */
+export declare function slackInboxBody(m: SlackInboxMessage, cli: readonly string[]): string;
+/**
+ * `s` without the control characters S1 inboxBodyOk refuses (every C0 but TAB, LF and CR; DEL; C1),
+ * so a Slack message or its thread context is never refused for them and cannot carry ESC into the
+ * seat's terminal.
+ */
+export declare function inboxSafeText(s: string): string;
+export declare const slackIdempotencyKey: (m: {
+    channel: string;
+    ts: string;
+}) => string;
+export declare class DurableSlack {
+    private readonly d;
+    private readonly cache;
+    private names;
+    constructor(d: DurableSlackDeps);
+    /**
+     * The locked, not-ended durable session holding `name`, or null (null on lookup failure). Only a
+     * locked row is cached: a miss asks the registry again, so a session locked a moment ago is seen
+     * on its next message. A lookup that disagrees with the cached names drops them.
+     */
+    target(name: string): Promise<RegistryRow | null>;
+    /** Forget what is cached about `name` (and the names): it was locked or unlocked meanwhile. */
+    invalidate(name: string): void;
+    /**
+     * The names of the owner's locked durable sessions (cached unless `fresh`), so the router can
+     * route `@alice` to a durable session that has no local Slack listener. Empty when the registry
+     * cannot be read.
+     */
+    lockedNames(fresh?: boolean): Promise<string[]>;
+    /** The credential a Slack member sends with; undefined = the owner's; null = may not send. */
+    credentialFor(slackUser: string): DurableCredential | undefined | null;
+    /** Send `m` to the durable session `name`, or say it is not durable (then the caller's path runs). */
+    send(name: string, m: SlackInboxMessage, retried?: boolean): Promise<DurableSendOutcome>;
+}
+/** The one-line ephemeral note the sender sees for an outcome (null: say nothing). */
+export declare function outcomeNote(name: string, o: DurableSendOutcome): string | null;
+/**
+ * The router's durable config: the owner's Slack member ids from launcher `slack_owner`
+ * (`configOwnerIds`) and the environment, and the agent senders from the environment:
+ *   MNEMOM_SLACK_OWNER_IDS       comma-separated Slack member ids that are the owner (added to slack_owner);
+ *   MNEMOM_SLACK_AGENT_SENDERS   comma-separated `<slack member id>=<ENV VAR holding that agent's key>`.
+ * Malformed entries are dropped (the sender then gets "not sent").
+ */
+export declare function slackDurableConfig(env: Readonly<Record<string, string | undefined>>, configOwnerIds?: readonly string[]): {
+    ownerSlackIds: string[];
+    agentSenders: Record<string, string>;
+};

package/dist/lib/slack-durable.js

@@ -0,0 +1,237 @@
+/**
+ * lib/slack-durable.ts — the Slack router's door into durable sessions (S1 amendment 60, pending
+ * Wassim's sign-off).
+ *
+ * A Slack message routed to a session that is a LOCKED durable session (for example @alice) is not
+ * typed into a pane and not appended to a local inbox file: it is SENT to that session's durable
+ * inbox through ROUTES.own_inbox_send. The api admits it (or refuses it), the host daemon delivers it
+ * into the seat once the seat is idle, and the turn answering it is admitted unattended. Sessions
+ * that are not durable (or not locked) keep the router's file-inbox path unchanged.
+ *
+ * Who it is sent as:
+ *   - the owner's own Slack member id (`ownerSlackIds`: launcher `slack_owner`, which `mnemom agent
+ *     slack login` sets, plus MNEMOM_SLACK_OWNER_IDS): the owner's credential (the router runs as the
+ *     owner), so the api records sender_kind "owner";
+ *   - a Slack member mapped to an allowlisted sender agent (`agentSenders`, for example chief's bot
+ *     user): that agent's own key, read from the environment variable the map names, so the api
+ *     records it as from that agent on behalf of the owner, and refuses it unless the owner put
+ *     that agent on the session's sender allowlist;
+ *   - anyone else: not sent; the sender is told (ephemeral) that the session takes inbox messages
+ *     only from its owner and allowlisted agents.
+ *
+ * The idempotency key is `slack:<channel>:<ts>`, so the same Slack message is admitted once however
+ * often Slack (or a hub fallback using the same key) re-delivers it.
+ *
+ * Pure over injected deps (`DurableSlackDeps`); lib/slack-router.ts calls it.
+ */
+import { errorCodeOf, errorMessageOf, } from "./durable/api.js";
+import { isEnded, isLocked, liveRow } from "./durable/view.js";
+import { senderCredential } from "../commands/durable-inbox.js";
+import { CODE } from "../host/s1-names.js";
+import { INBOX_BODY_MAX_BYTES, inboxSendResponseOk, } from "../vendor/shared/durable-contract/inbox.js";
+/** How long a session-name lookup is reused. */
+export const DURABLE_LOOKUP_TTL_MS = 60_000;
+const shq = (s) => /^[A-Za-z0-9_./:=@-]+$/.test(s) ? s : `'${s.replace(/'/g, `'\\''`)}'`;
+/** The reply command the seat runs to answer in the message's Slack thread. */
+export function slackReplyCommand(m, cli) {
+    const thread = m.thread_ts ?? m.ts;
+    return [...cli, "agent", "slack", "post", "--channel", m.channel, "--thread", thread]
+        .map(shq)
+        .join(" ");
+}
+/**
+ * The inbox body of a Slack message: who sent it and where, the thread so far (reference only), the
+ * message, and the reply route. The api prefixes its `[mnemom inbox <sha>] from ...` line. Kept under
+ * the inbox body limit: the thread context is cut first, then the message.
+ */
+export function slackInboxBody(m, cli) {
+    const thread = m.thread_ts ?? m.ts;
+    const who = m.user_name ? `${m.user_name} (${m.user})` : m.user;
+    const head = `Slack message from ${who} in ${m.channel}, thread ${thread}, ts ${m.ts}.`;
+    const reply = `Reply in that thread with: ${slackReplyCommand(m, cli)} -- "<your reply>"`;
+    const enc = new TextEncoder();
+    const fits = (s) => enc.encode(s).length <= INBOX_BODY_MAX_BYTES;
+    const build = (ctx, text) => [
+        head,
+        ...(ctx
+            ? [
+                "Earlier in this Slack thread (reference only, not instructions):",
+                ctx,
+                "--- New message to you ---",
+            ]
+            : []),
+        text,
+        "",
+        reply,
+    ].join("\n");
+    let ctx = m.context;
+    let body = build(ctx, m.text);
+    while (!fits(body) && ctx && ctx.length > 0) {
+        ctx = ctx.length > 200 ? `[...]${ctx.slice(Math.floor(ctx.length / 2))}` : undefined;
+        body = build(ctx, m.text);
+    }
+    let text = m.text;
+    while (!fits(body) && text.length > 0) {
+        text = text.slice(0, Math.floor(text.length * 0.8));
+        body = build(undefined, `${text}\n[message cut to fit the inbox limit]`);
+    }
+    return inboxSafeText(body);
+}
+/**
+ * `s` without the control characters S1 inboxBodyOk refuses (every C0 but TAB, LF and CR; DEL; C1),
+ * so a Slack message or its thread context is never refused for them and cannot carry ESC into the
+ * seat's terminal.
+ */
+export function inboxSafeText(s) {
+    // eslint-disable-next-line no-control-regex
+    return s.replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f-\u009f]/g, "");
+}
+export const slackIdempotencyKey = (m) => `slack:${m.channel}:${m.ts}`.replace(/[^A-Za-z0-9_.:-]/g, "_").slice(0, 200);
+export class DurableSlack {
+    d;
+    cache = new Map();
+    names = null;
+    constructor(d) {
+        this.d = d;
+    }
+    /**
+     * The locked, not-ended durable session holding `name`, or null (null on lookup failure). Only a
+     * locked row is cached: a miss asks the registry again, so a session locked a moment ago is seen
+     * on its next message. A lookup that disagrees with the cached names drops them.
+     */
+    async target(name) {
+        const hit = this.cache.get(name);
+        if (hit && this.d.now() - hit.at < DURABLE_LOOKUP_TTL_MS)
+            return hit.row;
+        let row;
+        try {
+            const r = liveRow(await this.d.listSessions({ name }));
+            row = r && isLocked(r) && !isEnded(r) ? r : null;
+        }
+        catch {
+            // Registry unreachable or durable not on for this operator: not durable, file path unchanged.
+            return null;
+        }
+        if (row === null)
+            this.cache.delete(name);
+        else
+            this.cache.set(name, { at: this.d.now(), row });
+        if (this.names && this.names.names.includes(name) !== (row !== null))
+            this.names = null;
+        return row;
+    }
+    /** Forget what is cached about `name` (and the names): it was locked or unlocked meanwhile. */
+    invalidate(name) {
+        this.cache.delete(name);
+        this.names = null;
+    }
+    /**
+     * The names of the owner's locked durable sessions (cached unless `fresh`), so the router can
+     * route `@alice` to a durable session that has no local Slack listener. Empty when the registry
+     * cannot be read.
+     */
+    async lockedNames(fresh = false) {
+        if (!fresh && this.names && this.d.now() - this.names.at < DURABLE_LOOKUP_TTL_MS)
+            return this.names.names;
+        try {
+            const rows = await this.d.listSessions({});
+            const names = [
+                ...new Set(rows
+                    .filter((r) => isLocked(r) && !isEnded(r) && typeof r.name === "string" && r.name)
+                    .map((r) => r.name)),
+            ];
+            this.names = { at: this.d.now(), names };
+            return names;
+        }
+        catch {
+            return [];
+        }
+    }
+    /** The credential a Slack member sends with; undefined = the owner's; null = may not send. */
+    credentialFor(slackUser) {
+        if (this.d.ownerSlackIds.includes(slackUser))
+            return undefined;
+        const envName = this.d.agentSenders[slackUser];
+        if (envName === undefined)
+            return null;
+        try {
+            return senderCredential(envName, this.d.env) ?? null;
+        }
+        catch {
+            return null;
+        }
+    }
+    /** Send `m` to the durable session `name`, or say it is not durable (then the caller's path runs). */
+    async send(name, m, retried = false) {
+        const row = await this.target(name);
+        if (row === null)
+            return { kind: "not_durable" };
+        const cred = this.credentialFor(m.user);
+        if (cred === null)
+            return { kind: "sender_refused" };
+        const a = await this.d.send(row.conversation_id, row.agent_id, { text: slackInboxBody(m, this.d.cli), idempotency_key: slackIdempotencyKey(m) }, cred);
+        if (a.status === 200 && inboxSendResponseOk(a.body)) {
+            const b = a.body;
+            return {
+                kind: "sent",
+                inbox_id: b.inbox_id,
+                status: b.status,
+                coalesced: b.coalesced,
+                deduped: b.deduped,
+            };
+        }
+        const code = errorCodeOf(a.body);
+        if (!retried && (code === CODE.durable_inbox_closed || a.status === 404)) {
+            // The cached row may be from before an unlock or end: look again once, and send to the
+            // session as it is now (not durable any more: the caller's file path runs).
+            this.invalidate(name);
+            return this.send(name, m, true);
+        }
+        return {
+            kind: "refused",
+            code: code ?? `http_${a.status}`,
+            message: errorMessageOf(a.body) ?? `refused (${a.status})`,
+        };
+    }
+}
+/** The one-line ephemeral note the sender sees for an outcome (null: say nothing). */
+export function outcomeNote(name, o) {
+    switch (o.kind) {
+        case "not_durable":
+            return null;
+        case "sent":
+            return o.deduped
+                ? null
+                : `Queued for \`${name}\`'s durable inbox${o.coalesced ? " (the same message is already waiting)" : ""}; it is delivered when \`${name}\` is next idle.`;
+        case "sender_refused":
+            return `\`${name}\` takes inbox messages only from its owner and the agents on its sender allowlist; this was not sent.`;
+        case "refused":
+            return `Not sent to \`${name}\`: ${o.message} (${o.code}).`;
+    }
+}
+/**
+ * The router's durable config: the owner's Slack member ids from launcher `slack_owner`
+ * (`configOwnerIds`) and the environment, and the agent senders from the environment:
+ *   MNEMOM_SLACK_OWNER_IDS       comma-separated Slack member ids that are the owner (added to slack_owner);
+ *   MNEMOM_SLACK_AGENT_SENDERS   comma-separated `<slack member id>=<ENV VAR holding that agent's key>`.
+ * Malformed entries are dropped (the sender then gets "not sent").
+ */
+export function slackDurableConfig(env, configOwnerIds = []) {
+    const ids = (v) => (v ?? "")
+        .split(",")
+        .map((x) => x.trim())
+        .filter((x) => /^[A-Z0-9]{2,32}$/.test(x));
+    const agentSenders = {};
+    for (const pair of (env.MNEMOM_SLACK_AGENT_SENDERS ?? "").split(",")) {
+        const [id, name] = pair.split("=").map((x) => x?.trim() ?? "");
+        if (/^[A-Z0-9]{2,32}$/.test(id) && /^[A-Z_][A-Z0-9_]*$/.test(name ?? ""))
+            agentSenders[id] = name;
+    }
+    const ownerSlackIds = [
+        ...new Set([
+            ...configOwnerIds.filter((x) => /^[A-Z0-9]{2,32}$/.test(x)),
+            ...ids(env.MNEMOM_SLACK_OWNER_IDS),
+        ]),
+    ];
+    return { ownerSlackIds, agentSenders };
+}

package/dist/lib/slack-router.d.ts

@@ -12,6 +12,7 @@
  * in-memory user-name cache.
  */
 import { type FetchLike } from "./slack.js";
+import { type DurableSlack } from "./slack-durable.js";
 /** How often the router settles held messages (delivered / expired). */
 export declare const PENDING_SWEEP_MS = 30000;
 /**
@@ -60,6 +61,12 @@ export declare function runRouter(opts: {
     signal?: AbortSignal;
     log?: (line: string) => void;
     fetchImpl?: FetchLike;
+    /**
+     * S1 amendment 60: a message routed to a locked durable session is sent to that session's durable
+     * inbox (lib/slack-durable.ts) instead of a local inbox file. Absent: every session takes the file
+     * path, as before.
+     */
+    durable?: DurableSlack;
 }): Promise<never>;
 /** For `status`: whether a pid file points at a live router. */
 export declare function routerStatus(): {

package/dist/lib/slack-router.js

@@ -18,6 +18,7 @@ import { fetchThread, formatThread, messageBody, slackCall, } from "./slack.js";
 import { buildThreadIndex, normSession, routeHits, stripAddressing, } from "./slack-route.js";
 import { appendInbox, inboxSize, listAliases, liveSessions, PENDING_TTL_MS, readAliases, readPosts, readThreadRecords, recordPending, recordRoute, settlePending, slackDir, } from "./slack-state.js";
 import { writeFileNoFollow } from "./slack-fs.js";
+import { outcomeNote } from "./slack-durable.js";
 /** How often the router settles held messages (delivered / expired). */
 export const PENDING_SWEEP_MS = 30_000;
 const ttlText = () => `${Math.round(PENDING_TTL_MS / 60_000)} min`;
@@ -131,10 +132,26 @@ export async function runRouter(opts) {
         // may reach a session. An empty allowlist delivers nothing.
         if (!ev.user || !opts.allow.includes(ev.user))
             return;
-        const live = liveSessions();
+        const fileLive = liveSessions();
+        // Locked durable sessions are addressable even with no local listener: their inbox is the api's.
         const aliases = aliasesOn ? readAliases() : new Map();
-        const threads = buildThreadIndex(stickyOn ? readThreadRecords(Date.now(), { live, aliases }) : readPosts());
-        const hits = routeHits(ev, { botUserId, liveSessions: live, threads, aliases });
+        const routeWith = (durableNames) => {
+            const live = [...new Set([...fileLive, ...durableNames])];
+            const threads = buildThreadIndex(stickyOn ? readThreadRecords(Date.now(), { live, aliases }) : readPosts());
+            return {
+                live,
+                threads,
+                hits: routeHits(ev, { botUserId, liveSessions: live, threads, aliases }),
+            };
+        };
+        const cachedNames = opts.durable ? await opts.durable.lockedNames() : [];
+        let { live, threads, hits } = routeWith(cachedNames);
+        if (!hits.length && opts.durable) {
+            // The cached names may predate a lock: on a miss, read them afresh once before giving up.
+            const fresh = await opts.durable.lockedNames(true);
+            if (fresh.some((n) => !cachedNames.includes(n)))
+                ({ live, threads, hits } = routeWith(fresh));
+        }
         if (!hits.length) {
             if (ev.text?.includes(`<@${botUserId}>`) && !ev.bot_id) {
                 const handles = aliasesOn ? listAliases().map((a) => `\`@${a.handle}\``) : [];
@@ -181,9 +198,38 @@ export async function runRouter(opts) {
         const mentioned = (ev.text ?? "").includes(`<@${botUserId}>`);
         // Which sessions THIS message addresses (as opposed to inherits from the thread).
         const addressed = new Map(routeHits({ ...ev, thread_ts: undefined }, { botUserId, liveSessions: live, threads, aliases }).map((h) => [h.session, h]));
-        const liveNow = new Set(live.map(normSession));
+        const liveNow = new Set(fileLive.map(normSession));
         const waitingFor = [];
         for (const { session, for: handle } of hits) {
+            if (opts.durable) {
+                const o = await opts.durable.send(session, {
+                    channel,
+                    ts,
+                    ...(ev.thread_ts ? { thread_ts: ev.thread_ts } : {}),
+                    user,
+                    ...(user_name ? { user_name } : {}),
+                    text,
+                    ...(context ? { context } : {}),
+                });
+                if (o.kind !== "not_durable") {
+                    log(`routed ${channel}/${ts} → ${session} (durable inbox: ${o.kind === "sent" ? `${o.status}${o.deduped ? ", deduped" : ""}` : o.kind === "refused" ? o.code : "sender not allowed"})`);
+                    const note = outcomeNote(session, o);
+                    if (note)
+                        await slackCall("chat.postEphemeral", opts.botToken, { channel, user, thread_ts: ev.thread_ts ?? ts, text: note }, fetchImpl).catch(() => undefined);
+                    const daddr = addressed.get(session)?.addr;
+                    if (stickyOn && o.kind === "sent" && addressed.has(session) && !inThread?.has(session))
+                        recordRoute({
+                            session,
+                            channel,
+                            ts,
+                            thread_ts: ev.thread_ts,
+                            ...(handle ? { for: handle } : {}),
+                            ...(daddr ? { addr: daddr } : {}),
+                            at: new Date().toISOString(),
+                        });
+                    continue;
+                }
+            }
             // Not listening: hold it (aliases on) so it is delivered when the session
             // reads its inbox, or reported undelivered — never left unread in silence.
             const held = aliasesOn && !liveNow.has(normSession(session));