@softure-ai/mcp-access 0.4.0 → 0.6.0

package/dist/server/tool-list-session.d.ts

@@ -0,0 +1,22 @@
+/** The header that carries the session id, both ways. */
+export declare const MCP_SESSION_ID_HEADER = "mcp-session-id";
+/** A new session id for the version: `<base64url(version)>.<32 hex>`, visible ASCII whatever the version holds. */
+export declare function createToolListSessionId(toolListVersion: string): string;
+/** The tool list version a session id carries, or `null` when the id is not one the endpoint issues. */
+export declare function readToolListSessionVersion(sessionId: string): string | null;
+/** Whether a request in this session may be served: its version is the current one. */
+export declare function isToolListSessionCurrent(sessionId: string, toolListVersion: string): boolean;
+/** The answer to a request in a session from another tool list version: the client starts a new session. */
+export declare function createSessionRenewalResponse(): Response;
+/**
+ * Whether the request is a JSON-RPC `initialize`: a POST without a session id whose JSON body asks for it. The body
+ * is read from a clone, and a body over `maxBytes` is not read (the SDK refuses it with 413 anyway).
+ */
+export declare function isInitializeRequest(request: Request, maxBytes: number): Promise<boolean>;
+/**
+ * The `initialize` answer with `capabilities.tools.listChanged: false`, since no answer of the endpoint ever carries
+ * the notification, and with the session id when there is one. The body keeps its format (JSON or one SSE event);
+ * an answer that is not a successful `InitializeResult` is returned as it is.
+ */
+export declare function rewriteInitializeAnswer(response: Response, sessionId: string | null): Promise<Response>;
+//# sourceMappingURL=tool-list-session.d.ts.map

package/dist/server/tool-list-session.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-list-session.d.ts","sourceRoot":"","sources":["../../src/server/tool-list-session.ts"],"names":[],"mappings":"AAQA,yDAAyD;AACzD,eAAO,MAAM,qBAAqB,mBAAmB,CAAC;AAOtD,mHAAmH;AACnH,wBAAgB,uBAAuB,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,CAEvE;AAED,wGAAwG;AACxG,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAI3E;AAED,uFAAuF;AACvF,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,CAE5F;AAED,4GAA4G;AAC5G,wBAAgB,4BAA4B,IAAI,QAAQ,CAKvD;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAc9F;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAsB7G"}

package/dist/server/tool-list-session.js

@@ -0,0 +1,97 @@
+// Sessions tied to the tool list version (#1055). A hosted client keeps its cached `tools/list` for as long as its
+// connection lives, even after a release changed a tool, and the endpoint has no channel to send
+// `notifications/tools/list_changed`. So the endpoint answers `initialize` with an `Mcp-Session-Id` that carries the
+// tool list version of the identity's access level, and a later request whose session carries another version gets
+// `404 Not Found`: Streamable HTTP defines that as "start a new session", so the client initializes again and lists
+// the tools again. Nothing is stored: the id itself holds the version, so any instance can check it.
+import { randomBytes } from "node:crypto";
+/** The header that carries the session id, both ways. */
+export const MCP_SESSION_ID_HEADER = "mcp-session-id";
+/** Random bytes after the version, as hex. */
+const RANDOM_BYTES = 16;
+const SESSION_ID_PATTERN = /^([A-Za-z0-9_-]+)\.[0-9a-f]+$/;
+const SSE_DATA_PREFIX = "data: ";
+/** A new session id for the version: `<base64url(version)>.<32 hex>`, visible ASCII whatever the version holds. */
+export function createToolListSessionId(toolListVersion) {
+    return `${Buffer.from(toolListVersion, "utf8").toString("base64url")}.${randomBytes(RANDOM_BYTES).toString("hex")}`;
+}
+/** The tool list version a session id carries, or `null` when the id is not one the endpoint issues. */
+export function readToolListSessionVersion(sessionId) {
+    const match = SESSION_ID_PATTERN.exec(sessionId);
+    if (match?.[1] === undefined)
+        return null;
+    return Buffer.from(match[1], "base64url").toString("utf8");
+}
+/** Whether a request in this session may be served: its version is the current one. */
+export function isToolListSessionCurrent(sessionId, toolListVersion) {
+    return readToolListSessionVersion(sessionId) === toolListVersion;
+}
+/** The answer to a request in a session from another tool list version: the client starts a new session. */
+export function createSessionRenewalResponse() {
+    return Response.json({ jsonrpc: "2.0", error: { code: -32001, message: "Session not found: the tool list changed, initialize again" }, id: null }, { status: 404, headers: { "cache-control": "no-store" } });
+}
+/**
+ * Whether the request is a JSON-RPC `initialize`: a POST without a session id whose JSON body asks for it. The body
+ * is read from a clone, and a body over `maxBytes` is not read (the SDK refuses it with 413 anyway).
+ */
+export async function isInitializeRequest(request, maxBytes) {
+    if (request.method !== "POST" || request.headers.has(MCP_SESSION_ID_HEADER))
+        return false;
+    const length = Number(request.headers.get("content-length") ?? "0");
+    if (!Number.isFinite(length) || length > maxBytes)
+        return false;
+    let body;
+    try {
+        const text = await request.clone().text();
+        if (text.length > maxBytes)
+            return false;
+        body = JSON.parse(text);
+    }
+    catch {
+        // Not JSON: the SDK answers the parse error itself.
+        return false;
+    }
+    return typeof body === "object" && body !== null && !Array.isArray(body) && body.method === "initialize";
+}
+/**
+ * The `initialize` answer with `capabilities.tools.listChanged: false`, since no answer of the endpoint ever carries
+ * the notification, and with the session id when there is one. The body keeps its format (JSON or one SSE event);
+ * an answer that is not a successful `InitializeResult` is returned as it is.
+ */
+export async function rewriteInitializeAnswer(response, sessionId) {
+    if (response.status !== 200)
+        return response;
+    const text = await response.text();
+    const isEventStream = (response.headers.get("content-type") ?? "").includes("text/event-stream");
+    const lines = text.split("\n");
+    const dataIndex = isEventStream ? lines.findIndex((line) => line.startsWith(SSE_DATA_PREFIX)) : -1;
+    const json = isEventStream ? (dataIndex === -1 ? null : (lines[dataIndex] ?? "").slice(SSE_DATA_PREFIX.length)) : text;
+    const answer = parseInitializeAnswer(json);
+    const headers = new Headers(response.headers);
+    // The body changes length, so the old one would be wrong.
+    headers.delete("content-length");
+    const tools = answer?.result?.capabilities?.tools;
+    if (answer === null || answer.result?.protocolVersion === undefined) {
+        return new Response(text, { status: response.status, statusText: response.statusText, headers });
+    }
+    if (tools !== undefined && tools !== null && typeof tools === "object")
+        tools.listChanged = false;
+    if (sessionId !== null)
+        headers.set(MCP_SESSION_ID_HEADER, sessionId);
+    const rewritten = JSON.stringify(answer);
+    if (isEventStream)
+        lines[dataIndex] = `${SSE_DATA_PREFIX}${rewritten}`;
+    return new Response(isEventStream ? lines.join("\n") : rewritten, { status: response.status, statusText: response.statusText, headers });
+}
+/** The answer as JSON, or `null` when there is none or it is not JSON (the SDK's own error text). */
+function parseInitializeAnswer(json) {
+    if (json === null)
+        return null;
+    try {
+        return JSON.parse(json);
+    }
+    catch {
+        return null;
+    }
+}
+//# sourceMappingURL=tool-list-session.js.map

package/dist/server/tool-list-session.js.map

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

package/dist/testing/index.d.ts

@@ -1,2 +1,3 @@
 export { expectToolCatalogMatchesServer, getToolCatalogDifferences, measureServedToolLists, type ServedToolLists, type ToolCatalogDifferences, } from "./catalog.js";
+export { expectToolListSessionRenewed } from "./sessions.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/testing/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/testing/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,8BAA8B,EAC9B,yBAAyB,EACzB,sBAAsB,EACtB,KAAK,eAAe,EACpB,KAAK,sBAAsB,GAC5B,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/testing/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,8BAA8B,EAC9B,yBAAyB,EACzB,sBAAsB,EACtB,KAAK,eAAe,EACpB,KAAK,sBAAsB,GAC5B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,4BAA4B,EAAE,MAAM,eAAe,CAAC"}

package/dist/testing/index.js

@@ -1,3 +1,4 @@
 // `@softure-ai/mcp-access/testing`: checks for an app's own tests.
 export { expectToolCatalogMatchesServer, getToolCatalogDifferences, measureServedToolLists, } from "./catalog.js";
+export { expectToolListSessionRenewed } from "./sessions.js";
 //# sourceMappingURL=index.js.map

package/dist/testing/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/testing/index.ts"],"names":[],"mappings":"AAAA,mEAAmE;AACnE,OAAO,EACL,8BAA8B,EAC9B,yBAAyB,EACzB,sBAAsB,GAGvB,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/testing/index.ts"],"names":[],"mappings":"AAAA,mEAAmE;AACnE,OAAO,EACL,8BAA8B,EAC9B,yBAAyB,EACzB,sBAAsB,GAGvB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,4BAA4B,EAAE,MAAM,eAAe,CAAC"}

package/dist/testing/sessions.d.ts

@@ -0,0 +1,8 @@
+import type { McpServerFactory } from "../server/endpoint.js";
+/**
+ * Throws unless a session opened under `before` (the previous release's factory) is renewed under `after` for every
+ * access level whose served tool list changed, and kept for every level whose list did not. A pair where no level
+ * changed throws too: the check would prove nothing.
+ */
+export declare function expectToolListSessionRenewed(before: McpServerFactory, after: McpServerFactory): Promise<void>;
+//# sourceMappingURL=sessions.d.ts.map

package/dist/testing/sessions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../src/testing/sessions.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAA6B,MAAM,uBAAuB,CAAC;AAWzF;;;;GAIG;AACH,wBAAsB,4BAA4B,CAAC,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAanH"}

package/dist/testing/sessions.js

@@ -0,0 +1,40 @@
+import { createToolListSessionId, isToolListSessionCurrent } from "../server/tool-list-session.js";
+import { fingerprintToolList, listServedTools } from "../server/tool-list.js";
+const READER = { userId: "00000000-0000-4000-8000-000000000001", canWrite: false, tokenId: "session-check" };
+const WRITER = { ...READER, canWrite: true };
+const LEVELS = [
+    ["read", READER],
+    ["write", WRITER],
+];
+/**
+ * Throws unless a session opened under `before` (the previous release's factory) is renewed under `after` for every
+ * access level whose served tool list changed, and kept for every level whose list did not. A pair where no level
+ * changed throws too: the check would prove nothing.
+ */
+export async function expectToolListSessionRenewed(before, after) {
+    const problems = [];
+    const unchanged = [];
+    for (const [level, identity] of LEVELS) {
+        const sessionId = createToolListSessionId(await readVersion(before, identity));
+        const isCurrent = isToolListSessionCurrent(sessionId, await readVersion(after, identity));
+        const hasChanged = fingerprintToolList(await listServedTools(() => before(identity))) !== fingerprintToolList(await listServedTools(() => after(identity)));
+        if (!hasChanged)
+            unchanged.push(level);
+        if (hasChanged && isCurrent)
+            problems.push(`the ${level} tool list changed but a session opened before is kept`);
+        if (!hasChanged && !isCurrent)
+            problems.push(`the ${level} tool list did not change but a session opened before is renewed`);
+    }
+    if (unchanged.length === LEVELS.length)
+        problems.push(`the tool list did not change for any access level (${unchanged.join(", ")})`);
+    if (problems.length > 0)
+        throw new Error(`@softure-ai/mcp-access: sessions do not follow the tool list: ${problems.join("; ")}`);
+}
+async function readVersion(factory, identity) {
+    const reader = factory.toolListVersion;
+    if (typeof reader !== "function") {
+        throw new Error("@softure-ai/mcp-access: the factory has no toolListVersion; build it with createMcpServerFactory or pass toolListVersion to createMcpEndpoint");
+    }
+    return reader(identity);
+}
+//# sourceMappingURL=sessions.js.map

package/dist/testing/sessions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sessions.js","sourceRoot":"","sources":["../../src/testing/sessions.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AACnG,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9E,MAAM,MAAM,GAAsB,EAAE,MAAM,EAAE,sCAAsC,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC;AAChI,MAAM,MAAM,GAAsB,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;AAChE,MAAM,MAAM,GAAG;IACb,CAAC,MAAM,EAAE,MAAM,CAAC;IAChB,CAAC,OAAO,EAAE,MAAM,CAAC;CACT,CAAC;AAEX;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAAC,MAAwB,EAAE,KAAuB;IAClG,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,KAAK,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,MAAM,EAAE,CAAC;QACvC,MAAM,SAAS,GAAG,uBAAuB,CAAC,MAAM,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC/E,MAAM,SAAS,GAAG,wBAAwB,CAAC,SAAS,EAAE,MAAM,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC1F,MAAM,UAAU,GAAG,mBAAmB,CAAC,MAAM,eAAe,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,mBAAmB,CAAC,MAAM,eAAe,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC5J,IAAI,CAAC,UAAU;YAAE,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvC,IAAI,UAAU,IAAI,SAAS;YAAE,QAAQ,CAAC,IAAI,CAAC,OAAO,KAAK,wDAAwD,CAAC,CAAC;QACjH,IAAI,CAAC,UAAU,IAAI,CAAC,SAAS;YAAE,QAAQ,CAAC,IAAI,CAAC,OAAO,KAAK,kEAAkE,CAAC,CAAC;IAC/H,CAAC;IACD,IAAI,SAAS,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM;QAAE,QAAQ,CAAC,IAAI,CAAC,sDAAsD,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrI,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,iEAAiE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACnI,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,OAAyB,EAAE,QAA2B;IAC/E,MAAM,MAAM,GAAI,OAA8C,CAAC,eAAe,CAAC;IAC/E,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CAAC,+IAA+I,CAAC,CAAC;IACnK,CAAC;IACD,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC"}

package/module.json

@@ -1,6 +1,6 @@
 {
   "id": "mcp-access",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "dependsOn": { "security": "^0.2.0", "auth": "^0.2.0", "jobs": "^0.1.1?", "ops": "^0.2.0?" },
   "dbSchema": "mcp",
   "tables": ["access_tokens", "oauth_clients", "oauth_authorization_codes", "oauth_grants", "oauth_registration_window", "used_confirmations", "operation_tasks"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softure-ai/mcp-access",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "SOFTURE AI MCP access module: hashed, scoped, expiring access tokens, a rate-limited Bearer endpoint around the app's MCP server factory, and a token page with client setup instructions for Next.js; tool result helpers with a safe error boundary, a stdio entry, a catalog parity check and the softure-mcp prune command.",
   "license": "MIT",
   "type": "module",

package/src/index.ts

@@ -51,7 +51,7 @@ export const API_TOKEN_RATE_LIMIT_BUCKETS = {
 export const mcpAccess = defineModule({
   manifest: {
     id: MODULE_ID,
-    version: "0.4.0",
+    version: "0.6.0",
     dependsOn: { security: "^0.2.0", auth: "^0.2.0", jobs: "^0.1.1?", ops: "^0.2.0?" },
     dbSchema: "mcp",
     tables: ["access_tokens", "oauth_clients", "oauth_authorization_codes", "oauth_grants", "oauth_registration_window", "used_confirmations", "operation_tasks"],

package/src/server/endpoint.ts

@@ -19,7 +19,25 @@ import { getProtectedResourceMetadataUrl, isOAuthEnabled } from "./oauth-http.js
 import { resolveMcpOrigins } from "./origins.js";
 import { MCP_READ_SCOPE, MCP_WRITE_SCOPE } from "./scopes.js";
 import { verifyAccessToken, type McpAccessContext } from "./tokens.js";
+import {
+  createSessionRenewalResponse,
+  createToolListSessionId,
+  isInitializeRequest,
+  isToolListSessionCurrent,
+  MCP_SESSION_ID_HEADER,
+  readToolListSessionVersion,
+  rewriteInitializeAnswer,
+} from "./tool-list-session.js";
 import { isWritingEnabled } from "./writes-switch.js";
+import {
+  createDiagnosticsSink,
+  readJsonRpcSummary,
+  sanitizeDiagnosticText,
+  type JsonRpcSummary,
+  type McpRequestDiagnostic,
+  type McpRequestDiagnostics,
+  type McpSessionState,
+} from "./request-diagnostics.js";
 
 export { MCP_READ_SCOPE, MCP_WRITE_SCOPE };
 
@@ -37,8 +55,35 @@ const NO_STORE = { "cache-control": "no-store" };
 /** The app's MCP server for one request. It registers write tools only when `canWrite` is true. */
 export type McpServerFactory = (identity: McpServerIdentity) => McpServer | Server | Promise<McpServer | Server>;
 
+/** Reads the tool list version the factory's servers answer at `initialize` for the identity. */
+export type ToolListVersionReader = (identity: McpServerIdentity) => Promise<string>;
+
+/** A factory that can tell its tool list version without building a server; `createMcpServerFactory` returns one. */
+export interface VersionedMcpServerFactory extends McpServerFactory {
+  readonly toolListVersion: ToolListVersionReader;
+}
+
 export interface McpEndpointOptions {
-  readonly createServer: McpServerFactory;
+  readonly createServer: McpServerFactory | VersionedMcpServerFactory;
+  /**
+   * The tool list version per identity, for sessions tied to it (#1055). Default: the factory's own
+   * `toolListVersion` (`createMcpServerFactory`). Without either, the endpoint issues no session id.
+   */
+  readonly toolListVersion?: ToolListVersionReader;
+  /**
+   * Request diagnostics (#1066), off by default: `true` logs one `console.info` line per request, a function receives
+   * each entry. An entry holds the JSON-RPC method, the tool name, the session state, the served tool list version,
+   * the status and the client's `clientInfo` on `initialize`; never a token, body, argument value or identity.
+   */
+  readonly diagnostics?: McpRequestDiagnostics;
+}
+
+/** What serving a request found out, for the diagnostics. */
+interface SessionTrace {
+  session: McpSessionState;
+  sessionVersion: string | null;
+  toolListVersion: string | null;
+  sessionIssued: boolean;
 }
 
 /** Serves one request to the MCP endpoint. */
@@ -50,7 +95,9 @@ export type McpEndpoint = (ctx: McpAccessContext, request: Request) => Promise<R
  * (`responseMode: "json"`): a stream would add proxy buffering and timeouts for no tool that needs
  * it, and mid-call notifications are dropped.
  */
-export function createMcpEndpoint({ createServer }: McpEndpointOptions): McpEndpoint {
+export function createMcpEndpoint({ createServer, toolListVersion, diagnostics }: McpEndpointOptions): McpEndpoint {
+  const readToolListVersion = toolListVersion ?? getFactoryToolListVersion(createServer);
+  const report = createDiagnosticsSink(diagnostics);
   const handler = createMcpHandler(
     (requestContext) => createServer(readIdentity(requestContext.authInfo)),
     {
@@ -61,6 +108,17 @@ export function createMcpEndpoint({ createServer }: McpEndpointOptions): McpEndp
   );
 
   return async (ctx, request) => {
+    if (report === undefined) return serve(ctx, request, null);
+    const trace: SessionTrace = { session: "unchecked", sessionVersion: null, toolListVersion: null, sessionIssued: false };
+    // Read before serving: the SDK consumes the body. Only the method, tool name and clientInfo are kept.
+    const summary = await readJsonRpcSummary(request, MAX_MCP_REQUEST_BYTES);
+    const response = await serve(ctx, request, trace);
+    report(createDiagnostic(request, summary, trace, response.status));
+    return response;
+  };
+
+  async function serve(ctx: McpAccessContext, request: Request, trace: SessionTrace | null): Promise<Response> {
+    if (trace !== null && !request.headers.has(MCP_SESSION_ID_HEADER)) trace.session = "none";
     assertRateLimitBucket(ctx);
     const client = identifyClient(ctx, request.headers);
     if (!client.ok) return Response.json({ error: "client_unidentified" }, { status: 400, headers: NO_STORE });
@@ -83,10 +141,73 @@ export function createMcpEndpoint({ createServer }: McpEndpointOptions): McpEndp
 
     const authInfo = await authenticate(ctx, request);
     if (authInfo instanceof Response) return authInfo;
-    return handler.fetch(request, { authInfo });
+    return serveInSession(request, authInfo, trace);
+  }
+
+  /**
+   * Sessions tied to the tool list version (#1055): a session from another version (a release changed a tool, or the
+   * access level changed) answers 404, so the client initializes again and lists the tools again; `initialize` gets a
+   * new session id. A request without a session id is served as it always was.
+   */
+  async function serveInSession(request: Request, authInfo: AuthInfo, trace: SessionTrace | null): Promise<Response> {
+    const sessionId = request.headers.get(MCP_SESSION_ID_HEADER);
+    const isInitialize = sessionId === null && (await isInitializeRequest(request, MAX_MCP_REQUEST_BYTES));
+    if (readToolListVersion === undefined || (sessionId === null && !isInitialize)) {
+      const response = await handler.fetch(request, { authInfo });
+      return isInitialize ? rewriteInitializeAnswer(response, null) : response;
+    }
+    let version;
+    try {
+      version = await readToolListVersion(readIdentity(authInfo));
+    } catch (error) {
+      // Without the version no session can be checked or issued: serve the request statelessly, as before #1055.
+      console.error(`@softure-ai/mcp-access: reading the tool list version failed: ${errorLogLabel(error)}`);
+      const response = await handler.fetch(request, { authInfo });
+      return isInitialize ? rewriteInitializeAnswer(response, null) : response;
+    }
+    if (trace !== null) trace.toolListVersion = version;
+    if (sessionId !== null) {
+      if (isToolListSessionCurrent(sessionId, version)) {
+        if (trace !== null) trace.session = "current";
+        return handler.fetch(request, { authInfo });
+      }
+      if (trace !== null) recordRenewedSession(trace, sessionId);
+      return createSessionRenewalResponse();
+    }
+    const response = await rewriteInitializeAnswer(await handler.fetch(request, { authInfo }), createToolListSessionId(version));
+    if (trace !== null) trace.sessionIssued = response.headers.has(MCP_SESSION_ID_HEADER);
+    return response;
+  }
+}
+
+/** A session answered 404: stale when the id carries a version, not issued by the endpoint otherwise. */
+function recordRenewedSession(trace: SessionTrace, sessionId: string): void {
+  const sessionVersion = readToolListSessionVersion(sessionId);
+  trace.session = sessionVersion === null ? "not_issued" : "stale";
+  trace.sessionVersion = sessionVersion === null ? null : sanitizeDiagnosticText(sessionVersion);
+}
+
+/** The diagnostics entry of one served request. */
+function createDiagnostic(request: Request, summary: JsonRpcSummary, trace: SessionTrace, status: number): McpRequestDiagnostic {
+  return {
+    httpMethod: request.method,
+    method: summary.method,
+    tool: summary.tool,
+    session: trace.session,
+    sessionVersion: trace.sessionVersion,
+    toolListVersion: trace.toolListVersion,
+    sessionIssued: trace.sessionIssued,
+    status,
+    client: summary.client,
+    protocolVersion: summary.protocolVersion,
   };
 }
 
+/** The factory's own version reader, when it has one (`createMcpServerFactory`). */
+function getFactoryToolListVersion(factory: McpServerFactory | VersionedMcpServerFactory): ToolListVersionReader | undefined {
+  return "toolListVersion" in factory && typeof factory.toolListVersion === "function" ? factory.toolListVersion : undefined;
+}
+
 /**
  * The verified identity as the SDK's `AuthInfo`, or the challenge response. Unknown, revoked,
  * expired and malformed tokens get the same `401 invalid_token`. Expiry is decided by the query on

package/src/server/index.ts

@@ -9,6 +9,8 @@ export {
   type McpEndpoint,
   type McpEndpointOptions,
   type McpServerFactory,
+  type ToolListVersionReader,
+  type VersionedMcpServerFactory,
 } from "./endpoint.js";
 export { actionTool, toFormData, type ActionToolOptions, type FormActionHandler } from "./action-tool.js";
 export {
@@ -155,6 +157,13 @@ export {
   type ServedTool,
   type ToolListMeasurement,
 } from "./tool-list.js";
+export {
+  createToolListSessionId,
+  isToolListSessionCurrent,
+  MCP_SESSION_ID_HEADER,
+  readToolListSessionVersion,
+} from "./tool-list-session.js";
+export { type McpRequestDiagnostic, type McpRequestDiagnostics, type McpSessionState } from "./request-diagnostics.js";
 export {
   toolError,
   toolResult,

package/src/server/request-diagnostics.ts

@@ -0,0 +1,130 @@
+// Opt-in request diagnostics for the MCP endpoint (#1066). A hosted client can keep a stale tool list although the
+// server serves the current one, and nothing showed what the client actually sends. One entry per request says which
+// JSON-RPC method came, in which session state, with which answer. No token, body, argument value, session id or
+// user identity is ever part of an entry; client-supplied strings are cut and stripped of control characters.
+import { errorLogLabel } from "@softure-ai/core";
+
+/** How a request's `Mcp-Session-Id` relates to the tool list version (#1055). */
+export type McpSessionState =
+  /** No session id came with the request. */
+  | "none"
+  /** The session carries the current version and was served. */
+  | "current"
+  /** The session carries another version and was answered 404, so the client should initialize again. */
+  | "stale"
+  /** The session id is not one the endpoint issues; answered 404 like a stale one. */
+  | "not_issued"
+  /** A session id came, but it was not checked (refused before authentication, or no version to check against). */
+  | "unchecked";
+
+/** One request as the diagnostics see it. */
+export interface McpRequestDiagnostic {
+  /** The HTTP method. */
+  readonly httpMethod: string;
+  /** The JSON-RPC method, `"batch"` for an array, `null` when the body was not read or is not JSON-RPC. */
+  readonly method: string | null;
+  /** The tool name of a `tools/call`, otherwise `null`. */
+  readonly tool: string | null;
+  readonly session: McpSessionState;
+  /** The version a stale session carries, otherwise `null`. */
+  readonly sessionVersion: string | null;
+  /** The tool list version served to the identity, `null` when unknown (refused before authentication, no reader). */
+  readonly toolListVersion: string | null;
+  /** Whether the answer issued a new session id (a successful `initialize`). */
+  readonly sessionIssued: boolean;
+  /** The HTTP status of the answer. */
+  readonly status: number;
+  /** The client's `clientInfo` on `initialize`, otherwise `null`. */
+  readonly client: { readonly name: string; readonly version: string } | null;
+  /** The protocol version the client asked for on `initialize`, otherwise the `MCP-Protocol-Version` header, or `null`. */
+  readonly protocolVersion: string | null;
+}
+
+/** `true` logs one `console.info` line per request; a function receives each entry instead. */
+export type McpRequestDiagnostics = boolean | ((entry: McpRequestDiagnostic) => void);
+
+/** What the diagnostics read from a request body. */
+export interface JsonRpcSummary {
+  readonly method: string | null;
+  readonly tool: string | null;
+  readonly client: { readonly name: string; readonly version: string } | null;
+  readonly protocolVersion: string | null;
+}
+
+const MAX_TEXT_LENGTH = 128;
+const PROTOCOL_VERSION_HEADER = "mcp-protocol-version";
+const EMPTY_SUMMARY: JsonRpcSummary = { method: null, tool: null, client: null, protocolVersion: null };
+
+/** Client-supplied text as it may be logged: control characters replaced, at most 128 characters. */
+export function sanitizeDiagnosticText(value: string): string {
+  const clean = Array.from(value, (character) => (isControlCharacter(character) ? "?" : character)).join("");
+  return clean.length > MAX_TEXT_LENGTH ? `${clean.slice(0, MAX_TEXT_LENGTH)}…` : clean;
+}
+
+/**
+ * The method, tool name, `clientInfo` and protocol version of a request, read from a clone of its body. A body over
+ * `maxBytes` or one that is not JSON gives no method (the SDK answers it itself). Nothing else of the body is kept.
+ */
+export async function readJsonRpcSummary(request: Request, maxBytes: number): Promise<JsonRpcSummary> {
+  const header = request.headers.get(PROTOCOL_VERSION_HEADER);
+  const headerVersion = header === null ? null : sanitizeDiagnosticText(header);
+  const withHeader = { ...EMPTY_SUMMARY, protocolVersion: headerVersion };
+  if (request.method !== "POST") return withHeader;
+  const length = Number(request.headers.get("content-length") ?? "0");
+  if (!Number.isFinite(length) || length > maxBytes) return withHeader;
+  let body: unknown;
+  try {
+    const text = await request.clone().text();
+    if (text.length > maxBytes) return withHeader;
+    body = JSON.parse(text);
+  } catch {
+    // Not JSON or no readable body: the SDK answers that itself; the entry just has no method.
+    return withHeader;
+  }
+  if (Array.isArray(body)) return { ...withHeader, method: "batch" };
+  if (!isRecord(body) || typeof body.method !== "string") return withHeader;
+
+  const method = sanitizeDiagnosticText(body.method);
+  const params = isRecord(body.params) ? body.params : {};
+  if (body.method === "tools/call") {
+    return { ...withHeader, method, tool: typeof params.name === "string" ? sanitizeDiagnosticText(params.name) : null };
+  }
+  if (body.method !== "initialize") return { ...withHeader, method };
+  const clientInfo = isRecord(params.clientInfo) ? params.clientInfo : null;
+  const client =
+    clientInfo === null
+      ? null
+      : {
+          name: typeof clientInfo.name === "string" ? sanitizeDiagnosticText(clientInfo.name) : "",
+          version: typeof clientInfo.version === "string" ? sanitizeDiagnosticText(clientInfo.version) : "",
+        };
+  const protocolVersion = typeof params.protocolVersion === "string" ? sanitizeDiagnosticText(params.protocolVersion) : headerVersion;
+  return { method, tool: null, client, protocolVersion };
+}
+
+/** The sink for the option, or `undefined` when diagnostics are off. A throwing sink is logged, never rethrown. */
+export function createDiagnosticsSink(diagnostics: McpRequestDiagnostics | undefined): ((entry: McpRequestDiagnostic) => void) | undefined {
+  if (diagnostics === undefined || diagnostics === false) return undefined;
+  const write = diagnostics === true ? logDiagnostic : diagnostics;
+  return (entry) => {
+    try {
+      write(entry);
+    } catch (error) {
+      console.error(`@softure-ai/mcp-access: the request diagnostics sink failed: ${errorLogLabel(error)}`);
+    }
+  };
+}
+
+function logDiagnostic(entry: McpRequestDiagnostic): void {
+  console.info(`@softure-ai/mcp-access: mcp request ${JSON.stringify(entry)}`);
+}
+
+/** C0 controls, DEL and C1 controls: anything that could break or forge a log line. */
+function isControlCharacter(character: string): boolean {
+  const code = character.codePointAt(0) ?? 0;
+  return code < 0x20 || (code >= 0x7f && code <= 0x9f);
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}

package/src/server/server-factory.ts

@@ -10,7 +10,7 @@
 //   });
 import { McpServer, type McpServerOptions } from "@modelcontextprotocol/server";
 import type { McpServerIdentity } from "../contract.js";
-import type { McpServerFactory } from "./endpoint.js";
+import type { VersionedMcpServerFactory } from "./endpoint.js";
 import { withStrictToolInput, type StrictToolInputOptions } from "./strict-input.js";
 import { registerServerInfoTool, type ServerInfoToolOptions } from "./server-info.js";
 import { measureToolList, type ToolListMeasurement } from "./tool-list.js";
@@ -39,8 +39,12 @@ export interface McpServerFactoryOptions {
   readonly serverInfoTool?: ServerInfoToolOptions;
 }
 
-/** An `McpServerFactory` whose servers carry the tool list's version for the identity's access level. */
-export function createMcpServerFactory(options: McpServerFactoryOptions): McpServerFactory {
+/**
+ * An `McpServerFactory` whose servers carry the tool list's version for the identity's access level. Its
+ * `toolListVersion(identity)` reads that version without building a server, so `createMcpEndpoint` ties each session
+ * to it (#1055).
+ */
+export function createMcpServerFactory(options: McpServerFactoryOptions): VersionedMcpServerFactory {
   const strictOptions = options.strictToolInput === true ? {} : options.strictToolInput === false ? undefined : options.strictToolInput;
   // The served version reaches `get_server_info` here; the recording server registers it with a placeholder, since
   // its handler never runs there and the version is not part of the listed tool.
@@ -66,8 +70,9 @@ export function createMcpServerFactory(options: McpServerFactoryOptions): McpSer
     return measurement;
   };
 
-  return async (identity) => {
-    const version = options.version ?? (await measure(identity)).toolListVersion;
+  const toolListVersion = async (identity: McpServerIdentity): Promise<string> => options.version ?? (await measure(identity)).toolListVersion;
+  const factory = async (identity: McpServerIdentity): Promise<McpServer> => {
+    const version = await toolListVersion(identity);
     const server = new McpServer(
       { name: options.name, version, ...(options.title === undefined ? {} : { title: options.title }) },
       options.serverOptions,
@@ -75,4 +80,5 @@ export function createMcpServerFactory(options: McpServerFactoryOptions): McpSer
     await registerTools(server, identity, version);
     return server;
   };
+  return Object.assign(factory, { toolListVersion });
 }