mcpose 3.0.0 → 3.1.0

package/dist/sanitizeCatalog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sanitizeCatalog.d.ts","sourceRoot":"","sources":["../src/sanitizeCatalog.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAKrD,oDAAoD;AACpD,MAAM,WAAW,+BAA+B;IAC9C;;;;OAIG;IACH,QAAQ,CAAC,EAAE,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;IAC1C,uEAAuE;IACvE,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AA8BD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,GAAE,+BAAoC,GAC5C,mBAAmB,CAgDrB"}
+{"version":3,"file":"sanitizeCatalog.d.ts","sourceRoot":"","sources":["../src/sanitizeCatalog.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAWrD,oDAAoD;AACpD,MAAM,WAAW,+BAA+B;IAC9C;;;;OAIG;IACH,QAAQ,CAAC,EAAE,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;IAC1C,uEAAuE;IACvE,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AA8BD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,GAAE,+BAAoC,GAC5C,mBAAmB,CAgDrB"}

package/dist/sanitizeCatalog.js

@@ -3,8 +3,14 @@
  * descriptions verbatim into model context, and real upstreams leak org
  * slugs and internal hostnames there. See ADR-0010.
  */
-/** Matches http(s) URLs; always stripped regardless of `patterns`. */
-const URL_PATTERN = /\bhttps?:\/\/[^\s"'<>()[\]]+/g;
+/**
+ * Matches http(s) URLs; always stripped regardless of `patterns`.
+ * The `i` flag is load-bearing: URI schemes are case-insensitive
+ * (RFC 3986 §6.2.2), so an uppercase `HTTPS://` is the same URL, and a
+ * case-sensitive strip would let an upstream leak a hostname simply by
+ * capitalizing the scheme.
+ */
+const URL_PATTERN = /\bhttps?:\/\/[^\s"'<>()[\]]+/gi;
 /**
  * Rebuilds a schema node with every string-valued `description` property
  * sanitized, at any depth through plain objects and arrays. Returns the

package/dist/sanitizeCatalog.js.map

@@ -1 +1 @@
-{"version":3,"file":"sanitizeCatalog.js","sourceRoot":"","sources":["../src/sanitizeCatalog.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,sEAAsE;AACtE,MAAM,WAAW,GAAG,+BAA+B,CAAC;AAcpD;;;;GAIG;AACH,SAAS,cAAc,CACrB,IAAa,EACb,QAAkC;IAElC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;QAClE,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IACpE,CAAC;IACD,IAAI,IAAI,KAAK,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC3D,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QACzD,GAAG;QACH,GAAG,KAAK,aAAa,IAAI,OAAO,KAAK,KAAK,QAAQ;YAChD,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;YACjB,CAAC,CAAC,cAAc,CAAC,KAAK,EAAE,QAAQ,CAAC;KACpC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC,IAAI,CACjB,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CACf,KAAK,KAAM,IAAgC,CAAC,GAAa,CAAC,CAC7D;QACC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC;QAC7B,CAAC,CAAC,IAAI,CAAC;AACX,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,wBAAwB,CACtC,UAA2C,EAAE;IAE7C,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC;IAC9C,MAAM,QAAQ,GAAmC;QAC/C,WAAW;QACX,iEAAiE;QACjE,sEAAsE;QACtE,iDAAiD;QACjD,GAAG,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACpC,CAAC,YAAY,MAAM;YACjB,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC;YAC1D,CAAC,CAAC,CAAC,CACN;KACF,CAAC;IACF,uEAAuE;IACvE,yDAAyD;IACzD,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAU,EAAE,CACxC,QAAQ,CAAC,MAAM,CAAS,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,EAAE,WAAW,CAAC,EAAE,IAAI,CAAC,CAAC;IAE5E,OAAO,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACzB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACtC,MAAM,WAAW,GACf,OAAO,IAAI,CAAC,WAAW,KAAK,QAAQ;gBAClC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC;gBAC5B,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC;YACvB,MAAM,WAAW,GAAG,cAAc,CAChC,IAAI,CAAC,WAAW,EAChB,QAAQ,CACkB,CAAC;YAC7B,MAAM,YAAY,GAAG,cAAc,CACjC,IAAI,CAAC,YAAY,EACjB,QAAQ,CACmB,CAAC;YAC9B,OAAO,WAAW,KAAK,IAAI,CAAC,WAAW;gBACrC,WAAW,KAAK,IAAI,CAAC,WAAW;gBAChC,YAAY,KAAK,IAAI,CAAC,YAAY;gBAClC,CAAC,CAAC,IAAI;gBACN,CAAC,CAAC;oBACE,GAAG,IAAI;oBACP,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC;oBACrD,WAAW;oBACX,GAAG,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC;iBACxD,CAAC;QACR,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,KAAK,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACtD,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE;YACtB,CAAC,CAAC,MAAM,CAAC;IACb,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"sanitizeCatalog.js","sourceRoot":"","sources":["../src/sanitizeCatalog.ts"],"names":[],"mappings":"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"}

package/dist/sessionRegistry.d.ts

@@ -37,7 +37,7 @@ export interface SessionRecord {
 export interface SessionRegistry {
     /**
      * Persists a record. Awaited before the client learns its session id, so a
-     * rejection fails the initialize with a 500 rather than handing out an id
+     * rejection fails the initialize with a 400 rather than handing out an id
      * that no other instance could honour.
      */
     set(sessionId: string, record: SessionRecord): Promise<void>;

package/dist/version.d.ts

@@ -3,5 +3,5 @@
  * `createRequire('../package.json')` lookup breaks when consumers bundle
  * the package). Kept in sync with package.json by `version.test.ts`.
  */
-export declare const VERSION = "3.0.0";
+export declare const VERSION = "3.1.0";
 //# sourceMappingURL=version.d.ts.map

package/dist/version.js

@@ -3,5 +3,5 @@
  * `createRequire('../package.json')` lookup breaks when consumers bundle
  * the package). Kept in sync with package.json by `version.test.ts`.
  */
-export const VERSION = '3.0.0';
+export const VERSION = '3.1.0';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcpose",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "The audit and governance layer for MCP",
   "type": "module",
   "main": "./dist/index.js",
@@ -51,13 +51,13 @@
     "@modelcontextprotocol/sdk": "^1.17.0"
   },
   "devDependencies": {
-    "@modelcontextprotocol/sdk": "1.30.0",
+    "@modelcontextprotocol/sdk": "1.32.1",
     "@stryker-mutator/core": "10.0.0",
     "@stryker-mutator/vitest-runner": "10.0.0",
-    "@types/node": "^26.5.1",
-    "@vitest/coverage-v8": "5.0.1",
+    "@types/node": "^26.6.5",
+    "@vitest/coverage-v8": "5.0.4",
     "typescript": "6.0.3",
-    "vitest": "5.0.1"
+    "vitest": "5.0.4"
   },
   "scripts": {
     "build": "tsc -p tsconfig.build.json",

package/src/__tests__/core.test.ts

@@ -1,6 +1,7 @@
 import { describe, it, expect, vi } from 'vitest';
 import { readFileSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
+import { runInNewContext } from 'node:vm';
 import {
   createProxyServer,
   type ListToolsMiddleware,
@@ -721,6 +722,33 @@ describe('createProxyServer() — onTelemetry', () => {
       outcome: 'error',
     });
   });
+
+  it.each(['LEDGER_POOL_RESET', 'constructor'])(
+    'emits an error event, not a rejection, when the upstream throws with the unknown reason %s (#238)',
+    async (reason) => {
+      const backend = makeMockBackend();
+      vi.mocked(backend.callTool).mockRejectedValueOnce(
+        Object.assign(new Error('upstream failure'), {
+          data: { rejectionReason: reason },
+        }),
+      );
+      const events: ToolCallTelemetryEvent[] = [];
+      const server = createProxyServer(backend, {
+        onTelemetry: (e) => {
+          if (e.type === 'tool_call') events.push(e);
+        },
+        name: 'test-server',
+      });
+
+      await expect(
+        invokeHandler(server, 'tools/call', { name: 'echo', arguments: {} }),
+      ).rejects.toBeDefined();
+
+      expect(events).toHaveLength(1);
+      expect(events[0]?.outcome).toBe('error');
+      expect(Object.hasOwn(events[0]!, 'rejectionReason')).toBe(false);
+    },
+  );
 });
 
 describe('createProxyServer() — server identity', () => {
@@ -929,6 +957,64 @@ describe('createProxyServer() — telemetry outcomes', () => {
     expect(consoleSpy).toHaveBeenCalled();
     consoleSpy.mockRestore();
   });
+
+  it('does not fail the call when an async onTelemetry rejects', async () => {
+    const backend = makeMockBackend();
+    const consoleSpy = vi
+      .spyOn(console, 'error')
+      .mockImplementation(() => undefined);
+    const rejection = new Error('exporter down');
+    const server = createProxyServer(backend, {
+      onTelemetry: async () => {
+        await Promise.resolve();
+        throw rejection;
+      },
+      name: 'test-server',
+    });
+
+    const result = await invokeHandler(server, 'tools/call', {
+      name: 'normal_tool',
+      arguments: {},
+    });
+    expect(result).toMatchObject({
+      content: [{ type: 'text', text: 'raw upstream response' }],
+    });
+    // A rejection nobody observes would surface as an unhandled rejection and
+    // fail the run, so reaching here at all is part of the assertion; the spy
+    // pins that it was also logged rather than dropped.
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    expect(consoleSpy).toHaveBeenCalledWith(rejection);
+    consoleSpy.mockRestore();
+  });
+
+  it('does not fail the call when onTelemetry returns a cross-realm promise that rejects', async () => {
+    const backend = makeMockBackend();
+    const consoleSpy = vi
+      .spyOn(console, 'error')
+      .mockImplementation(() => undefined);
+    const rejection = new Error('exporter down');
+    // A sink loaded from a `node:vm` sandbox hands back a promise built by that
+    // realm's `Promise`, so it is not `instanceof Promise` here; the guard has
+    // to adopt it rather than test its constructor.
+    const rejectFromOtherRealm = runInNewContext(
+      '(reason) => Promise.reject(reason)',
+    ) as (reason: unknown) => unknown;
+    const server = createProxyServer(backend, {
+      onTelemetry: () => rejectFromOtherRealm(rejection),
+      name: 'test-server',
+    });
+
+    const result = await invokeHandler(server, 'tools/call', {
+      name: 'normal_tool',
+      arguments: {},
+    });
+    expect(result).toMatchObject({
+      content: [{ type: 'text', text: 'raw upstream response' }],
+    });
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    expect(consoleSpy).toHaveBeenCalledWith(rejection);
+    consoleSpy.mockRestore();
+  });
 });
 
 describe('createProxyServer() — promptMiddleware', () => {

package/src/__tests__/core.toolCallTelemetry.test.ts

@@ -0,0 +1,157 @@
+import { describe, it, expect, vi } from 'vitest';
+import { createProxyServer, type LocalTool } from '../core.js';
+import type { BackendClient } from '../backendClient.js';
+import type { TelemetryEvent } from '../telemetry.js';
+
+/** Invokes a registered handler directly via `_requestHandlers` — no transport needed. */
+async function invokeHandler(
+  server: ReturnType<typeof createProxyServer>,
+  method: string,
+  params: Record<string, unknown> = {},
+) {
+  const { _requestHandlers: handlers } = server as unknown as {
+    _requestHandlers: Map<
+      string,
+      (
+        req: { method: string; params: Record<string, unknown> },
+        extra: object,
+      ) => Promise<unknown>
+    >;
+  };
+  const handler = handlers.get(method);
+  if (!handler) throw new Error(`No handler registered for method: ${method}`);
+  return handler({ method, params }, {});
+}
+
+function makeBackend(): BackendClient {
+  return {
+    getServerCapabilities: vi.fn().mockReturnValue({ tools: {} }),
+    listTools: vi.fn().mockResolvedValue({ tools: [] }),
+    callTool: vi.fn(),
+    setNotificationHandler: vi.fn(),
+  } as unknown as BackendClient;
+}
+
+/**
+ * `hasToolContent` answers false for a value that is not a tool result instead
+ * of throwing on it. The `tools/call` telemetry decision reads that guard, so a
+ * pipeline that resolved to nothing must not be recorded as a clean call: the
+ * result never reached the client, and there is no `isError` to judge it by.
+ */
+describe('tools/call telemetry — a result that is not a tool result', () => {
+  it('reports error when a local tool handler resolves to nothing', async () => {
+    const events: TelemetryEvent[] = [];
+    const noReturn: LocalTool = {
+      tool: {
+        name: 'silent_tool',
+        description: 'returns undefined',
+        inputSchema: { type: 'object', properties: {} },
+      },
+      // A local tool with a missing `return`: the pipeline resolves to undefined.
+      handler: (async () => undefined) as unknown as LocalTool['handler'],
+    };
+
+    const server = createProxyServer(
+      { crm: makeBackend() },
+      {
+        name: 'test-server',
+        localTools: [noReturn],
+        onTelemetry: (e) => events.push(e),
+      },
+    );
+
+    // The SDK rejects the malformed result on the way out, which is correct and
+    // unchanged by this PR. What matters is what telemetry recorded first.
+    await expect(
+      invokeHandler(server, 'tools/call', {
+        name: 'silent_tool',
+        arguments: {},
+      }),
+    ).rejects.toBeDefined();
+
+    expect(events).toHaveLength(1);
+    expect(events[0]).toMatchObject({
+      type: 'tool_call',
+      tool: 'silent_tool',
+      outcome: 'error',
+    });
+  });
+
+  it('still reports success for a real result and error for an isError one', async () => {
+    const events: TelemetryEvent[] = [];
+    const ok: LocalTool = {
+      tool: {
+        name: 'ok_tool',
+        description: 'ok',
+        inputSchema: { type: 'object', properties: {} },
+      },
+      handler: async () => ({ content: [{ type: 'text', text: 'fine' }] }),
+    };
+    const failing: LocalTool = {
+      tool: {
+        name: 'bad_tool',
+        description: 'bad',
+        inputSchema: { type: 'object', properties: {} },
+      },
+      handler: async () => ({
+        content: [{ type: 'text', text: 'nope' }],
+        isError: true,
+      }),
+    };
+
+    const server = createProxyServer(
+      { crm: makeBackend() },
+      {
+        name: 'test-server',
+        localTools: [ok, failing],
+        onTelemetry: (e) => events.push(e),
+      },
+    );
+
+    await invokeHandler(server, 'tools/call', {
+      name: 'ok_tool',
+      arguments: {},
+    });
+    await invokeHandler(server, 'tools/call', {
+      name: 'bad_tool',
+      arguments: {},
+    });
+
+    expect(events.map((e) => (e as { outcome?: string }).outcome)).toEqual([
+      'success',
+      'error',
+    ]);
+  });
+});
+
+/**
+ * The legacy `{ toolResult }` shape (protocol 2024-10-07) is a valid, documented
+ * result — `mapToolResult` returns it untouched and the guard answers `false` for
+ * it because it has no `.content`. It is not a failure, so it must not be
+ * telemetered as one.
+ */
+describe('tools/call telemetry — the legacy { toolResult } shape', () => {
+  it('reports success for a legacy-shape result', async () => {
+    const events: TelemetryEvent[] = [];
+    const backend = makeBackend();
+    backend.callTool = vi.fn().mockResolvedValue({
+      toolResult: { raw: true },
+    }) as BackendClient['callTool'];
+
+    const server = createProxyServer(
+      { crm: backend },
+      { name: 'test-server', onTelemetry: (e) => events.push(e) },
+    );
+
+    await invokeHandler(server, 'tools/call', {
+      name: 'crm__legacy_tool',
+      arguments: {},
+    });
+
+    expect(events).toHaveLength(1);
+    expect(events[0]).toMatchObject({
+      type: 'tool_call',
+      outcome: 'success',
+    });
+  });
+});

package/src/__tests__/hasToolContent.test.ts

@@ -0,0 +1,63 @@
+import { describe, it, expect } from 'vitest';
+import { hasToolContent, mapToolResult } from '../core.js';
+import type {
+  CallToolResult,
+  CompatibilityCallToolResult,
+} from '@modelcontextprotocol/sdk/types.js';
+
+/**
+ * `hasToolContent` narrows by reading `.content`, and a value that is not a
+ * tool result has none: the legacy `{ toolResult }` shape, and a pipeline that
+ * resolved to nothing at all (a local tool handler with a missing `return`, or
+ * a middleware that dropped the result). It is a guard, so the answer to
+ * "is this a CallToolResult?" has to be `false`, not a thrown TypeError.
+ *
+ * Both in-repo call sites depend on that answer rather than on a throw:
+ * `mapToolResult` returns the value untouched when the guard says `false`, and
+ * the `tools/call` handler reads `result.isError` only behind it. A throw here
+ * instead replaces whatever the pipeline produced with
+ * `TypeError: Cannot read properties of undefined (reading 'content')`.
+ */
+
+/** Callers reach this through a pipeline result, which the types do not pin. */
+const untyped = (value: unknown): CompatibilityCallToolResult =>
+  value as CompatibilityCallToolResult;
+
+describe('hasToolContent()', () => {
+  it('is true for a CallToolResult, even an empty content array', () => {
+    const result: CallToolResult = { content: [] };
+    expect(hasToolContent(result)).toBe(true);
+  });
+
+  it('is false for the legacy { toolResult } shape, which has no content', () => {
+    const legacy: CompatibilityCallToolResult = {
+      toolResult: { raw: true },
+    };
+    expect(hasToolContent(legacy)).toBe(false);
+  });
+
+  it('is false for a non-object, rather than throwing', () => {
+    expect(hasToolContent(untyped('a string'))).toBe(false);
+    expect(hasToolContent(untyped(42))).toBe(false);
+  });
+
+  for (const [label, value] of [
+    ['undefined', undefined],
+    ['null', null],
+  ] as const) {
+    it(`is false for a ${label} result rather than throwing`, () => {
+      expect(hasToolContent(untyped(value))).toBe(false);
+    });
+
+    it(`mapToolResult returns a ${label} result untouched`, () => {
+      const result = untyped(value);
+      expect(
+        mapToolResult(result, {
+          onText: () => null,
+          onOther: () => null,
+          onStructured: () => undefined,
+        }),
+      ).toBe(result);
+    });
+  }
+});

package/src/__tests__/sanitizeCatalog.test.ts

@@ -147,6 +147,27 @@ describe('sanitizeToolDescriptions()', () => {
     expect(result.tools[0]?.description).toBe('see  for details');
   });
 
+  it.each([
+    ['uppercase', 'HTTPS'],
+    ['mixed case', 'HtTp'],
+    ['mixed-case with s', 'HTtpS'],
+  ])(
+    'strips a %s scheme, which RFC 3986 treats as case-insensitive',
+    async (_label, scheme) => {
+      const upstream: ListToolsResult = {
+        tools: [
+          {
+            name: 't',
+            description: `see ${scheme}://internal.host/a for details`,
+            inputSchema: { type: 'object' },
+          },
+        ],
+      };
+      const result = await run(sanitizeToolDescriptions(), upstream);
+      expect(result.tools[0]?.description).toBe('see  for details');
+    },
+  );
+
   it('accepts a pattern that already carries the global flag', async () => {
     const upstream: ListToolsResult = {
       tools: [

package/src/__tests__/startHttpProxy.lifecycle.test.ts

@@ -221,6 +221,8 @@ describe('startHttpProxy() session lifecycle', () => {
         ['sessionTtlMs', 0],
         ['sessionTtlMs', -1],
         ['sessionTtlMs', Number.NaN],
+        ['maxBodyBytes', Number.NaN],
+        ['maxBodyBytes', -1],
       ])('rejects %s: %s at startup', (option, value) => {
         expect(() =>
           startHttpProxy(
@@ -270,6 +272,41 @@ describe('startHttpProxy() session lifecycle', () => {
           await closeServer(server);
         }
       });
+
+      it('accepts maxBodyBytes: Infinity as the opt-out from the cap', async () => {
+        const server = await startHttpProxy(
+          makeMockBackend(),
+          { name: 'test-server' },
+          { port: 0, path: '/mcp', maxBodyBytes: Infinity },
+        );
+        const baseUrl = `http://localhost:${getPort(server)}`;
+        try {
+          await initSession(baseUrl);
+        } finally {
+          await closeServer(server);
+        }
+      });
+
+      it('keeps maxBodyBytes: 0 a cap that rejects every POST body', async () => {
+        // `0` is not the opt-out and not a typo to be forgiven: like
+        // `maxSessions: 0`, it keeps its literal meaning.
+        const server = await startHttpProxy(
+          makeMockBackend(),
+          { name: 'test-server' },
+          { port: 0, path: '/mcp', maxBodyBytes: 0 },
+        );
+        const baseUrl = `http://localhost:${getPort(server)}`;
+        try {
+          const res = await fetch(`${baseUrl}/mcp`, {
+            method: 'POST',
+            headers: MCP_HEADERS,
+            body: INIT_BODY,
+          });
+          expect(res.status).toBe(413);
+        } finally {
+          await closeServer(server);
+        }
+      });
     });
   });
 

package/src/__tests__/startHttpProxy.test.ts

@@ -452,6 +452,86 @@ describe('startHttpProxy()', () => {
       }
     });
 
+    it('still answers 401 when onError itself throws (#238 sibling)', async () => {
+      // `onError` is observability, so its own failure must change nothing.
+      // Unguarded it replaces the 401 documented for a throwing
+      // `resolveIdentity` with a 500, and rejects out of the request handler.
+      const server = await startHttpProxy(
+        makeMockBackend(),
+        { name: 'test-server' },
+        {
+          port: 0,
+          path: '/mcp',
+          onError: () => {
+            throw new Error('logging backend down');
+          },
+          resolveIdentity: () => {
+            throw new Error('jwks fetch failed');
+          },
+        },
+      );
+      const baseUrl = `http://localhost:${getPort(server)}`;
+
+      try {
+        const res = await fetch(`${baseUrl}/mcp`, {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: initializeBody,
+        });
+        expect(res.status).toBe(401);
+      } finally {
+        await closeServer(server);
+      }
+    });
+
+    it('still answers 401 when onError rejects asynchronously (#245)', async () => {
+      // `onError` is observability, so its own failure must change nothing.
+      // An async reporter that rejects after its first await escapes the
+      // synchronous guard: nothing observes the rejection, so Node's default
+      // --unhandled-rejections=throw ends the process.
+      const rejections: unknown[] = [];
+      const onUnhandled = (reason: unknown): void => {
+        rejections.push(reason);
+      };
+      process.on('unhandledRejection', onUnhandled);
+
+      try {
+        const server = await startHttpProxy(
+          makeMockBackend(),
+          { name: 'test-server' },
+          {
+            port: 0,
+            path: '/mcp',
+            onError: async () => {
+              await new Promise((resolve) => setTimeout(resolve, 1));
+              throw new Error('logging backend down');
+            },
+            resolveIdentity: () => {
+              throw new Error('jwks fetch failed');
+            },
+          },
+        );
+        const baseUrl = `http://localhost:${getPort(server)}`;
+
+        try {
+          const res = await fetch(`${baseUrl}/mcp`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: initializeBody,
+          });
+          expect(res.status).toBe(401);
+          // One macrotask turn, so a rejection nobody adopted has surfaced as
+          // an unhandledRejection event by the time this asserts.
+          await new Promise((resolve) => setTimeout(resolve, 20));
+          expect(rejections).toHaveLength(0);
+        } finally {
+          await closeServer(server);
+        }
+      } finally {
+        process.removeListener('unhandledRejection', onUnhandled);
+      }
+    });
+
     it('reports an error thrown by validateSession instead of only discarding it', async () => {
       const errors: unknown[] = [];
       const server = await startHttpProxy(