holon-sh 0.0.1-dev.16 → 0.0.1-dev.17

package/dist/context.d.ts

@@ -1,3 +1,4 @@
+import type { AuthInfo } from "@modelcontextprotocol/client";
 /** Standard OpenID Connect address claims. */
 export interface AddressClaims {
     formatted?: string;
@@ -47,11 +48,7 @@ export interface RequestContext {
 }
 /** Read the caller and the app's origin from the context an MCP server receives: a tool callback's ctx.http, or the McpRequestContext of a createMcpHandler factory. */
 export declare function getContext(context?: {
-    authInfo?: {
-        clientId: string;
-        scopes: string[];
-        extra?: Record<string, unknown>;
-    };
+    authInfo?: Pick<AuthInfo, "clientId" | "scopes" | "extra">;
     req?: Request;
     requestInfo?: Request;
 }): RequestContext;

package/dist/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAAA,8CAA8C;AAC9C,MAAM,WAAW,aAAa;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IACxH,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B;AACD,yHAAyH;AACzH,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClG,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAClG,cAAc,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAClG,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,aAAa,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IACrG,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B;AACD,yDAAyD;AACzD,MAAM,WAAW,SAAS;IAAG,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,EAAE,cAAc,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE;AAC3J,sJAAsJ;AACtJ,MAAM,WAAW,cAAc;IAAG,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE;AAMtF,wKAAwK;AACxK,wBAAgB,UAAU,CAAC,OAAO,GAAE;IAAE,QAAQ,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,CAAC;IAAC,GAAG,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,cAAc,CAMrL"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAE7D,8CAA8C;AAC9C,MAAM,WAAW,aAAa;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IACxH,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B;AACD,yHAAyH;AACzH,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClG,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAClG,cAAc,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAClG,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,aAAa,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IACrG,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B;AACD,yDAAyD;AACzD,MAAM,WAAW,SAAS;IAAG,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,EAAE,cAAc,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE;AAC3J,sJAAsJ;AACtJ,MAAM,WAAW,cAAc;IAAG,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE;AAMtF,wKAAwK;AACxK,wBAAgB,UAAU,CAAC,OAAO,GAAE;IAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,UAAU,GAAG,QAAQ,GAAG,OAAO,CAAC,CAAC;IAAC,GAAG,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,cAAc,CAM7J"}

package/dist/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAsBA,wKAAwK;AACxK,MAAM,UAAU,UAAU,CAAC,OAAO,GAAiI,EAAE;IACnK,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,OAAO,CAAC,WAAW,EAAE,GAAG,OAAO,CAAC;IACxD,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE,CAAa,CAAC;IACtE,MAAM,SAAS,GAAG,CAAC,QAAQ,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI;QACtF,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,IAAI,EAAE,EAAE,GAAG,CAAC,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;IAC1I,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AACzD,CAAC;AAED,0HAA0H;AAC1H,WAAW;AACX,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO,EAAW;IACvC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IACxC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,IAAI,EAAE,CAAC;AACrH,CAAC"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAwBA,wKAAwK;AACxK,MAAM,UAAU,UAAU,CAAC,OAAO,GAAyG,EAAE;IAC3I,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,OAAO,CAAC,WAAW,EAAE,GAAG,OAAO,CAAC;IACxD,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE,CAAa,CAAC;IACtE,MAAM,SAAS,GAAG,CAAC,QAAQ,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI;QACtF,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,IAAI,EAAE,EAAE,GAAG,CAAC,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;IAC1I,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AACzD,CAAC;AAED,0HAA0H;AAC1H,WAAW;AACX,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO,EAAW;IACvC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IACxC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,IAAI,EAAE,CAAC;AACrH,CAAC"}

package/dist/ext/events.client.d.ts

@@ -0,0 +1,4 @@
+import { type Link } from "../link.js";
+import type { Contract, RuntimeClient } from "../runtime.js";
+export declare function events(link: Link, contract: Contract | null, expect: (schema: object, label: string) => (value: unknown) => void): RuntimeClient["ext"]["events"];
+//# sourceMappingURL=events.client.d.ts.map

package/dist/ext/events.client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"events.client.d.ts","sourceRoot":"","sources":["../../src/ext/events.client.ts"],"names":[],"mappings":"AAGA,OAAO,EAA2C,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAEhF,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAW7D,wBAAgB,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI,EAAE,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CA4IjK"}

package/dist/ext/events.client.js

@@ -0,0 +1,180 @@
+import { patient, sleep, unchecked, untilAborted } from "../link.js";
+// A stream that has said nothing for twice the longest heartbeat interval is dead: https://github.com/modelcontextprotocol/experimental-ext-triggers-events/blob/main/docs/design-sketch-proposal.md#lifecycle
+const QUIET = 60_000;
+// A server's refusal ends a subscription: a client error, or an answer that the event type is gone, that access was
+// lost, or that the request is no longer valid. Anything else is tried again from the cursor.
+const refused = (error) => error?.status >= 400 && error.status < 500 || error?.data?.status >= 400 && error.data.status < 500 || [-32602, -32023, -32024, -32026].includes(error?.code);
+export function events(link, contract, expect) {
+    const { name } = link;
+    const connected = (options, run) => link.session(options, (_, connection) => {
+        if (!connection)
+            throw new Error(`MCP Events of ${name} require an endpoint binding.`);
+        return run(connection.client);
+    });
+    const list = (options) => connected(options, async (client) => {
+        const events = [];
+        for (let cursor;;) {
+            const page = await client.request({ method: "events/list", params: { ...(cursor && { cursor }) } }, unchecked(), patient(options));
+            events.push(...page.events ?? []);
+            if (!(cursor = page.nextCursor))
+                return events;
+        }
+    });
+    const subscribe = async (event, args = {}, { signal, onGap, maxAgeMs, ...options } = {}) => {
+        const resolved = link.endpoint(`Subscribing to ${name} ${event}`);
+        const offered = (await list(signal && { signal })).find(type => type.name === event)?.delivery;
+        if (!offered)
+            throw new Error(`${name} has no event ${event}.`);
+        const delivery = options.delivery ?? ["push", "poll"].find(mode => offered.includes(mode));
+        // The sketch's NoCompatibleDeliveryMode: none of the modes the server offers is one this client uses.
+        if (!delivery || !offered.includes(delivery))
+            throw Object.assign(new Error(`${name} does not deliver ${event} by ${delivery ?? "poll or push"}.`), { name: "NoCompatibleDeliveryMode" });
+        const cancelled = new AbortController();
+        const ended = signal ? AbortSignal.any([signal, cancelled.signal]) : cancelled.signal;
+        let cursor = options.cursor ?? null;
+        const queue = [];
+        const seen = new Set();
+        let wake = () => { };
+        let done = false;
+        let failure;
+        const reach = (next, truncated) => {
+            cursor = next ?? null;
+            if (truncated)
+                onGap?.();
+        };
+        const expected = contract?.events?.find(type => type.name === event)?.payloadSchema;
+        const check = expected && expect(expected, `data of ${name} ${event}`);
+        const deliver = ({ cursor: _, _meta, ...occurrence }) => {
+            if (seen.has(occurrence.eventId))
+                return;
+            seen.add(occurrence.eventId);
+            if (seen.size > 1024)
+                seen.delete(seen.values().next().value);
+            check?.(occurrence.data);
+            queue.push(occurrence);
+            wake();
+        };
+        const request = { name: event, arguments: args, ...(maxAgeMs !== undefined && { maxAgeMs }) };
+        let confirmed = false;
+        const established = Promise.withResolvers();
+        const confirm = () => { confirmed = true; established.resolve(); };
+        const poll = async () => {
+            while (!ended.aborted) {
+                let wait = 1000;
+                try {
+                    const result = await connected({ signal: ended }, client => client.request({ method: "events/poll", params: { ...request, cursor } }, unchecked(), patient({ signal: ended })));
+                    try {
+                        for (const occurrence of result.events ?? [])
+                            deliver(occurrence);
+                    }
+                    catch (error) {
+                        failure = error;
+                        return cancelled.abort();
+                    }
+                    reach(result.cursor, result.truncated);
+                    confirm();
+                    // A server that asks for a tight loop is not obeyed.
+                    wait = result.hasMore ? 0 : Math.max(1000, result.nextPollMs ?? 0);
+                }
+                catch (error) {
+                    if (ended.aborted)
+                        return;
+                    if (!confirmed || refused(error))
+                        throw error;
+                }
+                await sleep(wait, ended);
+            }
+        };
+        const stream = async () => {
+            while (!ended.aborted) {
+                let wait = 1000;
+                const quiet = new AbortController();
+                // The MCP client keeps waiting for the answer of a request whose stream has ended, so the end is watched for here.
+                // Only the stream's own response is watched: a 2025 server answers its initialization as a stream too.
+                const watched = async (input, init) => {
+                    const response = await (resolved.fetch ?? fetch)(input, init);
+                    const streaming = typeof init?.body === "string" && init.body.includes('"method":"events/stream"');
+                    if (!streaming || !response.body || !response.headers.get("content-type")?.startsWith("text/event-stream"))
+                        return response;
+                    const reader = response.body.getReader();
+                    const body = new ReadableStream({
+                        pull: controller => reader.read().then(({ done, value }) => {
+                            if (!done)
+                                return controller.enqueue(value);
+                            controller.close();
+                            // The answer, when the stream ended with one, is handled first.
+                            setTimeout(() => quiet.abort());
+                        }, error => { controller.error(error); quiet.abort(); }),
+                        cancel: reason => reader.cancel(reason),
+                    });
+                    return new Response(body, response);
+                };
+                // Each stream has its own connection, so every event notification on it is this subscription's.
+                const connection = link.connect({ ...resolved, fetch: watched });
+                let timer;
+                const heard = () => {
+                    clearTimeout(timer);
+                    timer = setTimeout(() => quiet.abort(), QUIET);
+                };
+                let terminated;
+                try {
+                    await untilAborted(connection.ready, ended);
+                    const on = (method, handle) => connection.client.setNotificationHandler(`notifications/events/${method}`, { params: unchecked() }, params => { heard(); handle(params); });
+                    on("active", ({ cursor: next, truncated }) => { reach(next, truncated); confirm(); });
+                    on("event", occurrence => {
+                        wait = 0;
+                        try {
+                            deliver(occurrence);
+                        }
+                        catch (error) {
+                            failure = error;
+                            return cancelled.abort();
+                        }
+                        reach(occurrence.cursor);
+                    });
+                    on("heartbeat", ({ cursor: next }) => reach(next));
+                    // The server recovers from an error by itself, and the stream stays open.
+                    on("error", () => { });
+                    on("terminated", ({ error }) => { terminated = error; quiet.abort(); });
+                    heard();
+                    await connection.client.request({ method: "events/stream", params: { ...request, cursor } }, unchecked(), { signal: AbortSignal.any([ended, quiet.signal]), timeout: 2 ** 31 - 1 });
+                }
+                catch (error) {
+                    if (!terminated && !ended.aborted && (!confirmed || refused(error)))
+                        throw error;
+                }
+                finally {
+                    clearTimeout(timer);
+                    await connection.close();
+                }
+                if (terminated)
+                    throw Object.assign(new Error(`${name} ended the subscription to ${event}: ${terminated.message}`), { code: terminated.code, data: terminated.data });
+                await sleep(wait, ended);
+            }
+        };
+        void (delivery === "push" ? stream() : poll())
+            .catch(error => { failure ??= error; })
+            .finally(() => { done = true; wake(); established.reject(failure ?? ended.reason); });
+        await established.promise;
+        return {
+            delivery,
+            get cursor() { return cursor; },
+            cancel: () => cancelled.abort(),
+            [Symbol.asyncIterator]: () => ({
+                next: async () => {
+                    while (!queue.length && !done)
+                        await new Promise(resolve => { wake = resolve; });
+                    const value = queue.shift();
+                    if (value)
+                        return { value, done: false };
+                    if (failure)
+                        throw failure;
+                    return { value: undefined, done: true };
+                },
+                return: async () => { cancelled.abort(); return { value: undefined, done: true }; },
+            }),
+        };
+    };
+    return Object.freeze({ list, subscribe: subscribe });
+}
+//# sourceMappingURL=events.client.js.map

package/dist/ext/events.client.js.map

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

package/dist/ext/events.d.ts

@@ -1,8 +1,7 @@
-import type { AuthInfo, JSONRPCErrorResponse, McpServer, Server, StandardSchemaWithJSON } from "@modelcontextprotocol/server";
+import type { JSONRPCErrorResponse, McpServer, Server, ServerContext, StandardSchemaWithJSON } from "@modelcontextprotocol/server";
+import type { EventOccurrence as Occurrence } from "../protocol.js";
 /** The request a subscription came in, as Holon admitted it: read its caller with getContext. */
-export type SubscriptionContext = {
-    authInfo?: AuthInfo | undefined;
-} | undefined;
+export type SubscriptionContext = ServerContext["http"];
 /** How a subscription receives its events. */
 export type DeliveryModeName = "poll" | "push";
 /** A JSON-RPC error, as a subscription that is terminated or fails is told it. */
@@ -24,14 +23,9 @@ export interface Subscription<A> {
     readonly context: SubscriptionContext;
 }
 /** An occurrence as subscriptions receive it: the sketch's EventOccurrence. `cursor` is the position after it. */
-export interface EventOccurrence<D = unknown> {
-    eventId: string;
-    name: string;
-    /** When it happened, in ISO 8601. */
-    timestamp: string;
-    data: D;
+export type EventOccurrence<D = unknown> = Occurrence<D> & {
     cursor?: string;
-}
+};
 /** An event type: the arguments a subscription gives, and the data each occurrence carries. */
 export interface EventDefinition<A, D> {
     description?: string;
@@ -51,7 +45,7 @@ export interface EventDefinition<A, D> {
     /** The data a subscription with these arguments receives of an emitted event. Without it, the data as emitted. */
     transform?: (data: D, args: A, context: SubscriptionContext) => unknown;
     /** The delivery modes this event type offers: poll and push unless given. */
-    delivery?: DeliveryModeName[];
+    delivery?: [DeliveryModeName, ...DeliveryModeName[]];
     /**
      * Whether the caller may subscribe with these arguments. A subscription is refused with Forbidden when it may not,
      * and one already open is ended when it no longer may: each poll asks, and a stream asks at each heartbeat. A

package/dist/ext/events.d.ts.map

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

package/dist/ext/events.js

@@ -1,25 +1,20 @@
 // The server side of MCP Events, as the Triggers & Events Working Group's design sketch defines it:
 // https://github.com/modelcontextprotocol/experimental-ext-triggers-events/blob/main/docs/design-sketch-proposal.md
-// The draft is experimental, so this lives under ext and may change with it. It serves the poll and push delivery
-// modes. Names follow the sketch, and types are the MCP SDK's own wherever it has them.
 import { ProtocolError, ProtocolErrorCode, SUBSCRIPTION_ID_META_KEY } from "@modelcontextprotocol/server";
+import { getContext } from "../context.js";
 /** The identifier a server declares the Events extension under, in capabilities.extensions. */
 export const EVENTS_EXTENSION = "io.modelcontextprotocol/events";
-const INVALID_PARAMS = ProtocolErrorCode.InvalidParams;
-const INTERNAL_ERROR = ProtocolErrorCode.InternalError;
 // The sketch's general-purpose codes, provisional until the specification allocates them.
 const NOT_FOUND = -32023;
 const FORBIDDEN = -32024;
 const RESOURCE_EXHAUSTED = -32025;
 const UNSUPPORTED = -32026;
-// Requests are checked here, against each event type's own schema.
-const params = { "~standard": { version: 1, vendor: "holon-sh", validate: (value) => ({ value: value ?? {} }) } };
+const params = { "~standard": { version: 1, vendor: "holon-sh", validate: value => ({ value: (value ?? {}) }) } };
 const refusal = ({ code, message, data }) => new ProtocolError(code, message, data);
 const removed = { code: NOT_FOUND, message: "NotFound", data: { kind: "event" } };
 const forbidden = { code: FORBIDDEN, message: "Forbidden" };
-// What a client is told of a failure: its code when it is a JSON-RPC one, and its message.
 const described = (error) => ({
-    code: Number.isInteger(error?.code) ? error.code : INTERNAL_ERROR,
+    code: Number.isInteger(error?.code) ? error.code : ProtocolErrorCode.InternalError,
     message: error?.message || "InternalError",
     ...(error?.data !== undefined && { data: error.data }),
 });
@@ -27,14 +22,9 @@ const described = (error) => ({
 const canonical = (value) => Array.isArray(value) ? value.map(canonical)
     : value && typeof value === "object" ? Object.fromEntries(Object.keys(value).sort().map(key => [key, canonical(value[key])]))
         : value;
-// Who asked, as Holon admitted them: the user, the client acting for them, the agent when one acts for the user, and
-// what the token allows. A caller without a subject has no identity: nobody can tell it from another such caller.
 const caller = (context) => {
-    const authInfo = context?.authInfo;
-    const { iss = null, sub, act = null } = authInfo?.extra ?? {};
-    if (!authInfo || typeof sub !== "string")
-        return null;
-    return JSON.stringify(canonical([iss, sub, authInfo.clientId ?? null, act, [...authInfo.scopes ?? []].sort()]));
+    const { principal } = getContext(context);
+    return principal && JSON.stringify(canonical([principal.issuer, principal.subject, principal.clientId, principal.actor ?? null, [...principal.scopes].sort()]));
 };
 const hex = (bytes) => [...bytes].map(byte => byte.toString(16).padStart(2, "0")).join("");
 // A subscription's id is the same for the same caller, event type and arguments, so it survives reconnects and poll
@@ -43,11 +33,8 @@ const identify = async (who, name, args) => {
     const digest = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(JSON.stringify([who, name, canonical(args)])));
     return `sub_${hex(new Uint8Array(digest, 0, 16))}`;
 };
-// A caller without an identity gets an id of its own for each stream.
 const unique = () => `sub_${hex(crypto.getRandomValues(new Uint8Array(16)))}`;
-// The subscriber a subscription's arguments name, whoever the caller.
 const named = (args) => JSON.stringify(canonical(args));
-// Counts up or down under a key, and forgets a key that reaches none.
 const count = (counts, key, by) => {
     const total = (counts.get(key) ?? 0) + by;
     if (total)
@@ -55,8 +42,6 @@ const count = (counts, key, by) => {
     else
         counts.delete(key);
 };
-// A teardown that fails has nobody to tell, and must not take the process down.
-const settle = (run) => { Promise.resolve().then(run).catch(() => { }); };
 const integer = (value, minimum) => value === undefined || Number.isInteger(value) && value >= minimum;
 const OFFERED = ["poll", "push"];
 // What each type keeps of what it emits, for polls and reconnecting streams: the sketch's emit buffer.
@@ -72,7 +57,6 @@ const POLL_SUBSCRIPTION_TTL = 60_000;
 // cannot be told apart, so they count together as one caller.
 const MAX_SUBSCRIPTIONS = 10_000;
 const MAX_SUBSCRIPTIONS_PER_CALLER = 1000;
-// How many event types events/list returns at a time.
 const PAGE_SIZE = 100;
 /**
  * What a stream sends before it ends and its client resumes from its cursor. The draft leaves flow control to the
@@ -95,7 +79,7 @@ export function createEvents() {
     let declared = 0;
     let subscribed = 0;
     const callers = new Map();
-    const position = (type, sequence = type.sequence) => `${epoch}.${sequence}`;
+    const position = (sequence) => `${epoch}.${sequence}`;
     // What a subscription is owed after a cursor, up to `until`: the events for it, in order, where delivery starts,
     // and where it now stands. A null cursor starts where the subscription was opened, and so does one from another
     // process, which says that events were skipped. One past the events still kept starts from the oldest kept, and
@@ -111,16 +95,16 @@ export function createEvents() {
         const events = [];
         const failures = [];
         let reached = recent.length ? recent[0].sequence - 1 : until;
-        const start = position(type, reached);
+        const start = position(reached);
         for (const kept of recent) {
             if (events.length === limit)
-                return { events, failures, start, cursor: position(type, reached), truncated, hasMore: true };
+                return { events, failures, start, cursor: position(reached), truncated, hasMore: true };
             reached = kept.sequence;
             const event = shape(type, kept, subscription, error => failures.push(error));
             if (event)
                 events.push(event);
         }
-        return { events, failures, start, cursor: position(type, until), truncated, hasMore: false };
+        return { events, failures, start, cursor: position(until), truncated, hasMore: false };
     };
     // The occurrence a subscription receives, or nothing when it is not for it. An event emitted to one subscription
     // is for that one alone, and its arguments are not asked.
@@ -139,10 +123,10 @@ export function createEvents() {
         catch (error) {
             const { eventId } = occurrence;
             console.error(`holon-sh/ext/events: event ${eventId} of ${type.name} was skipped for a subscription:`, error);
-            failed({ code: INTERNAL_ERROR, message: `Event ${eventId} could not be delivered and was skipped`, data: { eventId, reason: String(error?.message ?? error) } });
+            failed({ code: ProtocolErrorCode.InternalError, message: `Event ${eventId} could not be delivered and was skipped`, data: { eventId, reason: String(error?.message ?? error) } });
             return undefined;
         }
-        return { ...occurrence, data, cursor: position(type, sequence) };
+        return { ...occurrence, data, cursor: position(sequence) };
     };
     // The event type and arguments a request names, checked as the sketch's errors require, in its order: the type,
     // the delivery mode, the request's own fields, the arguments, and then whether the caller may subscribe. A caller
@@ -154,14 +138,14 @@ export function createEvents() {
         if (!type.delivery.includes(delivery))
             throw refusal({ code: UNSUPPORTED, message: "Unsupported", data: { feature: "deliveryMode", value: delivery } });
         if (cursor != null && typeof cursor !== "string")
-            throw new ProtocolError(INVALID_PARAMS, "cursor must be a string or null");
+            throw new ProtocolError(ProtocolErrorCode.InvalidParams, "cursor must be a string or null");
         if (!integer(maxAgeMs, 0))
-            throw new ProtocolError(INVALID_PARAMS, "maxAgeMs must be a non-negative integer");
+            throw new ProtocolError(ProtocolErrorCode.InvalidParams, "maxAgeMs must be a non-negative integer");
         if (!integer(maxEvents, 1))
-            throw new ProtocolError(INVALID_PARAMS, "maxEvents must be a positive integer");
+            throw new ProtocolError(ProtocolErrorCode.InvalidParams, "maxEvents must be a positive integer");
         const checked = await type.inputSchema["~standard"].validate(args);
         if (checked.issues)
-            throw new ProtocolError(INVALID_PARAMS, `Invalid arguments for ${name}: ${checked.issues.map(issue => issue.message).join("; ")}`);
+            throw new ProtocolError(ProtocolErrorCode.InvalidParams, `Invalid arguments for ${name}: ${checked.issues.map(issue => issue.message).join("; ")}`);
         const who = caller(context);
         // Polls share a lease per caller and arguments, and callers without an identity share one per arguments.
         const lease = await identify(who, type.name, checked.value);
@@ -171,7 +155,8 @@ export function createEvents() {
             leases.delete(lease);
             throw refusal(forbidden);
         }
-        return { type, subscription: { id: who === null ? unique() : lease, lease, arguments: checked.value, context } };
+        const subscription = { id: who === null ? unique() : lease, lease, arguments: checked.value, context };
+        return { type, subscription, cursor: cursor ?? null, maxAgeMs, maxEvents };
     };
     const endSubscription = (type, id, error) => {
         for (const held of [...type.subscriptions.get(id)?.held ?? []])
@@ -184,7 +169,6 @@ export function createEvents() {
     const open = async (type, { id, delivery, arguments: args, context }, end) => {
         if (types.get(type.name) !== type)
             throw refusal(removed);
-        // Callers without an identity cannot be told apart, so they count together as one.
         const who = caller(context) ?? "anonymous";
         if (subscribed >= MAX_SUBSCRIPTIONS)
             throw refusal({ code: RESOURCE_EXHAUSTED, message: "ResourceExhausted", data: { limit: "subscriptions", max: MAX_SUBSCRIPTIONS } });
@@ -192,7 +176,6 @@ export function createEvents() {
             throw refusal({ code: RESOURCE_EXHAUSTED, message: "ResourceExhausted", data: { limit: "subscriptionsPerCaller", max: MAX_SUBSCRIPTIONS_PER_CALLER } });
         subscribed++;
         count(callers, who, 1);
-        // A presence keeps a subscriber's value while any of its streams or leases is open.
         const subscriber = named(args);
         const hold = (by) => {
             count(type.holds, subscriber, by);
@@ -222,9 +205,9 @@ export function createEvents() {
                     return;
                 if (type.subscriptions.get(id) === current)
                     type.subscriptions.delete(id);
-                // Only a subscription that was set up is told it ended.
-                current.ready.then(subscription => { if (type.onUnsubscribe)
-                    settle(() => type.onUnsubscribe(subscription)); }, () => { });
+                // Only a subscription that was set up is told it ended. A teardown that fails has nobody to tell, and must not
+                // take the process down.
+                current.ready.then(subscription => type.onUnsubscribe?.(subscription)).catch(() => { });
             } };
         current.held.add(held);
         try {
@@ -294,14 +277,11 @@ export function createEvents() {
          * Declares an event type and returns the function that emits it. `match` decides which subscriptions receive an
          * event from their arguments, and `transform` shapes its data for each.
          */
-        event(name, { description, inputSchema, payloadSchema, _meta, match, transform, delivery = OFFERED, authorize, onSubscribe, onUnsubscribe }) {
+        event(name, definition) {
             if (types.has(name))
                 throw new Error(`Event ${name} is already declared.`);
-            const unknown = delivery.filter(mode => !OFFERED.includes(mode));
-            if (unknown.length || !delivery.length)
-                throw new Error(`Event ${name} is delivered by ${delivery.join(", ") || "nothing"}, but only ${OFFERED.join(", ")} are served.`);
             const type = {
-                name, order: ++declared, description, inputSchema, payloadSchema, _meta, delivery, match, transform, authorize, onSubscribe, onUnsubscribe,
+                ...definition, name, order: ++declared, delivery: definition.delivery ?? OFFERED,
                 sequence: 0, dropped: 0, kept: [], sinks: new Set(), subscriptions: new Map(), holds: new Map(), present: new Set(),
             };
             types.set(name, type);
@@ -319,7 +299,7 @@ export function createEvents() {
                         sink();
                 },
                 cursor() {
-                    return position(type);
+                    return position(type.sequence);
                 },
                 terminate(id, error = forbidden) {
                     if (id !== undefined)
@@ -370,8 +350,7 @@ export function createEvents() {
         },
         /** Serves the declared event types on an MCP server: events/list, events/poll and events/stream. */
         serve(mcp) {
-            // The custom methods are registered through the parts of the server this module uses.
-            const server = ("server" in mcp ? mcp.server : mcp);
+            const server = "server" in mcp ? mcp.server : mcp;
             // The sketch declares capabilities.events. The MCP SDK's client drops top-level capabilities it does not know,
             // so the extension is declared under capabilities.extensions too, where SDK clients read it.
             // Clients are never told the event types changed: over Holon's stateless HTTP, the notification reaches none.
@@ -383,7 +362,7 @@ export function createEvents() {
                 if (request.cursor != null) {
                     const after = Number(request.cursor);
                     if (typeof request.cursor !== "string" || !Number.isInteger(after))
-                        throw new ProtocolError(INVALID_PARAMS, "Invalid cursor for events/list");
+                        throw new ProtocolError(ProtocolErrorCode.InvalidParams, "Invalid cursor for events/list");
                     start = all.findIndex(type => type.order > after);
                     if (start < 0)
                         start = all.length;
@@ -402,18 +381,18 @@ export function createEvents() {
                 };
             });
             server.setRequestHandler("events/poll", { params }, async (request, ctx) => {
-                const { type, subscription: subscribed } = await subscription(request, ctx.http, "poll");
+                const { type, subscription: subscribed, cursor, maxAgeMs, maxEvents } = await subscription(request, ctx.http, "poll");
                 // Taken before the lease, which waits for onSubscribe. The sketch's poll from null returns no events and a
                 // fresh cursor: this one is where the subscription opened, so the next poll has what onSubscribe emitted.
                 const opened = type.sequence;
                 const held = await lease(type, subscribed);
                 // Each poll is answered for its own caller, with the lease's id.
-                const { events, start, failures, ...rest } = since(type, { ...subscribed, id: held.id, untargetable: held.untargetable }, request.cursor, { maxAgeMs: request.maxAgeMs, maxEvents: request.maxEvents, opened, ...(request.cursor == null && { until: opened }) });
+                const { events, start, failures, ...rest } = since(type, { ...subscribed, id: held.id, untargetable: held.untargetable }, cursor, { maxAgeMs, maxEvents, opened, ...(cursor === null && { until: opened }) });
                 // A poll carries its cursor once, for the whole response.
                 return { events: events.map(({ cursor, ...event }) => event), ...rest, nextPollMs: INTERVAL };
             });
             server.setRequestHandler("events/stream", { params }, async (request, ctx) => {
-                const { type, subscription: subscribed } = await subscription(request, ctx.http, "push");
+                const { type, subscription: subscribed, cursor: from, maxAgeMs } = await subscription(request, ctx.http, "push");
                 const { signal } = ctx.mcpReq;
                 const meta = { [SUBSCRIPTION_ID_META_KEY]: ctx.mcpReq.id };
                 let done = false;
@@ -468,7 +447,7 @@ export function createEvents() {
                 // The stream follows its cursor, and emitted events wake it. What it is owed waits in the buffer, not here, so
                 // a slow client is not owed more memory than one batch; when what it is owed is no longer kept, it is told of
                 // the gap.
-                let cursor = request.cursor ?? null;
+                let cursor = from;
                 let behind = true;
                 const sink = () => {
                     // Nothing emitted after the app terminated the stream is for it.
@@ -502,7 +481,7 @@ export function createEvents() {
                     while (!done) {
                         if (behind) {
                             behind = false;
-                            const result = since(type, held, cursor, { ...(first && request.maxAgeMs !== undefined && { maxAgeMs: request.maxAgeMs }), opened, until });
+                            const result = since(type, held, cursor, { ...(first && { maxAgeMs }), opened, until });
                             // The stream is confirmed before anything else is said on it.
                             if (first || result.truncated)
                                 await notify("active", { cursor: result.start, truncated: result.truncated });