mcp-trellis 1.0.0 → 2.1.0

package/dist/oauth/types.d.ts

@@ -1,7 +1,7 @@
-import type { CodeStore } from "./codes.js";
-import type { ConsentOptions } from "./consent.js";
-import { type TokenEndpointAuthMethod } from "./constants.js";
-import type { RedirectAllowlistOptions } from "./redirect.js";
+import type { CimdCache } from "./cimd/types.js";
+import type { TokenEndpointAuthMethod } from "./constants.js";
+import type { CodeStore } from "./crypto/codes.js";
+import type { RedirectAllowlistOptions } from "./policy/redirect.js";
 export type OAuthUser = {
     id: string;
 };
@@ -16,6 +16,35 @@ export type RegisteredClient = {
     redirectUris: string[];
     tokenEndpointAuthMethod: TokenEndpointAuthMethod;
 };
+export type ConsentRequest = {
+    clientId: string;
+    registeredClient: RegisteredClient | null;
+    redirectUri: string;
+    scope: string[];
+    resource: string;
+    user: OAuthUser;
+    /** Embed this in your form's `consent_ticket` field (hidden input or POST body). */
+    ticket: string;
+    oauthPath: string;
+};
+export type ConsentOptions = {
+    /**
+     * Render the approval page yourself. Return any `Response` — HTML, or a
+     * redirect to your own route. Omit for the built-in hardened interstitial.
+     *
+     * If your page sets its own `Content-Security-Policy` with `form-action`,
+     * include `new URL(input.redirectUri).origin` in it — Chromium enforces
+     * `form-action` across the redirect your approval POST triggers, not just
+     * the immediate submission target, so `'self'` alone blocks the eventual
+     * redirect back to the client's own callback.
+     */
+    render?: (input: ConsentRequest) => Response | Promise<Response>;
+    /**
+     * Client ids that skip approval. Only honored when `clientStore` actually
+     * resolves the id — a DCR or self-invented id is never trusted.
+     */
+    preApprovedClientIds?: string[];
+};
 /**
  * The payload sealed into a `client_id` this server itself issued via
  * `/register` (see `sealed.ts`, type `"client"`). Zero storage: the id
@@ -23,6 +52,13 @@ export type RegisteredClient = {
  */
 export type ClientAssertion = {
     redirectUris: string[];
+    /**
+     * Unix seconds when `/register` sealed this assertion. Informational only
+     * — not enforced as an expiry — so it can help an operator judge how old
+     * a still-valid DCR client is. Optional on read: an assertion sealed
+     * before this field existed still unseals and works.
+     */
+    iat?: number;
 };
 export type ClientStore = {
     /** Resolve a pre-registered client, or null when unknown. */
@@ -66,6 +102,13 @@ export type RefreshAccessTokenInput = {
      * Implementations MUST reject refresh tokens not originally issued for this resource.
      */
     resource: string;
+    /**
+     * RFC 6749 §6 — optional scope reduction requested by the client.
+     * When set, the library validates against advertised `scopes` only.
+     * Implementations MUST also reject any scope outside what was originally
+     * granted to this refresh token (the library cannot see opaque RTs).
+     */
+    scope?: string;
 };
 export type RevokeTokenInput = {
     token: string;
@@ -88,8 +131,18 @@ export type OAuthAuditEntry = {
     reason: string;
 };
 export type OAuthPorts = {
-    /** HMAC secret for signing auth codes. */
-    codeSecret: string | ((req: Request) => string | Promise<string>);
+    /**
+     * Secret(s) that seal auth codes, consent tickets, and self-issued DCR
+     * client assertions (`sealed.ts`), and key `ClientStore.secretHash`.
+     *
+     * Pass a single string, or for key rotation an array: the **first** entry seals new material and hashes new client
+     * secrets; **every** entry is tried when unsealing/verifying, so material
+     * sealed under an older key keeps working until you drop it from the
+     * array. `ports.audit` sees a `"legacy_code_secret_used"` event whenever
+     * anything but the first entry was the one that actually verified,
+     * so you know when it's safe to remove.
+     */
+    codeSecret: string | string[] | ((req: Request) => string | string[] | Promise<string | string[]>);
     /** Resolve the logged-in user, or null → redirect to login. */
     resolveUser: (req: Request) => Promise<OAuthUser | null>;
     /** Where to send unauthenticated authorize requests. */
@@ -106,7 +159,7 @@ export type OAuthPorts = {
      * tokens not issued to `clientId` MUST no-op (not throw).
      */
     revokeToken?: ((input: RevokeTokenInput) => Promise<void>) | undefined;
-    /** Shared single-use jti store for multi-instance; in-memory default otherwise. */
+    /** Shared single-use jti store for multi-instance. Required unless `allowInMemoryCodeStore`. */
     codeStore?: CodeStore | undefined;
     /** Pre-registered clients. Required to serve confidential clients. */
     clientStore?: ClientStore | undefined;
@@ -118,14 +171,6 @@ export type OAuthPorts = {
      */
     audit?: ((entry: OAuthAuditEntry) => void | Promise<void>) | undefined;
 };
-/**
- * Invoke `ports.audit`, swallowing any failure — the OAuth-side twin of
- * `methods.ts`'s `safeAudit`. No timeout wrapper here: unlike the MCP
- * side, nothing here is expected to be a slow, request-scoped metrics
- * call in the same way, and adding one would be complexity without a
- * demonstrated need — revisit if that changes.
- */
-export declare const safeOAuthAudit: (options: OAuthRouterOptions, entry: OAuthAuditEntry) => Promise<void>;
 export type OAuthRouterOptions = {
     ports: OAuthPorts;
     resourcePath?: string;
@@ -169,44 +214,53 @@ export type OAuthRouterOptions = {
      * not under `ports`. Omit for the built-in hardened interstitial.
      */
     consent?: ConsentOptions;
+    /**
+     * Max time to wait for `ports.audit` before responding anyway. Default
+     * 1000ms — same guarantee as `McpHandlerOptions.auditTimeoutMs`.
+     */
+    auditTimeoutMs?: number;
+    /**
+     * Allow the process-local in-memory jti Map when `ports.codeStore` is
+     * omitted. Default **false** since 2.0 — multi-instance deploys silently
+     * double-redeem auth codes without a shared store. Set true only for
+     * single-process demos and tests.
+     */
+    allowInMemoryCodeStore?: boolean;
+    /**
+     * Resolve Client ID Metadata Documents (HTTPS URL `client_id`s).
+     * Default **false** — opt in with `cimd: true`. Off until connect-pinned
+     * fetch exists; see `cimd.ts` ponytail.
+     */
+    cimd?: boolean;
+    /**
+     * CIMD document cache (respects Cache-Control max-age, capped at 1 h).
+     * **Strongly recommended with `cimd: true`:** without it `/token` and
+     * `/revoke` re-fetch the client's document on every call, so a flaky
+     * document host fails refresh/revoke (audited as `cimd_resolve_failed`).
+     */
+    cimdCache?: CimdCache;
+    /** Optional DNS lookup for CIMD SSRF checks — see `CimdFetchOptions.lookup`. */
+    cimdLookup?: (hostname: string) => Promise<string[]>;
 };
-/** Default true — see `OAuthRouterOptions.allowUnregisteredClients`. */
-export declare const unregisteredClientsAllowed: (options: OAuthRouterOptions) => boolean;
-/** Default true since 1.0 — see `OAuthRouterOptions.requireRegisteredClients`. */
-export declare const registeredClientsRequired: (options: OAuthRouterOptions) => boolean;
-/** Scopes this AS advertises and is willing to grant. */
-export declare const advertisedScopes: (options: OAuthRouterOptions) => string[];
 /**
- * Scopes granted when a client omits `scope`. Falls back to the full
- * advertised set only when that set has at most one entry — see
- * `assertScopeConfig`, which forbids the ambiguous multi-scope case at
- * construction instead of silently over-granting here.
+ * `OAuthRouterOptions` after `createOAuthRouter` has resolved them: paths
+ * normalized and `ports.codeStore` always present, so no endpoint handler
+ * can fall back to a store of its own. Internal — not re-exported.
  */
-export declare const defaultScopes: (options: OAuthRouterOptions) => string[];
-/**
- * A multi-scope server MUST say what an omitted `scope` grants — the
- * alternative (silently granting everything advertised) is exactly the
- * escalation least-privilege scoping exists to prevent.
- */
-export declare const assertScopeConfig: (options: OAuthRouterOptions) => void;
-export declare const assertCodeSecret: (secret: string) => void;
-export declare const resolveSecret: (ports: OAuthPorts, req: Request) => Promise<string>;
+export type ResolvedOAuthRouterOptions = OAuthRouterOptions & {
+    resourcePath: string;
+    oauthPath: string;
+    ports: OAuthPorts & {
+        codeStore: CodeStore;
+    };
+};
 /**
  * An OAuth error's code and description without a `Response` built yet —
- * lets a caller choose delivery: `oauthError` below for a direct JSON
- * body, or a redirect to the client's own callback (RFC 6749 §4.1.2.1,
- * see `authorize.ts` and `consent.ts`).
+ * lets a caller choose delivery: `oauthError` for a direct JSON body, or a
+ * redirect to the client's own callback (RFC 6749 §4.1.2.1).
  */
 export type OAuthErrorInfo = {
     code: string;
     description: string;
 };
-export declare const oauthError: (error: string, status: number, description?: string) => Response;
-/** Direct JSON error when this AS does not serve unknown `client_id`s. */
-export declare const unregisteredClientError: (options: OAuthRouterOptions, reject: {
-    code: string;
-    status: number;
-}) => Response | null;
-/** `grantedScope` is what the auth code carried; the port may narrow it further. */
-export declare const tokenResponse: (minted: MintedToken, grantedScope?: string) => Response;
 //# sourceMappingURL=types.d.ts.map

package/dist/oauth/types.d.ts.map

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

package/dist/oauth/types.js

@@ -1,91 +1,2 @@
-import { jsonResponse } from "../http.js";
-import { DEFAULT_SCOPE } from "./constants.js";
-/**
- * Invoke `ports.audit`, swallowing any failure — the OAuth-side twin of
- * `methods.ts`'s `safeAudit`. No timeout wrapper here: unlike the MCP
- * side, nothing here is expected to be a slow, request-scoped metrics
- * call in the same way, and adding one would be complexity without a
- * demonstrated need — revisit if that changes.
- */
-export const safeOAuthAudit = async (options, entry) => {
-    try {
-        await options.ports.audit?.(entry);
-    }
-    catch {
-        // Intentionally ignored.
-    }
-};
-/** Default true — see `OAuthRouterOptions.allowUnregisteredClients`. */
-export const unregisteredClientsAllowed = (options) => options.allowUnregisteredClients !== false;
-/** Default true since 1.0 — see `OAuthRouterOptions.requireRegisteredClients`. */
-export const registeredClientsRequired = (options) => options.requireRegisteredClients !== false;
-/** Scopes this AS advertises and is willing to grant. */
-export const advertisedScopes = (options) => options.scopes ?? [DEFAULT_SCOPE];
-/**
- * Scopes granted when a client omits `scope`. Falls back to the full
- * advertised set only when that set has at most one entry — see
- * `assertScopeConfig`, which forbids the ambiguous multi-scope case at
- * construction instead of silently over-granting here.
- */
-export const defaultScopes = (options) => options.defaultScopes ?? advertisedScopes(options);
-/**
- * A multi-scope server MUST say what an omitted `scope` grants — the
- * alternative (silently granting everything advertised) is exactly the
- * escalation least-privilege scoping exists to prevent.
- */
-export const assertScopeConfig = (options) => {
-    const advertised = advertisedScopes(options);
-    if (advertised.length > 1 && !options.defaultScopes) {
-        throw new Error("scopes has more than one entry — defaultScopes must say what an omitted " +
-            "scope request grants (e.g. defaultScopes: [] for least privilege)");
-    }
-    const unknown = (options.defaultScopes ?? []).find((scope) => !advertised.includes(scope));
-    if (unknown !== undefined) {
-        throw new Error(`defaultScopes contains "${unknown}", which is not in scopes`);
-    }
-};
-/**
- * `codeSecret` can forge an auth code for any userId/scope/resource, so a
- * weak or copy-pasted one is a full authorization bypass, not a footgun.
- * The literals here are the exact strings this package's own docs/examples
- * publish — copy-paste is the realistic failure mode.
- */
-const MIN_CODE_SECRET_LENGTH = 32;
-const DENYLISTED_CODE_SECRETS = new Set([
-    "e2e-code-secret-value",
-    "change-me",
-    "test-secret-value",
-]);
-const GENERATE_HINT = "generate one with `openssl rand -base64 32`";
-export const assertCodeSecret = (secret) => {
-    // Checked before the length rule so a denylisted literal is always named
-    // for what it is, even if a future literal happens to be 32+ characters.
-    if (DENYLISTED_CODE_SECRETS.has(secret)) {
-        throw new Error(`codeSecret must not be a literal published in this package's own docs or examples — ${GENERATE_HINT}`);
-    }
-    if (secret.length < MIN_CODE_SECRET_LENGTH) {
-        throw new Error(`codeSecret must be at least ${MIN_CODE_SECRET_LENGTH} characters (got ${secret.length}) — ${GENERATE_HINT}`);
-    }
-};
-export const resolveSecret = async (ports, req) => {
-    const secret = typeof ports.codeSecret === "string" ? ports.codeSecret : await ports.codeSecret(req);
-    assertCodeSecret(secret);
-    return secret;
-};
-export const oauthError = (error, status, description) => jsonResponse(description ? { error, error_description: description } : { error }, status, undefined, { cors: false });
-const UNREGISTERED_CLIENT_DESCRIPTION = "unknown client_id — this server only serves pre-registered clients";
-/** Direct JSON error when this AS does not serve unknown `client_id`s. */
-export const unregisteredClientError = (options, reject) => {
-    if (unregisteredClientsAllowed(options))
-        return null;
-    return oauthError(reject.code, reject.status, UNREGISTERED_CLIENT_DESCRIPTION);
-};
-/** `grantedScope` is what the auth code carried; the port may narrow it further. */
-export const tokenResponse = (minted, grantedScope) => jsonResponse({
-    access_token: minted.accessToken,
-    token_type: minted.tokenType ?? "bearer",
-    expires_in: minted.expiresIn,
-    scope: minted.scope ?? grantedScope ?? DEFAULT_SCOPE,
-    ...(minted.refreshToken ? { refresh_token: minted.refreshToken } : {}),
-}, 200, undefined, { cors: false });
+export {};
 //# sourceMappingURL=types.js.map

package/dist/oauth/types.js.map

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

package/dist/server.d.ts

@@ -1,16 +1,16 @@
-export { createMcpApp, type McpApp, type McpAppAuth, type McpAppOptions, type VerifiedToken, } from "./app.js";
+export { createMcpApp, type McpApp, type McpAppAuth, type McpAppOptions, type UnifiedAuditEntry, type VerifiedToken, } from "./app.js";
 export { consoleAudit } from "./audit.js";
-export { matchesAny, parseBearer, rejectQueryToken, timingSafeEqual, type WwwAuthenticateOptions, wwwAuthenticateHeader, } from "./auth/bearer.js";
+export { parseBearer, rejectQueryToken, type WwwAuthenticateOptions, wwwAuthenticateHeader, } from "./auth/bearer.js";
 export { authMethodsFor, CLIENT_PROFILES, type ClientName, type ClientProfile, DEFAULT_CLIENTS, hasDynamicClient, preRegisteredClients, redirectUrisFor, } from "./clients.js";
-export { type AuditEntry, createMcpHandler, type McpHandler, type McpHandlerOptions, type McpPorts, type Principal, type ServerInfo, } from "./dispatch.js";
-export { corsHeaders, emptyResponse, jsonResponse, methodNotAllowed, optionsResponse, } from "./http.js";
-export { JSONRPC_INTERNAL_ERROR, JSONRPC_INVALID_PARAMS, JSONRPC_INVALID_REQUEST, JSONRPC_METHOD_NOT_FOUND, JSONRPC_PARSE_ERROR, JSONRPC_UNAUTHORIZED, type JsonRpcId, type JsonRpcRequest, type JsonRpcResponse, rpcError, rpcResult, } from "./jsonrpc.js";
-export type { CodeStore } from "./oauth/codes.js";
-export type { ConsentOptions, ConsentRequest } from "./oauth/consent.js";
+export * from "./deprecated.js";
+export { type JsonResponseInput, type JsonResponseOptions, jsonResponse, } from "./http/http.js";
+export { type AuditEntry, createMcpHandler, type McpHandler, type McpHandlerOptions, type McpPorts, type Principal, type ServerInfo, } from "./mcp/dispatch.js";
+export { JSONRPC_INTERNAL_ERROR, JSONRPC_INVALID_PARAMS, JSONRPC_INVALID_REQUEST, JSONRPC_METHOD_NOT_FOUND, JSONRPC_PARSE_ERROR, JSONRPC_UNAUTHORIZED, type JsonRpcId, type JsonRpcRequest, type JsonRpcResponse, rpcError, rpcResult, } from "./mcp/jsonrpc.js";
+export { DEFAULT_PROTOCOL_VERSION, PROTOCOL_VERSIONS } from "./mcp/protocol.js";
+export { createToolRegistry, type RegistryOptions, type ToolDef, type ToolHandler, type ToolListEntry, type ToolRegistry, type ToolResult, } from "./mcp/registry.js";
+export { type ApiRequest, type ApiToolOptions, apiTool, type DefineToolOptions, defineTool, type StandardSchemaV1, } from "./mcp/tools.js";
+export type { JsonSchema } from "./mcp/validate.js";
+export type { CodeStore } from "./oauth/crypto/codes.js";
 /** Auth-port types used by `McpAppAuth` — annotate extracted stores/callbacks. */
-export type { ClientStore, MintAccessTokenInput, MintedToken, OAuthUser, RefreshAccessTokenInput, RegisteredClient, RevokeTokenInput, } from "./oauth/types.js";
-export { ASSUMED_HEADER_PROTOCOL_VERSION, DEFAULT_PROTOCOL_VERSION, PROTOCOL_VERSIONS, pickProtocolVersion, } from "./protocol.js";
-export { createToolRegistry, type RegistryOptions, type ToolDef, type ToolHandler, type ToolListEntry, type ToolRegistry, type ToolResult, } from "./registry.js";
-export { type ApiRequest, type ApiToolOptions, apiTool, type DefineToolOptions, defineTool, type StandardSchemaV1, } from "./tools.js";
-export { IGNORED_SCHEMA_KEYWORDS, JSON_SCHEMA_TYPES, type JsonSchema, missingObjectType, SUPPORTED_SCHEMA_KEYWORDS, unsupportedKeywords, validateAgainstSchema, } from "./validate.js";
+export type { ClientStore, ConsentOptions, ConsentRequest, MintAccessTokenInput, MintedToken, OAuthUser, RefreshAccessTokenInput, RegisteredClient, RevokeTokenInput, } from "./oauth/types.js";
 //# sourceMappingURL=server.d.ts.map

package/dist/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,KAAK,MAAM,EACX,KAAK,UAAU,EACf,KAAK,aAAa,EAClB,KAAK,aAAa,GACnB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EACL,UAAU,EACV,WAAW,EACX,gBAAgB,EAChB,eAAe,EACf,KAAK,sBAAsB,EAC3B,qBAAqB,GACtB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,cAAc,EACd,eAAe,EACf,KAAK,UAAU,EACf,KAAK,aAAa,EAClB,eAAe,EACf,gBAAgB,EAChB,oBAAoB,EACpB,eAAe,GAChB,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,KAAK,UAAU,EACf,gBAAgB,EAChB,KAAK,UAAU,EACf,KAAK,iBAAiB,EACtB,KAAK,QAAQ,EACb,KAAK,SAAS,EACd,KAAK,UAAU,GAChB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,WAAW,EACX,aAAa,EACb,YAAY,EACZ,gBAAgB,EAChB,eAAe,GAChB,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EACtB,uBAAuB,EACvB,wBAAwB,EACxB,mBAAmB,EACnB,oBAAoB,EACpB,KAAK,SAAS,EACd,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,QAAQ,EACR,SAAS,GACV,MAAM,cAAc,CAAC;AACtB,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,YAAY,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzE,kFAAkF;AAClF,YAAY,EACV,WAAW,EACX,oBAAoB,EACpB,WAAW,EACX,SAAS,EACT,uBAAuB,EACvB,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,+BAA+B,EAC/B,wBAAwB,EACxB,iBAAiB,EACjB,mBAAmB,GACpB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,kBAAkB,EAClB,KAAK,eAAe,EACpB,KAAK,OAAO,EACZ,KAAK,WAAW,EAChB,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,UAAU,GAChB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,KAAK,UAAU,EACf,KAAK,cAAc,EACnB,OAAO,EACP,KAAK,iBAAiB,EACtB,UAAU,EACV,KAAK,gBAAgB,GACtB,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,uBAAuB,EACvB,iBAAiB,EACjB,KAAK,UAAU,EACf,iBAAiB,EACjB,yBAAyB,EACzB,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,eAAe,CAAC"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,KAAK,MAAM,EACX,KAAK,UAAU,EACf,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACtB,KAAK,aAAa,GACnB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EACL,WAAW,EACX,gBAAgB,EAChB,KAAK,sBAAsB,EAC3B,qBAAqB,GACtB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,cAAc,EACd,eAAe,EACf,KAAK,UAAU,EACf,KAAK,aAAa,EAClB,eAAe,EACf,gBAAgB,EAChB,oBAAoB,EACpB,eAAe,GAChB,MAAM,cAAc,CAAC;AAEtB,cAAc,iBAAiB,CAAC;AAChC,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,mBAAmB,EACxB,YAAY,GACb,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,KAAK,UAAU,EACf,gBAAgB,EAChB,KAAK,UAAU,EACf,KAAK,iBAAiB,EACtB,KAAK,QAAQ,EACb,KAAK,SAAS,EACd,KAAK,UAAU,GAChB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EACtB,uBAAuB,EACvB,wBAAwB,EACxB,mBAAmB,EACnB,oBAAoB,EACpB,KAAK,SAAS,EACd,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,QAAQ,EACR,SAAS,GACV,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAChF,OAAO,EACL,kBAAkB,EAClB,KAAK,eAAe,EACpB,KAAK,OAAO,EACZ,KAAK,WAAW,EAChB,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,UAAU,GAChB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,KAAK,UAAU,EACf,KAAK,cAAc,EACnB,OAAO,EACP,KAAK,iBAAiB,EACtB,UAAU,EACV,KAAK,gBAAgB,GACtB,MAAM,gBAAgB,CAAC;AACxB,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,YAAY,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACzD,kFAAkF;AAClF,YAAY,EACV,WAAW,EACX,cAAc,EACd,cAAc,EACd,oBAAoB,EACpB,WAAW,EACX,SAAS,EACT,uBAAuB,EACvB,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,kBAAkB,CAAC"}

package/dist/server.js

@@ -1,12 +1,13 @@
 export { createMcpApp, } from "./app.js";
 export { consoleAudit } from "./audit.js";
-export { matchesAny, parseBearer, rejectQueryToken, timingSafeEqual, wwwAuthenticateHeader, } from "./auth/bearer.js";
+export { parseBearer, rejectQueryToken, wwwAuthenticateHeader, } from "./auth/bearer.js";
 export { authMethodsFor, CLIENT_PROFILES, DEFAULT_CLIENTS, hasDynamicClient, preRegisteredClients, redirectUrisFor, } from "./clients.js";
-export { createMcpHandler, } from "./dispatch.js";
-export { corsHeaders, emptyResponse, jsonResponse, methodNotAllowed, optionsResponse, } from "./http.js";
-export { JSONRPC_INTERNAL_ERROR, JSONRPC_INVALID_PARAMS, JSONRPC_INVALID_REQUEST, JSONRPC_METHOD_NOT_FOUND, JSONRPC_PARSE_ERROR, JSONRPC_UNAUTHORIZED, rpcError, rpcResult, } from "./jsonrpc.js";
-export { ASSUMED_HEADER_PROTOCOL_VERSION, DEFAULT_PROTOCOL_VERSION, PROTOCOL_VERSIONS, pickProtocolVersion, } from "./protocol.js";
-export { createToolRegistry, } from "./registry.js";
-export { apiTool, defineTool, } from "./tools.js";
-export { IGNORED_SCHEMA_KEYWORDS, JSON_SCHEMA_TYPES, missingObjectType, SUPPORTED_SCHEMA_KEYWORDS, unsupportedKeywords, validateAgainstSchema, } from "./validate.js";
+// Moved to `mcp-trellis/advanced`; deprecated aliases until 3.0.
+export * from "./deprecated.js";
+export { jsonResponse, } from "./http/http.js";
+export { createMcpHandler, } from "./mcp/dispatch.js";
+export { JSONRPC_INTERNAL_ERROR, JSONRPC_INVALID_PARAMS, JSONRPC_INVALID_REQUEST, JSONRPC_METHOD_NOT_FOUND, JSONRPC_PARSE_ERROR, JSONRPC_UNAUTHORIZED, rpcError, rpcResult, } from "./mcp/jsonrpc.js";
+export { DEFAULT_PROTOCOL_VERSION, PROTOCOL_VERSIONS } from "./mcp/protocol.js";
+export { createToolRegistry, } from "./mcp/registry.js";
+export { apiTool, defineTool, } from "./mcp/tools.js";
 //# sourceMappingURL=server.js.map

package/dist/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,GAKb,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EACL,UAAU,EACV,WAAW,EACX,gBAAgB,EAChB,eAAe,EAEf,qBAAqB,GACtB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,cAAc,EACd,eAAe,EAGf,eAAe,EACf,gBAAgB,EAChB,oBAAoB,EACpB,eAAe,GAChB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAEL,gBAAgB,GAMjB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,WAAW,EACX,aAAa,EACb,YAAY,EACZ,gBAAgB,EAChB,eAAe,GAChB,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EACtB,uBAAuB,EACvB,wBAAwB,EACxB,mBAAmB,EACnB,oBAAoB,EAIpB,QAAQ,EACR,SAAS,GACV,MAAM,cAAc,CAAC;AActB,OAAO,EACL,+BAA+B,EAC/B,wBAAwB,EACxB,iBAAiB,EACjB,mBAAmB,GACpB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,kBAAkB,GAOnB,MAAM,eAAe,CAAC;AACvB,OAAO,EAGL,OAAO,EAEP,UAAU,GAEX,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,uBAAuB,EACvB,iBAAiB,EAEjB,iBAAiB,EACjB,yBAAyB,EACzB,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,eAAe,CAAC"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,GAMb,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EACL,WAAW,EACX,gBAAgB,EAEhB,qBAAqB,GACtB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,cAAc,EACd,eAAe,EAGf,eAAe,EACf,gBAAgB,EAChB,oBAAoB,EACpB,eAAe,GAChB,MAAM,cAAc,CAAC;AACtB,iEAAiE;AACjE,cAAc,iBAAiB,CAAC;AAChC,OAAO,EAGL,YAAY,GACb,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAEL,gBAAgB,GAMjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EACtB,uBAAuB,EACvB,wBAAwB,EACxB,mBAAmB,EACnB,oBAAoB,EAIpB,QAAQ,EACR,SAAS,GACV,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAChF,OAAO,EACL,kBAAkB,GAOnB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAGL,OAAO,EAEP,UAAU,GAEX,MAAM,gBAAgB,CAAC"}

package/dist/util/defined.d.ts

@@ -0,0 +1,11 @@
+/** `keys` of `T` with `undefined` removed from each value type, all optional. */
+export type DefinedProps<T, K extends keyof T> = {
+    [P in K]?: Exclude<T[P], undefined>;
+};
+/**
+ * Copies only the listed keys whose value is not `undefined`. Under
+ * `exactOptionalPropertyTypes` an explicit `undefined` is not assignable to
+ * an optional property, so forwarding optional options needs exactly this.
+ */
+export declare const pickDefined: <T extends object, K extends keyof T>(source: T, keys: readonly K[]) => DefinedProps<T, K>;
+//# sourceMappingURL=defined.d.ts.map

package/dist/util/defined.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"defined.d.ts","sourceRoot":"","sources":["../../src/util/defined.ts"],"names":[],"mappings":"AAAA,iFAAiF;AACjF,MAAM,MAAM,YAAY,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI;KAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC;CAAE,CAAC;AAEzF;;;;GAIG;AACH,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,CAAC,EAC7D,QAAQ,CAAC,EACT,MAAM,SAAS,CAAC,EAAE,KACjB,YAAY,CAAC,CAAC,EAAE,CAAC,CAOnB,CAAC"}

package/dist/util/defined.js

@@ -0,0 +1,15 @@
+/**
+ * Copies only the listed keys whose value is not `undefined`. Under
+ * `exactOptionalPropertyTypes` an explicit `undefined` is not assignable to
+ * an optional property, so forwarding optional options needs exactly this.
+ */
+export const pickDefined = (source, keys) => {
+    const picked = {};
+    for (const key of keys) {
+        const value = source[key];
+        if (value !== undefined)
+            picked[key] = value;
+    }
+    return picked;
+};
+//# sourceMappingURL=defined.js.map

package/dist/util/defined.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"defined.js","sourceRoot":"","sources":["../../src/util/defined.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,MAAS,EACT,IAAkB,EACE,EAAE;IACtB,MAAM,MAAM,GAAuB,EAAE,CAAC;IACtC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,KAAK,KAAK,SAAS;YAAE,MAAM,CAAC,GAAG,CAAC,GAAG,KAAiC,CAAC;IAC3E,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}

package/dist/util/json.d.ts

@@ -0,0 +1,3 @@
+/** A parsed JSON object — not `null`, not an array. */
+export declare const isJsonObject: (value: unknown) => value is Record<string, unknown>;
+//# sourceMappingURL=json.d.ts.map

package/dist/util/json.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["../../src/util/json.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,eAAO,MAAM,YAAY,GAAI,OAAO,OAAO,KAAG,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CACP,CAAC"}

package/dist/util/json.js

@@ -0,0 +1,3 @@
+/** A parsed JSON object — not `null`, not an array. */
+export const isJsonObject = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+//# sourceMappingURL=json.js.map

package/dist/util/json.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/util/json.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAc,EAAoC,EAAE,CAC/E,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC"}

package/docs/ROADMAP.md

@@ -1,24 +1,33 @@
 # mcp-trellis — roadmap
 
-Status: 2026-08-21. Written against MCP spec revision `2026-07-28`.
+Status: 2026-09-14. Written against MCP spec revision `2026-07-28`.
 
 ## What this library is
 
-> **The easy way to build a secure MCP server that works with Claude, Gemini,
-> and Codex** — on any Web-standard runtime, with no database and no vendor.
+> **Existing SaaS → authenticated AI connector SDK** — MCP + self-hosted OAuth
+> AS in one npm install, on any Web-standard runtime, with no database and no
+> vendor.
 
 The differentiating axis is **clients**, not runtimes. Runtime portability is
 table stakes; the official SDK has it too. What nobody in TypeScript ships is
 both halves — the MCP handler *and* a self-hosted OAuth authorization server —
 in one package you can drop into a Next.js route or a Deno server.
 
-| | Portable runtime | Self-hosted | AS included | Zero-dep |
+Contrast composition stacks that split the MCP runtime from the identity
+product (e.g. xmcp + Scalekit): those are 2–3 products to wire; mcp-trellis is
+one package with BYO-auth ports.
+
+| | Portable runtime | Self-hosted AS | One npm install | Zero-dep |
 |---|---|---|---|---|
-| Official SDK v2 | yes | yes | **no** | no |
+| Official SDK v2 | yes | **no** | yes (handler only) | no |
 | `workers-oauth-provider` | Workers only | yes | yes | — |
-| Auth0 / Authlete / Clerk / WorkOS | yes | **no** (SaaS) | yes | — |
+| Auth0 / Authlete / Clerk | yes | **no** (SaaS) | no (IdP + MCP) | — |
 | Better Auth | yes | yes | yes, but full stack + DB | no |
-| **mcp-trellis** | yes | yes | yes | yes |
+| **xmcp** | yes | **no** (compose) | no — pair with IdP | — |
+| **Scalekit** | yes | managed connector IdP | no — pair with MCP runtime | — |
+| **WorkOS Standalone Connect** | yes | managed | no — IdP + your MCP | — |
+| **Descope** | yes | managed | no — IdP + your MCP | — |
+| **mcp-trellis** | yes | yes | **yes** (handler + AS) | yes |
 
 The official SDK explicitly does not provide an authorization server — it offers
 SDK-level opt-ins and expects you to bring the infrastructure. That gap is the
@@ -110,7 +119,9 @@ a proper JSON-RPC error.
 - **Claims on `Principal`.** Optional `claims` from `verifyToken` /
   `VerifiedToken` flow into `context` (plan/role metadata — not the
   Host→tenant isolation key). Host-origin allowlisting (`allowedOrigins` on
-  `asNodeHandler`) is **required** when origin is Host-derived.
+  `asNodeHandler`) is **required** when origin is Host-derived. Separately,
+  browser `Origin` on MCP is gated by `allowedRequestOrigins` (fail-closed
+  when the header is present; native clients omit it).
 
 - **`validateArgs` fail-fast.** With `validateArgs: true`, unsupported JSON
   Schema keywords throw at `createToolRegistry` construction instead of
@@ -210,49 +221,26 @@ a proper JSON-RPC error.
   MCP audit hook. Sees the real reason behind a collapsed `invalid_client`
   or a rejected `codeSecret`, which the caller never does.
 
+**2.0 — CIMD, unified audit, recipes.**
+
+- **CIMD (Client ID Metadata Documents)** — opt-in (`cimd: true`). HTTPS URL
+  `client_id`s are fetched and validated with SSRF hardening (public hosts
+  only, size / redirect / timeout caps). Advertises
+  `client_id_metadata_document_supported`. Optional `cimdCache` port.
+  Off by default until connect-pinned fetch closes the DNS-rebinding ceiling.
+- **Unified `audit` sink** on `createMcpApp` — one callback for MCP and
+  OAuth events (`source: "mcp" | "oauth"`); `auth.audit` remains an
+  OAuth-only override.
+- **Framework recipes** — `examples/nextjs-route.ts`, `examples/express.ts`.
+- Fail-closed defaults: `allowInMemoryCodeStore` / `validateArgs`.
+- **RFC 9207 `iss`** on authorize / error redirects; AS metadata advertises
+  `authorization_response_iss_parameter_supported`.
+
 ---
 
 ## Next
 
-### 1. CIMD — Client ID Metadata Documents
-
-DCR is deprecated as of `2026-07-28`; CIMD is the recommended replacement and
-the direction Claude and Codex are heading. The client publishes JSON at an
-HTTPS URL and uses that URL as its `client_id`; the AS resolves it on demand.
-
-AS-side requirements: detect URL-formatted `client_id`; fetch it; **MUST**
-validate the document's `client_id` equals the URL exactly; **MUST** validate
-the request's `redirect_uri` against the document's `redirect_uris`; **SHOULD**
-cache respecting HTTP cache headers; advertise
-`client_id_metadata_document_supported: true`.
-
-This slots cleanly into the existing shape — pure `fetch` plus validation, with
-caching as a port. It also completes the picture: the spec defines exactly three
-registration mechanisms, and they map one-to-one onto the three clients.
-
-```
-CIMD             → Claude, Codex     (public + PKCE)
-pre-registration → Gemini Enterprise (confidential)   ← shipped
-DCR              → legacy fallback                    ← shipped
-```
-
-The security work is the real work: an AS that fetches attacker-supplied URLs is
-an SSRF engine unless it blocks private/loopback/link-local ranges and DNS
-rebinding, caps redirects, response size, and timeout, and refuses non-HTTPS.
-Cloudflare's implementation is a useful reference for what "done right" means
-(5 KB cap, 10 s timeout, public clients only).
-
-Note: CIMD is not unclaimed. Authlete, Auth0, Clerk, and `workers-oauth-provider`
-all ship it. The claim here is narrower and still true — none of them is a
-portable, self-hosted, zero-dependency library.
-
-### 2. RFC 9207 — `iss` in the authorization response
-
-Add `iss` to the authorize redirect and
-`authorization_response_iss_parameter_supported` to AS metadata. Small, and a
-spec-level SHOULD.
-
-### 3. Protocol currency — `2026-07-28`
+### 1. Protocol currency — `2026-07-28`
 
 Deferred deliberately: Claude, Gemini, and Codex all work against current
 revisions today, and the official SDK already covers dual-era for anyone who