@animalabs/agent-framework 0.22.1 → 0.22.3

package/dist/src/mcpl/push-handler.d.ts

@@ -7,8 +7,9 @@
  * Spec reference: Section 9 (Push Events).
  */
 import type { ContentBlock } from '@animalabs/membrane';
-import type { McplContentBlock, PushEventParams, PushEventResult } from './types.js';
+import type { PushEventParams, PushEventResult } from './types.js';
 import type { FeatureSetManager } from './feature-set-manager.js';
+import type { InboundSource } from './inbound-source.js';
 /**
  * A push event converted for the framework processing queue.
  *
@@ -32,12 +33,12 @@ export interface McplPushEvent {
     coalescingSubject?: string;
     /** RFC-006 assembly: materialized for this agent's turn (store directly). */
     assemblingFor?: string;
+    /** Host acceptance time (epoch ms), stamped where the push is admitted. */
+    acceptedAt?: number;
+    /** Framework-owned source envelope, frozen at a coalesced occurrence's
+     *  acceptance so its later delivery cannot restamp it (inbound-source.ts). */
+    inboundSource?: InboundSource;
 }
-/**
- * Convert a single MCPL wire-format content block to a membrane ContentBlock.
- * Same logic as hook-orchestrator.ts.
- */
-export declare function convertBlock(block: McplContentBlock): ContentBlock;
 /** Minimal responder interface for sending JSON-RPC results back. */
 interface Responder {
     respond(result: PushEventResult): void;
@@ -45,15 +46,26 @@ interface Responder {
 }
 export declare class PushHandler {
     private readonly handleCoalesced?;
+    /** An ordinary (uncoalesced) push was just admitted, before it is queued
+     *  or acknowledged: return its source envelope, frozen now
+     *  (mcpl/inbound-source.ts). Coalesced work is stamped by its own path. */
+    private readonly acceptInbound?;
     private featureSetManager;
     private pushEventFn;
     private emitTraceFn;
     private shouldTriggerInference?;
     private dedup;
+    /** Holds back repeats of the line for a channel-scoped push refused because
+     *  its channel isn't declared (-32023) or may not be used (-32017). */
+    private channelRefusalLines;
     constructor(featureSetManager: FeatureSetManager, pushEventFn: (event: McplPushEvent) => void, emitTraceFn: (event: {
         type: string;
         [key: string]: unknown;
-    }) => void, shouldTriggerInference?: (content: string, metadata: Record<string, unknown>) => boolean, handleCoalesced?: ((serverId: string, params: PushEventParams, event: McplPushEvent) => Promise<PushEventResult>) | undefined);
+    }) => void, shouldTriggerInference?: (content: string, metadata: Record<string, unknown>) => boolean, handleCoalesced?: ((serverId: string, params: PushEventParams, event: McplPushEvent) => Promise<PushEventResult>) | undefined, 
+    /** An ordinary (uncoalesced) push was just admitted, before it is queued
+     *  or acknowledged: return its source envelope, frozen now
+     *  (mcpl/inbound-source.ts). Coalesced work is stamped by its own path. */
+    acceptInbound?: ((event: McplPushEvent) => InboundSource | undefined) | undefined);
     /**
      * Handle a push/event message from an MCPL server.
      *
@@ -66,7 +78,25 @@ export declare class PushHandler {
      * 7. Respond with accepted + inferenceId
      */
     handlePushEvent(serverId: string, params: PushEventParams, responder?: Responder): Promise<void>;
-    /** Loud, like every other push rejection: the producer's wake went nowhere. */
+    /**
+     * A coalesced occurrence the host refused, as loud as every other push
+     * rejection: its producer is told on the wire, and until now the host said
+     * nothing, so a dropped message left no trace where operators look
+     * (agent-framework#266). The producer gets the wire answer this lane gives
+     * (`answered`): the thrown error's code and message, or -32602 for a
+     * malformed occurrence without one. The reason follows that answer
+     * (coalesceRejectionReason): `coalesce-failed` when the host itself failed,
+     * `coalesce-invalid` when the producer's occurrence was refused, with the
+     * failing `field` and the error's message as `detail`. A missing eventId
+     * prints as `""` and traces as `''`, as the channel lane's missing id does.
+     * A channel-scoped push refused because its channel isn't declared or may
+     * not be used names the channel on its line and its trace, and is refused
+     * for as long as that lasts, so its line prints at most once a minute per
+     * channel (RefusalLines); every refusal is traced.
+     */
+    private traceCoalesceRejection;
+    /** Loud, like every other push rejection: the producer's wake went nowhere.
+     *  A missing eventId prints as `""` and traces as `''`, as on every push line. */
     private traceEmptyRejection;
 }
 export {};

package/dist/src/mcpl/push-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"push-handler.d.ts","sourceRoot":"","sources":["../../../src/mcpl/push-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGxD,OAAO,KAAK,EACV,gBAAgB,EAChB,eAAe,EACf,eAAe,EAChB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAUlE;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,iBAAiB,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,0EAA0E;IAC1E,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,6EAA6E;IAC7E,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAMD;;;GAGG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,gBAAgB,GAAG,YAAY,CA2DlE;AAsCD,qEAAqE;AACrE,UAAU,SAAS;IACjB,OAAO,CAAC,MAAM,EAAE,eAAe,GAAG,IAAI,CAAC;IACvC,YAAY,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CACpE;AAMD,qBAAa,WAAW;IAYpB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC;IAXnC,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,WAAW,CAAiC;IACpD,OAAO,CAAC,WAAW,CAA4D;IAC/E,OAAO,CAAC,sBAAsB,CAAC,CAAkE;IACjG,OAAO,CAAC,KAAK,CAAsB;gBAGjC,iBAAiB,EAAE,iBAAiB,EACpC,WAAW,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,EAC3C,WAAW,EAAE,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,KAAK,IAAI,EACtE,sBAAsB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,EACvE,eAAe,CAAC,GAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,aAAa,KAAK,OAAO,CAAC,eAAe,CAAC,aAAA;IAQlI;;;;;;;;;;OAUG;IACG,eAAe,CACnB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,eAAe,EACvB,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CAAC,IAAI,CAAC;IAsIhB,+EAA+E;IAC/E,OAAO,CAAC,mBAAmB;CAU5B"}
+{"version":3,"file":"push-handler.d.ts","sourceRoot":"","sources":["../../../src/mcpl/push-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGxD,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EAChB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAIlE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AASzD;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,iBAAiB,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,0EAA0E;IAC1E,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,6EAA6E;IAC7E,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,2EAA2E;IAC3E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;kFAC8E;IAC9E,aAAa,CAAC,EAAE,aAAa,CAAC;CAC/B;AAsCD,qEAAqE;AACrE,UAAU,SAAS;IACjB,OAAO,CAAC,MAAM,EAAE,eAAe,GAAG,IAAI,CAAC;IACvC,YAAY,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CACpE;AAMD,qBAAa,WAAW;IAepB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC;IACjC;;+EAE2E;IAC3E,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC;IAlBjC,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,WAAW,CAAiC;IACpD,OAAO,CAAC,WAAW,CAA4D;IAC/E,OAAO,CAAC,sBAAsB,CAAC,CAAkE;IACjG,OAAO,CAAC,KAAK,CAAsB;IACnC;2EACuE;IACvE,OAAO,CAAC,mBAAmB,CAAsB;IAEjD,YACE,iBAAiB,EAAE,iBAAiB,EACpC,WAAW,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,EAC3C,WAAW,EAAE,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,KAAK,IAAI,EACtE,sBAAsB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,EACvE,eAAe,CAAC,GAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,aAAa,KAAK,OAAO,CAAC,eAAe,CAAC,aAAA;IAChI;;+EAE2E;IAC1D,aAAa,CAAC,GAAE,CAAC,KAAK,EAAE,aAAa,KAAK,aAAa,GAAG,SAAS,aAAA,EAMrF;IAED;;;;;;;;;;OAUG;IACG,eAAe,CACnB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,eAAe,EACvB,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CAAC,IAAI,CAAC,CA6If;IAED;;;;;;;;;;;;;;;OAeG;IACH,OAAO,CAAC,sBAAsB;IA+B9B;sFACkF;IAClF,OAAO,CAAC,mBAAmB;CAU5B"}

package/dist/src/mcpl/push-handler.js

@@ -6,74 +6,13 @@
  *
  * Spec reference: Section 9 (Push Events).
  */
-import { INLINE_WITHHELD_TEXT, isInlineContradiction, referenceStubOrNull } from './references.js';
+import { convertBlock } from './convert-block.js';
 import { McplFeatureSetError } from './feature-set-manager.js';
 import { expandCoreTags } from './tags.js';
-import { EmptyContentError, validateCoalescedContent } from './push-coalescer.js';
-import { isSilentHeartbeatMarker, isVisiblyEmptyContent } from './visible-content.js';
-// ============================================================================
-// Content conversion: McplContentBlock → membrane ContentBlock
-// ============================================================================
-/**
- * Convert a single MCPL wire-format content block to a membrane ContentBlock.
- * Same logic as hook-orchestrator.ts.
- */
-export function convertBlock(block) {
-    switch (block.type) {
-        case 'text':
-            return { type: 'text', text: block.text };
-        case 'image':
-            if (isInlineContradiction(block)) {
-                // RFC-005 vector 2: inline data claiming bulk disposition — fail
-                // closed, withhold the data (checked BEFORE the data branch).
-                return { type: 'text', text: INLINE_WITHHELD_TEXT };
-            }
-            if (block.uri && block.disposition) {
-                // RFC-005 uri-form media with a disposition claim: stub, do not
-                // hand the URI to the provider or inline it.
-                return { type: 'text', text: referenceStubOrNull(block, 'attachment on push event') ?? '[reference]' };
-            }
-            if (block.data && block.mimeType) {
-                return {
-                    type: 'image',
-                    source: { type: 'base64', data: block.data, mediaType: block.mimeType },
-                };
-            }
-            if (block.uri) {
-                return {
-                    type: 'image',
-                    source: { type: 'url', url: block.uri },
-                };
-            }
-            return { type: 'text', text: '[Image: no data]' };
-        case 'audio':
-            if (isInlineContradiction(block)) {
-                // RFC-005 vector 2: inline data claiming bulk disposition — fail
-                // closed, withhold the data (checked BEFORE the data branch).
-                return { type: 'text', text: INLINE_WITHHELD_TEXT };
-            }
-            if (block.uri && block.disposition) {
-                // RFC-005 uri-form media with a disposition claim: stub, do not
-                // hand the URI to the provider or inline it.
-                return { type: 'text', text: referenceStubOrNull(block, 'attachment on push event') ?? '[reference]' };
-            }
-            if (block.data && block.mimeType) {
-                return {
-                    type: 'audio',
-                    source: { type: 'base64', data: block.data, mediaType: block.mimeType },
-                };
-            }
-            return { type: 'text', text: '[Audio: no data]' };
-        case 'resource':
-            // RFC-005: reference blocks become bounded stubs — never raw URIs
-            // (a signed URL is a bearer credential that looks like a location).
-            return { type: 'text', text: referenceStubOrNull(block, 'attachment on push event') ?? '[reference]' };
-        default:
-            // Unknown wire block types previously fell off the exhaustive switch
-            // and propagated `undefined` into ContentBlock[]. Fail visibly.
-            return { type: 'text', text: `[unrecognized content block: ${block.type ?? 'untyped'}]` };
-    }
-}
+import { coalesceRejectionReason, EmptyContentError, validateCoalescedContent } from './push-coalescer.js';
+import { isSilentHeartbeatMarker, isVisiblyEmptyConversion } from './visible-content.js';
+import { logDetail, logValue } from './log-value.js';
+import { RefusalLines } from './refusal-lines.js';
 // ============================================================================
 // LRU Dedup Set
 // ============================================================================
@@ -107,13 +46,22 @@ class DedupSet {
 // ============================================================================
 export class PushHandler {
     handleCoalesced;
+    acceptInbound;
     featureSetManager;
     pushEventFn;
     emitTraceFn;
     shouldTriggerInference;
     dedup = new DedupSet(1000);
-    constructor(featureSetManager, pushEventFn, emitTraceFn, shouldTriggerInference, handleCoalesced) {
+    /** Holds back repeats of the line for a channel-scoped push refused because
+     *  its channel isn't declared (-32023) or may not be used (-32017). */
+    channelRefusalLines = new RefusalLines();
+    constructor(featureSetManager, pushEventFn, emitTraceFn, shouldTriggerInference, handleCoalesced, 
+    /** An ordinary (uncoalesced) push was just admitted, before it is queued
+     *  or acknowledged: return its source envelope, frozen now
+     *  (mcpl/inbound-source.ts). Coalesced work is stamped by its own path. */
+    acceptInbound) {
         this.handleCoalesced = handleCoalesced;
+        this.acceptInbound = acceptInbound;
         this.featureSetManager = featureSetManager;
         this.pushEventFn = pushEventFn;
         this.emitTraceFn = emitTraceFn;
@@ -153,7 +101,7 @@ export class PushHandler {
                 : 'Feature set validation failed';
             // Loud rejection — a rejected push event is an agent that silently
             // never hears the message. (2026-07-09 diagnosability pass.)
-            console.error(`[push-event-rejected] server=${serverId} eventId=${params.eventId} reason=${reason}`);
+            console.error(`[push-event-rejected] server=${serverId} eventId=${logValue(params.eventId ?? '')} reason=${logValue(reason)}`);
             if (err instanceof McplFeatureSetError && responder?.respondError) {
                 responder.respondError(err.code, reason, { featureSet: err.featureSet });
             }
@@ -172,14 +120,17 @@ export class PushHandler {
         if (coalesced) {
             // RFC-006 §13: malformed content is a -32602, checked before conversion.
             try {
-                validateCoalescedContent(params.payload?.content, undefined, { allowEmpty: emptyAllowed });
+                validateCoalescedContent(params.payload?.content, { allowEmpty: emptyAllowed });
             }
             catch (error) {
                 const err = error;
+                const code = err.code ?? -32602;
                 if (err instanceof EmptyContentError)
                     this.traceEmptyRejection(serverId, params);
+                else
+                    this.traceCoalesceRejection(serverId, params, err, code);
                 if (responder?.respondError)
-                    responder.respondError(err.code ?? -32602, err.message, { field: err.field });
+                    responder.respondError(code, err.message, { field: err.field });
                 else
                     responder?.respond({ accepted: false, reason: err instanceof EmptyContentError ? err.reason : err.message });
                 return;
@@ -187,8 +138,8 @@ export class PushHandler {
         }
         // 2. Convert content blocks, and refuse content with nothing visible in
         // it — before dedup, so a refused eventId is not burned for a retry.
-        const content = params.payload.content.map(convertBlock);
-        if (!emptyAllowed && isVisiblyEmptyContent(content)) {
+        const content = params.payload.content.map((block) => convertBlock(block, 'attachment on push event', serverId));
+        if (!emptyAllowed && isVisiblyEmptyConversion(params.payload.content, content)) {
             const err = new EmptyContentError();
             this.traceEmptyRejection(serverId, params);
             if (responder?.respondError)
@@ -201,7 +152,7 @@ export class PushHandler {
         // coalescer's receipts instead (RFC-006 §3.1: a retry within the window
         // gets its original result, which this set could not return).
         if (!coalesced && this.dedup.checkAndAdd(params.eventId)) {
-            console.error(`[push-event-rejected] server=${serverId} eventId=${params.eventId} reason=duplicate`);
+            console.error(`[push-event-rejected] server=${serverId} eventId=${logValue(params.eventId ?? '')} reason=duplicate`);
             responder?.respond({ accepted: false, reason: 'duplicate' });
             return;
         }
@@ -236,6 +187,7 @@ export class PushHandler {
             timestamp: params.timestamp,
             inferenceId,
             triggerInference,
+            acceptedAt: Date.now(),
         };
         if (coalesced) {
             // RFC-006: the coalescer decides whether this occurrence replaces an
@@ -248,14 +200,21 @@ export class PushHandler {
             }
             catch (error) {
                 const err = error;
-                console.error(`[push-event-rejected] server=${serverId} eventId=${params.eventId} reason=${err.message}`);
+                const code = typeof err.code === 'number' ? err.code : -32603;
+                this.traceCoalesceRejection(serverId, params, err, code);
                 if (responder?.respondError)
-                    responder.respondError(typeof err.code === 'number' ? err.code : -32603, err.message, { field: err.field });
+                    responder.respondError(code, err.message, { field: err.field });
                 else
                     responder?.respond({ accepted: false, reason: err.message });
             }
             return;
         }
+        // The source envelope is frozen at admission, before queueing or the
+        // acknowledgement: nothing that changes while the push waits in the
+        // queue can rewrite where it came from.
+        const inboundSource = this.acceptInbound?.(pushEvent);
+        if (inboundSource)
+            pushEvent.inboundSource = inboundSource;
         this.pushEventFn(pushEvent);
         // 7. Emit trace
         this.emitTraceFn({
@@ -267,13 +226,53 @@ export class PushHandler {
         // 8. Respond
         responder?.respond({ accepted: true, inferenceId });
     }
-    /** Loud, like every other push rejection: the producer's wake went nowhere. */
+    /**
+     * A coalesced occurrence the host refused, as loud as every other push
+     * rejection: its producer is told on the wire, and until now the host said
+     * nothing, so a dropped message left no trace where operators look
+     * (agent-framework#266). The producer gets the wire answer this lane gives
+     * (`answered`): the thrown error's code and message, or -32602 for a
+     * malformed occurrence without one. The reason follows that answer
+     * (coalesceRejectionReason): `coalesce-failed` when the host itself failed,
+     * `coalesce-invalid` when the producer's occurrence was refused, with the
+     * failing `field` and the error's message as `detail`. A missing eventId
+     * prints as `""` and traces as `''`, as the channel lane's missing id does.
+     * A channel-scoped push refused because its channel isn't declared or may
+     * not be used names the channel on its line and its trace, and is refused
+     * for as long as that lasts, so its line prints at most once a minute per
+     * channel (RefusalLines); every refusal is traced.
+     */
+    traceCoalesceRejection(serverId, params, error, answered) {
+        const reason = coalesceRejectionReason(answered);
+        const field = typeof error.field === 'string' && error.field ? error.field : undefined;
+        const scoped = params.coalesce?.channelId;
+        const channelId = (answered === -32023 || answered === -32017) && typeof scoped === 'string' ? scoped : undefined;
+        const held = channelId === undefined ? 0 : this.channelRefusalLines.admit(serverId, channelId);
+        if (held !== null) {
+            console.error(`[push-event-rejected] server=${serverId} featureSet=${logValue(params.featureSet ?? '')} eventId=${logValue(params.eventId ?? '')} ` +
+                (channelId === undefined ? '' : `channel=${logValue(channelId)} `) +
+                `reason=${reason}${field ? ` field=${logValue(field)}` : ''}: ${logDetail(error.message)}` +
+                (held ? ` (${held} more since the last line)` : ''));
+        }
+        this.emitTraceFn({
+            type: 'mcpl:push-event-rejected',
+            serverId,
+            eventId: typeof params.eventId === 'string' ? params.eventId : '',
+            featureSet: params.featureSet,
+            reason,
+            ...(field ? { field } : {}),
+            ...(channelId === undefined ? {} : { channelId }),
+            detail: error.message,
+        });
+    }
+    /** Loud, like every other push rejection: the producer's wake went nowhere.
+     *  A missing eventId prints as `""` and traces as `''`, as on every push line. */
     traceEmptyRejection(serverId, params) {
-        console.error(`[push-event-rejected] server=${serverId} eventId=${params.eventId} reason=empty-content`);
+        console.error(`[push-event-rejected] server=${serverId} eventId=${logValue(params.eventId ?? '')} reason=empty-content`);
         this.emitTraceFn({
             type: 'mcpl:push-event-rejected',
             serverId,
-            eventId: params.eventId,
+            eventId: typeof params.eventId === 'string' ? params.eventId : '',
             featureSet: params.featureSet,
             reason: 'empty-content',
         });

package/dist/src/mcpl/push-handler.js.map

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

package/dist/src/mcpl/reference-fetcher.d.ts

@@ -3,7 +3,9 @@ import type { ReferenceRecord } from './references.js';
 export declare const DEFAULT_FETCH_MAX_BYTES: number;
 /** Eager (autofetch) threshold: at most what could have shipped inline. */
 export declare const DEFAULT_EAGER_FETCH_MAX_BYTES: number;
-/** Cumulative per-server budget for this process. */
+/** Cumulative per-server budget for this process: every byte a fetch dialed
+ *  through a server reads counts against that server's, whether or not it's
+ *  kept. */
 export declare const DEFAULT_MAX_TOTAL_BYTES: number;
 declare const EAGER_FETCH_TIMEOUT_MS = 10000;
 export interface ResolvedServerBinding {
@@ -37,6 +39,10 @@ export declare class ReferenceFetcher {
     /** Persist the payload; returns a mount-prefixed path or null when no
      *  writable workspace exists. File name is host-generated (§7.3). */
     private readonly saveFile;
+    /** Bytes read through each server in this process, charged to the server a
+     *  fetch dials through as each chunk is read, kept or not. Concurrent
+     *  fetches through one server share the total, so each checks what the
+     *  others have taken. */
     private totals;
     private inFlight;
     constructor(resolveServer: (serverId: string) => ResolvedServerBinding | undefined, 
@@ -44,8 +50,14 @@ export declare class ReferenceFetcher {
      *  writable workspace exists. File name is host-generated (§7.3). */
     saveFile: (fileName: string, data: Buffer, mimeType: string) => Promise<string | null>);
     /** Would the eager (autofetch) default fetch this record? Not one the
-     *  fetcher refuses as expired, which would only take an eager slot. */
+     *  fetcher refuses as expired, which would only take an eager slot. It
+     *  takes the eager limit of the server the fetch would dial. */
     isEagerEligible(record: ReferenceRecord): boolean;
+    /** The server to dial for a record (§6.2): the first, in the order they
+     *  delivered it, whose address is on the uri's origin. When none is, the
+     *  first server's refusal (unknown to this host, or the origin check's),
+     *  and for a record no server delivered, that it's unbound. */
+    private serverFor;
     /** §6.1/§7.1 policy check; returns a refusal reason or null. */
     private originCheck;
     /** Fetch a reference to workspace storage. Idempotent per record; concurrent

package/dist/src/mcpl/reference-fetcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reference-fetcher.d.ts","sourceRoot":"","sources":["../../../src/mcpl/reference-fetcher.ts"],"names":[],"mappings":"AA8BA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAGvD,8EAA8E;AAC9E,eAAO,MAAM,uBAAuB,QAAoB,CAAC;AACzD,2EAA2E;AAC3E,eAAO,MAAM,6BAA6B,QAAa,CAAC;AACxD,qDAAqD;AACrD,eAAO,MAAM,uBAAuB,QAAqB,CAAC;AAE1D,QAAA,MAAM,sBAAsB,QAAS,CAAC;AAEtC,MAAM,WAAW,qBAAqB;IACpC,gEAAgE;IAChE,GAAG,EAAE,MAAM,CAAC;IACZ,yEAAyE;IACzE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC3D;AAED,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ,uEAAuE;IACvE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;yDAGyD;AACzD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAerD;AAWD,4EAA4E;AAC5E,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAU3D;AAED,qBAAa,gBAAgB;IAKzB,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B;yEACqE;IACrE,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAP3B,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,QAAQ,CAA4C;gBAGzC,aAAa,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,qBAAqB,GAAG,SAAS;IACvF;yEACqE;IACpD,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAGzG;2EACuE;IACvE,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO;IAWjD,gEAAgE;IAChE,OAAO,CAAC,WAAW;IAgBnB;6CACyC;IACzC,KAAK,CAAC,MAAM,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,YAAY,CAAC;YAYzF,OAAO;CAyFtB;AAED,OAAO,EAAE,sBAAsB,EAAE,CAAC"}
+{"version":3,"file":"reference-fetcher.d.ts","sourceRoot":"","sources":["../../../src/mcpl/reference-fetcher.ts"],"names":[],"mappings":"AA+BA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAGvD,8EAA8E;AAC9E,eAAO,MAAM,uBAAuB,QAAoB,CAAC;AACzD,2EAA2E;AAC3E,eAAO,MAAM,6BAA6B,QAAa,CAAC;AACxD;;YAEY;AACZ,eAAO,MAAM,uBAAuB,QAAqB,CAAC;AAO1D,QAAA,MAAM,sBAAsB,QAAS,CAAC;AAEtC,MAAM,WAAW,qBAAqB;IACpC,gEAAgE;IAChE,GAAG,EAAE,MAAM,CAAC;IACZ,yEAAyE;IACzE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC3D;AAED,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ,uEAAuE;IACvE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;yDAGyD;AACzD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAerD;AAWD,4EAA4E;AAC5E,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAU3D;AAED,qBAAa,gBAAgB;IASzB,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B;yEACqE;IACrE,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAX3B;;;6BAGyB;IACzB,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,QAAQ,CAA4C;IAE5D,YACmB,aAAa,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,qBAAqB,GAAG,SAAS;IACvF;yEACqE;IACpD,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,EACrG;IAEJ;;oEAEgE;IAChE,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAOhD;IAED;;;mEAG+D;IAC/D,OAAO,CAAC,SAAS;IAejB,gEAAgE;IAChE,OAAO,CAAC,WAAW;IAgBnB;6CACyC;IACzC,KAAK,CAAC,MAAM,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAUtG;YAEa,OAAO;CAwGtB;AAED,OAAO,EAAE,sBAAsB,EAAE,CAAC"}

package/dist/src/mcpl/reference-fetcher.js

@@ -3,7 +3,8 @@
  * dereferences a reference, and it fails closed on every axis the RFC names:
  *
  *  - **origin binding (§6.1, revision 3):** authenticated fetches go only to
- *    the origin the reference's server connection was dialed to. This v1 does
+ *    the origin a server's connection was dialed to, for a reference that
+ *    server delivered, with that server's credential. This v1 does
  *    not fetch third-party origins at all (deferred with declared reference
  *    origins); the connection credential is applied as an Authorization
  *    header by this code alone and never surfaces to model, script, or URI.
@@ -28,14 +29,21 @@
  * that the bytes are wanted). Per-server budgets cap cumulative appetite.
  */
 import { createHash } from 'node:crypto';
-import { EXPIRY_REASON, isReferenceExpired, referenceExpiry, REFERENCE_LIMITS, sanitizeLabel } from './references.js';
+import { EXPIRY_REASON, isReferenceExpired, referenceExpiry, REFERENCE_LIMITS, sanitizeLabel, UNBOUND_REASON } from './references.js';
 /** Per-fetch hard ceiling on actual bytes (overridable per server / call). */
 export const DEFAULT_FETCH_MAX_BYTES = 256 * 1024 * 1024;
 /** Eager (autofetch) threshold: at most what could have shipped inline. */
 export const DEFAULT_EAGER_FETCH_MAX_BYTES = 256 * 1024;
-/** Cumulative per-server budget for this process. */
+/** Cumulative per-server budget for this process: every byte a fetch dialed
+ *  through a server reads counts against that server's, whether or not it's
+ *  kept. */
 export const DEFAULT_MAX_TOTAL_BYTES = 1024 * 1024 * 1024;
 const FETCH_TIMEOUT_MS = 60_000;
+/** What a refusal by the per-server budget adds. The total lives as long as
+ *  this fetcher, one per framework, so only someone running the host renews
+ *  it, by starting a new one, or raises the budget (the server's config's
+ *  autofetch.maxTotalBytes, which each fetch reads afresh). */
+const BUDGET_LASTS = "the budget doesn't renew on its own, so calling again won't change that unless whoever runs this host raises or renews it";
 const EAGER_FETCH_TIMEOUT_MS = 10_000;
 /** Magic-byte sniff for the formats this pipeline actually moves. The
  *  header is testimony too (vector 13): sniffed type wins for the storage
@@ -94,6 +102,10 @@ export function normalizedOrigin(url) {
 export class ReferenceFetcher {
     resolveServer;
     saveFile;
+    /** Bytes read through each server in this process, charged to the server a
+     *  fetch dials through as each chunk is read, kept or not. Concurrent
+     *  fetches through one server share the total, so each checks what the
+     *  others have taken. */
     totals = new Map();
     inFlight = new Map();
     constructor(resolveServer, 
@@ -104,21 +116,37 @@ export class ReferenceFetcher {
         this.saveFile = saveFile;
     }
     /** Would the eager (autofetch) default fetch this record? Not one the
-     *  fetcher refuses as expired, which would only take an eager slot. */
+     *  fetcher refuses as expired, which would only take an eager slot. It
+     *  takes the eager limit of the server the fetch would dial. */
     isEagerEligible(record) {
         if (record.fetchedPath)
             return false;
         if (isReferenceExpired(record.testimony))
             return false;
-        if (record.serverId === undefined)
+        const server = this.serverFor(record);
+        if ('refusal' in server)
             return false;
-        const binding = this.resolveServer(record.serverId);
-        if (!binding)
-            return false;
-        const cap = binding.autofetch?.maxBytes ?? DEFAULT_EAGER_FETCH_MAX_BYTES;
-        if (record.testimony.sizeBytes === undefined || record.testimony.sizeBytes > cap)
-            return false;
-        return this.originCheck(record, binding) === null;
+        const cap = server.binding.autofetch?.maxBytes ?? DEFAULT_EAGER_FETCH_MAX_BYTES;
+        return record.testimony.sizeBytes !== undefined && record.testimony.sizeBytes <= cap;
+    }
+    /** The server to dial for a record (§6.2): the first, in the order they
+     *  delivered it, whose address is on the uri's origin. When none is, the
+     *  first server's refusal (unknown to this host, or the origin check's),
+     *  and for a record no server delivered, that it's unbound. */
+    serverFor(record) {
+        let refusal;
+        for (const serverId of record.serverIds) {
+            const binding = this.resolveServer(serverId);
+            if (!binding) {
+                refusal ??= `unknown server: ${serverId}`;
+                continue;
+            }
+            const offOrigin = this.originCheck(record, binding);
+            if (offOrigin === null)
+                return { serverId, binding };
+            refusal ??= offOrigin;
+        }
+        return { refusal: refusal ?? `reference ${UNBOUND_REASON}` };
     }
     /** §6.1/§7.1 policy check; returns a refusal reason or null. */
     originCheck(record, binding) {
@@ -155,26 +183,34 @@ export class ReferenceFetcher {
     }
     async doFetch(record, opts) {
         const t = record.testimony;
-        if (record.serverId === undefined)
-            return { ok: false, error: 'reference has no server binding' };
-        const binding = this.resolveServer(record.serverId);
-        if (!binding)
-            return { ok: false, error: `unknown server: ${record.serverId}` };
-        const refusal = this.originCheck(record, binding);
-        if (refusal)
-            return { ok: false, error: refusal };
+        const server = this.serverFor(record);
+        if ('refusal' in server)
+            return { ok: false, error: server.refusal };
+        const { serverId, binding } = server;
         const expiry = referenceExpiry(t);
         if (expiry)
             return { ok: false, error: `reference ${EXPIRY_REASON[expiry]}` };
         const ceiling = opts?.maxBytes ?? DEFAULT_FETCH_MAX_BYTES;
-        // Vector 4: a claim already over the ceiling refuses without dialing.
-        if (t.sizeBytes !== undefined && t.sizeBytes > ceiling) {
-            return { ok: false, error: `claimed ${t.sizeBytes} bytes exceeds fetch ceiling ${ceiling}` };
-        }
+        // The budget is checked before the ceiling, here and while reading: a
+        // larger max_bytes lifts the ceiling, and nothing the caller does lifts
+        // the budget, so a fetch past both is told about the budget.
         const budget = binding.autofetch?.maxTotalBytes ?? DEFAULT_MAX_TOTAL_BYTES;
-        const used = this.totals.get(record.serverId) ?? 0;
+        const used = this.totals.get(serverId) ?? 0;
         if (used >= budget) {
-            return { ok: false, error: `per-server fetch budget exhausted (${used}/${budget} bytes)` };
+            return { ok: false, error: `per-server fetch budget exhausted (${used}/${budget} bytes); ${BUDGET_LASTS}` };
+        }
+        // Vector 4: a claim already over the ceiling refuses without dialing. One
+        // that's also over what's left of the budget is told about the budget,
+        // which no max_bytes lifts. A claim over what's left but within the
+        // ceiling still dials, and the budget stops it at its first chunk past.
+        if (t.sizeBytes !== undefined && t.sizeBytes > ceiling) {
+            if (t.sizeBytes > budget - used) {
+                return {
+                    ok: false,
+                    error: `claimed ${t.sizeBytes} bytes exceeds what's left of the per-server fetch budget (${used}/${budget} bytes); ${BUDGET_LASTS}`,
+                };
+            }
+            return { ok: false, error: `claimed ${t.sizeBytes} bytes exceeds fetch ceiling ${ceiling}` };
         }
         const controller = new AbortController();
         const timer = setTimeout(() => controller.abort(), opts?.timeoutMs ?? FETCH_TIMEOUT_MS);
@@ -199,10 +235,17 @@ export class ReferenceFetcher {
                 if (done)
                     break;
                 received += value.byteLength;
-                if (received > ceiling || received > budget - used) {
+                // What's read is charged at once, kept or not: other fetches from
+                // this server read the same total, so none spends what another took.
+                const total = (this.totals.get(serverId) ?? 0) + value.byteLength;
+                this.totals.set(serverId, total);
+                if (total > budget) {
+                    controller.abort();
+                    return { ok: false, error: `aborted: per-server fetch budget exhausted (${total}/${budget} bytes); ${BUDGET_LASTS}` };
+                }
+                if (received > ceiling) {
                     controller.abort();
-                    const which = received > ceiling ? 'ceiling' : 'per-server budget';
-                    return { ok: false, error: `aborted: actual bytes exceeded ${which} at ${received}` };
+                    return { ok: false, error: `aborted: actual bytes exceeded ceiling at ${received}` };
                 }
                 const buf = Buffer.from(value);
                 hash.update(buf);
@@ -231,7 +274,6 @@ export class ReferenceFetcher {
             const path = await this.saveFile(`${record.refId}.${ext}`, data, observedMime);
             if (path === null)
                 return { ok: false, error: 'no writable workspace mount to store the payload' };
-            this.totals.set(record.serverId, used + data.length);
             record.fetchedPath = path;
             record.verifiedBytes = data.length;
             record.verifiedMimeType = observedMime;